diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index ce41fe82e..5592fb72f 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -94,7 +94,6 @@ "stylelint-config-standard": "^29.0.0", "stylelint-order": "^5.0.0", "typescript": "4.9.3", - "unplugin-vue-macros": "^0.16.4", "vite": "3.2.4", "vite-plugin-compression": "^0.5.1", "vite-plugin-eslint": "^1.8.1", diff --git a/yudao-ui-admin-vue3/pnpm-lock.yaml b/yudao-ui-admin-vue3/pnpm-lock.yaml index b318165da..9f9cc7041 100644 --- a/yudao-ui-admin-vue3/pnpm-lock.yaml +++ b/yudao-ui-admin-vue3/pnpm-lock.yaml @@ -59,7 +59,6 @@ specifiers: stylelint-config-standard: ^29.0.0 stylelint-order: ^5.0.0 typescript: 4.9.3 - unplugin-vue-macros: ^0.16.4 url: ^0.11.0 vite: 3.2.4 vite-plugin-compression: ^0.5.1 @@ -150,7 +149,6 @@ devDependencies: stylelint-config-standard: registry.npmmirror.com/stylelint-config-standard/29.0.0_stylelint@14.15.0 stylelint-order: registry.npmmirror.com/stylelint-order/5.0.0_stylelint@14.15.0 typescript: registry.npmmirror.com/typescript/4.9.3 - unplugin-vue-macros: registry.npmmirror.com/unplugin-vue-macros/0.16.4_ryx65up42ty3l266jfwf32kodm vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi vite-plugin-compression: registry.npmmirror.com/vite-plugin-compression/0.5.1_vite@3.2.4 vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.8.1_eslint@8.28.0+vite@3.2.4 @@ -180,12 +178,6 @@ packages: version: 0.5.2 dev: true - registry.npmmirror.com/@antfu/utils/0.6.3: - resolution: {integrity: sha512-sEYpyyKUPOew9QsXZ8feRVMzW6DWLviwOl+/ap06UQW02A8Srbc95CPHVm4eUbiBzBgD46eyIT+przv//KSSlQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@antfu/utils/-/utils-0.6.3.tgz} - name: '@antfu/utils' - version: 0.6.3 - dev: true - registry.npmmirror.com/@babel/code-frame/7.18.6: resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz} name: '@babel/code-frame' @@ -1323,6 +1315,7 @@ packages: resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz} name: '@types/web-bluetooth' version: 0.0.16 + dev: false registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.44.0_fnsv2sbzcckq65bwfk7a5xwslu: resolution: {integrity: sha512-j5ULd7FmmekcyWeArx+i8x7sdRHzAtXTkmDPthE4amxZOWKFK7bomoJ4r7PJ8K7PoMzD16U8MmuZFAonr1ERvw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz} @@ -1609,175 +1602,6 @@ packages: '@volar/vue-language-core': registry.npmmirror.com/@volar/vue-language-core/1.0.9 dev: true - registry.npmmirror.com/@vue-macros/api/0.2.0: - resolution: {integrity: sha512-E0rhhszd3MSE8l+A78gj9ONs4lsqOLHpONNzrc7H2nlPhEDsp4ZyQt+A9rRfxX+BTeLYfq64mli2qRV0tixiaw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/api/-/api-0.2.0.tgz} - name: '@vue-macros/api' - version: 0.2.0 - engines: {node: '>=14.19.0'} - dependencies: - '@babel/types': registry.npmmirror.com/@babel/types/7.20.2 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - dev: true - - registry.npmmirror.com/@vue-macros/better-define/0.2.0: - resolution: {integrity: sha512-hcYGpfGLGBw+32jQyAwJU4bd1eE95cD7/aqv9Ov86LJFR5nZ/d7P/Fh1HJBE4KUxC9vJa2ZtdkdiV83n6NADYA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/better-define/-/better-define-0.2.0.tgz} - name: '@vue-macros/better-define' - version: 0.2.0 - engines: {node: '>=14.19.0'} - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/api': registry.npmmirror.com/@vue-macros/api/0.2.0 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - dev: true - - registry.npmmirror.com/@vue-macros/common/0.13.4: - resolution: {integrity: sha512-mQooO33XcY4kQyKBrbGfdIPPsYhpcfmH75SQnXx2vNsNLSNvhLuDaIIV0fhMJ0HV5Z02V9Ka1gx7v1g5bk9Q0A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/common/-/common-0.13.4.tgz} - name: '@vue-macros/common' - version: 0.13.4 - engines: {node: '>=14.19.0'} - dependencies: - '@babel/types': registry.npmmirror.com/@babel/types/7.20.2 - '@vue/compiler-sfc': registry.npmmirror.com/@vue/compiler-sfc/3.2.45 - magic-string: registry.npmmirror.com/magic-string/0.26.7 - dev: true - - registry.npmmirror.com/@vue-macros/define-model/0.14.1_@vueuse+core@9.6.0: - resolution: {integrity: sha512-Mwg/+OGDTEzaGyGXcAUJ0ZfEmgXKEVeWk3zVR6wC7l0f8OOBZ4lb1gWq9NJT+D1Xxy34mdNmkmRVoevW5kN0iQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/define-model/-/define-model-0.14.1.tgz} - id: registry.npmmirror.com/@vue-macros/define-model/0.14.1 - name: '@vue-macros/define-model' - version: 0.14.1 - engines: {node: '>=14.19.0'} - peerDependencies: - '@vueuse/core': ^9.0.0 - peerDependenciesMeta: - '@vueuse/core': - optional: true - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - '@vueuse/core': registry.npmmirror.com/@vueuse/core/9.6.0_vue@3.2.45 - ast-walker-scope: registry.npmmirror.com/ast-walker-scope/0.3.0 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - dev: true - - registry.npmmirror.com/@vue-macros/define-props/0.0.3_vue@3.2.45: - resolution: {integrity: sha512-GAiALWSrIogwdjbIe60Hi4CSvWFmZG7KySK8JBf7lszWNgoSirj/NKzmJOaHY0/I217tfq4Ew/brbdvcEhCikg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/define-props/-/define-props-0.0.3.tgz} - id: registry.npmmirror.com/@vue-macros/define-props/0.0.3 - name: '@vue-macros/define-props' - version: 0.0.3 - engines: {node: '>=14.19.0'} - peerDependencies: - vue: ^3.2.25 - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - vue: registry.npmmirror.com/vue/3.2.45 - dev: true - - registry.npmmirror.com/@vue-macros/define-render/0.13.9_vue@3.2.45: - resolution: {integrity: sha512-TD4/vpVagRiOELKMzbT8VpLd0vTgYcjLzO/GVmtXLQ7LxnAgOQCTdmoQNfCp4B2Jx0KgKINgZJIoHV2c9n84pA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/define-render/-/define-render-0.13.9.tgz} - id: registry.npmmirror.com/@vue-macros/define-render/0.13.9 - name: '@vue-macros/define-render' - version: 0.13.9 - engines: {node: '>=14.19.0'} - peerDependencies: - vue: ^2.7.0 || ^3.0.0 - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - vue: registry.npmmirror.com/vue/3.2.45 - dev: true - - registry.npmmirror.com/@vue-macros/define-slots/0.0.6_vue@3.2.45: - resolution: {integrity: sha512-pK4P/oUjcrP/Rr5clsV2eZ53OJ3QlU2fZlnn91w++L0+lio+0M06ptr/IkHNVLNQ9U9Z43MkjHkMLX8Df8BknA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/define-slots/-/define-slots-0.0.6.tgz} - id: registry.npmmirror.com/@vue-macros/define-slots/0.0.6 - name: '@vue-macros/define-slots' - version: 0.0.6 - engines: {node: '>=14.19.0'} - peerDependencies: - vue: ^2.7.0 || ^3.0.0 - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - vue: registry.npmmirror.com/vue/3.2.45 - dev: true - - registry.npmmirror.com/@vue-macros/hoist-static/0.12.8: - resolution: {integrity: sha512-aSjTBntS/DhQvhyvbSluXwVtrw1WRAxcGjIJTUrgXLyagurIt0KQR8B2ut4ulnMzRaxD8TYmhoWmnzkSNUpXdw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/hoist-static/-/hoist-static-0.12.8.tgz} - name: '@vue-macros/hoist-static' - version: 0.12.8 - engines: {node: '>=14.19.0'} - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - dev: true - - registry.npmmirror.com/@vue-macros/named-template/0.0.6_4jsdaiqeu6rfrlpxhoq2uxpaga: - resolution: {integrity: sha512-nEoutSYbwu7QC+uWcs90rD28erP6xZ0aU4uYnrxTUnVcbga9xMchxcs3MgI/2ax6dz/EXf1f1utYXXpGgLi+Tw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/named-template/-/named-template-0.0.6.tgz} - id: registry.npmmirror.com/@vue-macros/named-template/0.0.6 - name: '@vue-macros/named-template' - version: 0.0.6 - engines: {node: '>=14.19.0'} - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/3.2.0_vite@3.2.4+vue@3.2.45 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom/3.2.45 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - unplugin-combine: registry.npmmirror.com/unplugin-combine/0.2.8_rollup@3.4.0+vite@3.2.4 - transitivePeerDependencies: - - esbuild - - rollup - - vite - - vue - - webpack - dev: true - - registry.npmmirror.com/@vue-macros/setup-component/0.12.8_rollup@3.4.0+vite@3.2.4: - resolution: {integrity: sha512-2tRMl8l8OYMpIRYsZyAZfH0dNT7CONMTcmdGEffJb5GvK8XOmdgGk7NFUhaQg3EEnk1SUq1Kdcx+gyH/a0qE4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/setup-component/-/setup-component-0.12.8.tgz} - id: registry.npmmirror.com/@vue-macros/setup-component/0.12.8 - name: '@vue-macros/setup-component' - version: 0.12.8 - engines: {node: '>=14.19.0'} - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - unplugin-combine: registry.npmmirror.com/unplugin-combine/0.2.8_rollup@3.4.0+vite@3.2.4 - transitivePeerDependencies: - - esbuild - - rollup - - vite - - webpack - dev: true - - registry.npmmirror.com/@vue-macros/setup-sfc/0.12.8: - resolution: {integrity: sha512-eOQxlY53GD/WkJrDHpDvHecWQ70Cw9aSYwS9eT1dQ9vWJVeJ/2R96z09GfYKz6cr9T00OPeZjftU5sC1FO+3xA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/setup-sfc/-/setup-sfc-0.12.8.tgz} - name: '@vue-macros/setup-sfc' - version: 0.12.8 - engines: {node: '>=14.19.0'} - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - dev: true - - registry.npmmirror.com/@vue-macros/short-emits/0.12.9: - resolution: {integrity: sha512-DrvdyMuiqSVLY26VJCLm5neVmqiAlEVbLAmdH9gORGDn2u+OsmyY9bb2T+04PGzBsu2F64XbJwi0GmXypdcLgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue-macros/short-emits/-/short-emits-0.12.9.tgz} - name: '@vue-macros/short-emits' - version: 0.12.9 - engines: {node: '>=14.19.0'} - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - dev: true - registry.npmmirror.com/@vue/babel-helper-vue-transform-on/1.0.2: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz} name: '@vue/babel-helper-vue-transform-on' @@ -1916,11 +1740,13 @@ packages: transitivePeerDependencies: - '@vue/composition-api' - vue + dev: false registry.npmmirror.com/@vueuse/metadata/9.6.0: resolution: {integrity: sha512-sIC8R+kWkIdpi5X2z2Gk8TRYzmczDwHRhEFfCu2P+XW2JdPoXrziqsGpDDsN7ykBx4ilwieS7JUIweVGhvZ93w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.6.0.tgz} name: '@vueuse/metadata' version: 9.6.0 + dev: false registry.npmmirror.com/@vueuse/shared/9.6.0_vue@3.2.45: resolution: {integrity: sha512-/eDchxYYhkHnFyrb00t90UfjCx94kRHxc7J1GtBCqCG4HyPMX+krV9XJgVtWIsAMaxKVU4fC8NSUviG1JkwhUQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@vueuse/shared/-/shared-9.6.0.tgz} @@ -1932,6 +1758,7 @@ packages: transitivePeerDependencies: - '@vue/composition-api' - vue + dev: false registry.npmmirror.com/@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4: resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz} @@ -2332,16 +2159,6 @@ packages: engines: {node: '>=12'} dev: true - registry.npmmirror.com/anymatch/3.1.2: - resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz} - name: anymatch - version: 3.1.2 - engines: {node: '>= 8'} - dependencies: - normalize-path: registry.npmmirror.com/normalize-path/3.0.0 - picomatch: registry.npmmirror.com/picomatch/2.3.1 - dev: true - registry.npmmirror.com/arg/4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/arg/-/arg-4.1.3.tgz} name: arg @@ -2423,16 +2240,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - registry.npmmirror.com/ast-walker-scope/0.3.0: - resolution: {integrity: sha512-bsOBv3jB+1kGaxwPHhkLiagS+75KfzEqtkNWvATgMGtXM6kJZG3PlG4fYQFMiHeLpoAkwc6G61w07+hEXx39aA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ast-walker-scope/-/ast-walker-scope-0.3.0.tgz} - name: ast-walker-scope - version: 0.3.0 - engines: {node: '>=14.19.0'} - dependencies: - '@babel/parser': registry.npmmirror.com/@babel/parser/7.20.3 - '@babel/types': registry.npmmirror.com/@babel/types/7.20.2 - dev: true - registry.npmmirror.com/astral-regex/2.0.0: resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/astral-regex/-/astral-regex-2.0.0.tgz} name: astral-regex @@ -2547,13 +2354,6 @@ packages: version: 5.2.2 dev: true - registry.npmmirror.com/binary-extensions/2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz} - name: binary-extensions - version: 2.2.0 - engines: {node: '>=8'} - dev: true - registry.npmmirror.com/bl/4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz} name: bl @@ -2817,23 +2617,6 @@ packages: version: 0.7.0 dev: true - registry.npmmirror.com/chokidar/3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz} - name: chokidar - version: 3.5.3 - engines: {node: '>= 8.10.0'} - dependencies: - anymatch: registry.npmmirror.com/anymatch/3.1.2 - braces: registry.npmmirror.com/braces/3.0.2 - glob-parent: registry.npmmirror.com/glob-parent/5.1.2 - is-binary-path: registry.npmmirror.com/is-binary-path/2.1.0 - is-glob: registry.npmmirror.com/is-glob/4.0.3 - normalize-path: registry.npmmirror.com/normalize-path/3.0.0 - readdirp: registry.npmmirror.com/readdirp/3.6.0 - optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 - dev: true - registry.npmmirror.com/class-utils/0.3.6: resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/class-utils/-/class-utils-0.3.6.tgz} name: class-utils @@ -5271,15 +5054,6 @@ packages: version: 0.2.1 dev: true - registry.npmmirror.com/is-binary-path/2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz} - name: is-binary-path - version: 2.1.0 - engines: {node: '>=8'} - dependencies: - binary-extensions: registry.npmmirror.com/binary-extensions/2.2.0 - dev: true - registry.npmmirror.com/is-buffer/1.1.6: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz} name: is-buffer @@ -5874,13 +5648,6 @@ packages: json5: registry.npmmirror.com/json5/1.0.1 dev: true - registry.npmmirror.com/local-pkg/0.4.2: - resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.2.tgz} - name: local-pkg - version: 0.4.2 - engines: {node: '>=14'} - dev: true - registry.npmmirror.com/locate-path/5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz} name: locate-path @@ -7348,15 +7115,6 @@ packages: util-deprecate: registry.npmmirror.com/util-deprecate/1.0.2 dev: true - registry.npmmirror.com/readdirp/3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz} - name: readdirp - version: 3.6.0 - engines: {node: '>=8.10.0'} - dependencies: - picomatch: registry.npmmirror.com/picomatch/2.3.1 - dev: true - registry.npmmirror.com/rechoir/0.8.0: resolution: {integrity: sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rechoir/-/rechoir-0.8.0.tgz} name: rechoir @@ -8586,99 +8344,6 @@ packages: engines: {node: '>= 10.0.0'} dev: true - registry.npmmirror.com/unplugin-combine/0.2.8_rollup@3.4.0+vite@3.2.4: - resolution: {integrity: sha512-Z38AC/TEjXbVyZ5HjVqo+lADj0/dcfwWC0Z4y0LNhybJzJQwmcMxm+ZsqHY3faauj4YigmlRMdptR5JEW9RuLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-combine/-/unplugin-combine-0.2.8.tgz} - id: registry.npmmirror.com/unplugin-combine/0.2.8 - name: unplugin-combine - version: 0.2.8 - engines: {node: '>=14.19.0'} - peerDependencies: - esbuild: '>=0.13' - rollup: ^2.50.0 - vite: ^2.3.0 || ^3.0.0 - webpack: 4 || 5 - peerDependenciesMeta: - esbuild: - optional: true - rollup: - optional: true - vite: - optional: true - webpack: - optional: true - dependencies: - '@antfu/utils': registry.npmmirror.com/@antfu/utils/0.6.3 - rollup: registry.npmmirror.com/rollup/3.4.0 - unplugin: registry.npmmirror.com/unplugin/0.10.2 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi - dev: true - - registry.npmmirror.com/unplugin-vue-define-options/0.12.8: - resolution: {integrity: sha512-/5NjICUI9Ick6LI31pc0jTh7DUdEBerLS3UKor3AanldLtqKWYd0lzjHjgg4JXUvuOEkpDf7e0f3jpqE362mKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-vue-define-options/-/unplugin-vue-define-options-0.12.8.tgz} - name: unplugin-vue-define-options - version: 0.12.8 - engines: {node: '>=14.19.0'} - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/common': registry.npmmirror.com/@vue-macros/common/0.13.4 - ast-walker-scope: registry.npmmirror.com/ast-walker-scope/0.3.0 - unplugin: registry.npmmirror.com/unplugin/1.0.0 - dev: true - - registry.npmmirror.com/unplugin-vue-macros/0.16.4_ryx65up42ty3l266jfwf32kodm: - resolution: {integrity: sha512-1dxQ/U4rZhf+LXP/7HSP2ycjCYQFCSB3QYu3zGPSiuN9M3yWjDkSTcXQcsFcdEvJGMbFWzKB/NJd4PnEqhQWOQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin-vue-macros/-/unplugin-vue-macros-0.16.4.tgz} - id: registry.npmmirror.com/unplugin-vue-macros/0.16.4 - name: unplugin-vue-macros - version: 0.16.4 - engines: {node: '>=14.19.0'} - peerDependencies: - vue: ^2.7.0 || ^3.2.25 - dependencies: - '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 - '@vue-macros/better-define': registry.npmmirror.com/@vue-macros/better-define/0.2.0 - '@vue-macros/define-model': registry.npmmirror.com/@vue-macros/define-model/0.14.1_@vueuse+core@9.6.0 - '@vue-macros/define-props': registry.npmmirror.com/@vue-macros/define-props/0.0.3_vue@3.2.45 - '@vue-macros/define-render': registry.npmmirror.com/@vue-macros/define-render/0.13.9_vue@3.2.45 - '@vue-macros/define-slots': registry.npmmirror.com/@vue-macros/define-slots/0.0.6_vue@3.2.45 - '@vue-macros/hoist-static': registry.npmmirror.com/@vue-macros/hoist-static/0.12.8 - '@vue-macros/named-template': registry.npmmirror.com/@vue-macros/named-template/0.0.6_4jsdaiqeu6rfrlpxhoq2uxpaga - '@vue-macros/setup-component': registry.npmmirror.com/@vue-macros/setup-component/0.12.8_rollup@3.4.0+vite@3.2.4 - '@vue-macros/setup-sfc': registry.npmmirror.com/@vue-macros/setup-sfc/0.12.8 - '@vue-macros/short-emits': registry.npmmirror.com/@vue-macros/short-emits/0.12.9 - local-pkg: registry.npmmirror.com/local-pkg/0.4.2 - unplugin-combine: registry.npmmirror.com/unplugin-combine/0.2.8_rollup@3.4.0+vite@3.2.4 - unplugin-vue-define-options: registry.npmmirror.com/unplugin-vue-define-options/0.12.8 - vue: registry.npmmirror.com/vue/3.2.45 - transitivePeerDependencies: - - '@vueuse/core' - - esbuild - - rollup - - vite - - webpack - dev: true - - registry.npmmirror.com/unplugin/0.10.2: - resolution: {integrity: sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin/-/unplugin-0.10.2.tgz} - name: unplugin - version: 0.10.2 - dependencies: - acorn: registry.npmmirror.com/acorn/8.8.1 - chokidar: registry.npmmirror.com/chokidar/3.5.3 - webpack-sources: registry.npmmirror.com/webpack-sources/3.2.3 - webpack-virtual-modules: registry.npmmirror.com/webpack-virtual-modules/0.4.6 - dev: true - - registry.npmmirror.com/unplugin/1.0.0: - resolution: {integrity: sha512-H5UnBUxfhTXBXGo2AwKsl0UaLSHzSNDZNehPQSgdhVfO/t+XAS1Yoj3vmLrrlBrS9ZwtH5tejbX/TCp5DcyCKg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unplugin/-/unplugin-1.0.0.tgz} - name: unplugin - version: 1.0.0 - dependencies: - acorn: registry.npmmirror.com/acorn/8.8.1 - chokidar: registry.npmmirror.com/chokidar/3.5.3 - webpack-sources: registry.npmmirror.com/webpack-sources/3.2.3 - webpack-virtual-modules: registry.npmmirror.com/webpack-virtual-modules/0.4.6 - dev: true - registry.npmmirror.com/unset-value/1.0.0: resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/unset-value/-/unset-value-1.0.0.tgz} name: unset-value @@ -8980,6 +8645,7 @@ packages: optional: true dependencies: vue: registry.npmmirror.com/vue/3.2.45 + dev: false registry.npmmirror.com/vue-eslint-parser/9.1.0_eslint@8.28.0: resolution: {integrity: sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz} @@ -9112,19 +8778,6 @@ packages: version: 3.0.1 dev: true - registry.npmmirror.com/webpack-sources/3.2.3: - resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz} - name: webpack-sources - version: 3.2.3 - engines: {node: '>=10.13.0'} - dev: true - - registry.npmmirror.com/webpack-virtual-modules/0.4.6: - resolution: {integrity: sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz} - name: webpack-virtual-modules - version: 0.4.6 - dev: true - registry.npmmirror.com/whatwg-url/5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz} name: whatwg-url diff --git a/yudao-ui-admin-vue3/src/config/axios/service.ts b/yudao-ui-admin-vue3/src/config/axios/service.ts index 6d3f604a8..a574cbbad 100644 --- a/yudao-ui-admin-vue3/src/config/axios/service.ts +++ b/yudao-ui-admin-vue3/src/config/axios/service.ts @@ -112,6 +112,7 @@ service.interceptors.response.use( const { t } = useI18n() // 未设置状态码则默认成功状态 const code = data.code || result_code + // 二进制数据则直接返回 if ( response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer' @@ -133,7 +134,7 @@ service.interceptors.response.use( } // 2. 进行刷新访问令牌 try { - const refreshTokenRes = refreshToken() + const refreshTokenRes = await refreshToken() // 2.1 刷新成功,则回放队列的请求 + 当前请求 setToken((await refreshTokenRes).data.data) config.headers!.Authorization = 'Bearer ' + getAccessToken() diff --git a/yudao-ui-admin-vue3/vite.config.ts b/yudao-ui-admin-vue3/vite.config.ts index c33a46208..3508d8c5e 100644 --- a/yudao-ui-admin-vue3/vite.config.ts +++ b/yudao-ui-admin-vue3/vite.config.ts @@ -11,7 +11,6 @@ import { createSvgIconsPlugin } from 'vite-plugin-svg-icons' import PurgeIcons from 'vite-plugin-purge-icons' import { createHtmlPlugin } from 'vite-plugin-html' import viteCompression from 'vite-plugin-compression' -import VueMarcos from 'unplugin-vue-macros/vite' // 当前执行node命令时文件夹的地址(工作目录) const root = process.cwd() @@ -86,7 +85,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { svgoOptions: true }), PurgeIcons(), - VueMarcos(), viteCompression({ verbose: true, // 是否在控制台输出压缩结果 disable: true, // 是否禁用