canrd-outside / order-erp-front · Commits

Commit eb0fdb2cfcb9f5677c59cb6fef3b365563832c72

Authored by HUCHAOQI
Committed by GitHub
1 parent e154d136

fix(component): 修复keep-alive组件包裹的文件onActivited不生效 (#2785) 

* fix(table): 使用lodash 的merge来递归assign,优化在多对象嵌套情况下的结构

* fix(component): 修复keep-alive组件包裹的文件onActivited不生效
Inline Side-by-side
Showing 3 changed files with 48 additions and 29 deletions
internal/vite-config/src/plugins/index.ts
  View file @eb0fdb2
... ... @@ -11,7 +11,7 @@ import { configHtmlPlugin } from './html';
11 11 import { configMockPlugin } from './mock';
12 12 import { configSvgIconsPlugin } from './svgSprite';
13 13 import { configVisualizerConfig } from './visualizer';
14   -
  14 +import vueSetupExtend from 'vite-plugin-vue-setup-extend';
15 15 interface Options {
16 16 isBuild: boolean;
17 17 root: string;
... ... @@ -21,7 +21,12 @@ interface Options {
21 21 }
22 22  
23 23 async function createPlugins({ isBuild, root, enableMock, compress, enableAnalyze }: Options) {
24   - const vitePlugins: (PluginOption | PluginOption[])[] = [vue(), vueJsx(), DefineOptions()];
  24 + const vitePlugins: (PluginOption | PluginOption[])[] = [
  25 + vue(),
  26 + vueJsx(),
  27 + vueSetupExtend(),
  28 + DefineOptions(),
  29 + ];
25 30  
26 31 const appConfigPlugin = await createAppConfigPlugin({ root, isBuild });
27 32 vitePlugins.push(appConfigPlugin);
... ...
package.json
  View file @eb0fdb2
... ... @@ -144,6 +144,7 @@
144 144 "unplugin-vue-define-options": "^1.3.3",
145 145 "vite": "^4.3.0-beta.2",
146 146 "vite-plugin-mock": "^2.9.6",
  147 + "vite-plugin-vue-setup-extend": "^0.4.0",
147 148 "vue-tsc": "^1.2.0"
148 149 },
149 150 "packageManager": "pnpm@8.1.0",
... ...
pnpm-lock.yaml
  View file @eb0fdb2
... ... @@ -97,6 +97,9 @@ importers:
97 97 vditor:
98 98 specifier: ^3.9.1
99 99 version: 3.9.1
  100 + vite-plugin-vue-setup-extend:
  101 + specifier: ^0.4.0
  102 + version: 0.4.0(vite@4.3.0-beta.2)
100 103 vue:
101 104 specifier: ^3.2.47
102 105 version: 3.2.47
... ... @@ -2460,7 +2463,7 @@ packages:
2460 2463 dependencies:
2461 2464 '@babel/types': 7.21.4
2462 2465 '@rollup/pluginutils': 5.0.2(rollup@2.79.1)
2463   - '@vue/compiler-sfc': 3.3.0-alpha.8
  2466 + '@vue/compiler-sfc': 3.3.4
2464 2467 local-pkg: 0.4.3
2465 2468 magic-string-ast: 0.1.2
2466 2469 vue: 3.2.47
... ... @@ -2496,13 +2499,13 @@ packages:
2496 2499 estree-walker: 2.0.2
2497 2500 source-map: 0.6.1
2498 2501  
2499   - /@vue/compiler-core@3.3.0-alpha.8:
2500   - resolution: {integrity: sha512-PXzKxwGdAu6iN62fwmbzbFXLJNTt6E0vYc2CXKf3qAzRIY1ECcocyx6GjDACVcl7/ClJhQ43YKSSoaGuZ8i5UQ==}
  2502 + /@vue/compiler-core@3.3.4:
  2503 + resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
2501 2504 dependencies:
2502 2505 '@babel/parser': 7.21.4
2503   - '@vue/shared': 3.3.0-alpha.8
  2506 + '@vue/shared': 3.3.4
2504 2507 estree-walker: 2.0.2
2505   - source-map: 0.6.1
  2508 + source-map-js: 1.0.2
2506 2509  
2507 2510 /@vue/compiler-dom@3.2.47:
2508 2511 resolution: {integrity: sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==}
... ... @@ -2510,11 +2513,11 @@ packages:
2510 2513 '@vue/compiler-core': 3.2.47
2511 2514 '@vue/shared': 3.2.47
2512 2515  
2513   - /@vue/compiler-dom@3.3.0-alpha.8:
2514   - resolution: {integrity: sha512-88nWCX6aD9ud6RN1zHq5RyOfSWDLqg49TrnbA6U5Qc9KwBtf1KO1vARdqi1xM4/Ep1oWFod5UVYsHLFED30daQ==}
  2516 + /@vue/compiler-dom@3.3.4:
  2517 + resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==}
2515 2518 dependencies:
2516   - '@vue/compiler-core': 3.3.0-alpha.8
2517   - '@vue/shared': 3.3.0-alpha.8
  2519 + '@vue/compiler-core': 3.3.4
  2520 + '@vue/shared': 3.3.4
2518 2521  
2519 2522 /@vue/compiler-sfc@3.2.47:
2520 2523 resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==}
... ... @@ -2530,19 +2533,19 @@ packages:
2530 2533 postcss: 8.4.21
2531 2534 source-map: 0.6.1
2532 2535  
2533   - /@vue/compiler-sfc@3.3.0-alpha.8:
2534   - resolution: {integrity: sha512-Hru3kTyT2vVWtYmeSHYX1T6RaQbzwJa6rIq7LiucmG5/myWbngutZ5JWLWNgt7aV6YOzu6Z6yXjXLJ05c4y6cQ==}
  2536 + /@vue/compiler-sfc@3.3.4:
  2537 + resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==}
2535 2538 dependencies:
2536 2539 '@babel/parser': 7.21.4
2537   - '@vue/compiler-core': 3.3.0-alpha.8
2538   - '@vue/compiler-dom': 3.3.0-alpha.8
2539   - '@vue/compiler-ssr': 3.3.0-alpha.8
2540   - '@vue/reactivity-transform': 3.3.0-alpha.8
2541   - '@vue/shared': 3.3.0-alpha.8
  2540 + '@vue/compiler-core': 3.3.4
  2541 + '@vue/compiler-dom': 3.3.4
  2542 + '@vue/compiler-ssr': 3.3.4
  2543 + '@vue/reactivity-transform': 3.3.4
  2544 + '@vue/shared': 3.3.4
2542 2545 estree-walker: 2.0.2
2543 2546 magic-string: 0.30.0
2544 2547 postcss: 8.4.21
2545   - source-map: 0.6.1
  2548 + source-map-js: 1.0.2
2546 2549  
2547 2550 /@vue/compiler-ssr@3.2.47:
2548 2551 resolution: {integrity: sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==}
... ... @@ -2550,11 +2553,11 @@ packages:
2550 2553 '@vue/compiler-dom': 3.2.47
2551 2554 '@vue/shared': 3.2.47
2552 2555  
2553   - /@vue/compiler-ssr@3.3.0-alpha.8:
2554   - resolution: {integrity: sha512-cshqRLjfm9IxS7MFoYLXP1srr80Ozxdw04PlgDo/RmKEzHO15vGqPy4eSVeSerZ9/Io6qBiqBP8uKdxy66gyRA==}
  2556 + /@vue/compiler-ssr@3.3.4:
  2557 + resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==}
2555 2558 dependencies:
2556   - '@vue/compiler-dom': 3.3.0-alpha.8
2557   - '@vue/shared': 3.3.0-alpha.8
  2559 + '@vue/compiler-dom': 3.3.4
  2560 + '@vue/shared': 3.3.4
2558 2561  
2559 2562 /@vue/devtools-api@6.5.0:
2560 2563 resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==}
... ... @@ -2569,12 +2572,12 @@ packages:
2569 2572 estree-walker: 2.0.2
2570 2573 magic-string: 0.25.9
2571 2574  
2572   - /@vue/reactivity-transform@3.3.0-alpha.8:
2573   - resolution: {integrity: sha512-miMpRSF6rkgS5X4mkTWy3f0y/rvnQjxOBQAtUmyQ6aotDrv9P2sHhH3zBkiMtrsQ1E99O9KxsRPJLTp+d7h0FQ==}
  2575 + /@vue/reactivity-transform@3.3.4:
  2576 + resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==}
2574 2577 dependencies:
2575 2578 '@babel/parser': 7.21.4
2576   - '@vue/compiler-core': 3.3.0-alpha.8
2577   - '@vue/shared': 3.3.0-alpha.8
  2579 + '@vue/compiler-core': 3.3.4
  2580 + '@vue/shared': 3.3.4
2578 2581 estree-walker: 2.0.2
2579 2582 magic-string: 0.30.0
2580 2583  
... ... @@ -2608,8 +2611,8 @@ packages:
2608 2611 /@vue/shared@3.2.47:
2609 2612 resolution: {integrity: sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==}
2610 2613  
2611   - /@vue/shared@3.3.0-alpha.8:
2612   - resolution: {integrity: sha512-NIASpbxrk3QjO/Lu75ueIji2GJ+3W8nJKgL9FmfIa85TNm+N+wbp3+n9AwibWcgZ9MnlwpGy3Iu6efH69jg+Ig==}
  2614 + /@vue/shared@3.3.4:
  2615 + resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==}
2613 2616  
2614 2617 /@vue/test-utils@2.3.2(vue@3.2.47):
2615 2618 resolution: {integrity: sha512-hJnVaYhbrIm0yBS0+e1Y0Sj85cMyAi+PAbK4JHqMRUZ6S622Goa+G7QzkRSyvCteG8wop7tipuEbHoZo26wsSA==}
... ... @@ -9662,6 +9665,16 @@ packages:
9662 9665 - supports-color
9663 9666 dev: true
9664 9667  
  9668 + /vite-plugin-vue-setup-extend@0.4.0(vite@4.3.0-beta.2):
  9669 + resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==}
  9670 + peerDependencies:
  9671 + vite: '>=2.0.0'
  9672 + dependencies:
  9673 + '@vue/compiler-sfc': 3.2.47
  9674 + magic-string: 0.25.9
  9675 + vite: 4.3.0-beta.2(@types/node@18.15.11)(less@4.1.3)(sass@1.60.0)
  9676 + dev: false
  9677 +
9665 9678 /vite@4.3.0-beta.2(@types/node@18.15.11)(less@4.1.3)(sass@1.60.0):
9666 9679 resolution: {integrity: sha512-RRghM7RiRnwknCG3hS+NE8C+N3CNX4yKfVhFxO3NqrtYErN6htac//De9IwIHWqgV8DdKoNPeK8Yb/FOlZvjoQ==}
9667 9680 engines: {node: ^14.18.0 || >=16.0.0}
... ...