canrd-outside / order-erp-front · Commits

Commit b9d53a7133de70922d6f2a0e16e5b623ffab84fb

Authored by vben
1 parent b803c410

fix(table): tableAction icon #182

Inline Side-by-side
Showing 4 changed files with 15 additions and 7 deletions
CHANGELOG.zh_CN.md
  View file @b9d53a7
  1 +## Wip
  2 +
  3 +### 🐛 Bug Fixes
  4 +
  5 +- 修复 `TableAction`图标问题
  6 +- 修复菜单折叠按钮丢失问题
  7 +
1 ## 2.0.0-rc.16 (2020-01-12) 8 ## 2.0.0-rc.16 (2020-01-12)
2 9
3 ### ✨ Refactor 10 ### ✨ Refactor
package.json
  View file @b9d53a7
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 "stylelint-order": "^4.1.0", 96 "stylelint-order": "^4.1.0",
97 "ts-node": "^9.1.0", 97 "ts-node": "^9.1.0",
98 "typescript": "^4.1.3", 98 "typescript": "^4.1.3",
99 - "vite": "^2.0.0-beta.26", 99 + "vite": "^2.0.0-beta.27",
100 "vite-plugin-html": "^2.0.0-beta.5", 100 "vite-plugin-html": "^2.0.0-beta.5",
101 "vite-plugin-mock": "^2.0.0-beta.3", 101 "vite-plugin-mock": "^2.0.0-beta.3",
102 "vite-plugin-purge-icons": "^0.5.1", 102 "vite-plugin-purge-icons": "^0.5.1",
src/components/Button/src/PopConfirmButton.vue
  View file @b9d53a7
@@ -32,12 +32,13 @@ @@ -32,12 +32,13 @@
32 return popValues; 32 return popValues;
33 }); 33 });
34 return () => { 34 return () => {
35 - const Button = h(BasicButton, unref(getBindValues), extendSlots(slots)); 35 + const values = omit(unref(getBindValues), 'icon');
  36 + const Button = h(BasicButton, values, extendSlots(slots));
36 if (!props.enable) { 37 if (!props.enable) {
37 return Button; 38 return Button;
38 } 39 }
39 40
40 - return h(Popconfirm, omit(unref(getBindValues), 'icon'), { default: () => Button }); 41 + return h(Popconfirm, values, { default: () => Button });
41 }; 42 };
42 }, 43 },
43 }); 44 });
yarn.lock
  View file @b9d53a7
@@ -7850,10 +7850,10 @@ vite-plugin-pwa@^0.3.6: @@ -7850,10 +7850,10 @@ vite-plugin-pwa@^0.3.6:
7850 pretty-bytes "^5.5.0" 7850 pretty-bytes "^5.5.0"
7851 workbox-build "^6.0.2" 7851 workbox-build "^6.0.2"
7852 7852
7853 -vite@^2.0.0-beta.26:  
7854 - version "2.0.0-beta.26"  
7855 - resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.26.tgz#70e2277003de609b218ddb33d740f76d01f01dc2"  
7856 - integrity sha512-/OZ5X5nq9xV3UKO2x3Xl83RQM0DsRWsa4htaRyzZ6e+G5Z+SfMiUlveJctSoPJ3JjoIBm4bbDAe0rXM5Mt2tlw== 7853 +vite@^2.0.0-beta.27:
  7854 + version "2.0.0-beta.27"
  7855 + resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.27.tgz#a2e4b3a698e67c89fd963ff51ee5283ec564c65c"
  7856 + integrity sha512-1fGPjSVE4MmCGVguFy7pPurCLnvHu4fJSzVjejd9GoFqCNie+JKCpe3KGsxIb9B8ot/aDd4ISCB0+fH1/01FUA==
7857 dependencies: 7857 dependencies:
7858 esbuild "^0.8.26" 7858 esbuild "^0.8.26"
7859 postcss "^8.2.1" 7859 postcss "^8.2.1"