From 035663eb3b8198404245f68df49fe00799ca27c3 Mon Sep 17 00:00:00 2001 From: renqian805 <1743369777@qq.com> Date: Sun, 10 Jul 2022 20:42:12 +0800 Subject: [PATCH] refactor: simplified code --- components.d.ts | 1 - package.json | 32 +- pnpm-lock.yaml | 511 ++++++++---------- src/packages/base-widgets/index.ts | 8 +- src/packages/base-widgets/text/fontArr.ts | 2 +- src/packages/base-widgets/text/index.tsx | 2 +- src/packages/container-component/index.ts | 4 +- .../container-component/layout/index.tsx | 4 +- src/visual-editor/components/header/index.vue | 4 + .../components/header/preview.vue | 37 +- .../components/data-source/data-fetch.vue | 9 +- .../components/data-source/utils.tsx | 14 +- .../components/left-aside/components/index.ts | 4 +- .../components/left-aside/index.vue | 8 +- .../components/animate/Animate.tsx | 4 +- .../components/animate/animateConfig.ts | 20 +- .../table-prop-edit.service.tsx | 2 +- .../draggable-transition-group.vue | 72 ++- .../simulator-editor/simulator-editor.vue | 330 ++++++----- .../components/simulator-editor/slot-item.vue | 77 ++- src/visual-editor/hooks/useModal.tsx | 2 +- src/visual-editor/utils/dialog-service.tsx | 2 +- src/visual-editor/visual-editor.utils.ts | 68 +-- src/visual.config.tsx | 8 +- 24 files changed, 552 insertions(+), 673 deletions(-) diff --git a/components.d.ts b/components.d.ts index 45e3280..1296c7c 100644 --- a/components.d.ts +++ b/components.d.ts @@ -32,7 +32,6 @@ declare module '@vue/runtime-core' { RouterLink: typeof import('vue-router')['RouterLink']; RouterView: typeof import('vue-router')['RouterView']; } - export interface ComponentCustomProperties { vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll']; } diff --git a/package.json b/package.json index dc69ee2..0a5d9ca 100644 --- a/package.json +++ b/package.json @@ -33,13 +33,13 @@ "dependencies": { "@element-plus/icons-vue": "^2.0.6", "@vant/touch-emulator": "^1.3.2", - "@vueuse/core": "^8.7.5", - "@vueuse/integrations": "^8.7.5", + "@vueuse/core": "^8.9.1", + "@vueuse/integrations": "^8.9.1", "animate.css": "^4.1.1", "axios": "^0.27.2", "dayjs": "^1.11.3", "dexie": "^3.2.2", - "element-plus": "2.2.8", + "element-plus": "2.2.9", "lodash-es": "^4.17.21", "monaco-editor": "^0.33.0", "nanoid": "^4.0.0", @@ -57,9 +57,9 @@ "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", "@types/lodash-es": "^4.17.6", - "@types/node": "^18.0.0", - "@typescript-eslint/eslint-plugin": "^5.30.3", - "@typescript-eslint/parser": "^5.30.3", + "@types/node": "^18.0.3", + "@typescript-eslint/eslint-plugin": "^5.30.5", + "@typescript-eslint/parser": "^5.30.5", "@vitejs/plugin-legacy": "^1.8.2", "@vitejs/plugin-vue": "^2.3.3", "@vitejs/plugin-vue-jsx": "^1.3.10", @@ -71,32 +71,32 @@ "eslint-define-config": "^1.5.1", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-vue": "^9.1.1", + "eslint-plugin-vue": "^9.2.0", "husky": "^8.0.1", - "lint-staged": "^13.0.3", + "lint-staged": "^12.5.0", "postcss": "^8.4.14", - "postcss-html": "^1.4.1", + "postcss-html": "^1.5.0", "postcss-scss": "^4.0.4", "prettier": "^2.7.1", "pretty-quick": "^3.1.3", "rimraf": "^3.0.2", "sass": "1.53.0", "stylelint": "^14.9.1", - "stylelint-config-html": "^1.0.0", + "stylelint-config-html": "^1.1.0", "stylelint-config-prettier": "^9.0.3", "stylelint-config-recommended": "^8.0.0", "stylelint-config-standard": "^26.0.0", "stylelint-order": "^5.0.0", - "stylelint-scss": "^4.2.0", + "stylelint-scss": "^4.3.0", "typescript": "^4.7.4", "unplugin-auto-import": "^0.9.2", - "unplugin-vue-components": "^0.21.0", - "unplugin-vue-define-options": "^0.6.1", - "vite": "2.9.13", - "vite-plugin-checker": "^0.4.7", + "unplugin-vue-components": "^0.21.1", + "unplugin-vue-define-options": "^0.6.2", + "vite": "2.9.14", + "vite-plugin-checker": "^0.4.8", "vite-plugin-windicss": "^1.8.6", "vue-eslint-parser": "^9.0.3", - "vue-tsc": "^0.38.2", + "vue-tsc": "^0.38.3", "windicss": "^3.5.6" }, "repository": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30889ad..4ad687b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,15 +5,15 @@ specifiers: '@commitlint/config-conventional': ^17.0.3 '@element-plus/icons-vue': ^2.0.6 '@types/lodash-es': ^4.17.6 - '@types/node': ^18.0.0 - '@typescript-eslint/eslint-plugin': ^5.30.3 - '@typescript-eslint/parser': ^5.30.3 + '@types/node': ^18.0.3 + '@typescript-eslint/eslint-plugin': ^5.30.5 + '@typescript-eslint/parser': ^5.30.5 '@vant/touch-emulator': ^1.3.2 '@vitejs/plugin-legacy': ^1.8.2 '@vitejs/plugin-vue': ^2.3.3 '@vitejs/plugin-vue-jsx': ^1.3.10 - '@vueuse/core': ^8.7.5 - '@vueuse/integrations': ^8.7.5 + '@vueuse/core': ^8.9.1 + '@vueuse/integrations': ^8.9.1 animate.css: ^4.1.1 axios: ^0.27.2 commitizen: ^4.2.4 @@ -21,15 +21,15 @@ specifiers: cross-env: ^7.0.3 dayjs: ^1.11.3 dexie: ^3.2.2 - element-plus: 2.2.8 + element-plus: 2.2.9 eslint: ^8.19.0 eslint-config-prettier: ^8.5.0 eslint-define-config: ^1.5.1 eslint-plugin-import: ^2.26.0 eslint-plugin-prettier: ^4.2.1 - eslint-plugin-vue: ^9.1.1 + eslint-plugin-vue: ^9.2.0 husky: ^8.0.1 - lint-staged: ^13.0.3 + lint-staged: ^12.5.0 lodash-es: ^4.17.21 monaco-editor: ^0.33.0 nanoid: ^4.0.0 @@ -37,7 +37,7 @@ specifiers: nprogress: ^1.0.0-1 pinia: ^2.0.14 postcss: ^8.4.14 - postcss-html: ^1.4.1 + postcss-html: ^1.5.0 postcss-scss: ^4.0.4 prettier: ^2.7.1 pretty-quick: ^3.1.3 @@ -46,37 +46,37 @@ specifiers: rimraf: ^3.0.2 sass: 1.53.0 stylelint: ^14.9.1 - stylelint-config-html: ^1.0.0 + stylelint-config-html: ^1.1.0 stylelint-config-prettier: ^9.0.3 stylelint-config-recommended: ^8.0.0 stylelint-config-standard: ^26.0.0 stylelint-order: ^5.0.0 - stylelint-scss: ^4.2.0 + stylelint-scss: ^4.3.0 typescript: ^4.7.4 unplugin-auto-import: ^0.9.2 - unplugin-vue-components: ^0.21.0 - unplugin-vue-define-options: ^0.6.1 + unplugin-vue-components: ^0.21.1 + unplugin-vue-define-options: ^0.6.2 vant: 3.5.2 - vite: 2.9.13 - vite-plugin-checker: ^0.4.7 + vite: 2.9.14 + vite-plugin-checker: ^0.4.8 vite-plugin-windicss: ^1.8.6 vue: 3.2.37 vue-eslint-parser: ^9.0.3 vue-router: ^4.0.16 - vue-tsc: ^0.38.2 + vue-tsc: ^0.38.3 vuedraggable: ^4.1.0 windicss: ^3.5.6 dependencies: '@element-plus/icons-vue': 2.0.6_vue@3.2.37 '@vant/touch-emulator': 1.3.2 - '@vueuse/core': 8.7.5_vue@3.2.37 - '@vueuse/integrations': 8.7.5_44yexj3ri2snr37tpylk774ef4 + '@vueuse/core': 8.9.1_vue@3.2.37 + '@vueuse/integrations': 8.9.1_44yexj3ri2snr37tpylk774ef4 animate.css: 4.1.1 axios: 0.27.2 dayjs: 1.11.3 dexie: 3.2.2 - element-plus: 2.2.8_vue@3.2.37 + element-plus: 2.2.9_vue@3.2.37 lodash-es: 4.17.21 monaco-editor: 0.33.0 nanoid: 4.0.0 @@ -94,11 +94,11 @@ devDependencies: '@commitlint/cli': 17.0.3 '@commitlint/config-conventional': 17.0.3 '@types/lodash-es': 4.17.6 - '@types/node': 18.0.0 - '@typescript-eslint/eslint-plugin': 5.30.3_xuuykav7urhdozug7htlfgar3u - '@typescript-eslint/parser': 5.30.3_4x5o4skxv6sl53vpwefgt23khm - '@vitejs/plugin-legacy': 1.8.2_vite@2.9.13 - '@vitejs/plugin-vue': 2.3.3_vite@2.9.13+vue@3.2.37 + '@types/node': 18.0.3 + '@typescript-eslint/eslint-plugin': 5.30.5_6zdoc3rn4mpiddqwhppni2mnnm + '@typescript-eslint/parser': 5.30.5_4x5o4skxv6sl53vpwefgt23khm + '@vitejs/plugin-legacy': 1.8.2_vite@2.9.14 + '@vitejs/plugin-vue': 2.3.3_vite@2.9.14+vue@3.2.37 '@vitejs/plugin-vue-jsx': 1.3.10 commitizen: 4.2.4 conventional-changelog-cli: 2.2.2 @@ -106,34 +106,34 @@ devDependencies: eslint: 8.19.0 eslint-config-prettier: 8.5.0_eslint@8.19.0 eslint-define-config: 1.5.1 - eslint-plugin-import: 2.26.0_xgi3rtbx7oxkcq3vxqkef6isyu + eslint-plugin-import: 2.26.0_iom7pm3yknyiblqpw2vvqvxs5i eslint-plugin-prettier: 4.2.1_7uxdfn2xinezdgvmbammh6ev5i - eslint-plugin-vue: 9.1.1_eslint@8.19.0 + eslint-plugin-vue: 9.2.0_eslint@8.19.0 husky: 8.0.1 - lint-staged: 13.0.3 + lint-staged: 12.5.0 postcss: 8.4.14 - postcss-html: 1.4.1 + postcss-html: 1.5.0 postcss-scss: 4.0.4_postcss@8.4.14 prettier: 2.7.1 pretty-quick: 3.1.3_prettier@2.7.1 rimraf: 3.0.2 sass: 1.53.0 stylelint: 14.9.1 - stylelint-config-html: 1.0.0_rbvrlex3zkw5dqq3eg5f64dp2u + stylelint-config-html: 1.1.0_5rxrxgs7sjazj2ve56ds3kmipi stylelint-config-prettier: 9.0.3_stylelint@14.9.1 stylelint-config-recommended: 8.0.0_stylelint@14.9.1 stylelint-config-standard: 26.0.0_stylelint@14.9.1 stylelint-order: 5.0.0_stylelint@14.9.1 - stylelint-scss: 4.2.0_stylelint@14.9.1 + stylelint-scss: 4.3.0_stylelint@14.9.1 typescript: 4.7.4 - unplugin-auto-import: 0.9.2_5smtrbmayeckluww3ebuwm6kim - unplugin-vue-components: 0.21.0_vite@2.9.13+vue@3.2.37 - unplugin-vue-define-options: 0.6.1_vite@2.9.13+vue@3.2.37 - vite: 2.9.13_sass@1.53.0 - vite-plugin-checker: 0.4.7_vite@2.9.13 - vite-plugin-windicss: 1.8.6_vite@2.9.13 + unplugin-auto-import: 0.9.2_jg57o3hw2g6ynl3mkvtaux3hqe + unplugin-vue-components: 0.21.1_vite@2.9.14+vue@3.2.37 + unplugin-vue-define-options: 0.6.2_vite@2.9.14+vue@3.2.37 + vite: 2.9.14_sass@1.53.0 + vite-plugin-checker: 0.4.8_vite@2.9.14 + vite-plugin-windicss: 1.8.6_vite@2.9.14 vue-eslint-parser: 9.0.3_eslint@8.19.0 - vue-tsc: 0.38.2_typescript@4.7.4 + vue-tsc: 0.38.3_typescript@4.7.4 windicss: 3.5.6 packages: @@ -150,13 +150,6 @@ packages: resolution: {integrity: sha512-CQkeV+oJxUazwjlHD0/3ZD08QWKuGQkhnrKo3e6ly5pd48VUpXbb77q0xMU4+vc2CkJnDS02Eq/M9ugyX20XZA==} dev: true - /@babel/code-frame/7.16.7: - resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/highlight': 7.16.7 - dev: true - /@babel/code-frame/7.18.6: resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==} engines: {node: '>=6.9.0'} @@ -402,15 +395,6 @@ packages: - supports-color dev: true - /@babel/highlight/7.16.7: - resolution: {integrity: sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-validator-identifier': 7.16.7 - chalk: 2.4.2 - js-tokens: 4.0.0 - dev: true - /@babel/highlight/7.18.6: resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==} engines: {node: '>=6.9.0'} @@ -626,10 +610,10 @@ packages: '@commitlint/execute-rule': 17.0.0 '@commitlint/resolve-extends': 17.0.3 '@commitlint/types': 17.0.0 - '@types/node': 18.0.0 + '@types/node': 18.0.3 chalk: 4.1.2 cosmiconfig: 7.0.1 - cosmiconfig-typescript-loader: 2.0.2_qiyc72axg2v44xl4yovan2v55u + cosmiconfig-typescript-loader: 2.0.2_fxk5i3xm3ivo7fjwhcizcinpla lodash: 4.17.21 resolve-from: 5.0.0 typescript: 4.7.4 @@ -908,8 +892,8 @@ packages: resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} dev: true - /@types/node/18.0.0: - resolution: {integrity: sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==} + /@types/node/18.0.3: + resolution: {integrity: sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==} dev: true /@types/normalize-package-data/2.4.1: @@ -923,8 +907,8 @@ packages: /@types/web-bluetooth/0.0.14: resolution: {integrity: sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==} - /@typescript-eslint/eslint-plugin/5.30.3_xuuykav7urhdozug7htlfgar3u: - resolution: {integrity: sha512-QEgE1uahnDbWEkZlidq7uKB630ny1NN8KbLPmznX+8hYsYpoV1/quG1Nzvs141FVuumuS7O0EpqYw3RB4AVzRg==} + /@typescript-eslint/eslint-plugin/5.30.5_6zdoc3rn4mpiddqwhppni2mnnm: + resolution: {integrity: sha512-lftkqRoBvc28VFXEoRgyZuztyVUQ04JvUnATSPtIRFAccbXTWL6DEtXGYMcbg998kXw1NLUJm7rTQ9eUt+q6Ig==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -934,10 +918,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.30.3_4x5o4skxv6sl53vpwefgt23khm - '@typescript-eslint/scope-manager': 5.30.3 - '@typescript-eslint/type-utils': 5.30.3_4x5o4skxv6sl53vpwefgt23khm - '@typescript-eslint/utils': 5.30.3_4x5o4skxv6sl53vpwefgt23khm + '@typescript-eslint/parser': 5.30.5_4x5o4skxv6sl53vpwefgt23khm + '@typescript-eslint/scope-manager': 5.30.5 + '@typescript-eslint/type-utils': 5.30.5_4x5o4skxv6sl53vpwefgt23khm + '@typescript-eslint/utils': 5.30.5_4x5o4skxv6sl53vpwefgt23khm debug: 4.3.4 eslint: 8.19.0 functional-red-black-tree: 1.0.1 @@ -950,8 +934,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.30.3_4x5o4skxv6sl53vpwefgt23khm: - resolution: {integrity: sha512-ddwGEPC3E49DduAUC8UThQafHRE5uc1NE8jdOgl+w8/NrYF50MJQNeD3u4JZrqAXdY9rJz0CdQ9HpNME20CzkA==} + /@typescript-eslint/parser/5.30.5_4x5o4skxv6sl53vpwefgt23khm: + resolution: {integrity: sha512-zj251pcPXI8GO9NDKWWmygP6+UjwWmrdf9qMW/L/uQJBM/0XbU2inxe5io/234y/RCvwpKEYjZ6c1YrXERkK4Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -960,9 +944,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.30.3 - '@typescript-eslint/types': 5.30.3 - '@typescript-eslint/typescript-estree': 5.30.3_typescript@4.7.4 + '@typescript-eslint/scope-manager': 5.30.5 + '@typescript-eslint/types': 5.30.5 + '@typescript-eslint/typescript-estree': 5.30.5_typescript@4.7.4 debug: 4.3.4 eslint: 8.19.0 typescript: 4.7.4 @@ -970,16 +954,16 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager/5.30.3: - resolution: {integrity: sha512-yVJIIUXeo/vv6Alj6lKBvsqnRs5hcxUpN3Dg3aD9Zv6r7p6Nn106jJcr5rnpRHAReEb/aMI2RWrt3JmL17eCVA==} + /@typescript-eslint/scope-manager/5.30.5: + resolution: {integrity: sha512-NJ6F+YHHFT/30isRe2UTmIGGAiXKckCyMnIV58cE3JkHmaD6e5zyEYm5hBDv0Wbin+IC0T1FWJpD3YqHUG/Ydg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.30.3 - '@typescript-eslint/visitor-keys': 5.30.3 + '@typescript-eslint/types': 5.30.5 + '@typescript-eslint/visitor-keys': 5.30.5 dev: true - /@typescript-eslint/type-utils/5.30.3_4x5o4skxv6sl53vpwefgt23khm: - resolution: {integrity: sha512-IIzakE7OXOqdwPaXhRiPnaZ8OuJJYBLufOffd9fqzkI4IMFIYq8KC7bghdnF7QUJTirURRErQFrJ/w5UpwIqaw==} + /@typescript-eslint/type-utils/5.30.5_4x5o4skxv6sl53vpwefgt23khm: + resolution: {integrity: sha512-k9+ejlv1GgwN1nN7XjVtyCgE0BTzhzT1YsQF0rv4Vfj2U9xnslBgMYYvcEYAFVdvhuEscELJsB7lDkN7WusErw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -988,7 +972,7 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.30.3_4x5o4skxv6sl53vpwefgt23khm + '@typescript-eslint/utils': 5.30.5_4x5o4skxv6sl53vpwefgt23khm debug: 4.3.4 eslint: 8.19.0 tsutils: 3.21.0_typescript@4.7.4 @@ -997,13 +981,13 @@ packages: - supports-color dev: true - /@typescript-eslint/types/5.30.3: - resolution: {integrity: sha512-vshU3pjSTgBPNgfd55JLYngHkXuwQP68fxYFUAg1Uq+JrR3xG/XjvL9Dmv28CpOERtqwkaR4QQ3mD0NLZcE2Xw==} + /@typescript-eslint/types/5.30.5: + resolution: {integrity: sha512-kZ80w/M2AvsbRvOr3PjaNh6qEW1LFqs2pLdo2s5R38B2HYXG8Z0PP48/4+j1QHJFL3ssHIbJ4odPRS8PlHrFfw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.30.3_typescript@4.7.4: - resolution: {integrity: sha512-jqVh5N9AJx6+7yRgoA+ZelAFrHezgI9pzI9giv7s84DDOmtpFwTgURcpICDHyz9x6vAeOu91iACZ4dBTVfzIyA==} + /@typescript-eslint/typescript-estree/5.30.5_typescript@4.7.4: + resolution: {integrity: sha512-qGTc7QZC801kbYjAr4AgdOfnokpwStqyhSbiQvqGBLixniAKyH+ib2qXIVo4P9NgGzwyfD9I0nlJN7D91E1VpQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -1011,8 +995,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.30.3 - '@typescript-eslint/visitor-keys': 5.30.3 + '@typescript-eslint/types': 5.30.5 + '@typescript-eslint/visitor-keys': 5.30.5 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -1023,16 +1007,16 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.30.3_4x5o4skxv6sl53vpwefgt23khm: - resolution: {integrity: sha512-OEaBXGxxdIy35H+jyXfYAMQ66KMJczK9hEhL3gR6IRbWe5PyK+bPDC9zbQNVII6rNFTfF/Mse0z21NlEU+vOMw==} + /@typescript-eslint/utils/5.30.5_4x5o4skxv6sl53vpwefgt23khm: + resolution: {integrity: sha512-o4SSUH9IkuA7AYIfAvatldovurqTAHrfzPApOZvdUq01hHojZojCFXx06D/aFpKCgWbMPRdJBWAC3sWp3itwTA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: '@types/json-schema': 7.0.9 - '@typescript-eslint/scope-manager': 5.30.3 - '@typescript-eslint/types': 5.30.3 - '@typescript-eslint/typescript-estree': 5.30.3_typescript@4.7.4 + '@typescript-eslint/scope-manager': 5.30.5 + '@typescript-eslint/types': 5.30.5 + '@typescript-eslint/typescript-estree': 5.30.5_typescript@4.7.4 eslint: 8.19.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.19.0 @@ -1041,11 +1025,11 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys/5.30.3: - resolution: {integrity: sha512-ep2xtHOhnSRt6fDP9DSSxrA/FqZhdMF7/Y9fYsxrKss2uWJMbzJyBJ/We1fKc786BJ10pHwrzUlhvpz8i7XzBg==} + /@typescript-eslint/visitor-keys/5.30.5: + resolution: {integrity: sha512-D+xtGo9HUMELzWIUqcQc0p2PO4NyvTrgIOK/VnSH083+8sq0tiLozNRKuLarwHYGRuA6TVBQSuuLwJUDWd3aaA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.30.3 + '@typescript-eslint/types': 5.30.5 eslint-visitor-keys: 3.3.0 dev: true @@ -1067,7 +1051,7 @@ packages: resolution: {integrity: sha512-YonNN0SuJLEJuqdoMcVAJm2JUZWkHNrW81QzeF6FLyG5HFUGlmTM5Sby7gdS3Z/8UDMlkWRQpJxBWbmVzmUWxQ==} dev: false - /@vitejs/plugin-legacy/1.8.2_vite@2.9.13: + /@vitejs/plugin-legacy/1.8.2_vite@2.9.14: resolution: {integrity: sha512-NCOKU+pU+cxLMR9P9RTolEuOK+h+zYBXlknj+zGcKSj/NXBZYgA1GAH1FnO4zijoWRiTaiOm2ha9LQrELE7XHg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -1078,7 +1062,7 @@ packages: magic-string: 0.26.2 regenerator-runtime: 0.13.9 systemjs: 6.12.1 - vite: 2.9.13_sass@1.53.0 + vite: 2.9.14_sass@1.53.0 dev: true /@vitejs/plugin-vue-jsx/1.3.10: @@ -1095,43 +1079,43 @@ packages: - supports-color dev: true - /@vitejs/plugin-vue/2.3.3_vite@2.9.13+vue@3.2.37: + /@vitejs/plugin-vue/2.3.3_vite@2.9.14+vue@3.2.37: resolution: {integrity: sha512-SmQLDyhz+6lGJhPELsBdzXGc+AcaT8stgkbiTFGpXPe8Tl1tJaBw1A6pxDqDuRsVkD8uscrkx3hA7QDOoKYtyw==} engines: {node: '>=12.0.0'} peerDependencies: vite: ^2.5.10 vue: ^3.2.25 dependencies: - vite: 2.9.13_sass@1.53.0 + vite: 2.9.14_sass@1.53.0 vue: 3.2.37 dev: true - /@volar/code-gen/0.38.2: - resolution: {integrity: sha512-H81I6d7rZB7teqL+zhK/Xz1v0/kKkUwkB0Aq6b4+BTCqcJeiZkoWxd0gFhrhWTnUoqiM83lhoTGo2vkvx5YagQ==} + /@volar/code-gen/0.38.3: + resolution: {integrity: sha512-0yCkDtaxffyfC9e2dSLGXJmG3b0rCfTa6vqxjr70ZFTtcf/VytmMBwboFicnm+Zoen9EI8wUNfw4upw9Slz5RQ==} dependencies: - '@volar/source-map': 0.38.2 + '@volar/source-map': 0.38.3 dev: true - /@volar/source-map/0.38.2: - resolution: {integrity: sha512-DWcYbYt9SPwk0r4VmXk1F0v4X5+hCqH1JRkAWSeJymQyXCQ2OQDEbY2PF12a7y2qn4FUBD2gOba2TynAqI8ZFQ==} + /@volar/source-map/0.38.3: + resolution: {integrity: sha512-8aVM+r4lsHnLjhvnjQ6kn4J++3I6VXtJblcGzWuIOn9M8pJmRGW6Si/eOVjayLWfvPCxXUM7e3sg4Nm2tufTmg==} dev: true - /@volar/vue-code-gen/0.38.2: - resolution: {integrity: sha512-whLunD6phSGWBUHZKdTxeglrpzQu26ii8CRVapFdjfyMaVhQ7ESNeIAhkTVyg2ovOPc0PiDYPQEPzfWAADIWog==} + /@volar/vue-code-gen/0.38.3: + resolution: {integrity: sha512-euVuKtwV/KurRSVwNz5bZbCBJLwVOE56+Uh2PhsHcAM5Wzlt82cwLj07FbFagCftoC3IC/bsn43yuLc2I+ZjAQ==} dependencies: - '@volar/code-gen': 0.38.2 - '@volar/source-map': 0.38.2 + '@volar/code-gen': 0.38.3 + '@volar/source-map': 0.38.3 '@vue/compiler-core': 3.2.37 '@vue/compiler-dom': 3.2.37 '@vue/shared': 3.2.37 dev: true - /@volar/vue-typescript/0.38.2: - resolution: {integrity: sha512-5IKvSK2m5yUmH6iu/tNScVlvJGuiHawTfSmjxaMs+/tod25WeK37LEdf+pdKtlJ30bYTQmmkAuEfG01QvvBRGQ==} + /@volar/vue-typescript/0.38.3: + resolution: {integrity: sha512-rXh4RQBZrNfkiSnpBYbHrsxg7vBbZeYsGFgE/n8FVLcZfGlelsdXFIINsr/aZGUCJre9I15wQ44eEmXnc4+qww==} dependencies: - '@volar/code-gen': 0.38.2 - '@volar/source-map': 0.38.2 - '@volar/vue-code-gen': 0.38.2 + '@volar/code-gen': 0.38.3 + '@volar/source-map': 0.38.3 + '@volar/vue-code-gen': 0.38.3 '@vue/compiler-sfc': 3.2.37 '@vue/reactivity': 3.2.37 dev: true @@ -1234,8 +1218,8 @@ packages: /@vue/shared/3.2.37: resolution: {integrity: sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==} - /@vueuse/core/8.7.5_vue@3.2.37: - resolution: {integrity: sha512-tqgzeZGoZcXzoit4kOGLWJibDMLp0vdm6ZO41SSUQhkhtrPhAg6dbIEPiahhUu6sZAmSYvVrZgEr5aKD51nrLA==} + /@vueuse/core/8.9.1_vue@3.2.37: + resolution: {integrity: sha512-a7goYb/gJxjXRBw4Fr/jEACiN33ghwM1ohJVu+Zwsr3lNL4qCQ1nU+ogta98lNg5hXJxWj7mYEmQDjjyWOu5nA==} peerDependencies: '@vue/composition-api': ^1.1.0 vue: ^2.6.0 || ^3.2.0 @@ -1246,13 +1230,13 @@ packages: optional: true dependencies: '@types/web-bluetooth': 0.0.14 - '@vueuse/metadata': 8.7.5 - '@vueuse/shared': 8.7.5_vue@3.2.37 + '@vueuse/metadata': 8.9.1 + '@vueuse/shared': 8.9.1_vue@3.2.37 vue: 3.2.37 vue-demi: 0.12.1_vue@3.2.37 - /@vueuse/integrations/8.7.5_44yexj3ri2snr37tpylk774ef4: - resolution: {integrity: sha512-1vCOriEXhthpU9zczTqtG4a+YJFgkyUbK/Cc91Ey0VOdL6saMNjLsrGX7cae6troFyDCbF61eL6Y8epsNc3TXw==} + /@vueuse/integrations/8.9.1_44yexj3ri2snr37tpylk774ef4: + resolution: {integrity: sha512-xeApqTnMBUzlrpJacCdaFqUfTEf7NZUgHKJTsK9I41ISf2+pywgwpfjVk6KVSKk+GuE2MB1c945lul5jA5IcwA==} peerDependencies: async-validator: '*' axios: '*' @@ -1286,8 +1270,8 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 8.7.5_vue@3.2.37 - '@vueuse/shared': 8.7.5_vue@3.2.37 + '@vueuse/core': 8.9.1_vue@3.2.37 + '@vueuse/shared': 8.9.1_vue@3.2.37 axios: 0.27.2 nprogress: 1.0.0-1 qrcode: 1.5.0 @@ -1297,11 +1281,11 @@ packages: - vue dev: false - /@vueuse/metadata/8.7.5: - resolution: {integrity: sha512-emJZKRQSaEnVqmlu39NpNp8iaW+bPC2kWykWoWOZMSlO/0QVEmO/rt8A5VhOEJTKLX3vwTevqbiRy9WJRwVOQg==} + /@vueuse/metadata/8.9.1: + resolution: {integrity: sha512-6LADOlyl3oENHa9dsoY7LXjU1Mh14DnpM6ztETI3hpm5ZffOMIG5CB2Q6aEZfIvYr1lkJVmG2L82wFKk7VRfIA==} - /@vueuse/shared/8.7.5_vue@3.2.37: - resolution: {integrity: sha512-THXPvMBFmg6Gf6AwRn/EdTh2mhqwjGsB2Yfp374LNQSQVKRHtnJ0I42bsZTn7nuEliBxqUrGQm/lN6qUHmhJLw==} + /@vueuse/shared/8.9.1_vue@3.2.37: + resolution: {integrity: sha512-klZfn7ijI3juqVgpfQVrrlBh4uTFajwSCWm8Cdt45Kg26b1LZ9jn9n7J6GhmkFay5016GnjjivQoekQSMeJNUg==} peerDependencies: '@vue/composition-api': ^1.1.0 vue: ^2.6.0 || ^3.2.0 @@ -2012,16 +1996,16 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} dev: true - /cosmiconfig-typescript-loader/2.0.2_qiyc72axg2v44xl4yovan2v55u: + /cosmiconfig-typescript-loader/2.0.2_fxk5i3xm3ivo7fjwhcizcinpla: resolution: {integrity: sha512-KmE+bMjWMXJbkWCeY4FJX/npHuZPNr9XF9q9CIQ/bpFwi1qHfCmSiKarrCcRa0LO4fWjk93pVoeRtJAkTGcYNw==} engines: {node: '>=12', npm: '>=6'} peerDependencies: '@types/node': '*' typescript: '>=3' dependencies: - '@types/node': 18.0.0 + '@types/node': 18.0.3 cosmiconfig: 7.0.1 - ts-node: 10.8.1_qiyc72axg2v44xl4yovan2v55u + ts-node: 10.8.1_fxk5i3xm3ivo7fjwhcizcinpla typescript: 4.7.4 transitivePeerDependencies: - '@swc/core' @@ -2138,6 +2122,19 @@ packages: ms: 2.1.2 dev: true + /debug/4.3.4_supports-color@9.2.2: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + supports-color: 9.2.2 + dev: true + /decamelize-keys/1.1.0: resolution: {integrity: sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=} engines: {node: '>=0.10.0'} @@ -2216,31 +2213,31 @@ packages: esutils: 2.0.3 dev: true - /dom-serializer/1.3.2: - resolution: {integrity: sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==} + /dom-serializer/2.0.0: + resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} dependencies: - domelementtype: 2.2.0 - domhandler: 4.3.0 - entities: 2.2.0 + domelementtype: 2.3.0 + domhandler: 5.0.3 + entities: 4.3.1 dev: true - /domelementtype/2.2.0: - resolution: {integrity: sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==} + /domelementtype/2.3.0: + resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} dev: true - /domhandler/4.3.0: - resolution: {integrity: sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==} + /domhandler/5.0.3: + resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} dependencies: - domelementtype: 2.2.0 + domelementtype: 2.3.0 dev: true - /domutils/2.8.0: - resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} + /domutils/3.0.1: + resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==} dependencies: - dom-serializer: 1.3.2 - domelementtype: 2.2.0 - domhandler: 4.3.0 + dom-serializer: 2.0.0 + domelementtype: 2.3.0 + domhandler: 5.0.3 dev: true /dot-prop/5.3.0: @@ -2254,8 +2251,8 @@ packages: resolution: {integrity: sha512-FYPir3NSBEGexSZUEeht81oVhHfLFl6mhUKSkjHN/iB/TwEIt/WHQrqVGfTLN5gQxwJCQkIJBe05eOXjI7omgg==} dev: true - /element-plus/2.2.8_vue@3.2.37: - resolution: {integrity: sha512-+cubFh1rgeGcc2LeBm7hv/1BKFJre/LIIdRntm9OLaIhysCxigjEwcxk9gbVT4KsbcjmoqZUr4/mwhIhQV6mvw==} + /element-plus/2.2.9_vue@3.2.37: + resolution: {integrity: sha512-jYbL0JkCdv95rkT6trZJjCAizLPySa0qcd2cgq+57SKQnCZAcNDDq4GbTuFRnNavdoeCJnuM3HIficTIUpsMOQ==} peerDependencies: vue: ^3.2.0 dependencies: @@ -2265,7 +2262,7 @@ packages: '@popperjs/core': /@sxzz/popperjs-es/2.11.7 '@types/lodash': 4.14.182 '@types/lodash-es': 4.17.6 - '@vueuse/core': 8.7.5_vue@3.2.37 + '@vueuse/core': 8.9.1_vue@3.2.37 async-validator: 4.2.5 dayjs: 1.11.3 escape-html: 1.0.3 @@ -2296,12 +2293,8 @@ packages: once: 1.4.0 dev: true - /entities/2.2.0: - resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} - dev: true - - /entities/3.0.1: - resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==} + /entities/4.3.1: + resolution: {integrity: sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==} engines: {node: '>=0.12'} dev: true @@ -2610,7 +2603,7 @@ packages: - supports-color dev: true - /eslint-module-utils/2.7.3_bzaq7d2i4y5c5mw2ofduwxq46a: + /eslint-module-utils/2.7.3_ea34krk32wbcqzxapvwr7rsjs4: resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==} engines: {node: '>=4'} peerDependencies: @@ -2628,7 +2621,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.30.3_4x5o4skxv6sl53vpwefgt23khm + '@typescript-eslint/parser': 5.30.5_4x5o4skxv6sl53vpwefgt23khm debug: 3.2.7 eslint-import-resolver-node: 0.3.6 find-up: 2.1.0 @@ -2636,7 +2629,7 @@ packages: - supports-color dev: true - /eslint-plugin-import/2.26.0_xgi3rtbx7oxkcq3vxqkef6isyu: + /eslint-plugin-import/2.26.0_iom7pm3yknyiblqpw2vvqvxs5i: resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==} engines: {node: '>=4'} peerDependencies: @@ -2646,14 +2639,14 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.30.3_4x5o4skxv6sl53vpwefgt23khm + '@typescript-eslint/parser': 5.30.5_4x5o4skxv6sl53vpwefgt23khm array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 doctrine: 2.1.0 eslint: 8.19.0 eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.3_bzaq7d2i4y5c5mw2ofduwxq46a + eslint-module-utils: 2.7.3_ea34krk32wbcqzxapvwr7rsjs4 has: 1.0.3 is-core-module: 2.9.0 is-glob: 4.0.3 @@ -2684,8 +2677,8 @@ packages: prettier-linter-helpers: 1.0.0 dev: true - /eslint-plugin-vue/9.1.1_eslint@8.19.0: - resolution: {integrity: sha512-W9n5PB1X2jzC7CK6riG0oAcxjmKrjTF6+keL1rni8n57DZeilx/Fulz+IRJK3lYseLNAygN0I62L7DvioW40Tw==} + /eslint-plugin-vue/9.2.0_eslint@8.19.0: + resolution: {integrity: sha512-W2hc+NUXoce8sZtWgZ45miQTy6jNyuSdub5aZ1IBune4JDeAyzucYX0TzkrQ1jMO52sNUDYlCIHDoaNePe0p5g==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 @@ -2695,7 +2688,7 @@ packages: natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.0.10 - semver: 7.3.5 + semver: 7.3.7 vue-eslint-parser: 9.0.3_eslint@8.19.0 xml-name-validator: 4.0.0 transitivePeerDependencies: @@ -2853,21 +2846,6 @@ packages: strip-final-newline: 2.0.0 dev: true - /execa/6.1.0: - resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 3.0.1 - is-stream: 3.0.0 - merge-stream: 2.0.0 - npm-run-path: 5.1.0 - onetime: 6.0.0 - signal-exit: 3.0.7 - strip-final-newline: 3.0.0 - dev: true - /execall/2.0.0: resolution: {integrity: sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==} engines: {node: '>=8'} @@ -3359,13 +3337,13 @@ packages: engines: {node: '>=8'} dev: true - /htmlparser2/7.2.0: - resolution: {integrity: sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==} + /htmlparser2/8.0.1: + resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==} dependencies: - domelementtype: 2.2.0 - domhandler: 4.3.0 - domutils: 2.8.0 - entities: 3.0.1 + domelementtype: 2.3.0 + domhandler: 5.0.3 + domutils: 3.0.1 + entities: 4.3.1 dev: true /human-signals/1.1.1: @@ -3378,11 +3356,6 @@ packages: engines: {node: '>=10.17.0'} dev: true - /human-signals/3.0.1: - resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==} - engines: {node: '>=12.20.0'} - dev: true - /husky/8.0.1: resolution: {integrity: sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==} engines: {node: '>=14'} @@ -3596,11 +3569,6 @@ packages: engines: {node: '>=8'} dev: true - /is-stream/3.0.0: - resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: true - /is-string/1.0.7: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} engines: {node: '>= 0.4'} @@ -3654,6 +3622,10 @@ packages: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: true + /js-tokens/8.0.0: + resolution: {integrity: sha512-PC7MzqInq9OqKyTXfIvQNcjMkODJYC8A17kAaQgeW79yfhqTWSOfjHYQ2mDDcwJ96Iibtwkfh0C7R/OvqPlgVA==} + dev: true + /js-yaml/4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true @@ -3757,27 +3729,27 @@ packages: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} dev: true - /lint-staged/13.0.3: - resolution: {integrity: sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==} - engines: {node: ^14.13.1 || >=16.0.0} + /lint-staged/12.5.0: + resolution: {integrity: sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true dependencies: cli-truncate: 3.1.0 colorette: 2.0.19 commander: 9.3.0 - debug: 4.3.4 - execa: 6.1.0 + debug: 4.3.4_supports-color@9.2.2 + execa: 5.1.1 lilconfig: 2.0.5 listr2: 4.0.5 micromatch: 4.0.5 normalize-path: 3.0.0 object-inspect: 1.12.2 - pidtree: 0.6.0 + pidtree: 0.5.0 string-argv: 0.3.1 - yaml: 2.1.1 + supports-color: 9.2.2 + yaml: 1.10.2 transitivePeerDependencies: - enquirer - - supports-color dev: true /listr2/4.0.5: @@ -4020,11 +3992,6 @@ packages: engines: {node: '>=6'} dev: true - /mimic-fn/4.0.0: - resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} - engines: {node: '>=12'} - dev: true - /min-indent/1.0.1: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} @@ -4148,7 +4115,7 @@ packages: dependencies: hosted-git-info: 4.0.2 is-core-module: 2.9.0 - semver: 7.3.5 + semver: 7.3.7 validate-npm-package-license: 3.0.4 dev: true @@ -4172,13 +4139,6 @@ packages: path-key: 3.1.1 dev: true - /npm-run-path/5.1.0: - resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - path-key: 4.0.0 - dev: true - /nprogress/1.0.0-1: resolution: {integrity: sha512-Gr/Km0nIMbR7hOB0fjGx7nR0oRjTy9M61dXiQL5bfTBq0cQ+hNgt6gxE062j7Bxm+L/IjNVOr41iu2hrDeuedw==} dev: false @@ -4236,13 +4196,6 @@ packages: mimic-fn: 2.1.0 dev: true - /onetime/6.0.0: - resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} - engines: {node: '>=12'} - dependencies: - mimic-fn: 4.0.0 - dev: true - /optionator/0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} engines: {node: '>= 0.8.0'} @@ -4335,7 +4288,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.16.7 + '@babel/code-frame': 7.18.6 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -4365,11 +4318,6 @@ packages: engines: {node: '>=8'} dev: true - /path-key/4.0.0: - resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} - engines: {node: '>=12'} - dev: true - /path-parse/1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true @@ -4403,8 +4351,8 @@ packages: engines: {node: '>=8.6'} dev: true - /pidtree/0.6.0: - resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} + /pidtree/0.5.0: + resolution: {integrity: sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==} engines: {node: '>=0.10'} hasBin: true dev: true @@ -4450,11 +4398,12 @@ packages: engines: {node: '>=10.13.0'} dev: false - /postcss-html/1.4.1: - resolution: {integrity: sha512-OKihuWxPuBQrQeLNsavP7ytJ9IYNj/ViAXB2v7Qjh56LnfESKrkahKA9si4VfPN8xtz6oqUE6KdL0bTPrHJr6g==} + /postcss-html/1.5.0: + resolution: {integrity: sha512-kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA==} engines: {node: ^12 || >=14} dependencies: - htmlparser2: 7.2.0 + htmlparser2: 8.0.1 + js-tokens: 8.0.0 postcss: 8.4.14 postcss-safe-parser: 6.0.0_postcss@8.4.14 dev: true @@ -4832,14 +4781,6 @@ packages: hasBin: true dev: true - /semver/7.3.5: - resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==} - engines: {node: '>=10'} - hasBin: true - dependencies: - lru-cache: 6.0.0 - dev: true - /semver/7.3.7: resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==} engines: {node: '>=10'} @@ -5023,7 +4964,7 @@ packages: dev: true /strip-ansi/4.0.0: - resolution: {integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8=} + resolution: {integrity: sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==} engines: {node: '>=4'} dependencies: ansi-regex: 3.0.0 @@ -5064,11 +5005,6 @@ packages: engines: {node: '>=6'} dev: true - /strip-final-newline/3.0.0: - resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} - engines: {node: '>=12'} - dev: true - /strip-indent/3.0.0: resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} engines: {node: '>=8'} @@ -5096,14 +5032,14 @@ packages: resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==} dev: true - /stylelint-config-html/1.0.0_rbvrlex3zkw5dqq3eg5f64dp2u: - resolution: {integrity: sha512-rKQUUWDpaYC7ybsS6tLxddjn6DxhjSIXybElSmcTyVQj3ExhmU3q+l41ktrlwHRyY0M5SkTkZiwngvYPYmsgSQ==} + /stylelint-config-html/1.1.0_5rxrxgs7sjazj2ve56ds3kmipi: + resolution: {integrity: sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==} engines: {node: ^12 || >=14} peerDependencies: postcss-html: ^1.0.0 stylelint: '>=14.0.0' dependencies: - postcss-html: 1.4.1 + postcss-html: 1.5.0 stylelint: 14.9.1 dev: true @@ -5144,8 +5080,8 @@ packages: stylelint: 14.9.1 dev: true - /stylelint-scss/4.2.0_stylelint@14.9.1: - resolution: {integrity: sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA==} + /stylelint-scss/4.3.0_stylelint@14.9.1: + resolution: {integrity: sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==} peerDependencies: stylelint: ^14.5.1 dependencies: @@ -5220,6 +5156,11 @@ packages: has-flag: 4.0.0 dev: true + /supports-color/9.2.2: + resolution: {integrity: sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==} + engines: {node: '>=12'} + dev: true + /supports-hyperlinks/2.2.0: resolution: {integrity: sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==} engines: {node: '>=8'} @@ -5318,7 +5259,7 @@ packages: engines: {node: '>=8'} dev: true - /ts-node/10.8.1_qiyc72axg2v44xl4yovan2v55u: + /ts-node/10.8.1_fxk5i3xm3ivo7fjwhcizcinpla: resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==} hasBin: true peerDependencies: @@ -5337,7 +5278,7 @@ packages: '@tsconfig/node12': 1.0.9 '@tsconfig/node14': 1.0.1 '@tsconfig/node16': 1.0.2 - '@types/node': 18.0.0 + '@types/node': 18.0.3 acorn: 8.7.1 acorn-walk: 8.2.0 arg: 4.1.3 @@ -5430,7 +5371,7 @@ packages: which-boxed-primitive: 1.0.2 dev: true - /unimport/0.4.1_vite@2.9.13: + /unimport/0.4.1_vite@2.9.14: resolution: {integrity: sha512-0j7Xk55XOR33f+4hHGva1pauchJEn6QNcjYvmB8bu1UnSphYfOmGlGUfhFa/uzA5JqWJqFkvLU192VXwj4ZU4A==} dependencies: '@rollup/pluginutils': 4.2.1 @@ -5442,7 +5383,7 @@ packages: pathe: 0.3.2 scule: 0.2.1 strip-literal: 0.4.0 - unplugin: 0.7.1_vite@2.9.13 + unplugin: 0.7.1_vite@2.9.14 transitivePeerDependencies: - esbuild - rollup @@ -5460,7 +5401,7 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin-auto-import/0.9.2_5smtrbmayeckluww3ebuwm6kim: + /unplugin-auto-import/0.9.2_jg57o3hw2g6ynl3mkvtaux3hqe: resolution: {integrity: sha512-cihfSyWtDyOvpD+bKQ77XSJF2Ix3N3ueatd59slBKgl995fbfExf2qXk/KialZE4/pPNjdGNEJl5ZwAhYj+e1g==} engines: {node: '>=14'} peerDependencies: @@ -5471,11 +5412,11 @@ packages: dependencies: '@antfu/utils': 0.5.2 '@rollup/pluginutils': 4.2.1 - '@vueuse/core': 8.7.5_vue@3.2.37 + '@vueuse/core': 8.9.1_vue@3.2.37 local-pkg: 0.4.1 magic-string: 0.26.2 - unimport: 0.4.1_vite@2.9.13 - unplugin: 0.7.1_vite@2.9.13 + unimport: 0.4.1_vite@2.9.14 + unplugin: 0.7.1_vite@2.9.14 transitivePeerDependencies: - esbuild - rollup @@ -5483,8 +5424,8 @@ packages: - webpack dev: true - /unplugin-vue-components/0.21.0_vite@2.9.13+vue@3.2.37: - resolution: {integrity: sha512-U7uOMNmRJ2eAv9CNjP8QRvxs6nAe3FVQUEIUphC1FGguBp3BWSLgGAcSHaX2nQy0gFoDY2mLF2M52W/t/eDaKg==} + /unplugin-vue-components/0.21.1_vite@2.9.14+vue@3.2.37: + resolution: {integrity: sha512-8MhIT323q1EUu7rz6NfQeiHqDrZKtygy6s9jzcQAuuZUM2T38SHlPT5YJjBOZmM0Bau6YuNTKfBBX4iHzeusaQ==} engines: {node: '>=14'} peerDependencies: '@babel/parser': ^7.15.8 @@ -5502,7 +5443,7 @@ packages: magic-string: 0.26.2 minimatch: 5.1.0 resolve: 1.22.1 - unplugin: 0.7.1_vite@2.9.13 + unplugin: 0.7.1_vite@2.9.14 vue: 3.2.37 transitivePeerDependencies: - esbuild @@ -5512,15 +5453,15 @@ packages: - webpack dev: true - /unplugin-vue-define-options/0.6.1_vite@2.9.13+vue@3.2.37: - resolution: {integrity: sha512-YZQxE3vC7Tb4Ev10blfYPC23hR3t8UNynoVSt2bY9GtHB2usxpywPQqRj7xdUtuj6JsDfrZ9wRKKbEkcMEXI1A==} - engines: {node: '>=14.17.0'} + /unplugin-vue-define-options/0.6.2_vite@2.9.14+vue@3.2.37: + resolution: {integrity: sha512-0YAbugPnN57ZkUM0fygfp43Vm321vOUYy2s81O09SfCM08mSul4vMxOZxLj9VSa3NVPF/IN0FmGyTMB5exOdyQ==} + engines: {node: '>=14.19.0'} peerDependencies: vue: ^3.2.25 dependencies: '@rollup/pluginutils': 4.2.1 '@vue/compiler-sfc': 3.2.37 - unplugin: 0.6.3_vite@2.9.13 + unplugin: 0.7.1_vite@2.9.14 vue: 3.2.37 transitivePeerDependencies: - esbuild @@ -5529,30 +5470,7 @@ packages: - webpack dev: true - /unplugin/0.6.3_vite@2.9.13: - resolution: {integrity: sha512-CoW88FQfCW/yabVc4bLrjikN9HC8dEvMU4O7B6K2jsYMPK0l6iAnd9dpJwqGcmXJKRCU9vwSsy653qg+RK0G6A==} - peerDependencies: - esbuild: '>=0.13' - rollup: ^2.50.0 - vite: ^2.3.0 - webpack: 4 || 5 - peerDependenciesMeta: - esbuild: - optional: true - rollup: - optional: true - vite: - optional: true - webpack: - optional: true - dependencies: - chokidar: 3.5.3 - vite: 2.9.13_sass@1.53.0 - webpack-sources: 3.2.3 - webpack-virtual-modules: 0.4.4 - dev: true - - /unplugin/0.7.1_vite@2.9.13: + /unplugin/0.7.1_vite@2.9.14: resolution: {integrity: sha512-Z6hNDXDNh9aimMkPU1mEjtk+2ova8gh0y7rJeJdGH1vWZOHwF2lLQiQ/R97rv9ymmzEQXsR2fyMet72T8jy6ew==} peerDependencies: esbuild: '>=0.13' @@ -5571,7 +5489,7 @@ packages: dependencies: acorn: 8.7.1 chokidar: 3.5.3 - vite: 2.9.13_sass@1.53.0 + vite: 2.9.14_sass@1.53.0 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.4 dev: true @@ -5594,7 +5512,7 @@ packages: dev: true /util-deprecate/1.0.2: - resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=} + resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} dev: true /uuid/3.4.0: @@ -5629,8 +5547,8 @@ packages: vue: 3.2.37 dev: false - /vite-plugin-checker/0.4.7_vite@2.9.13: - resolution: {integrity: sha512-cpuyopyDWyZO777Q0MM5dO2jmC9UKXQL4PfpxXYIjQ7uQWYGNMEw/hRP3oc/CUTiajB6Ndl1y3Fu93rOboahJA==} + /vite-plugin-checker/0.4.8_vite@2.9.14: + resolution: {integrity: sha512-MwgKe/No2bhHR9+q9d9VFvrKMITUHUkkcNdMO04Xqid5Es1L8Jeq3Bqtz2ppMG3Z4lGTl3yLYPt8qf14eoCh7A==} hasBin: true peerDependencies: vite: '>=2' @@ -5646,14 +5564,14 @@ packages: npm-run-path: 4.0.1 strip-ansi: 6.0.1 tiny-invariant: 1.2.0 - vite: 2.9.13_sass@1.53.0 + vite: 2.9.14_sass@1.53.0 vscode-languageclient: 7.0.0 vscode-languageserver: 7.0.0 vscode-languageserver-textdocument: 1.0.5 vscode-uri: 3.0.3 dev: true - /vite-plugin-windicss/1.8.6_vite@2.9.13: + /vite-plugin-windicss/1.8.6_vite@2.9.14: resolution: {integrity: sha512-D4G4qmumgklPiPrq/ZALqq8Mby6krskFVShbmb5c+0VCSsLUN96qyFRTwi81rNIHwFvlbpqflgh+BpUM/9VjQg==} peerDependencies: vite: ^2.0.1 @@ -5661,14 +5579,14 @@ packages: '@windicss/plugin-utils': 1.8.6 debug: 4.3.4 kolorist: 1.5.1 - vite: 2.9.13_sass@1.53.0 + vite: 2.9.14_sass@1.53.0 windicss: 3.5.6 transitivePeerDependencies: - supports-color dev: true - /vite/2.9.13_sass@1.53.0: - resolution: {integrity: sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==} + /vite/2.9.14_sass@1.53.0: + resolution: {integrity: sha512-P/UCjSpSMcE54r4mPak55hWAZPlyfS369svib/gpmz8/01L822lMPOJ/RYW6tLCe1RPvMvOsJ17erf55bKp4Hw==} engines: {node: '>=12.2.0'} hasBin: true peerDependencies: @@ -5773,13 +5691,13 @@ packages: vue: 3.2.37 dev: false - /vue-tsc/0.38.2_typescript@4.7.4: - resolution: {integrity: sha512-+OMmpw9BZC9khul3I1HGtWchv7BCiaM7NvfdilVAiOFkjnivIoaW6jJm6YPQJaEPouePtpkDUWovyzgNxWdDsw==} + /vue-tsc/0.38.3_typescript@4.7.4: + resolution: {integrity: sha512-mWlneSF+PG2kXYGJI12N4XEAG4ljAkae7IcB93fspqSkEt/oKwDbWy3DzcPSgUm0LsXqOUprTMaZkwDVSRBIvw==} hasBin: true peerDependencies: typescript: '*' dependencies: - '@volar/vue-typescript': 0.38.2 + '@volar/vue-typescript': 0.38.3 typescript: 4.7.4 dev: true @@ -5911,11 +5829,6 @@ packages: engines: {node: '>= 6'} dev: true - /yaml/2.1.1: - resolution: {integrity: sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==} - engines: {node: '>= 14'} - dev: true - /yargs-parser/18.1.3: resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} engines: {node: '>=6'} diff --git a/src/packages/base-widgets/index.ts b/src/packages/base-widgets/index.ts index 9e184b6..4e1275b 100644 --- a/src/packages/base-widgets/index.ts +++ b/src/packages/base-widgets/index.ts @@ -1,10 +1,12 @@ +import { VisualEditorComponent } from '@/visual-editor/visual-editor.utils'; + const modules = import.meta.globEager('./*/index.tsx'); -const components = {}; +const components: Record = {}; -Object.keys(modules).forEach((key: string) => { +Object.entries(modules).forEach(([key, module]) => { const name = key.replace(/\.\/(.*)\/index\.(tsx|vue)/, '$1'); - components[name] = modules[key]?.default || modules[key]; + components[name] = module?.default || module; }); console.log(components, 'base-widgets'); diff --git a/src/packages/base-widgets/text/fontArr.ts b/src/packages/base-widgets/text/fontArr.ts index b1e90c4..5de5650 100644 --- a/src/packages/base-widgets/text/fontArr.ts +++ b/src/packages/base-widgets/text/fontArr.ts @@ -51,4 +51,4 @@ export const fontArr = [ { label: '思源黑体', value: 'Source Han Sans CN' }, { label: '思源宋体', value: 'Source Han Serif SC' }, { label: '文泉驿微米黑', value: 'WenQuanYi Micro Hei' }, -]; +] as const; diff --git a/src/packages/base-widgets/text/index.tsx b/src/packages/base-widgets/text/index.tsx index 49b4502..d3e9ef2 100644 --- a/src/packages/base-widgets/text/index.tsx +++ b/src/packages/base-widgets/text/index.tsx @@ -40,7 +40,7 @@ export default { }, props: { text: createEditorInputProp({ label: '显示文本' }), - font: createEditorSelectProp({ label: '字体设置', options: fontArr }), + font: createEditorSelectProp({ label: '字体设置', options: [...fontArr] }), color: createEditorColorProp({ label: '字体颜色' }), size: createEditorInputNumberProp({ label: '字体大小', diff --git a/src/packages/container-component/index.ts b/src/packages/container-component/index.ts index 6d4f2cd..60c123c 100644 --- a/src/packages/container-component/index.ts +++ b/src/packages/container-component/index.ts @@ -1,6 +1,8 @@ +import { VisualEditorComponent } from '@/visual-editor/visual-editor.utils'; + const modules = import.meta.globEager('./*/index.tsx'); -const components = {}; +const components: Record = {}; Object.keys(modules).forEach((key: string) => { const name = key.replace(/\.\/(.*)\/index\.(tsx|vue)/, '$1'); diff --git a/src/packages/container-component/layout/index.tsx b/src/packages/container-component/layout/index.tsx index 6ea4f6e..a2201a3 100644 --- a/src/packages/container-component/layout/index.tsx +++ b/src/packages/container-component/layout/index.tsx @@ -44,9 +44,9 @@ export default { watchEffect(() => { if (Object.keys(props.slots || {}).length) { - Object.keys(props.slots).forEach((key) => { + Object.entries(props.slots).forEach(([key, slot]) => { if (slotsTemp[block._vid][key]?.children) { - props.slots[key].children = slotsTemp[block._vid][key].children; + slot.children = slotsTemp[block._vid][key].children; } }); } diff --git a/src/visual-editor/components/header/index.vue b/src/visual-editor/components/header/index.vue index 06f20cd..cee70a3 100644 --- a/src/visual-editor/components/header/index.vue +++ b/src/visual-editor/components/header/index.vue @@ -74,6 +74,10 @@ import { useVisualData, localKey } from '@/visual-editor/hooks/useVisualData'; import { BASE_URL } from '@/visual-editor/utils'; + defineOptions({ + name: 'PageHeader', + }); + const isShowH5Preview = ref(false); const tools = useTools(); diff --git a/src/visual-editor/components/header/preview.vue b/src/visual-editor/components/header/preview.vue index 2220b1f..dbe6f38 100644 --- a/src/visual-editor/components/header/preview.vue +++ b/src/visual-editor/components/header/preview.vue @@ -10,37 +10,24 @@ -