diff --git a/es/components/common/tabBar/index.json b/es/components/common/tabBar/index.json index 54d0697ab..cf908c012 100644 --- a/es/components/common/tabBar/index.json +++ b/es/components/common/tabBar/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "oak-icon": "../../icon/index", + "oak-icon": "@oak-frontend-base/icon/index", "l-badge": "@oak-frontend-base/miniprogram_npm/lin-ui/badge/index" } } diff --git a/es/components/func/actionPanel/index.json b/es/components/func/actionPanel/index.json index 30f832814..693ceb04b 100644 --- a/es/components/func/actionPanel/index.json +++ b/es/components/func/actionPanel/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "oak-icon": "../../icon/index", + "oak-icon": "@oak-frontend-base/icon/index", "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-icon": "@oak-frontend-base/miniprogram_npm/lin-ui/icon/index", "l-grid": "@oak-frontend-base/miniprogram_npm/lin-ui/grid/index", diff --git a/es/components/func/debugPanel/index.json b/es/components/func/debugPanel/index.json index fbf928d8e..c142cec07 100644 --- a/es/components/func/debugPanel/index.json +++ b/es/components/func/debugPanel/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "oak-icon": "../../icon/index", + "oak-icon": "@oak-frontend-base/icon/index", "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-arc-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/arc-popup/index", "l-dialog": "@oak-frontend-base/miniprogram_npm/lin-ui/dialog/index", diff --git a/es/components/func/debugPanel/web.js b/es/components/func/debugPanel/web.js index 763c65a9b..ce4993ca1 100644 --- a/es/components/func/debugPanel/web.js +++ b/es/components/func/debugPanel/web.js @@ -2,11 +2,13 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run import React, { useState } from 'react'; import { Button, Space, Drawer, Modal, Tooltip } from 'antd'; import Style from './web.module.less'; -import OakIcon from '../../icon'; +import OakIcon from 'oak-frontend-base/es/components/icon'; +import IconDemo from '../../icon'; export default function render(props) { const { placement = 'bottom', style = {} } = props.data; const { printCachedStore, printDebugStore, printRunningTree, resetInitialData, downloadEnv, resetEnv } = props.methods; const [visible, setVisible] = useState(false); + const [iconOpen, setIconOpen] = useState(false); return (_jsxs(React.Fragment, { children: [_jsx(Button, { type: "text", shape: "circle", icon: _jsx(OakIcon, { name: "packup" }), style: { position: 'fixed', bottom: 0, @@ -68,6 +70,13 @@ export default function render(props) { }, }); }, children: "Reset" }) }), _jsx(Tooltip, { title: "\u67E5\u770BOakIcon", children: _jsx(Button, { size: "large", type: "primary", shape: "circle", onClick: () => { - window.open('/icon'); - }, children: "Icon" }) })] })] })] })); + setIconOpen(true); + }, children: "Icon" }) })] })] }), _jsx(Modal, { width: 960, title: "oak-icon", footer: null, open: iconOpen, onCancel: () => { + setIconOpen(false); + }, styles: { + body: { + height: window.innerHeight - 200, + overflowY: 'auto' + } + }, children: _jsx(IconDemo, {}) })] })); } diff --git a/es/pages/icon/iconfont.json b/es/components/icon/iconfont.json similarity index 100% rename from es/pages/icon/iconfont.json rename to es/components/icon/iconfont.json diff --git a/es/components/icon/iconfont.less b/es/components/icon/iconfont.less deleted file mode 100644 index 8446ff151..000000000 --- a/es/components/icon/iconfont.less +++ /dev/null @@ -1,724 +0,0 @@ -@font-face { - font-family: "iconfont"; - src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'); -} - -.oak-icon { - display: inline-block; - font-family: 'iconfont'; - speak: none; - font-size: 14px; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - text-rendering: auto; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - vertical-align: middle; -} - -.oak-icon-accessory:before { - content: "\e6dd"; -} - -.oak-icon-activity:before { - content: "\e6de"; -} - -.oak-icon-activity_fill:before { - content: "\e6df"; -} - -.oak-icon-add:before { - content: "\e6e0"; -} - -.oak-icon-addition_fill:before { - content: "\e6e1"; -} - -.oak-icon-addition:before { - content: "\e6e2"; -} - -.oak-icon-addpeople_fill:before { - content: "\e6e3"; -} - -.oak-icon-addpeople:before { - content: "\e6e4"; -} - -.oak-icon-addressbook_fill:before { - content: "\e6e5"; -} - -.oak-icon-addressbook:before { - content: "\e6e6"; -} - -.oak-icon-barrage_fill:before { - content: "\e6e7"; -} - -.oak-icon-barrage:before { - content: "\e6e8"; -} - -.oak-icon-browse_fill:before { - content: "\e6e9"; -} - -.oak-icon-browse:before { - content: "\e6ea"; -} - -.oak-icon-brush:before { - content: "\e6eb"; -} - -.oak-icon-brush_fill:before { - content: "\e6ec"; -} - -.oak-icon-businesscard_fill:before { - content: "\e6ed"; -} - -.oak-icon-businesscard:before { - content: "\e6ee"; -} - -.oak-icon-camera_fill:before { - content: "\e6ef"; -} - -.oak-icon-camera:before { - content: "\e6f0"; -} - -.oak-icon-clock_fill:before { - content: "\e6f1"; -} - -.oak-icon-clock:before { - content: "\e6f2"; -} - -.oak-icon-close:before { - content: "\e6f3"; -} - -.oak-icon-collection_fill:before { - content: "\e6f4"; -} - -.oak-icon-collection:before { - content: "\e6f5"; -} - -.oak-icon-computer_fill:before { - content: "\e6f6"; -} - -.oak-icon-computer:before { - content: "\e6f7"; -} - -.oak-icon-coordinates_fill:before { - content: "\e6f8"; -} - -.oak-icon-coordinates:before { - content: "\e6f9"; -} - -.oak-icon-coupons_fill:before { - content: "\e6fa"; -} - -.oak-icon-coupons:before { - content: "\e6fb"; -} - -.oak-icon-createtask_fill:before { - content: "\e6fc"; -} - -.oak-icon-createtask:before { - content: "\e6fd"; -} - -.oak-icon-customerservice_fill:before { - content: "\e6fe"; -} - -.oak-icon-customerservice:before { - content: "\e6ff"; -} - -.oak-icon-delete_fill:before { - content: "\e700"; -} - -.oak-icon-delete:before { - content: "\e701"; -} - -.oak-icon-document:before { - content: "\e702"; -} - -.oak-icon-document_fill:before { - content: "\e703"; -} - -.oak-icon-dynamic_fill:before { - content: "\e704"; -} - -.oak-icon-dynamic:before { - content: "\e705"; -} - -.oak-icon-editor:before { - content: "\e706"; -} - -.oak-icon-eit:before { - content: "\e707"; -} - -.oak-icon-emoji_fill:before { - content: "\e708"; -} - -.oak-icon-emoji:before { - content: "\e709"; -} - -.oak-icon-empty:before { - content: "\e70a"; -} - -.oak-icon-empty_fill:before { - content: "\e70b"; -} - -.oak-icon-enter:before { - content: "\e70c"; -} - -.oak-icon-enterinto:before { - content: "\e70d"; -} - -.oak-icon-enterinto_fill:before { - content: "\e70e"; -} - -.oak-icon-feedback_fill:before { - content: "\e70f"; -} - -.oak-icon-feedback:before { - content: "\e710"; -} - -.oak-icon-flag_fill:before { - content: "\e711"; -} - -.oak-icon-flag:before { - content: "\e712"; -} - -.oak-icon-flashlight:before { - content: "\e713"; -} - -.oak-icon-flashlight_fill:before { - content: "\e714"; -} - -.oak-icon-flip:before { - content: "\e715"; -} - -.oak-icon-flip_fill:before { - content: "\e716"; -} - -.oak-icon-fullscreen:before { - content: "\e717"; -} - -.oak-icon-group:before { - content: "\e718"; -} - -.oak-icon-group_fill:before { - content: "\e719"; -} - -.oak-icon-headlines_fill:before { - content: "\e71a"; -} - -.oak-icon-headlines:before { - content: "\e71b"; -} - -.oak-icon-homepage_fill:before { - content: "\e71c"; -} - -.oak-icon-homepage:before { - content: "\e71d"; -} - -.oak-icon-integral_fill:before { - content: "\e71e"; -} - -.oak-icon-integral:before { - content: "\e71f"; -} - -.oak-icon-interactive_fill:before { - content: "\e720"; -} - -.oak-icon-interactive:before { - content: "\e721"; -} - -.oak-icon-keyboard:before { - content: "\e722"; -} - -.oak-icon-label:before { - content: "\e723"; -} - -.oak-icon-label_fill:before { - content: "\e724"; -} - -.oak-icon-like_fill:before { - content: "\e725"; -} - -.oak-icon-like:before { - content: "\e726"; -} - -.oak-icon-live_fill:before { - content: "\e727"; -} - -.oak-icon-live:before { - content: "\e728"; -} - -.oak-icon-lock_fill:before { - content: "\e729"; -} - -.oak-icon-lock:before { - content: "\e72a"; -} - -.oak-icon-mail:before { - content: "\e72b"; -} - -.oak-icon-mail_fill:before { - content: "\e72c"; -} - -.oak-icon-manage_fill:before { - content: "\e72d"; -} - -.oak-icon-manage:before { - content: "\e72e"; -} - -.oak-icon-message:before { - content: "\e72f"; -} - -.oak-icon-message_fill:before { - content: "\e730"; -} - -.oak-icon-mine:before { - content: "\e731"; -} - -.oak-icon-mine_fill:before { - content: "\e732"; -} - -.oak-icon-mobilephone_fill:before { - content: "\e733"; -} - -.oak-icon-mobilephone:before { - content: "\e734"; -} - -.oak-icon-more:before { - content: "\e735"; -} - -.oak-icon-narrow:before { - content: "\e736"; -} - -.oak-icon-offline_fill:before { - content: "\e737"; -} - -.oak-icon-offline:before { - content: "\e738"; -} - -.oak-icon-order_fill:before { - content: "\e739"; -} - -.oak-icon-order:before { - content: "\e73a"; -} - -.oak-icon-other:before { - content: "\e73b"; -} - -.oak-icon-people_fill:before { - content: "\e73c"; -} - -.oak-icon-people:before { - content: "\e73d"; -} - -.oak-icon-picture_fill:before { - content: "\e73e"; -} - -.oak-icon-picture:before { - content: "\e73f"; -} - -.oak-icon-play:before { - content: "\e740"; -} - -.oak-icon-play_fill:before { - content: "\e741"; -} - -.oak-icon-playon_fill:before { - content: "\e742"; -} - -.oak-icon-playon:before { - content: "\e743"; -} - -.oak-icon-praise_fill:before { - content: "\e744"; -} - -.oak-icon-praise:before { - content: "\e745"; -} - -.oak-icon-prompt_fill:before { - content: "\e746"; -} - -.oak-icon-prompt:before { - content: "\e747"; -} - -.oak-icon-qrcode_fill:before { - content: "\e748"; -} - -.oak-icon-qrcode:before { - content: "\e749"; -} - -.oak-icon-redpacket_fill:before { - content: "\e74a"; -} - -.oak-icon-redpacket:before { - content: "\e74b"; -} - -.oak-icon-refresh:before { - content: "\e74c"; -} - -.oak-icon-remind_fill:before { - content: "\e74d"; -} - -.oak-icon-remind:before { - content: "\e74e"; -} - -.oak-icon-return:before { - content: "\e74f"; -} - -.oak-icon-right:before { - content: "\e750"; -} - -.oak-icon-scan:before { - content: "\e751"; -} - -.oak-icon-select_fill:before { - content: "\e752"; -} - -.oak-icon-select:before { - content: "\e753"; -} - -.oak-icon-send:before { - content: "\e754"; -} - -.oak-icon-service_fill:before { - content: "\e755"; -} - -.oak-icon-service:before { - content: "\e756"; -} - -.oak-icon-setup_fill:before { - content: "\e757"; -} - -.oak-icon-setup:before { - content: "\e758"; -} - -.oak-icon-share_fill:before { - content: "\e759"; -} - -.oak-icon-share:before { - content: "\e75a"; -} - -.oak-icon-shielding_fill:before { - content: "\e75b"; -} - -.oak-icon-shielding:before { - content: "\e75c"; -} - -.oak-icon-smallscreen_fill:before { - content: "\e75d"; -} - -.oak-icon-smallscreen:before { - content: "\e75e"; -} - -.oak-icon-stealth_fill:before { - content: "\e75f"; -} - -.oak-icon-stealth:before { - content: "\e760"; -} - -.oak-icon-success_fill:before { - content: "\e761"; -} - -.oak-icon-success:before { - content: "\e762"; -} - -.oak-icon-suspend:before { - content: "\e763"; -} - -.oak-icon-switch:before { - content: "\e764"; -} - -.oak-icon-systemprompt_fill:before { - content: "\e765"; -} - -.oak-icon-systemprompt:before { - content: "\e766"; -} - -.oak-icon-tailor:before { - content: "\e767"; -} - -.oak-icon-task:before { - content: "\e768"; -} - -.oak-icon-task_fill:before { - content: "\e769"; -} - -.oak-icon-tasklist_fill:before { - content: "\e76a"; -} - -.oak-icon-tasklist:before { - content: "\e76b"; -} - -.oak-icon-text:before { - content: "\e76c"; -} - -.oak-icon-time_fill:before { - content: "\e76d"; -} - -.oak-icon-time:before { - content: "\e76e"; -} - -.oak-icon-translation_fill:before { - content: "\e76f"; -} - -.oak-icon-translation:before { - content: "\e770"; -} - -.oak-icon-trash:before { - content: "\e771"; -} - -.oak-icon-trash_fill:before { - content: "\e772"; -} - -.oak-icon-undo:before { - content: "\e773"; -} - -.oak-icon-unlock_fill:before { - content: "\e774"; -} - -.oak-icon-unlock:before { - content: "\e775"; -} - -.oak-icon-video:before { - content: "\e776"; -} - -.oak-icon-video_fill:before { - content: "\e777"; -} - -.oak-icon-warning_fill:before { - content: "\e778"; -} - -.oak-icon-warning:before { - content: "\e779"; -} - -.oak-icon-workbench_fill:before { - content: "\e77a"; -} - -.oak-icon-workbench:before { - content: "\e77b"; -} - -.oak-icon-search:before { - content: "\e77c"; -} - -.oak-icon-search_fill:before { - content: "\e77d"; -} - -.oak-icon-publish_goods_fill:before { - content: "\e77e"; -} - -.oak-icon-shop_fill:before { - content: "\e77f"; -} - -.oak-icon-transaction_fill:before { - content: "\e780"; -} - -.oak-icon-packup:before { - content: "\e781"; -} - -.oak-icon-unfold:before { - content: "\e782"; -} - -.oak-icon-financial_fill:before { - content: "\e783"; -} - -.oak-icon-marketing_fill:before { - content: "\e784"; -} - -.oak-icon-shake:before { - content: "\e785"; -} - -.oak-icon-decoration_fill:before { - content: "\e786"; -} - -.oak-icon-questions:before { - content: "\e787"; -} - -.oak-icon-supply:before { - content: "\e788"; -} - -.oak-icon-tools:before { - content: "\e789"; -} - -.oak-icon-int_fill:before { - content: "\e78a"; -} - -.oak-icon-commodity:before { - content: "\e78b"; -} - -.oak-icon-energy:before { - content: "\e78c"; -} \ No newline at end of file diff --git a/es/components/icon/index.d.ts b/es/components/icon/index.d.ts index 39599d270..1bb3b86c8 100644 --- a/es/components/icon/index.d.ts +++ b/es/components/icon/index.d.ts @@ -1,7 +1,4 @@ +/// /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/icon/index.js b/es/components/icon/index.js index 8985a3dc6..f3eb0950a 100644 --- a/es/components/icon/index.js +++ b/es/components/icon/index.js @@ -1,11 +1,4 @@ export default OakComponent({ - isList: false, - wechatMp: { - externalClasses: ['oak-class'], - }, - properties: { - name: '', - size: 0, - color: '', - }, + isList: true, + methods: {}, }); diff --git a/es/components/icon/index.json b/es/components/icon/index.json index 10e7f9d58..bc52459b0 100644 --- a/es/components/icon/index.json +++ b/es/components/icon/index.json @@ -1,3 +1,4 @@ { - "component": true + "navigationBarTitleText": "OakIcon示例", + "usingComponents": {} } diff --git a/es/components/icon/index.less b/es/components/icon/index.less index e0d95c9af..1e649940f 100644 --- a/es/components/icon/index.less +++ b/es/components/icon/index.less @@ -1,22 +1,6 @@ -@import './iconfont.less'; -@import '../../config/styles/mp/index.less'; -.oak-icon__primary { - color: @oak-color-primary; + +.page-body { + display: flex; } -.oak-icon__error { - color: @oak-color-error; -} - -.oak-icon__warning { - color: @oak-color-warning; -} - -.oak-icon__success { - color: @oak-color-success; -} - -.oak-icon__info { - color: @oak-color-info; -} \ No newline at end of file diff --git a/es/components/icon/index.xml b/es/components/icon/index.xml index 18e6baf43..b93d0c355 100644 --- a/es/components/icon/index.xml +++ b/es/components/icon/index.xml @@ -1 +1,4 @@ - \ No newline at end of file + + + 未实现 + \ No newline at end of file diff --git a/es/components/icon/web.d.ts b/es/components/icon/web.d.ts index 0d5c0042f..d6b0fa37c 100644 --- a/es/components/icon/web.d.ts +++ b/es/components/icon/web.d.ts @@ -1,11 +1,3 @@ -import { WebComponentProps } from 'oak-frontend-base'; -import React from 'react'; import { EntityDict } from '../../oak-app-domain'; -import './web.less'; -export default function Render(props: WebComponentProps): import("react/jsx-runtime").JSX.Element; +import { WebComponentProps } from 'oak-frontend-base'; +export default function Render(props: WebComponentProps): import("react/jsx-runtime").JSX.Element; diff --git a/es/components/icon/web.js b/es/components/icon/web.js index b249e9376..cb188dbd8 100644 --- a/es/components/icon/web.js +++ b/es/components/icon/web.js @@ -1,15 +1,47 @@ -import { jsx as _jsx } from "react/jsx-runtime"; -import './web.less'; -export default function Render(props) { - const { data } = props; - const { name, color = '', size, className, style = {}, } = data; - const isColor = ['primary', 'info', 'success', 'error', 'warning'].includes(color); - let class_name = 'oak-icon ' + 'oak-icon-' + name; - if (isColor || color === '') { - class_name += ' ' + 'oak-icon__' + (color || 'primary'); +import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime"; +import JsonData from './iconfont.json'; +import OakIcon from 'oak-frontend-base/es/components/icon'; +import Style from './web.module.less'; +/** + * 复制文本到剪切板中 + * + * @export + * @param {*} value 需要复制的文本 + * @param {*} cb 复制成功后的回调 + */ +function copy(value, cb) { + // 动态创建 textarea 标签 + const textarea = document.createElement('textarea'); + // 将该 textarea 设为 readonly 防止 iOS 下自动唤起键盘，同时将 textarea 移出可视区域 + textarea.readOnly = 'readonly'; + textarea.style.position = 'absolute'; + textarea.style.left = '-9999px'; + // 将要 copy 的值赋给 textarea 标签的 value 属性 + // 网上有些例子是赋值给innerText,这样也会赋值成功，但是识别不了\r\n的换行符，赋值给value属性就可以 + textarea.value = value; + // 将 textarea 插入到 body 中 + document.body.appendChild(textarea); + // 选中值并复制 + textarea.select(); + textarea.setSelectionRange(0, textarea.value.length); + document.execCommand('Copy'); + document.body.removeChild(textarea); + if (cb && Object.prototype.toString.call(cb) === '[object Function]') { + cb(); } - if (className) { - class_name += ' ' + className; - } - return (_jsx("span", { className: class_name, style: Object.assign(style, size && { fontSize: size }, color && !isColor && { color }) })); +} +export default function Render(props) { + const { methods } = props; + const icons = JsonData.glyphs; + return (_jsx("div", { className: Style.container, children: _jsx("ul", { className: Style.dibBox, children: icons.map((ele) => { + return (_jsxs("li", { className: Style.dib, onClick: () => { + const content = ``; + copy(content, () => { + methods.setMessage({ + type: 'success', + content, + }); + }); + }, children: [_jsx("div", { className: Style.iconBox, children: _jsx(OakIcon, { name: ele.name, size: 40 }) }), _jsx("div", { className: Style.name, children: ele.name })] })); + }) }) })); } diff --git a/es/components/icon/web.less b/es/components/icon/web.less deleted file mode 100644 index 870b0ef4c..000000000 --- a/es/components/icon/web.less +++ /dev/null @@ -1,21 +0,0 @@ -@import './iconfont.less'; - -.oak-icon__primary { - color: var(--oak-color-primary); -} - -.oak-icon__error { - color: var(--oak-color-error); -} - -.oak-icon__warning { - color: var(--oak-color-warning); -} - -.oak-icon__success { - color: var(--oak-color-success); -} - -.oak-icon__info { - color: var(--oak-color-info); -} \ No newline at end of file diff --git a/src/pages/icon/web.module.less b/es/components/icon/web.module.less similarity index 97% rename from src/pages/icon/web.module.less rename to es/components/icon/web.module.less index bc555241b..299e9cc69 100644 --- a/src/pages/icon/web.module.less +++ b/es/components/icon/web.module.less @@ -1,7 +1,7 @@ .container { display: flex; padding: 30px 100px; - width: 960px; + width: 900px; margin: 0 auto; background-color: var(--oak-bg-color-page); } diff --git a/es/components/my/avatar/web.js b/es/components/my/avatar/web.js index ca7cc1f7f..b426c081d 100644 --- a/es/components/my/avatar/web.js +++ b/es/components/my/avatar/web.js @@ -1,7 +1,7 @@ import { jsx as _jsx } from "react/jsx-runtime"; import { Avatar } from 'antd'; import Styles from './web.module.less'; -import OakIcon from '../../icon/index'; +import OakIcon from 'oak-frontend-base/es/components/icon'; export default function Render(props) { const { data: { avatarUrl, shape, size, iconColor, iconName, onClick } } = props; return avatarUrl ? (_jsx(Avatar, { className: onClick ? Styles.avatar : undefined, src: avatarUrl, shape: shape, size: size, onClick: onClick })) : (_jsx(Avatar, { className: onClick ? Styles.avatar : undefined, icon: _jsx(OakIcon, { name: iconName, color: iconColor }), shape: shape, size: size, onClick: onClick })); diff --git a/es/components/my/info/web.js b/es/components/my/info/web.js index 80a38e47c..5714c7eed 100644 --- a/es/components/my/info/web.js +++ b/es/components/my/info/web.js @@ -3,7 +3,7 @@ import { useState } from 'react'; import Styles from './web.pc.module.less'; import { Button, List, Popup, Tag, Input, Radio, Form, Space } from 'antd-mobile'; import MyAvatar from '../avatar'; -import OakIcon from '../../icon'; +import OakIcon from 'oak-frontend-base/es/components/icon'; const PrimaryColor = getComputedStyle(document.documentElement).getPropertyValue('--oak-color-primary'); const WarningColor = getComputedStyle(document.documentElement).getPropertyValue('--oak-color-warning'); const ErrorColor = getComputedStyle(document.documentElement).getPropertyValue('--oak-color-error'); diff --git a/es/components/my/info/web.pc.js b/es/components/my/info/web.pc.js index fcb80295c..196129d52 100644 --- a/es/components/my/info/web.pc.js +++ b/es/components/my/info/web.pc.js @@ -3,7 +3,7 @@ import { useState } from 'react'; import Styles from './web.pc.module.less'; import { Button, List, Modal, Tag, Input, Radio } from 'antd'; import MyAvatar from '../avatar'; -import OakIcon from '../../icon'; +import OakIcon from 'oak-frontend-base/es/components/icon'; const PrimaryColor = getComputedStyle(document.documentElement).getPropertyValue('--oak-color-primary'); const WarningColor = getComputedStyle(document.documentElement).getPropertyValue('--oak-color-warning'); const ErrorColor = getComputedStyle(document.documentElement).getPropertyValue('--oak-color-error'); diff --git a/es/components/token/me/index.json b/es/components/token/me/index.json index a9bf8da87..97dcbe15c 100644 --- a/es/components/token/me/index.json +++ b/es/components/token/me/index.json @@ -1,7 +1,7 @@ { "navigationBarTitleText": "个人中心", "usingComponents": { - "oak-icon": "../../../components/icon/index", + "oak-icon": "@oak-frontend-base/components/icon/index", "l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index", "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-avatar": "@oak-frontend-base/miniprogram_npm/lin-ui/avatar/index" diff --git a/es/components/user/manage/detail/index.json b/es/components/user/manage/detail/index.json index 1c24a5cb4..d59181208 100644 --- a/es/components/user/manage/detail/index.json +++ b/es/components/user/manage/detail/index.json @@ -2,7 +2,7 @@ "navigationBarTitleText": "用户详情", "usingComponents": { "actionPanel": "../../../../components/func/actionPanel/index", - "oak-icon": "../../../../components/icon/index", + "oak-icon": "@oak-frontend-base/components/icon/index", "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-avatar": "@oak-frontend-base/miniprogram_npm/lin-ui/avatar/index", "l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index", diff --git a/es/pages/changePassword/index.d.ts b/es/pages/changePassword/index.d.ts deleted file mode 100644 index 087d63e96..000000000 --- a/es/pages/changePassword/index.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -/// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; -export default _default; diff --git a/es/pages/changePassword/index.js b/es/pages/changePassword/index.js deleted file mode 100644 index 0fc123376..000000000 --- a/es/pages/changePassword/index.js +++ /dev/null @@ -1,38 +0,0 @@ -import { OakUserInvisibleException } from 'oak-domain/lib/types'; -export default OakComponent({ - isList: false, - properties: { - showBack: false, - userId: '', - }, - data: { - currentUserId: '', - }, - lifetimes: { - attached() { - const { userId } = this.props; - const currentUserId = this.features.token.getUserId(true); - if (!currentUserId) { - this.setMessage({ - type: 'error', - content: '您尚未登录', - }); - this.navigateTo({ - url: '/login', - }, undefined, true); - return; - } - if (userId && currentUserId) { - if (userId !== currentUserId) { - const isRoot = this.features.token.isRoot(); - if (!isRoot) { - throw new OakUserInvisibleException(); - } - } - } - this.setState({ - currentUserId, - }); - }, - }, -}); diff --git a/es/pages/changePassword/index.less b/es/pages/changePassword/index.less deleted file mode 100644 index 322711218..000000000 --- a/es/pages/changePassword/index.less +++ /dev/null @@ -1,38 +0,0 @@ -/** index.wxss **/ -@import "../../../config/styles/mp/index.less"; -@import "../../../config/styles/mp/mixins.less"; - -.page-body { - height: 100vh; - display: flex; - flex: 1; - flex-direction: column; - box-sizing: border-box; - align-items: stretch; - background-color: @oak-bg-color-page; - .safe-area-inset-bottom(); -} - -.container { - flex: 1; - display: flex; - flex-direction: column; -} - -.container2 { - flex-direction: row; - align-items: center; - justify-content: center; -} - -.card { - min-width: 480rpx; - text-align: center; -} - -.list { - background-color: #fff; - margin-top: 20rpx; - padding: 0 20rpx; - -} \ No newline at end of file diff --git a/es/pages/changePassword/web.d.ts b/es/pages/changePassword/web.d.ts deleted file mode 100644 index 8e3e05e80..000000000 --- a/es/pages/changePassword/web.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { WebComponentProps } from 'oak-frontend-base'; -import { EntityDict } from '../../oak-app-domain'; -export default function render(props: WebComponentProps): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/changePassword/web.js b/es/pages/changePassword/web.js deleted file mode 100644 index 54a42b255..000000000 --- a/es/pages/changePassword/web.js +++ /dev/null @@ -1,7 +0,0 @@ -import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime"; -import Style from './web.module.less'; -import ChangePassword from '../../components/changePassword'; -export default function render(props) { - const { showBack, userId, currentUserId } = props.data; - return ((userId || currentUserId) ? _jsx("div", { className: Style.container, children: _jsx(ChangePassword, { oakId: userId || currentUserId, oakPath: "$changePassword-component", oakAutoUnmount: true }) }) : _jsx(_Fragment, {})); -} diff --git a/es/pages/changePassword/web.module.less b/es/pages/changePassword/web.module.less deleted file mode 100644 index 89bd41be4..000000000 --- a/es/pages/changePassword/web.module.less +++ /dev/null @@ -1,12 +0,0 @@ - - -.container { - background: var(--oak-bg-color-container); - box-shadow: 0 2px 3px #0000001a; - border-radius: 3px; - padding: 30px 32px; -} - -.list { - margin-top: 10px !important; -} \ No newline at end of file diff --git a/es/pages/changePassword/web.pc.d.ts b/es/pages/changePassword/web.pc.d.ts deleted file mode 100644 index 8e3e05e80..000000000 --- a/es/pages/changePassword/web.pc.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { WebComponentProps } from 'oak-frontend-base'; -import { EntityDict } from '../../oak-app-domain'; -export default function render(props: WebComponentProps): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/changePassword/web.pc.js b/es/pages/changePassword/web.pc.js deleted file mode 100644 index 68a3750ec..000000000 --- a/es/pages/changePassword/web.pc.js +++ /dev/null @@ -1,8 +0,0 @@ -import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime"; -import Style from './web.module.less'; -import PageHeader from '../../components/common/pageHeader'; -import ChangePassword from '../../components/changePassword'; -export default function render(props) { - const { showBack, userId, currentUserId } = props.data; - return ((userId || currentUserId) ? _jsx(PageHeader, { showBack: showBack, title: "\u5BC6\u7801\u8BBE\u7F6E", children: _jsx("div", { className: Style.container, children: _jsx(ChangePassword, { oakId: userId || currentUserId, oakPath: "$changePassword-component", oakAutoUnmount: true }) }) }) : _jsx(_Fragment, {})); -} diff --git a/es/pages/icon/index.d.ts b/es/pages/icon/index.d.ts deleted file mode 100644 index 1bb3b86c8..000000000 --- a/es/pages/icon/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// -/// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; -export default _default; diff --git a/es/pages/icon/index.js b/es/pages/icon/index.js deleted file mode 100644 index f3eb0950a..000000000 --- a/es/pages/icon/index.js +++ /dev/null @@ -1,4 +0,0 @@ -export default OakComponent({ - isList: true, - methods: {}, -}); diff --git a/es/pages/icon/index.json b/es/pages/icon/index.json deleted file mode 100644 index bc52459b0..000000000 --- a/es/pages/icon/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "OakIcon示例", - "usingComponents": {} -} diff --git a/es/pages/icon/index.less b/es/pages/icon/index.less deleted file mode 100644 index 1e649940f..000000000 --- a/es/pages/icon/index.less +++ /dev/null @@ -1,6 +0,0 @@ - - -.page-body { - display: flex; -} - diff --git a/es/pages/icon/index.xml b/es/pages/icon/index.xml deleted file mode 100644 index b93d0c355..000000000 --- a/es/pages/icon/index.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 未实现 - \ No newline at end of file diff --git a/es/pages/icon/web.d.ts b/es/pages/icon/web.d.ts deleted file mode 100644 index d6b0fa37c..000000000 --- a/es/pages/icon/web.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { EntityDict } from '../../oak-app-domain'; -import { WebComponentProps } from 'oak-frontend-base'; -export default function Render(props: WebComponentProps): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/icon/web.js b/es/pages/icon/web.js deleted file mode 100644 index eab4bed63..000000000 --- a/es/pages/icon/web.js +++ /dev/null @@ -1,47 +0,0 @@ -import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime"; -import JsonData from './iconfont.json'; -import OakIcon from '../../components/icon'; -import Style from './web.module.less'; -/** - * 复制文本到剪切板中 - * - * @export - * @param {*} value 需要复制的文本 - * @param {*} cb 复制成功后的回调 - */ -function copy(value, cb) { - // 动态创建 textarea 标签 - const textarea = document.createElement('textarea'); - // 将该 textarea 设为 readonly 防止 iOS 下自动唤起键盘，同时将 textarea 移出可视区域 - textarea.readOnly = 'readonly'; - textarea.style.position = 'absolute'; - textarea.style.left = '-9999px'; - // 将要 copy 的值赋给 textarea 标签的 value 属性 - // 网上有些例子是赋值给innerText,这样也会赋值成功，但是识别不了\r\n的换行符，赋值给value属性就可以 - textarea.value = value; - // 将 textarea 插入到 body 中 - document.body.appendChild(textarea); - // 选中值并复制 - textarea.select(); - textarea.setSelectionRange(0, textarea.value.length); - document.execCommand('Copy'); - document.body.removeChild(textarea); - if (cb && Object.prototype.toString.call(cb) === '[object Function]') { - cb(); - } -} -export default function Render(props) { - const { methods } = props; - const icons = JsonData.glyphs; - return (_jsx("div", { className: Style.container, children: _jsx("ul", { className: Style.dibBox, children: icons.map((ele) => { - return (_jsxs("li", { className: Style.dib, onClick: () => { - const content = ``; - copy(content, () => { - methods.setMessage({ - type: 'success', - content, - }); - }); - }, children: [_jsx("div", { className: Style.iconBox, children: _jsx(OakIcon, { name: ele.name, size: 40 }) }), _jsx("div", { className: Style.name, children: ele.name })] })); - }) }) })); -} diff --git a/es/pages/mobile/login/index.d.ts b/es/pages/mobile/login/index.d.ts deleted file mode 100644 index 98aa9960a..000000000 --- a/es/pages/mobile/login/index.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps void) | undefined; -}>) => import("react").ReactElement>; -export default _default; diff --git a/es/pages/mobile/login/index.js b/es/pages/mobile/login/index.js deleted file mode 100644 index 9dca8b919..000000000 --- a/es/pages/mobile/login/index.js +++ /dev/null @@ -1,119 +0,0 @@ -import { LOCAL_STORAGE_KEYS } from '../../../config/constants'; -const SEND_KEY = LOCAL_STORAGE_KEYS.captchaSendAt; -const SEND_CAPTCHA_LATENCY = process.env.NODE_ENV === 'development' ? 10 : 60; -export default OakComponent({ - isList: false, - projection: { - id: 1, - mobile: 1, - userId: 1, - }, - data: { - mobile: '', - captcha: '', - counter: 0, - refreshing: false, - password: '', - }, - properties: { - onlyCaptcha: false, - onlyPassword: false, - eventLoggedIn: '', - callback: undefined, - }, - formData({ features }) { - const lastSendAt = features.localStorage.load(SEND_KEY); - const now = Date.now(); - let counter = 0; - if (typeof lastSendAt === 'number') { - counter = Math.max(SEND_CAPTCHA_LATENCY - Math.ceil((now - lastSendAt) / 1000), 0); - if (counter > 0) { - this.counterHandler = setTimeout(() => this.reRender(), 1000); - } - else if (this.counterHandler) { - clearTimeout(this.counterHandler); - this.counterHandler = undefined; - } - } - return { - counter, - }; - }, - methods: { - setMobile(value) { - this.setState({ - mobile: value, - }); - }, - setCaptcha(value) { - this.setState({ - captcha: value, - }); - }, - async sendCaptcha() { - const { mobile } = this.state; - try { - const result = await this.features.token.sendCaptcha(mobile, 'login'); - // 显示返回消息 - this.setMessage({ - type: 'success', - content: result, - }); - this.save(SEND_KEY, Date.now()); - this.reRender(); - } - catch (err) { - this.setMessage({ - type: 'error', - content: err.message, - }); - } - }, - async loginByMobile() { - const { eventLoggedIn, callback } = this.props; - const { mobile, password, captcha } = this.state; - try { - await this.features.token.loginByMobile(mobile, password, captcha); - if (typeof callback === 'function') { - callback(); - } - else if (eventLoggedIn) { - this.pubEvent(eventLoggedIn); - } - else { - this.navigateBack(); - } - } - catch (err) { - this.setMessage({ - type: 'error', - content: err.message, - }); - } - }, - async onRefreshMobile(e) { - this.setState({ - refreshing: true, - }); - try { - const { code, errMsg } = e.detail; - if (errMsg !== 'getPhoneNumber:ok') { - console.error(errMsg); - this.setMessage({ - title: '获取手机号失败', - type: 'warning', - }); - } - else { - await this.features.token.getWechatMpUserPhoneNumber(code); - } - } - catch (err) { - console.error(err); - } - this.setState({ - refreshing: false, - }); - }, - }, -}); diff --git a/es/pages/mobile/login/index.json b/es/pages/mobile/login/index.json deleted file mode 100644 index 0acccd206..000000000 --- a/es/pages/mobile/login/index.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "navigationBarTitleText": "绑定手机号", - "usingComponents": { - "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", - "l-card": "@oak-frontend-base/miniprogram_npm/lin-ui/card/index", - "l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index", - "l-icon": "@oak-frontend-base/miniprogram_npm/lin-ui/icon/index", - "l-dialog": "@oak-frontend-base/miniprogram_npm/lin-ui/dialog/index" - } -} diff --git a/es/pages/mobile/login/index.less b/es/pages/mobile/login/index.less deleted file mode 100644 index b30d31b4d..000000000 --- a/es/pages/mobile/login/index.less +++ /dev/null @@ -1,40 +0,0 @@ - -/** index.wxss **/ -@import "../../../config/styles/mp/index.less"; -@import "../../../config/styles/mp/mixins.less"; - -.page-body { - height: 100vh; - display: flex; - flex: 1; - flex-direction: column; - justify-content: center; - align-items: center; - box-sizing: border-box; - background-color: @oak-bg-color-page; - .safe-area-inset-bottom(); -} - -.container { - flex: 1; - display: flex; - flex-direction: column; -} - -.container2 { - flex-direction: row; - align-items: center; - justify-content: center; -} - -.card { - min-width: 480rpx; - text-align: center; -} - -.list { - background-color: #fff; - margin-top: 20rpx; - padding: 0 20rpx; - -} \ No newline at end of file diff --git a/es/pages/mobile/login/index.xml b/es/pages/mobile/login/index.xml deleted file mode 100644 index ef09f075d..000000000 --- a/es/pages/mobile/login/index.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 您尚未授权手机号 - - - - - - 授权手机号 - - - diff --git a/es/pages/mobile/login/locales/zh_CN.json b/es/pages/mobile/login/locales/zh_CN.json deleted file mode 100644 index 9015124a9..000000000 --- a/es/pages/mobile/login/locales/zh_CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Login": "确定", - "Send": "发送验证码", - "placeholder": { - "Captcha": "输入4位短信验证码", - "Mobile": "请输入手机号" - } -} diff --git a/es/pages/mobile/login/mobile.module.less b/es/pages/mobile/login/mobile.module.less deleted file mode 100644 index 2ad9229fc..000000000 --- a/es/pages/mobile/login/mobile.module.less +++ /dev/null @@ -1,35 +0,0 @@ - - -.loginbox-main { - height: 100vh; - display: flex; - flex: 1; - align-items: center; - flex-direction: column; - background: var(--oak-bg-color-container); - padding-top: 20%; -} - -.loginbox-wrap { - width: 90%; - display: block; - background: var(--oak-bg-color-container); - border-radius: 4px; - overflow: hidden; - box-shadow: 0 2px 4px rgb(0 0 0 / 8%), 0 0 4px rgb(0 0 0 / 8%); -} - -.loginbox-hd { - padding: 32px; - font-size: 14px; - font-weight: 500; -} - -.loginbox-bd { - height: 200px; -} - -.loginbox-mobile { - position: relative; - padding: 0 32px; -} diff --git a/es/pages/mobile/login/web.d.ts b/es/pages/mobile/login/web.d.ts deleted file mode 100644 index f20ffeaf0..000000000 --- a/es/pages/mobile/login/web.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { WebComponentProps } from 'oak-frontend-base'; -import { EntityDict } from '../../../oak-app-domain'; -export default function render(props: WebComponentProps void; - setMobile: (mobile: string) => void; - sendCaptcha: () => Promise; - loginByMobile: () => Promise; -}>): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/mobile/login/web.js b/es/pages/mobile/login/web.js deleted file mode 100644 index 5fe2d8b76..000000000 --- a/es/pages/mobile/login/web.js +++ /dev/null @@ -1,20 +0,0 @@ -import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime"; -import { isMobile, isCaptcha, } from 'oak-domain/lib/utils/validator'; -import { MobileOutlined } from '@ant-design/icons'; -import { Form, Input, Button } from 'antd'; -import Style from './mobile.module.less'; -export default function render(props) { - const { mobile, captcha, password, counter } = props.data; - const { t, setMobile, setCaptcha, sendCaptcha, loginByMobile } = props.methods; - const validMobile = isMobile(mobile); - const validCaptcha = isCaptcha(captcha); - const allowSubmit = validMobile && validCaptcha; - const LoginCaptcha = (_jsxs(Form, { colon: true, children: [_jsx(Form.Item, { name: "mobile", children: _jsx(Input, { allowClear: true, value: mobile, "data-attr": "mobile", type: "tel", maxLength: 11, prefix: _jsx(MobileOutlined, {}), placeholder: t('placeholder.Mobile'), size: "large", onChange: (e) => { - setMobile(e.target.value); - }, className: Style['loginbox-input'] }) }), _jsx(Form.Item, { name: "captcha", children: _jsx(Input, { allowClear: true, value: captcha, "data-attr": "captcha", - // type="number" - maxLength: 4, placeholder: t('placeholder.Captcha'), size: "large", onChange: (e) => { - setCaptcha(e.target.value); - }, className: Style['loginbox-input'], suffix: _jsx(Button, { type: "link", disabled: !validMobile || counter > 0, onClick: () => sendCaptcha(), children: counter > 0 ? `${counter}秒后可重发` : t('Send') }) }) }), _jsx(Form.Item, { children: _jsx(Button, { block: true, size: "large", type: "primary", htmlType: "submit", disabled: !allowSubmit, onClick: () => loginByMobile(), children: t('Login') }) })] })); - return (_jsx("div", { className: Style['loginbox-main'], children: _jsxs("div", { className: Style['loginbox-wrap'], children: [_jsx("div", { className: Style['loginbox-hd'], children: "\u4E3A\u4E86\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BF7\u7ED1\u5B9A\u624B\u673A\u53F7" }), _jsx("div", { className: Style['loginbox-bd'], children: _jsx("div", { className: Style['loginbox-mobile'], children: LoginCaptcha }) })] }) })); -} diff --git a/es/pages/mobile/login/web.module.less b/es/pages/mobile/login/web.module.less deleted file mode 100644 index 200e4c61b..000000000 --- a/es/pages/mobile/login/web.module.less +++ /dev/null @@ -1,37 +0,0 @@ - - -.loginbox-main { - display: flex; - flex: 1; - align-items: center; - flex-direction: column; - justify-content: center; - background: var(--oak-bg-color-container); -} - -.loginbox-wrap { - width: 400px; - display: block; - background: var(--oak-bg-color-container); - border-radius: 4px; - overflow: hidden; - box-shadow: 0 2px 4px rgb(0 0 0 / 8%), 0 0 4px rgb(0 0 0 / 8%); -} - -.loginbox-hd { - padding: 32px; - font-size: 14px; - font-weight: 500; -} - -.loginbox-bd { - height: 200px; -} - -.loginbox-mobile { - position: relative; - padding: 0 32px; -} - - - diff --git a/es/pages/mobile/login/web.pc.d.ts b/es/pages/mobile/login/web.pc.d.ts deleted file mode 100644 index bb1add491..000000000 --- a/es/pages/mobile/login/web.pc.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { WebComponentProps } from 'oak-frontend-base'; -import { EntityDict } from '../../../oak-app-domain'; -export default function render(props: WebComponentProps void; - setMobile: (mobile: string) => void; - sendCaptcha: () => Promise; - loginByMobile: () => Promise; -}>): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/mobile/login/web.pc.js b/es/pages/mobile/login/web.pc.js deleted file mode 100644 index b06f4200a..000000000 --- a/es/pages/mobile/login/web.pc.js +++ /dev/null @@ -1,20 +0,0 @@ -import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime"; -import { isMobile, isCaptcha, } from 'oak-domain/lib/utils/validator'; -import { MobileOutlined } from '@ant-design/icons'; -import { Form, Input, Button } from 'antd'; -import Style from './web.module.less'; -export default function render(props) { - const { mobile, captcha, counter } = props.data; - const { t, setMobile, setCaptcha, sendCaptcha, loginByMobile } = props.methods; - const validMobile = isMobile(mobile); - const validCaptcha = isCaptcha(captcha); - const allowSubmit = validMobile && validCaptcha; - const LoginCaptcha = (_jsxs(Form, { colon: true, children: [_jsx(Form.Item, { name: "mobile", children: _jsx(Input, { allowClear: true, value: mobile, "data-attr": "mobile", type: "tel", maxLength: 11, prefix: _jsx(MobileOutlined, {}), placeholder: t('placeholder.Mobile'), size: "large", onChange: (e) => { - setMobile(e.target.value); - }, className: Style['loginbox-input'] }) }), _jsx(Form.Item, { name: "captcha", children: _jsx(Input, { allowClear: true, value: captcha, "data-attr": "captcha", - // type="number" - maxLength: 4, placeholder: t('placeholder.Captcha'), size: "large", onChange: (e) => { - setCaptcha(e.target.value); - }, className: Style['loginbox-input'], suffix: _jsx(Button, { type: "link", disabled: !validMobile || counter > 0, onClick: () => sendCaptcha(), children: counter > 0 ? `${counter}秒后可重发` : t('Send') }) }) }), _jsx(Form.Item, { children: _jsx(Button, { block: true, size: "large", type: "primary", htmlType: "submit", disabled: !allowSubmit, onClick: () => loginByMobile(), children: t('Login') }) })] })); - return (_jsx("div", { className: Style['loginbox-main'], children: _jsxs("div", { className: Style['loginbox-wrap'], children: [_jsx("div", { className: Style['loginbox-hd'], children: "\u4E3A\u4E86\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BF7\u7ED1\u5B9A\u624B\u673A\u53F7" }), _jsx("div", { className: Style['loginbox-bd'], children: _jsx("div", { className: Style['loginbox-mobile'], children: LoginCaptcha }) })] }) })); -} diff --git a/es/pages/mobile/me/index.d.ts b/es/pages/mobile/me/index.d.ts deleted file mode 100644 index 516f8df68..000000000 --- a/es/pages/mobile/me/index.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; -export default _default; diff --git a/es/pages/mobile/me/index.js b/es/pages/mobile/me/index.js deleted file mode 100644 index fc2e5cfce..000000000 --- a/es/pages/mobile/me/index.js +++ /dev/null @@ -1,96 +0,0 @@ -export default OakComponent({ - entity: 'mobile', - isList: true, - projection: { - id: 1, - mobile: 1, - userId: 1, - ableState: 1, - }, - filters: [ - { - filter() { - // const token = this.features.token.getToken(); - const userId = this.features.token.getUserId(); - return { - userId, - }; - }, - }, - ], - formData: ({ data: mobiles, features }) => { - const token = features.token.getToken(); - const tokenMobileId = token.entity === 'mobile' && token.entityId; - return { - tokenMobileId, - mobiles, - allowRemove: mobiles.length > 1, - }; - }, - data: { - confirmDeleteModalVisible: false, - refreshing: false, - deleteIdx: undefined, - }, - properties: { - showBack: false, - }, - methods: { - async onRefreshMobile(e) { - this.setState({ - refreshing: true, - }); - try { - const { code, errMsg } = e.detail; - if (errMsg !== 'getPhoneNumber:ok') { - console.error(errMsg); - this.setMessage({ - title: '获取手机号失败', - type: 'warning', - }); - } - else { - await this.features.token.getWechatMpUserPhoneNumber(code); - } - } - catch (err) { - console.error(err); - } - this.setState({ - refreshing: false, - }); - }, - goAddMobile() { - const eventLoggedIn = `mobile:me:login:${Date.now()}`; - this.subEvent(eventLoggedIn, () => { - this.navigateBack(); - }); - this.navigateTo({ - url: '/mobile/login', - eventLoggedIn, - }); - }, - async onRemoveConfirm() { - const { mobileId } = this.state; - this.removeItem(mobileId); - await this.execute(); - this.setState({ - confirmDeleteModalVisible: false, - mobileId: '', - }); - }, - onRemoveModalOpen(e) { - const mobileId = e.currentTarget.dataset.id; - this.setState({ - confirmDeleteModalVisible: true, - mobileId, - }); - }, - onRemoveModalClose() { - this.setState({ - confirmDeleteModalVisible: false, - mobileId: '', - }); - }, - }, -}); diff --git a/es/pages/mobile/me/index.json b/es/pages/mobile/me/index.json deleted file mode 100644 index 0acccd206..000000000 --- a/es/pages/mobile/me/index.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "navigationBarTitleText": "绑定手机号", - "usingComponents": { - "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", - "l-card": "@oak-frontend-base/miniprogram_npm/lin-ui/card/index", - "l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index", - "l-icon": "@oak-frontend-base/miniprogram_npm/lin-ui/icon/index", - "l-dialog": "@oak-frontend-base/miniprogram_npm/lin-ui/dialog/index" - } -} diff --git a/es/pages/mobile/me/index.less b/es/pages/mobile/me/index.less deleted file mode 100644 index 322711218..000000000 --- a/es/pages/mobile/me/index.less +++ /dev/null @@ -1,38 +0,0 @@ -/** index.wxss **/ -@import "../../../config/styles/mp/index.less"; -@import "../../../config/styles/mp/mixins.less"; - -.page-body { - height: 100vh; - display: flex; - flex: 1; - flex-direction: column; - box-sizing: border-box; - align-items: stretch; - background-color: @oak-bg-color-page; - .safe-area-inset-bottom(); -} - -.container { - flex: 1; - display: flex; - flex-direction: column; -} - -.container2 { - flex-direction: row; - align-items: center; - justify-content: center; -} - -.card { - min-width: 480rpx; - text-align: center; -} - -.list { - background-color: #fff; - margin-top: 20rpx; - padding: 0 20rpx; - -} \ No newline at end of file diff --git a/es/pages/mobile/me/index.xml b/es/pages/mobile/me/index.xml deleted file mode 100644 index 1a9d50b77..000000000 --- a/es/pages/mobile/me/index.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 您尚未授权手机号 - - - - - - - 授权手机号 - - - - diff --git a/es/pages/mobile/me/mobile.module.less b/es/pages/mobile/me/mobile.module.less deleted file mode 100644 index 1cb437d13..000000000 --- a/es/pages/mobile/me/mobile.module.less +++ /dev/null @@ -1,33 +0,0 @@ - - -.container { - height: 100vh; - display: flex; - flex-direction: column; -} - -.list { - :global { - .t-list-item__meta { - - &-avatar { - width: auto !important; - height: auto !important; - background: transparent; - border-radius: unset; - } - &-title { - margin: 0 !important; - - } - } - } -} - -.noData { - display: flex; - flex-direction: column; - flex: 1; - align-items: center; - justify-content: center; -} \ No newline at end of file diff --git a/es/pages/mobile/me/web.d.ts b/es/pages/mobile/me/web.d.ts deleted file mode 100644 index 7b100c324..000000000 --- a/es/pages/mobile/me/web.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { WebComponentProps } from 'oak-frontend-base'; -import { EntityDict } from '../../../oak-app-domain'; -export default function render(props: WebComponentProps void; -}>): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/mobile/me/web.js b/es/pages/mobile/me/web.js deleted file mode 100644 index 6df0ffc93..000000000 --- a/es/pages/mobile/me/web.js +++ /dev/null @@ -1,23 +0,0 @@ -import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime"; -import { List, Button, Dialog } from 'antd-mobile'; -import { MobileOutlined, DeleteOutlined } from '@ant-design/icons'; -import Style from './mobile.module.less'; -export default function render(props) { - const { mobiles, allowRemove, tokenMobileId } = props.data; - const { goAddMobile, removeItem, recoverItem, execute } = props.methods; - return (_jsxs("div", { className: Style.container, children: [mobiles && mobiles.length > 0 ? (_jsxs(_Fragment, { children: [_jsx(List, { className: Style.list, children: mobiles?.map((ele, index) => (_jsx(List.Item, { prefix: _jsx(MobileOutlined, {}), extra: allowRemove && tokenMobileId !== ele.id && (_jsx("div", { onClick: async () => { - const result = await Dialog.confirm({ - content: '确认删除吗？删除后无法用此号码登录', - }); - if (result) { - removeItem(ele.id); - try { - await execute(); - } - catch (err) { - recoverItem(ele.id); - throw err; - } - } - }, children: _jsx(DeleteOutlined, {}) })), children: ele.mobile }, index))) }), _jsx("div", { style: { flex: 1 } })] })) : (_jsx("div", { className: Style.noData, children: _jsx("span", { children: "\u5C1A\u672A\u7ED1\u5B9A\u624B\u673A\u53F7" }) })), _jsx(Button, { block: true, size: "large", color: "primary", onClick: () => goAddMobile(), children: "\u7ED1\u5B9A" })] })); -} diff --git a/es/pages/mobile/me/web.module.less b/es/pages/mobile/me/web.module.less deleted file mode 100644 index 0dad10def..000000000 --- a/es/pages/mobile/me/web.module.less +++ /dev/null @@ -1,8 +0,0 @@ - - -.container { - background: var(--oak-bg-color-container); - box-shadow: 0 2px 3px #0000001a; - border-radius: 3px; - padding: 30px 32px; -} \ No newline at end of file diff --git a/es/pages/mobile/me/web.pc.d.ts b/es/pages/mobile/me/web.pc.d.ts deleted file mode 100644 index f91e4f872..000000000 --- a/es/pages/mobile/me/web.pc.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { WebComponentProps } from 'oak-frontend-base'; -import { EntityDict } from '../../../oak-app-domain'; -export default function render(props: WebComponentProps void; -}>): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/mobile/me/web.pc.js b/es/pages/mobile/me/web.pc.js deleted file mode 100644 index 029b4f341..000000000 --- a/es/pages/mobile/me/web.pc.js +++ /dev/null @@ -1,42 +0,0 @@ -import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime"; -import { useState } from 'react'; -import { List, Button, Modal, Row, Col } from 'antd'; -import { MobileOutlined, DeleteOutlined } from '@ant-design/icons'; -import Style from './web.module.less'; -import PageHeader from '../../../components/common/pageHeader'; -import MobileLogin from '../../../pages/mobile/login'; -export default function render(props) { - const { mobiles, allowRemove, tokenMobileId, showBack = false } = props.data; - const { goAddMobile, removeItem, recoverItem, execute, subEvent } = props.methods; - const [open, setOpen] = useState(false); - const eventLoggedIn = `user:info:login:${Date.now()}`; - return (_jsxs(PageHeader, { showBack: showBack, title: "\u6211\u7684\u624B\u673A\u53F7", children: [_jsxs("div", { className: Style.container, children: [_jsx(Button, { type: "primary", onClick: () => { - setOpen(true); - }, style: { marginBottom: 16 }, children: "\u7ED1\u5B9A" }), _jsx(Row, { children: _jsx(Col, { xs: 24, sm: 12, children: _jsx(List, { bordered: true, children: mobiles?.map((ele, index) => (_jsx(List.Item, { extra: allowRemove && - tokenMobileId !== ele.id && (_jsx("div", { onClick: () => { - const modal = Modal - .confirm({ - title: `确认删除吗？删除后无法用此号码登录`, - okText: '确定', - cancelText: '取消', - onOk: async (e) => { - removeItem(ele.id); - try { - await execute(); - } - catch (err) { - recoverItem(ele.id); - throw err; - } - modal.destroy(); - }, - onCancel: (e) => { - modal.destroy(); - }, - }); - }, children: _jsx(DeleteOutlined, {}) })), children: _jsx(List.Item.Meta, { avatar: _jsx(MobileOutlined, {}), title: ele.mobile }) }, index))) }) }) })] }), _jsx(Modal, { title: "\u7ED1\u5B9A\u624B\u673A\u53F7", open: open, destroyOnClose: true, footer: null, onCancel: () => { - setOpen(false); - }, children: _jsx("div", { style: { padding: 16 }, children: _jsx(MobileLogin, { callback: () => { - setOpen(false); - }, oakPath: "$mobile/me-mobile/login", oakAutoUnmount: true }) }) })] })); -} diff --git a/es/pages/token/me/index.d.ts b/es/pages/token/me/index.d.ts deleted file mode 100644 index d8903f829..000000000 --- a/es/pages/token/me/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// -/// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; -export default _default; diff --git a/es/pages/token/me/index.js b/es/pages/token/me/index.js deleted file mode 100644 index 4ac44581b..000000000 --- a/es/pages/token/me/index.js +++ /dev/null @@ -1,154 +0,0 @@ -export default OakComponent({ - entity: 'token', - isList: true, - projection: { - id: 1, - userId: 1, - playerId: 1, - user: { - id: 1, - nickname: 1, - name: 1, - birth: 1, - gender: 1, - idState: 1, - userState: 1, - isRoot: 1, - extraFile$entity: { - $entity: 'extraFile', - data: { - id: 1, - tag1: 1, - origin: 1, - bucket: 1, - objectId: 1, - filename: 1, - extra1: 1, - type: 1, - entity: 1, - entityId: 1, - extension: 1, - }, - filter: { - tag1: 'avatar', - }, - indexFrom: 0, - count: 1, - }, - mobile$user: { - $entity: 'mobile', - data: { - id: 1, - mobile: 1, - }, - }, - }, - player: { - id: 1, - isRoot: 1, - }, - }, - filters: [ - { - filter() { - const tokenId = this.features.token.getTokenValue(); - if (tokenId) { - return { - id: tokenId, - }; - } - return { - id: 'none', - }; - }, - }, - ], - formData: ({ data, features }) => { - const [token] = data || []; - const user = token?.user; - const player = token?.player; - const avatarFile = user?.extraFile$entity && user?.extraFile$entity[0]; - const avatar = features.extraFile.getUrl(avatarFile); - const nickname = user && user.nickname; - const mobileData = user && user.mobile$user && user.mobile$user[0]; - const { mobile } = mobileData || {}; - const mobileCount = user?.mobile$user?.length || 0; - const isLoggedIn = !!token; - const isPlayingAnother = token && token.userId !== token.playerId; - const isRoot = !!player?.isRoot; - const mobileText = mobileCount && mobileCount > 1 - ? `${mobileCount}条手机号` - : mobile || '未绑定'; - return { - tokenId: token?.id, - userId: user?.id, - avatar, - nickname, - mobile, - mobileCount, - mobileText, - isLoggedIn, - isPlayingAnother, - isRoot, - }; - }, - data: { - refreshing: false, - }, - methods: { - async doLogin() { - this.setState({ - refreshing: true, - }); - try { - switch (process.env.OAK_PLATFORM) { - case 'wechatMp': { - await this.features.token.loginWechatMp(); - this.setState({ - refreshing: false, - }); - break; - } - case 'web': { - const eventLoggedIn = `token:me:login:${Date.now()}`; - this.subEvent(eventLoggedIn, () => { - this.navigateBack(); - }); - this.navigateTo({ - url: '/login', - eventLoggedIn, - }, undefined, true); - break; - } - } - } - catch (err) { - console.error(err); - } - }, - goMyMobile() { - this.navigateTo({ - url: '/mobile/me', - }); - }, - goUserManage() { - this.navigateTo({ - url: '/user/manage', - }); - }, - goSetting() { - this.navigateTo({ - url: '/setting', - }); - }, - goMyInfo() { - if (!this.state.isLoggedIn) { - return; - } - this.navigateTo({ - url: '/user/info', - oakId: this.state.userId, - }); - }, - }, -}); diff --git a/es/pages/token/me/index.json b/es/pages/token/me/index.json deleted file mode 100644 index a9bf8da87..000000000 --- a/es/pages/token/me/index.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "navigationBarTitleText": "个人中心", - "usingComponents": { - "oak-icon": "../../../components/icon/index", - "l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index", - "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", - "l-avatar": "@oak-frontend-base/miniprogram_npm/lin-ui/avatar/index" - } -} diff --git a/es/pages/token/me/index.less b/es/pages/token/me/index.less deleted file mode 100644 index a8778d413..000000000 --- a/es/pages/token/me/index.less +++ /dev/null @@ -1,31 +0,0 @@ -@import "../../../config/styles/mp/index.less"; -@import "../../../config/styles/mp/mixins.less"; - -.page-body { - height: 100%; - display: flex; - flex: 1; - flex-direction: column; - background-color: @oak-bg-color-page; - // background-image: linear-gradient(to bottom, #ffffff, #f4f5f6); -} - -.userInfo { - padding: 14rpx; - display: flex; - flex-direction: column; - align-items: center; -} - -.nickname { - font-size: 30rpx; - color: @oak-text-color-secondary; - padding-top: 14rpx; - padding-bottom: 14rpx; -} - - -.list { - background-color: #ffffff; - padding: 0 10rpx; -} diff --git a/es/pages/token/me/index.xml b/es/pages/token/me/index.xml deleted file mode 100644 index 0d304a089..000000000 --- a/es/pages/token/me/index.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - {{t('login')}} - - - - - - - - - - - - \ No newline at end of file diff --git a/es/pages/token/me/locales/zh_CN.json b/es/pages/token/me/locales/zh_CN.json deleted file mode 100644 index d4ac5f383..000000000 --- a/es/pages/token/me/locales/zh_CN.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "login": "登录", - "syncWeChat": "同步微信信息" -} diff --git a/es/pages/token/me/mobile.module.less b/es/pages/token/me/mobile.module.less deleted file mode 100644 index 228807928..000000000 --- a/es/pages/token/me/mobile.module.less +++ /dev/null @@ -1,40 +0,0 @@ -.container { - height: 100%; - width: 100%; - display: flex; - flex-direction: column; - background-color: var(--oak-bg-color-page); -} - -.userInfo { - display: flex; - flex-direction: column; - align-items: center; - padding: 20px 10px 10px 10px; - margin-bottom: 10px; - background-color: var(--oak-bg-color-container); - - .avatar { - width: 60px; - height: 60px; - margin-bottom: 10px; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - } - - .nickname { - margin-bottom: 10px; - font-size: 14px; - } - - .userIcon { - color: #fff; - font-size: 24px; - } -} - -.list { - background-color: #fff; -} \ No newline at end of file diff --git a/es/pages/token/me/web.d.ts b/es/pages/token/me/web.d.ts deleted file mode 100644 index 7c23209aa..000000000 --- a/es/pages/token/me/web.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { EntityDict } from '../../../oak-app-domain'; -import { WebComponentProps } from 'oak-frontend-base'; -export default function Render(props: WebComponentProps Promise; - doLogin: () => Promise; - goMyMobile: () => Promise; - goUserManage: () => Promise; -}>): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/token/me/web.js b/es/pages/token/me/web.js deleted file mode 100644 index f718da233..000000000 --- a/es/pages/token/me/web.js +++ /dev/null @@ -1,9 +0,0 @@ -import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime"; -import { List, Button, Avatar } from 'antd-mobile'; -import { UserOutlined, MobileOutlined } from '@ant-design/icons'; -import Style from './mobile.module.less'; -export default function Render(props) { - const { avatar, isLoggedIn, refreshing, mobileText, isRoot, oakExecuting, tokenId, nickname, oakDirty, } = props.data; - const { doLogin, t, goMyMobile, goUserManage, goMyInfo } = props.methods; - return (_jsxs("div", { className: Style.container, children: [_jsxs("div", { className: Style.userInfo, children: [_jsx(Avatar, { className: Style.avatar, src: avatar }), _jsx("span", { className: Style.nickname, children: nickname || '未设置' }), isLoggedIn ? (_jsx(Button, { color: "primary", size: "small", disabled: refreshing, loading: refreshing, onClick: () => goMyInfo(), children: t('common::action.update') })) : (_jsx(Button, { size: "small", disabled: refreshing, loading: refreshing, onClick: () => doLogin(), children: t('login') }))] }), _jsxs(List, { className: Style.list, children: [_jsx(List.Item, { onClick: () => goMyMobile(), prefix: _jsx(MobileOutlined, {}), title: "\u624B\u673A\u53F7", extra: mobileText }), isRoot && (_jsx(List.Item, { onClick: () => goUserManage(), prefix: _jsx(UserOutlined, {}), title: "\u7528\u6237\u7BA1\u7406" }))] })] })); -} diff --git a/es/pages/token/me/web.module.less b/es/pages/token/me/web.module.less deleted file mode 100644 index 55cc5ed57..000000000 --- a/es/pages/token/me/web.module.less +++ /dev/null @@ -1,61 +0,0 @@ -.container { - height: 100%; - width: 100%; - display: flex; - flex-direction: column; - background-color: var(--oak-bg-color-page); -} - -.userInfo { - display: flex; - flex-direction: column; - align-items: center; - padding: 20px 10px 10px 10px; - margin-bottom: 10px; - background-color: var(--oak-bg-color-container); - - .avatar { - width: 60px; - height: 60px; - margin-bottom: 10px; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - } - - .nickname { - margin-bottom: 10px; - font-size: 14px; - } - - .userIcon { - color: #fff; - font-size: 24px; - } -} - -.list { - background-color: #fff; - padding: 0 10px; - - :global { - .t-list-item__meta { - - &-avatar { - width: auto !important; - height: auto !important; - background: transparent; - border-radius: unset; - display: flex; - justify-content: center; - align-items: center; - } - - &-title { - margin: 0 !important; - - } - } - } -} \ No newline at end of file diff --git a/es/pages/token/me/web.pc.d.ts b/es/pages/token/me/web.pc.d.ts deleted file mode 100644 index f8c59b723..000000000 --- a/es/pages/token/me/web.pc.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { EntityDict } from '../../../oak-app-domain'; -import { WebComponentProps } from 'oak-frontend-base'; -export default function Render(props: WebComponentProps Promise; - doLogin: () => Promise; - goMyMobile: () => Promise; - goUserManage: () => Promise; -}>): import("react/jsx-runtime").JSX.Element; diff --git a/es/pages/token/me/web.pc.js b/es/pages/token/me/web.pc.js deleted file mode 100644 index 9622b2b4c..000000000 --- a/es/pages/token/me/web.pc.js +++ /dev/null @@ -1,9 +0,0 @@ -import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime"; -import { List, Button, Avatar } from 'antd'; -import { UserOutlined, MobileOutlined } from '@ant-design/icons'; -import Style from './web.module.less'; -export default function Render(props) { - const { avatar, isLoggedIn, refreshing, mobileText, isRoot, oakExecuting, tokenId, nickname, oakDirty, } = props.data; - const { doLogin, t, goMyMobile, goUserManage, goMyInfo } = props.methods; - return (_jsxs("div", { className: Style.container, children: [_jsxs("div", { className: Style.userInfo, children: [avatar ? (_jsx(Avatar, { className: Style.avatar, src: avatar })) : (_jsx(Avatar, { className: Style.avatar, icon: _jsx(UserOutlined, { className: Style.userIcon }) })), _jsx("span", { className: Style.nickname, children: nickname || '未设置' }), isLoggedIn ? (_jsx(Button, { type: "primary", size: "small", disabled: refreshing, loading: refreshing, onClick: () => goMyInfo(), children: t('common::action.update') })) : (_jsx(Button, { size: "small", disabled: refreshing, loading: refreshing, onClick: () => doLogin(), children: t('login') }))] }), _jsxs(List, { className: Style.list, split: true, children: [_jsx(List.Item, { onClick: () => goMyMobile(), children: _jsx(List.Item.Meta, { avatar: _jsx(MobileOutlined, {}), title: "\u624B\u673A\u53F7", description: mobileText }) }), isRoot && (_jsx(List.Item, { onClick: () => goUserManage(), children: _jsx(List.Item.Meta, { avatar: _jsx(UserOutlined, {}), title: "\u7528\u6237\u7BA1\u7406" }) }))] })] })); -} diff --git a/es/pages/user/manage/detail/index.json b/es/pages/user/manage/detail/index.json index 1c24a5cb4..d59181208 100644 --- a/es/pages/user/manage/detail/index.json +++ b/es/pages/user/manage/detail/index.json @@ -2,7 +2,7 @@ "navigationBarTitleText": "用户详情", "usingComponents": { "actionPanel": "../../../../components/func/actionPanel/index", - "oak-icon": "../../../../components/icon/index", + "oak-icon": "@oak-frontend-base/components/icon/index", "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-avatar": "@oak-frontend-base/miniprogram_npm/lin-ui/avatar/index", "l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index", diff --git a/src/components/common/tabBar/index.json b/src/components/common/tabBar/index.json index 54d0697ab..cf908c012 100644 --- a/src/components/common/tabBar/index.json +++ b/src/components/common/tabBar/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "oak-icon": "../../icon/index", + "oak-icon": "@oak-frontend-base/icon/index", "l-badge": "@oak-frontend-base/miniprogram_npm/lin-ui/badge/index" } } diff --git a/src/components/func/actionPanel/index.json b/src/components/func/actionPanel/index.json index 30f832814..693ceb04b 100644 --- a/src/components/func/actionPanel/index.json +++ b/src/components/func/actionPanel/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "oak-icon": "../../icon/index", + "oak-icon": "@oak-frontend-base/icon/index", "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-icon": "@oak-frontend-base/miniprogram_npm/lin-ui/icon/index", "l-grid": "@oak-frontend-base/miniprogram_npm/lin-ui/grid/index", diff --git a/src/components/func/debugPanel/index.json b/src/components/func/debugPanel/index.json index fbf928d8e..c142cec07 100644 --- a/src/components/func/debugPanel/index.json +++ b/src/components/func/debugPanel/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "oak-icon": "../../icon/index", + "oak-icon": "@oak-frontend-base/icon/index", "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-arc-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/arc-popup/index", "l-dialog": "@oak-frontend-base/miniprogram_npm/lin-ui/dialog/index", diff --git a/src/components/func/debugPanel/web.tsx b/src/components/func/debugPanel/web.tsx index 77a76241b..c911353a1 100644 --- a/src/components/func/debugPanel/web.tsx +++ b/src/components/func/debugPanel/web.tsx @@ -3,7 +3,8 @@ import { Button, Space, Drawer, Modal, Tooltip } from 'antd'; import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../oak-app-domain'; import Style from './web.module.less'; -import OakIcon from '../../icon' +import OakIcon from 'oak-frontend-base/es/components/icon'; +import IconDemo from '../../icon'; export default function render(props: WebComponentProps