diff --git a/lib/components/func/debugPanel/index.js b/lib/components/func/debugPanel/index.js index cf81bb64a..bab6f0b08 100644 --- a/lib/components/func/debugPanel/index.js +++ b/lib/components/func/debugPanel/index.js @@ -28,13 +28,8 @@ exports.default = OakComponent({ handlePopup: function () { this.setVisible(true); }, - onVisibleChange: function (e) { - this.setVisible(e.detail.visible); - }, - onClose: function () { - if (this.state.visible) { - this.setVisible(false); - } + handlePopupClose: function () { + this.setVisible(false); }, //小程序重置 handleReset: function () { @@ -67,6 +62,6 @@ exports.default = OakComponent({ }, resetEnv: function (data) { this.features.localStorage.resetAll(data); - } + }, }, }); diff --git a/lib/components/func/debugPanel/index.xml b/lib/components/func/debugPanel/index.xml index 98bf829f0..0d57ac2d9 100644 --- a/lib/components/func/debugPanel/index.xml +++ b/lib/components/func/debugPanel/index.xml @@ -1,7 +1,7 @@ - + - + diff --git a/lib/components/func/debugPanel/web.js b/lib/components/func/debugPanel/web.js index 7ccb487f2..aecd1ca61 100644 --- a/lib/components/func/debugPanel/web.js +++ b/lib/components/func/debugPanel/web.js @@ -4,20 +4,17 @@ var tslib_1 = require("tslib"); var jsx_runtime_1 = require("react/jsx-runtime"); var react_1 = tslib_1.__importStar(require("react")); var antd_1 = require("antd"); -var icons_1 = require("@ant-design/icons"); var web_module_less_1 = tslib_1.__importDefault(require("./web.module.less")); -// import OakIcon from '../../icon' +var icon_1 = tslib_1.__importDefault(require("../../icon")); function render(props) { var _a = props.data, _b = _a.placement, placement = _b === void 0 ? 'bottom' : _b, _c = _a.style, style = _c === void 0 ? {} : _c; var _d = props.methods, printCachedStore = _d.printCachedStore, printDebugStore = _d.printDebugStore, printRunningTree = _d.printRunningTree, resetInitialData = _d.resetInitialData, downloadEnv = _d.downloadEnv, resetEnv = _d.resetEnv; var _e = tslib_1.__read((0, react_1.useState)(false), 2), visible = _e[0], setVisible = _e[1]; - return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(antd_1.Button, { type: "text", shape: "circle", icon: (0, jsx_runtime_1.jsx)(icons_1.UpOutlined, { style: { fontSize: 12 } }), - // icon={} - style: tslib_1.__assign({ position: 'fixed', bottom: 0, right: 'calc(100% / 2 - 16px)', zIndex: 999, width: 32, height: 32 }, style), onClick: function () { + return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(antd_1.Button, { type: "text", shape: "circle", icon: (0, jsx_runtime_1.jsx)(icon_1.default, { name: "packup" }), style: tslib_1.__assign({ position: 'fixed', bottom: 0, right: 'calc(100% / 2 - 16px)', zIndex: 999, width: 32, height: 32 }, style), onClick: function () { setVisible(true); } }), (0, jsx_runtime_1.jsxs)(antd_1.Drawer, tslib_1.__assign({ getContainer: false, placement: placement, open: visible, onClose: function () { setVisible(false); - }, title: "Debug\u63A7\u5236\u53F0", footer: (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {}), className: web_module_less_1.default.drawer }, { children: [(0, jsx_runtime_1.jsx)("input", { type: "file", accept: "application/json", hidden: true, id: "upload", onChange: function () { + }, title: "Debug\u63A7\u5236\u53F0", footer: (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {}), rootClassName: web_module_less_1.default.drawer }, { children: [(0, jsx_runtime_1.jsx)("input", { type: "file", accept: "application/json", hidden: true, id: "upload", onChange: function () { var file = document.getElementById('upload') .files[0]; if (typeof FileReader === undefined) { diff --git a/lib/components/icon/fontawesome.less b/lib/components/icon-font-awesome/fontawesome.less similarity index 99% rename from lib/components/icon/fontawesome.less rename to lib/components/icon-font-awesome/fontawesome.less index a070636a7..07f978415 100644 --- a/lib/components/icon/fontawesome.less +++ b/lib/components/icon-font-awesome/fontawesome.less @@ -17,7 +17,7 @@ @font-face { font-family: 'Font Awesome 6 Free Brands'; src: url('//cdn.staticfile.org/font-awesome/6.2.1/webfonts/fa-brands-400.ttf') format('truetype'); - font-weight: 900; + font-weight: 400; font-style: normal; font-display: swap; } diff --git a/lib/components/icon-font-awesome/index.d.ts b/lib/components/icon-font-awesome/index.d.ts new file mode 100644 index 000000000..42765aac1 --- /dev/null +++ b/lib/components/icon-font-awesome/index.d.ts @@ -0,0 +1,3 @@ +/// +declare const _default: import("react").ComponentType; +export default _default; diff --git a/lib/components/icon-font-awesome/index.js b/lib/components/icon-font-awesome/index.js new file mode 100644 index 000000000..450a4dae3 --- /dev/null +++ b/lib/components/icon-font-awesome/index.js @@ -0,0 +1,28 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = OakComponent({ + isList: false, + properties: { + type: { + type: String, + value: 'fas', + }, + size: { + type: Number, + optionalTypes: [Number, String], + value: 0, + }, + color: { + type: String, + value: 'primary', + }, + name: { + type: String, + value: '', + }, + larger: { + type: String, + value: '1x', + }, + }, +}); diff --git a/lib/components/icon-font-awesome/index.json b/lib/components/icon-font-awesome/index.json new file mode 100644 index 000000000..10e7f9d58 --- /dev/null +++ b/lib/components/icon-font-awesome/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} diff --git a/lib/components/icon-font-awesome/index.less b/lib/components/icon-font-awesome/index.less new file mode 100644 index 000000000..cc29ee5d1 --- /dev/null +++ b/lib/components/icon-font-awesome/index.less @@ -0,0 +1,22 @@ +@import './fontawesome.less'; +@import '../../config/styles/mp/index.less'; + +.primary { + color: @oak-color-primary; +} + +.error { + color: @oak-color-error; +} + +.warning { + color: @oak-color-warning; +} + +.success { + color: @oak-color-success; +} + +.info { + color: @oak-color-info; +} \ No newline at end of file diff --git a/lib/components/icon-font-awesome/index.xml b/lib/components/icon-font-awesome/index.xml new file mode 100644 index 000000000..6e511ef37 --- /dev/null +++ b/lib/components/icon-font-awesome/index.xml @@ -0,0 +1,9 @@ + + + + + + 不支持的icon类型{{type}} + \ No newline at end of file diff --git a/lib/components/icon-font-awesome/web.d.ts b/lib/components/icon-font-awesome/web.d.ts new file mode 100644 index 000000000..1d8a20e6d --- /dev/null +++ b/lib/components/icon-font-awesome/web.d.ts @@ -0,0 +1,11 @@ +import { WebComponentProps } from 'oak-frontend-base'; +import { EntityDict } from '../../general-app-domain'; +import './web.less'; +export default function Render(props: WebComponentProps): JSX.Element; diff --git a/lib/components/icon-font-awesome/web.js b/lib/components/icon-font-awesome/web.js new file mode 100644 index 000000000..8888a4fc4 --- /dev/null +++ b/lib/components/icon-font-awesome/web.js @@ -0,0 +1,24 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var jsx_runtime_1 = require("react/jsx-runtime"); +require("./web.less"); +function Render(props) { + var data = props.data; + var name = data.name, type = data.type, _a = data.color, color = _a === void 0 ? 'primary' : _a, size = data.size, className = data.className, _b = data.larger, larger = _b === void 0 ? '1x' : _b; + var isColor = ['primary', 'info', 'success', 'error', 'warning'].includes(color); + if (['far', 'fas'].includes(type)) { + var class_name = type + ' ' + 'fa-' + name; + if (className) { + class_name += ' ' + className; + } + if (larger) { + class_name += ' ' + 'fa-' + larger; + } + if (isColor) { + class_name += ' ' + 'oak-icon__' + color; + } + return ((0, jsx_runtime_1.jsx)("span", { className: class_name, style: Object.assign({}, size && { fontSize: size }, !isColor && { color: color }) })); + } + return (0, jsx_runtime_1.jsxs)("span", { children: ["\u4E0D\u652F\u6301\u7684icon\u7C7B\u578B", type] }); +} +exports.default = Render; diff --git a/lib/components/icon-font-awesome/web.less b/lib/components/icon-font-awesome/web.less new file mode 100644 index 000000000..49e9a1742 --- /dev/null +++ b/lib/components/icon-font-awesome/web.less @@ -0,0 +1,21 @@ +@import './fontawesome.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/lib/components/icon/iconfont.less b/lib/components/icon/iconfont.less new file mode 100644 index 000000000..e869cb2c0 --- /dev/null +++ b/lib/components/icon/iconfont.less @@ -0,0 +1,724 @@ +@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-searchfill:before { + content: "\e77d"; +} + +.oak-icon-publishgoods_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:before { + content: "\e78a"; +} + +.oak-icon-commodity:before { + content: "\e78b"; +} + +.oak-icon-zhtn:before { + content: "\e78c"; +} \ No newline at end of file diff --git a/lib/components/icon/index.js b/lib/components/icon/index.js index 450a4dae3..918458c7a 100644 --- a/lib/components/icon/index.js +++ b/lib/components/icon/index.js @@ -2,27 +2,25 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = OakComponent({ isList: false, + wechatMp: { + externalClasses: ['oak-class'], + }, properties: { - type: { - type: String, - value: 'fas', - }, - size: { - type: Number, - optionalTypes: [Number, String], - value: 0, - }, - color: { - type: String, - value: 'primary', - }, name: { type: String, value: '', }, - larger: { + custom: { type: String, - value: '1x', + value: '', + }, + size: { + type: Number, + value: 14, + }, + color: { + type: String, + value: '', }, }, }); diff --git a/lib/components/icon/index.less b/lib/components/icon/index.less index cc29ee5d1..e0d95c9af 100644 --- a/lib/components/icon/index.less +++ b/lib/components/icon/index.less @@ -1,22 +1,22 @@ -@import './fontawesome.less'; +@import './iconfont.less'; @import '../../config/styles/mp/index.less'; -.primary { +.oak-icon__primary { color: @oak-color-primary; } -.error { +.oak-icon__error { color: @oak-color-error; } -.warning { +.oak-icon__warning { color: @oak-color-warning; } -.success { +.oak-icon__success { color: @oak-color-success; } -.info { +.oak-icon__info { color: @oak-color-info; } \ No newline at end of file diff --git a/lib/components/icon/index.xml b/lib/components/icon/index.xml index 6e511ef37..b012218b2 100644 --- a/lib/components/icon/index.xml +++ b/lib/components/icon/index.xml @@ -1,9 +1 @@ - - - - - - 不支持的icon类型{{type}} - \ No newline at end of file + \ No newline at end of file diff --git a/lib/components/icon/web.d.ts b/lib/components/icon/web.d.ts index 1d8a20e6d..fd461eb99 100644 --- a/lib/components/icon/web.d.ts +++ b/lib/components/icon/web.d.ts @@ -1,11 +1,11 @@ import { WebComponentProps } from 'oak-frontend-base'; +import React from 'react'; import { EntityDict } from '../../general-app-domain'; import './web.less'; export default function Render(props: WebComponentProps): JSX.Element; diff --git a/lib/components/icon/web.js b/lib/components/icon/web.js index 8888a4fc4..8a8d79e90 100644 --- a/lib/components/icon/web.js +++ b/lib/components/icon/web.js @@ -4,21 +4,15 @@ var jsx_runtime_1 = require("react/jsx-runtime"); require("./web.less"); function Render(props) { var data = props.data; - var name = data.name, type = data.type, _a = data.color, color = _a === void 0 ? 'primary' : _a, size = data.size, className = data.className, _b = data.larger, larger = _b === void 0 ? '1x' : _b; + var name = data.name, _a = data.color, color = _a === void 0 ? '' : _a, size = data.size, className = data.className, _b = data.style, style = _b === void 0 ? {} : _b; var isColor = ['primary', 'info', 'success', 'error', 'warning'].includes(color); - if (['far', 'fas'].includes(type)) { - var class_name = type + ' ' + 'fa-' + name; - if (className) { - class_name += ' ' + className; - } - if (larger) { - class_name += ' ' + 'fa-' + larger; - } - if (isColor) { - class_name += ' ' + 'oak-icon__' + color; - } - return ((0, jsx_runtime_1.jsx)("span", { className: class_name, style: Object.assign({}, size && { fontSize: size }, !isColor && { color: color }) })); + var class_name = 'oak-icon ' + 'oak-icon-' + name; + if (className) { + class_name += ' ' + className; } - return (0, jsx_runtime_1.jsxs)("span", { children: ["\u4E0D\u652F\u6301\u7684icon\u7C7B\u578B", type] }); + if (isColor || color === '') { + class_name += ' ' + 'oak-icon__' + (color || 'primary'); + } + return ((0, jsx_runtime_1.jsx)("span", { className: class_name, style: Object.assign(style, size && { fontSize: size }, color && !isColor && { color: color }) })); } exports.default = Render; diff --git a/lib/components/icon/web.less b/lib/components/icon/web.less index 49e9a1742..870b0ef4c 100644 --- a/lib/components/icon/web.less +++ b/lib/components/icon/web.less @@ -1,4 +1,4 @@ -@import './fontawesome.less'; +@import './iconfont.less'; .oak-icon__primary { color: var(--oak-color-primary); diff --git a/lib/pages/user/manage/detail/index.js b/lib/pages/user/manage/detail/index.js index 34e1c0675..ca91f0c05 100644 --- a/lib/pages/user/manage/detail/index.js +++ b/lib/pages/user/manage/detail/index.js @@ -48,7 +48,9 @@ exports.default = OakComponent({ var _c = user || {}, id = _c.id, nickname = _c.nickname, idState = _c.idState, userState = _c.userState, name = _c.name, gender = _c.gender, mobile$user = _c.mobile$user, birth = _c.birth, extraFile$entity = _c.extraFile$entity; var mobile = mobile$user && ((_b = mobile$user[0]) === null || _b === void 0 ? void 0 : _b.mobile); var mobileCount = mobile$user ? mobile$user.length : 0; - var mobileText = mobileCount && mobileCount > 1 ? "".concat(mobileCount, "\u6761\u624B\u673A\u53F7") : (mobile || '未设置'); + var mobileText = mobileCount && mobileCount > 1 + ? "".concat(mobileCount, "\u6761\u624B\u673A\u53F7") + : mobile || '未设置'; var avatar = extraFile$entity && extraFile$entity[0] && (0, extraFile_1.composeFileUrl)(extraFile$entity[0]); @@ -59,7 +61,7 @@ exports.default = OakComponent({ mobile: mobile, gender: gender, avatar: avatar, - birth: birth ? (new Date(birth)).toLocaleDateString() : '', + birth: birth ? new Date(birth).toLocaleDateString() : '', userState: userState, idState: idState, mobileCount: mobileCount, @@ -85,34 +87,31 @@ exports.default = OakComponent({ idStateColor: { verifying: 'primary', verified: 'success', - unverified: 'warning' + unverified: 'warning', }, show: false, actionDescriptions: { accept: { icon: { - name: 'circle-check', - type: 'far', + name: 'success', }, label: '通过', }, activate: { icon: { - name: 'chart-line', + name: 'playon', }, label: '激活', }, disable: { icon: { - name: 'bell-slash', - type: 'far', + name: 'shielding', }, label: '禁用', }, enable: { icon: { - name: 'bell', - type: 'far', + name: 'barrage', }, label: '启用', }, @@ -124,19 +123,19 @@ exports.default = OakComponent({ }, update: { icon: { - name: 'edit', + name: 'editor', }, label: '更新', }, verify: { icon: { - name: 'certificate', + name: 'businesscard', }, label: '验证', }, play: { icon: { - name: 'person-praying', + name: 'refresh', }, label: '切换', }, @@ -190,6 +189,6 @@ exports.default = OakComponent({ onActionClickMp: function (e) { var action = e.detail.action; return this.onActionClick(action); - } + }, }, }); diff --git a/lib/pages/user/manage/detail/index.xml b/lib/pages/user/manage/detail/index.xml index d60c8d4dc..49fef1722 100644 --- a/lib/pages/user/manage/detail/index.xml +++ b/lib/pages/user/manage/detail/index.xml @@ -9,74 +9,26 @@ - - - - - - - 昵称 - - + {{nickname || '未设置'}} - - - - - - - 姓名 - - + {{name || '未设置'}} - - - - - - - 性别 - - + {{gender || '未设置'}} - - - - - - - 手机号 - - + {{mobileText}} - - - - - - - 用户状态 - - + {{userState || '未设置'}} - - - - - - - 认证状态 - - + {{idState || '未设置'}} diff --git a/package.json b/package.json index 5b3fb69db..f0768fea6 100644 --- a/package.json +++ b/package.json @@ -75,10 +75,12 @@ "scripts": { "make:domain": "ts-node ./scripts/make.ts", "clean": "rimraf lib/*", - "copy-files": "copyfiles -u 1 src/**/*.svg lib/ & copyfiles -u 1 src/**/*.xml lib/ & copyfiles -u 1 src/**/*.wxml lib/ & copyfiles -u 1 src/**/*.wxs lib/ & copyfiles -u 1 src/miniprogram_npm/**/*.js lib/ ", - "copy-less": "copyfiles -u 1 src/**/*.less lib/", - "copy-wxss": "copyfiles -u 1 src/**/*.wxss lib/", - "build": "tsc && npm run copy-files && npm run copy-less && npm run copy-wxss", + "copy-files": "copyfiles -u 1 src/miniprogram_npm/**/*.js lib/ ", + "copy-svg": "copyfiles -u 1 src/**/*.svg lib/", + "copy-less": "copyfiles -u 1 src/**/*.less lib/ & copyfiles -u 1 src/**/*.wxss lib/", + "copy-wxs": "copyfiles -u 1 src/**/*.wxs lib/", + "copy-wxml": "copyfiles -u 1 src/**/*.xml lib/ & copyfiles -u 1 src/**/*.wxml lib/", + "build": "tsc && npm run copy-files && npm run copy-less && npm run copy-wxs && npm run copy-svg && npm run copy-wxml", "gen:areaDebug": "ts-node ./scripts/generateAreaDebug.ts", "clean:dir": "ts-node ./scripts/cleanDtsAndJs", "test": "ts-node ./test/test.ts", diff --git a/src/components/func/debugPanel/index.ts b/src/components/func/debugPanel/index.ts index b1a067905..b4cfbf502 100644 --- a/src/components/func/debugPanel/index.ts +++ b/src/components/func/debugPanel/index.ts @@ -27,13 +27,8 @@ export default OakComponent({ handlePopup() { this.setVisible(true); }, - onVisibleChange(e: any) { - this.setVisible(e.detail.visible); - }, - onClose() { - if (this.state.visible) { - this.setVisible(false); - } + handlePopupClose() { + this.setVisible(false); }, //小程序重置 handleReset() { @@ -65,10 +60,10 @@ export default OakComponent({ }, downloadEnv() { const data = this.features.localStorage.loadAll(); - return data; + return data; }, resetEnv(data: Record) { this.features.localStorage.resetAll(data); - } + }, }, }); diff --git a/src/components/func/debugPanel/index.xml b/src/components/func/debugPanel/index.xml index 98bf829f0..0d57ac2d9 100644 --- a/src/components/func/debugPanel/index.xml +++ b/src/components/func/debugPanel/index.xml @@ -1,7 +1,7 @@ - + - + diff --git a/src/components/func/debugPanel/web.tsx b/src/components/func/debugPanel/web.tsx index c6f5854c1..5d0d932ec 100644 --- a/src/components/func/debugPanel/web.tsx +++ b/src/components/func/debugPanel/web.tsx @@ -1,10 +1,9 @@ import React, { useState } from 'react'; import { Button, Space, Drawer, Modal, Tooltip } from 'antd'; -import { UpOutlined } from '@ant-design/icons'; import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; import Style from './web.module.less'; -// import OakIcon from '../../icon' +import OakIcon from '../../icon' export default function render(props: WebComponentProps} - // icon={} + icon={} style={{ position: 'fixed', bottom: 0, @@ -49,7 +47,7 @@ export default function render(props: WebComponentProps} - className={Style.drawer} + rootClassName={Style.drawer} > + + + + + 不支持的icon类型{{type}} + \ No newline at end of file diff --git a/src/components/icon-font-awesome/web.less b/src/components/icon-font-awesome/web.less new file mode 100644 index 000000000..49e9a1742 --- /dev/null +++ b/src/components/icon-font-awesome/web.less @@ -0,0 +1,21 @@ +@import './fontawesome.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/components/icon-font-awesome/web.tsx b/src/components/icon-font-awesome/web.tsx new file mode 100644 index 000000000..3faa0e4b2 --- /dev/null +++ b/src/components/icon-font-awesome/web.tsx @@ -0,0 +1,71 @@ +import { WebComponentProps } from 'oak-frontend-base'; +import React from 'react'; +import { EntityDict } from '../../general-app-domain'; +import './web.less'; + +export default function Render( + props: WebComponentProps< + EntityDict, + 'user', + false, + { + name: string; + type: 'far' | 'fas'; + color?: 'primary' | 'success' | 'error' | 'waring' | 'info' | string; + className?: string; + size?: string; + larger?: + | '1x' + | '2x' + | '3x' + | '4x' + | '5x' + | '6x' + | '7x' + | '8x' + | '9x' + | '10x' + | 'xs' + | '2xs' + | 'sm' + | 'lg' + | 'xl' + | '2xl'; + }, + {} + > +) { + const { data } = props; + + const { name, type, color = 'primary', size, className, larger = '1x' } = data; + + const isColor = ['primary', 'info', 'success', 'error', 'warning'].includes( + color + ); + + if (['far', 'fas'].includes(type)) { + let class_name = type + ' ' + 'fa-' + name; + if (className) { + class_name += ' ' + className; + } + if (larger) { + class_name += ' ' + 'fa-' + larger; + } + if (isColor) { + class_name += ' ' + 'oak-icon__' + color; + } + return ( + + ); + } + return 不支持的icon类型{type}; +} \ No newline at end of file diff --git a/src/components/icon/iconfont.less b/src/components/icon/iconfont.less new file mode 100644 index 000000000..e869cb2c0 --- /dev/null +++ b/src/components/icon/iconfont.less @@ -0,0 +1,724 @@ +@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-searchfill:before { + content: "\e77d"; +} + +.oak-icon-publishgoods_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:before { + content: "\e78a"; +} + +.oak-icon-commodity:before { + content: "\e78b"; +} + +.oak-icon-zhtn:before { + content: "\e78c"; +} \ No newline at end of file diff --git a/src/components/icon/index.less b/src/components/icon/index.less index cc29ee5d1..e0d95c9af 100644 --- a/src/components/icon/index.less +++ b/src/components/icon/index.less @@ -1,22 +1,22 @@ -@import './fontawesome.less'; +@import './iconfont.less'; @import '../../config/styles/mp/index.less'; -.primary { +.oak-icon__primary { color: @oak-color-primary; } -.error { +.oak-icon__error { color: @oak-color-error; } -.warning { +.oak-icon__warning { color: @oak-color-warning; } -.success { +.oak-icon__success { color: @oak-color-success; } -.info { +.oak-icon__info { color: @oak-color-info; } \ No newline at end of file diff --git a/src/components/icon/index.ts b/src/components/icon/index.ts index 632515edb..87584a0fa 100644 --- a/src/components/icon/index.ts +++ b/src/components/icon/index.ts @@ -1,27 +1,25 @@ export default OakComponent({ isList: false, + wechatMp: { + externalClasses: ['oak-class'], + }, properties: { - type: { - type: String, - value: 'fas', - }, - size: { - type: Number, - optionalTypes: [Number, String], - value: 0, - }, - color: { - type: String, - value: 'primary', - }, name: { type: String, value: '', }, - larger: { + custom: { type: String, - value: '1x', + value: '', + }, + size: { + type: Number, + value: 14, + }, + color: { + type: String, + value: '', }, }, }); \ No newline at end of file diff --git a/src/components/icon/index.xml b/src/components/icon/index.xml index 6e511ef37..b012218b2 100644 --- a/src/components/icon/index.xml +++ b/src/components/icon/index.xml @@ -1,9 +1 @@ - - - - - - 不支持的icon类型{{type}} - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/icon/web.less b/src/components/icon/web.less index 49e9a1742..870b0ef4c 100644 --- a/src/components/icon/web.less +++ b/src/components/icon/web.less @@ -1,4 +1,4 @@ -@import './fontawesome.less'; +@import './iconfont.less'; .oak-icon__primary { color: var(--oak-color-primary); diff --git a/src/components/icon/web.tsx b/src/components/icon/web.tsx index 3faa0e4b2..08e4c5bcf 100644 --- a/src/components/icon/web.tsx +++ b/src/components/icon/web.tsx @@ -10,62 +10,51 @@ export default function Render( false, { name: string; - type: 'far' | 'fas'; - color?: 'primary' | 'success' | 'error' | 'waring' | 'info' | string; - className?: string; + color?: + | 'primary' + | 'success' + | 'error' + | 'waring' + | 'info' + | string; size?: string; - larger?: - | '1x' - | '2x' - | '3x' - | '4x' - | '5x' - | '6x' - | '7x' - | '8x' - | '9x' - | '10x' - | 'xs' - | '2xs' - | 'sm' - | 'lg' - | 'xl' - | '2xl'; + className?: string; + style?: React.CSSProperties; }, {} > ) { const { data } = props; - const { name, type, color = 'primary', size, className, larger = '1x' } = data; + const { + name, + color = '', + size, + className, + style = {}, + } = data; const isColor = ['primary', 'info', 'success', 'error', 'warning'].includes( color ); - if (['far', 'fas'].includes(type)) { - let class_name = type + ' ' + 'fa-' + name; - if (className) { - class_name += ' ' + className; - } - if (larger) { - class_name += ' ' + 'fa-' + larger; - } - if (isColor) { - class_name += ' ' + 'oak-icon__' + color; - } - return ( - - ); - } - return 不支持的icon类型{type}; + let class_name = 'oak-icon ' + 'oak-icon-' + name; + if (className) { + class_name += ' ' + className; + } + if (isColor || color === '') { + class_name += ' ' + 'oak-icon__' + (color || 'primary'); + } + return ( + + ); } \ No newline at end of file diff --git a/src/pages/user/manage/detail/index.ts b/src/pages/user/manage/detail/index.ts index 636d71795..a07afb7bd 100644 --- a/src/pages/user/manage/detail/index.ts +++ b/src/pages/user/manage/detail/index.ts @@ -41,7 +41,7 @@ export default OakComponent({ }, }, isList: false, - + formData: ({ data: user }) => { const { id, @@ -56,7 +56,10 @@ export default OakComponent({ } = user || {}; const mobile = mobile$user && mobile$user[0]?.mobile; const mobileCount = mobile$user ? mobile$user.length : 0; - const mobileText = mobileCount && mobileCount > 1 ? `${mobileCount}条手机号` : (mobile || '未设置'); + const mobileText = + mobileCount && mobileCount > 1 + ? `${mobileCount}条手机号` + : mobile || '未设置'; const avatar = extraFile$entity && extraFile$entity[0] && @@ -68,7 +71,7 @@ export default OakComponent({ mobile, gender, avatar, - birth: birth ? (new Date(birth)).toLocaleDateString() : '', + birth: birth ? new Date(birth).toLocaleDateString() : '', userState, idState, mobileCount, @@ -94,34 +97,31 @@ export default OakComponent({ idStateColor: { verifying: 'primary', verified: 'success', - unverified: 'warning' + unverified: 'warning', }, show: false, actionDescriptions: { accept: { icon: { - name: 'circle-check', - type: 'far', + name: 'success', }, label: '通过', }, activate: { icon: { - name: 'chart-line', + name: 'playon', }, label: '激活', }, disable: { icon: { - name: 'bell-slash', - type: 'far', + name: 'shielding', }, label: '禁用', }, enable: { icon: { - name: 'bell', - type: 'far', + name: 'barrage', }, label: '启用', }, @@ -133,25 +133,25 @@ export default OakComponent({ }, update: { icon: { - name: 'edit', + name: 'editor', }, label: '更新', }, verify: { icon: { - name: 'certificate', + name: 'businesscard', }, label: '验证', }, play: { icon: { - name: 'person-praying', + name: 'refresh', }, label: '切换', }, }, }, - methods: { + methods: { async onActionClick(action: string) { switch (action) { case 'update': { @@ -181,6 +181,6 @@ export default OakComponent({ onActionClickMp(e: WechatMiniprogram.TouchEvent) { const { action } = e.detail; return this.onActionClick(action); - } + }, }, }); diff --git a/src/pages/user/manage/detail/index.xml b/src/pages/user/manage/detail/index.xml index d60c8d4dc..49fef1722 100644 --- a/src/pages/user/manage/detail/index.xml +++ b/src/pages/user/manage/detail/index.xml @@ -9,74 +9,26 @@ - - - - - - - 昵称 - - + {{nickname || '未设置'}} - - - - - - - 姓名 - - + {{name || '未设置'}} - - - - - - - 性别 - - + {{gender || '未设置'}} - - - - - - - 手机号 - - + {{mobileText}} - - - - - - - 用户状态 - - + {{userState || '未设置'}} - - - - - - - 认证状态 - - + {{idState || '未设置'}}