canrd-outside / order-erp-front · Commits

Commit c2635f35c0c2c1b62bfb998455b8a2ab4a330b88

Authored by Vben
1 parent 24a3f90d

chore: fix sidebar trigger not work, fix #417

Inline Side-by-side
Showing 5 changed files with 66 additions and 58 deletions
README.zh-CN.md
  View file @c2635f3
... ... @@ -125,6 +125,16 @@ yarn build
125 125 - `types` 类型定义文件更改
126 126 - `wip` 开发中
127 127  
  128 +## 浏览器支持
  129 +
  130 +本地开发推荐使用`Chrome 80+` 浏览器
  131 +
  132 +支持现代浏览器, 不支持 IE
  133 +
  134 +| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
  135 +| :-: | :-: | :-: | :-: | :-: |
  136 +| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
  137 +
128 138 ## 相关仓库
129 139  
130 140 如果这些插件对你有帮助，可以给一个 star 支持下
... ... @@ -134,18 +144,12 @@ yarn build
134 144 - [vite-plugin-style-import](https://github.com/anncwb/vite-plugin-style-import) - 用于组件库样式按需引入
135 145 - [vite-plugin-theme](https://github.com/anncwb/vite-plugin-theme) - 用于在线切换主题色等颜色相关配置
136 146 - [vite-plugin-imagemin](https://github.com/anncwb/vite-plugin-imagemin) - 用于打包压缩图片资源
137   -- [vite-plugin-compression](https://github.com/anncwb/vite-plugin-compression) - 用于打包输入.gz|.brotil 文件
  147 +- [vite-plugin-compression](https://github.com/anncwb/vite-plugin-compression) - 用于打包输出.gz|.brotil 文件
138 148 - [vite-plugin-svg-icons](https://github.com/anncwb/vite-plugin-svg-icons) - 用于快速生成 svg 雪碧图
139 149  
140   -## 浏览器支持
  150 +## 后台整合示例
141 151  
142   -本地开发推荐使用`Chrome 80+` 浏览器
143   -
144   -支持现代浏览器, 不支持 IE
145   -
146   -| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
147   -| :-: | :-: | :-: | :-: | :-: |
148   -| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
  152 +- [lamp-cloud](https://github.com/zuihou/lamp-cloud) - 基于 SpringCloud Alibaba 的微服务中后台快速开发平台
149 153  
150 154 ## 维护者
151 155  
... ...
package.json
  View file @c2635f3
... ... @@ -32,7 +32,7 @@
32 32 },
33 33 "dependencies": {
34 34 "@iconify/iconify": "^2.0.0-rc.6",
35   - "@vueuse/core": "^4.4.1",
  35 + "@vueuse/core": "^4.5.0",
36 36 "@zxcvbn-ts/core": "^0.3.0",
37 37 "ant-design-vue": "2.1.0",
38 38 "apexcharts": "^3.26.0",
... ... @@ -57,7 +57,7 @@
57 57 "devDependencies": {
58 58 "@commitlint/cli": "^12.0.1",
59 59 "@commitlint/config-conventional": "^12.0.1",
60   - "@iconify/json": "^1.1.321",
  60 + "@iconify/json": "^1.1.322",
61 61 "@purge-icons/generated": "^0.7.0",
62 62 "@types/crypto-js": "^4.0.1",
63 63 "@types/fs-extra": "^9.0.8",
... ... @@ -108,13 +108,13 @@
108 108 "stylelint-order": "^4.1.0",
109 109 "ts-node": "^9.1.1",
110 110 "typescript": "4.2.3",
111   - "vite": "2.0.5",
  111 + "vite": "2.1.3",
112 112 "vite-plugin-compression": "^0.2.3",
113 113 "vite-plugin-html": "^2.0.3",
114 114 "vite-plugin-imagemin": "^0.2.9",
115   - "vite-plugin-mock": "^2.3.0",
  115 + "vite-plugin-mock": "^2.4.0",
116 116 "vite-plugin-purge-icons": "^0.7.0",
117   - "vite-plugin-pwa": "^0.5.6",
  117 + "vite-plugin-pwa": "^0.6.2",
118 118 "vite-plugin-style-import": "^0.8.3",
119 119 "vite-plugin-svg-icons": "^0.4.0",
120 120 "vite-plugin-theme": "^0.5.0",
... ...
src/components/Tree/src/TreeHeader.vue
  View file @c2635f3
... ... @@ -88,7 +88,7 @@
88 88 },
89 89 ...defaultToolbarList,
90 90 { label: t('component.tree.checkStrictly'), value: ToolbarEnum.CHECK_STRICTLY },
91   - { label: t('component.tree.checkUnStrictly'), value: ToolbarEnum.CHE },
  91 + { label: t('component.tree.checkUnStrictly'), value: ToolbarEnum.CHECK_UN_STRICTLY },
92 92 ]
93 93 : defaultToolbarList;
94 94 });
... ...
src/layouts/default/trigger/SiderTrigger.vue
  View file @c2635f3
1 1 <template>
2   - <DoubleRightOutlined v-if="getCollapsed" />
3   - <DoubleLeftOutlined v-else />
  2 + <div @click.stop="toggleCollapsed">
  3 + <DoubleRightOutlined v-if="getCollapsed" />
  4 + <DoubleLeftOutlined v-else />
  5 + </div>
4 6 </template>
5 7 <script lang="ts">
6 8 import { defineComponent } from 'vue';
... ... @@ -11,8 +13,9 @@
11 13 name: 'SiderTrigger',
12 14 components: { DoubleRightOutlined, DoubleLeftOutlined },
13 15 setup() {
14   - const { getCollapsed } = useMenuSetting();
15   - return { getCollapsed };
  16 + const { getCollapsed, toggleCollapsed } = useMenuSetting();
  17 +
  18 + return { getCollapsed, toggleCollapsed };
16 19 },
17 20 });
18 21 </script>
... ...
yarn.lock
  View file @c2635f3
... ... @@ -1121,10 +1121,10 @@
1121 1121 dependencies:
1122 1122 cross-fetch "^3.0.6"
1123 1123  
1124   -"@iconify/json@^1.1.321":
1125   - version "1.1.321"
1126   - resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.321.tgz#266c93b9192004b5c6ebd26094aaf6a64aa3dadb"
1127   - integrity sha512-Z72vJVwgtQ9FrM3dQ2EWkVlRgsg0eSugLhBUpXjj6Mt45gS358HmLT45kg9x2tNwFOJ4fzcVol2fO/J5ryYP0w==
  1124 +"@iconify/json@^1.1.322":
  1125 + version "1.1.322"
  1126 + resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.322.tgz#5559ba4efc658a423ce39e7af7ab5f5e8ee7bf7a"
  1127 + integrity sha512-D4o3P8Mrrvd/Gz2qBFVNZYeEn+A/OQkdfT9eh6hz3mz49ob/nk8Q3IRUC0xvVdE4PLawqcKAiKjUyYC8tk8+lA==
1128 1128  
1129 1129 "@intlify/core-base@9.0.0":
1130 1130 version "9.0.0"
... ... @@ -2076,18 +2076,18 @@
2076 2076 resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.7.tgz#96d52988efc07444c108c7c6803ba7cc93e40045"
2077 2077 integrity sha512-dn5FyfSc4ky424jH4FntiHno7Ss5yLkqKNmM/NXwANRnlkmqu74pnGetexDFVG5phMk9/FhwovUZCWGxsotVKg==
2078 2078  
2079   -"@vueuse/core@^4.4.1":
2080   - version "4.4.1"
2081   - resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.4.1.tgz#1c1a83ac29306840c96329b1005c4d7608cee92f"
2082   - integrity sha512-L9TWFwI+pEqgEmfv+uWz2kQ9bXejtpaQdoS67UUyii22rSesjP1aTTU7z7XX5i7aIgsHKnKYv68cDCtEZbjsPA==
  2079 +"@vueuse/core@^4.5.0":
  2080 + version "4.5.0"
  2081 + resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.5.0.tgz#7e19d0df721550ab27486dadf5b8f760370196da"
  2082 + integrity sha512-2em6NKrjJv2j2jjo73bm7pLKK7JQ8dTNrJ3Rh350xbHFqBXAECd+mbidm0gic20USDfpRMB7SwPY91qCSQDi2Q==
2083 2083 dependencies:
2084   - "@vueuse/shared" "4.4.1"
  2084 + "@vueuse/shared" "4.5.0"
2085 2085 vue-demi latest
2086 2086  
2087   -"@vueuse/shared@4.4.1":
2088   - version "4.4.1"
2089   - resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.4.1.tgz#8963740d1b8a036933ae5c02b461b430430e2433"
2090   - integrity sha512-pY7bXgYaA9g25XNREE3zeuIWfOwbyiKeQ0IppE4nIRuro4gVGuLoV/BIU6D0VOTv7hYefv5eqE+WS03v61y8xA==
  2087 +"@vueuse/shared@4.5.0":
  2088 + version "4.5.0"
  2089 + resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.5.0.tgz#f679d6c962feb37a1c5057d70984ec45b67358fb"
  2090 + integrity sha512-D8cxNlGQ0tJXRirPwRJ2h8qacZiVMzagkrB4+vLAwJQXWaZh7j14Mr+I/BRyqj1aFilDGU75vclTkslnbOEy0g==
2091 2091 dependencies:
2092 2092 vue-demi latest
2093 2093  
... ... @@ -4452,16 +4452,16 @@ esbuild-register@^2.2.0:
4452 4452 esbuild "^0.9.2"
4453 4453 jsonc-parser "^3.0.0"
4454 4454  
4455   -esbuild@^0.8.52:
4456   - version "0.8.57"
4457   - resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.8.57.tgz#a42d02bc2b57c70bcd0ef897fe244766bb6dd926"
4458   - integrity sha512-j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA==
4459   -
4460   -esbuild@^0.9.2, esbuild@^0.9.3:
  4455 +esbuild@^0.9.2:
4461 4456 version "0.9.4"
4462 4457 resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.9.4.tgz#4480ffc4c1e5d5bb25958f889b5de0279bfb2d6f"
4463 4458 integrity sha512-bF6laCiYE5+iAfZsX+v6Lwvi5QbvKN3tThxDIR2WLyLYzTzNn0ijdpqkvTVsafmRZjic2Nq1nkSf5RSWySDTjA==
4464 4459  
  4460 +esbuild@^0.9.3, esbuild@^0.9.7:
  4461 + version "0.9.7"
  4462 + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b"
  4463 + integrity sha512-VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg==
  4464 +
4465 4465 escalade@^3.1.1:
4466 4466 version "3.1.1"
4467 4467 resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
... ... @@ -9548,10 +9548,10 @@ rollup@^2.25.0, rollup@^2.38.5:
9548 9548 optionalDependencies:
9549 9549 fsevents "~2.3.1"
9550 9550  
9551   -rollup@^2.41.5:
9552   - version "2.42.0"
9553   - resolved "https://registry.npmjs.org/rollup/-/rollup-2.42.0.tgz#444ce20a45614099decdd786f2a6fcd6c2240b08"
9554   - integrity sha512-P9bJnaZ2P0hawoJo+Jto8YZZqil9URogNVE4KJeyj6wrUSDIbdMvmj7CsyEFwdXu/I5SiWEzB1hfmLeMldH6ww==
  9551 +rollup@^2.42.4:
  9552 + version "2.42.4"
  9553 + resolved "https://registry.npmjs.org/rollup/-/rollup-2.42.4.tgz#97c910a48bd0db6aaa4271dd48745870cbbbf970"
  9554 + integrity sha512-Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw==
9555 9555 optionalDependencies:
9556 9556 fsevents "~2.3.1"
9557 9557  
... ... @@ -11259,10 +11259,10 @@ vite-plugin-imagemin@^0.2.9:
11259 11259 imagemin-svgo "^8.0.0"
11260 11260 imagemin-webp "^6.0.0"
11261 11261  
11262   -vite-plugin-mock@^2.3.0:
11263   - version "2.3.0"
11264   - resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.3.0.tgz#c616e75d2724015e9450d637794a39713af93b5a"
11265   - integrity sha512-ucmLIUv8gAMxc+5TGxIEKQ6PhhRAxZvQ2ChUzvc1hF/XzKNI/DRYrwjcGsDwISVyoYED2odTTt1q395d18LK6w==
  11262 +vite-plugin-mock@^2.4.0:
  11263 + version "2.4.0"
  11264 + resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.4.0.tgz#41a71e40c4557d1052e94b9d16bdb6c5efa779a7"
  11265 + integrity sha512-tt38JCkxYQty2GXMB46KupCSL6qsWyvyT8hRUWSMwz5ak9jQ6Wkktcti/cPYnHkI1IVIUNIpxaqvpHUht3pN/A==
11266 11266 dependencies:
11267 11267 "@rollup/plugin-node-resolve" "^11.2.0"
11268 11268 "@types/mockjs" "^1.0.3"
... ... @@ -11270,10 +11270,10 @@ vite-plugin-mock@^2.3.0:
11270 11270 chokidar "^3.5.1"
11271 11271 connect "^3.7.0"
11272 11272 debug "^4.3.2"
11273   - esbuild "^0.9.3"
  11273 + esbuild "^0.9.7"
11274 11274 fast-glob "^3.2.5"
11275 11275 path-to-regexp "^6.2.0"
11276   - rollup "^2.41.5"
  11276 + rollup "^2.42.4"
11277 11277 rollup-plugin-esbuild "^3.0.2"
11278 11278  
11279 11279 vite-plugin-purge-icons@^0.7.0:
... ... @@ -11285,15 +11285,16 @@ vite-plugin-purge-icons@^0.7.0:
11285 11285 "@purge-icons/generated" "^0.7.0"
11286 11286 rollup-plugin-purge-icons "^0.7.0"
11287 11287  
11288   -vite-plugin-pwa@^0.5.6:
11289   - version "0.5.6"
11290   - resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.5.6.tgz#483267e83ff3a6f5a0adc97a7e06f841a353cf30"
11291   - integrity sha512-CQjfKdSm0YMRRdMkfdI1RqJyrCjOFUl61+puGfMNAUMM5tex9rjF9gHxqDV5pN/2jFMQoTKkLLQ7HOYM0VbF2w==
  11288 +vite-plugin-pwa@^0.6.2:
  11289 + version "0.6.2"
  11290 + resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.6.2.tgz#da014b7c8860390dc481c2ef235457c7ffe286e1"
  11291 + integrity sha512-HkKSSjzgm/8YPp8qH7UxWKlxR3ZKLL7X3lwOSvT+M4GpkmcZmq6xtVIOmlO526e9wh4/31xPwyr1o0MfCzL6Xw==
11292 11292 dependencies:
11293 11293 debug "^4.3.2"
11294 11294 fast-glob "^3.2.5"
11295 11295 pretty-bytes "^5.6.0"
11296 11296 workbox-build "^6.1.1"
  11297 + workbox-window "^6.1.1"
11297 11298  
11298 11299 vite-plugin-style-import@^0.8.3:
11299 11300 version "0.8.3"
... ... @@ -11357,12 +11358,12 @@ vite-plugin-windicss@0.9.11:
11357 11358 debug "^4.3.2"
11358 11359 windicss "^2.5.4"
11359 11360  
11360   -vite@2.0.5:
11361   - version "2.0.5"
11362   - resolved "https://registry.npmjs.org/vite/-/vite-2.0.5.tgz#ac46857a3fa8686d077921e61bd48a986931df1d"
11363   - integrity sha512-QTgEDbq1WsTtr6j+++ewjhBFEk6c8v0xz4fb/OWJQKNYU8ZZtphOshwOqAlnarSstPBtWCBR0tsugXx6ajfoUg==
  11361 +vite@2.1.3:
  11362 + version "2.1.3"
  11363 + resolved "https://registry.npmjs.org/vite/-/vite-2.1.3.tgz#a31a844d26d3846b5a78f06970d1ea1f8a442955"
  11364 + integrity sha512-bUzArZIUwADVJS/3ywCr4KKFn3a7izs4M87ZDlAlY2V34E4g1kH6p3sVNAh8/IXCn/56fwgMh3rRavPUW7qEQQ==
11364 11365 dependencies:
11365   - esbuild "^0.8.52"
  11366 + esbuild "^0.9.3"
11366 11367 postcss "^8.2.1"
11367 11368 resolve "^1.19.0"
11368 11369 rollup "^2.38.5"
... ... @@ -11714,7 +11715,7 @@ workbox-sw@^6.1.2:
11714 11715 resolved "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.1.2.tgz#0db44f0625ffb53c0e6e9a056a61dda57f066f45"
11715 11716 integrity sha512-daxYjELQlNmGLeQolz29vkiVKMcAzZrSv5MLPAghvid6sajpq9x+FfMGriWaZcpyGZVKStAf6XzUbvvm0sJ/HA==
11716 11717  
11717   -workbox-window@^6.1.2:
  11718 +workbox-window@^6.1.1, workbox-window@^6.1.2:
11718 11719 version "6.1.2"
11719 11720 resolved "https://registry.npmjs.org/workbox-window/-/workbox-window-6.1.2.tgz#6db9a3b1eebf6470513d916852bfd1b1c918fe05"
11720 11721 integrity sha512-SXOAv56PWHzLhJcyQGPio1OXGzSza814lc2D42+go8CmeNIJDb03nzUi1FGMF4Tt1F7h5q8IYzq5bPQLTZ7IKQ==
... ...