canrd-outside / order-erp-front · Commits

Commit 655b74323653147943cbde2352208cb765c82b8a

Authored by Vben
1 parent a03d3cc6

fix(modal): ensure that the shutdown event is not triggered multiple times

Inline Side-by-side
Showing 5 changed files with 45 additions and 48 deletions
.github/workflows/ftp-schedule.yml
  View file @655b743
... ... @@ -18,12 +18,13 @@ jobs:
18 18 run: |
19 19 sed -i 's#VITE_PUBLIC_PATH\s*=.*#VITE_PUBLIC_PATH = /next/#g' ./.env.production
20 20 sed -i "s#VITE_BUILD_COMPRESS\s*=.*#VITE_BUILD_COMPRESS = 'gzip'#g" ./.env.production
  21 + sed -i "s#VITE_DROP_CONSOLE\s*=.*#VITE_DROP_CONSOLE = true#g" ./.env.production
21 22 cat ./.env.production
22 23  
23   - - name: use Node.js 14
  24 + - name: use Node.js 15
24 25 uses: actions/setup-node@v2.1.2
25 26 with:
26   - node-version: '14.x'
  27 + node-version: '15.x'
27 28  
28 29 - name: Get yarn cache
29 30 id: yarn-cache
... ...
CHANGELOG.zh_CN.md
  View file @655b743
... ... @@ -14,6 +14,7 @@
14 14 ### 🐛 Bug Fixes
15 15  
16 16 - **Modal** 修复全屏高度计算错误
  17 +- **Modal** 修复关闭事件触发多次问题
17 18 - **PageWrapper** 修复高度计算问题
18 19 - **FlowChart** 修复拖放菜单丢失
19 20 - 修复后台模式下，Iframe 路由错误
... ...
package.json
  View file @655b743
... ... @@ -35,12 +35,12 @@
35 35 "@iconify/iconify": "^2.0.1",
36 36 "@logicflow/core": "^0.4.13",
37 37 "@logicflow/extension": "^0.4.13",
38   - "@vueuse/core": "^5.0.2",
  38 + "@vueuse/core": "^5.0.3",
39 39 "@zxcvbn-ts/core": "^0.3.0",
40 40 "ant-design-vue": "2.1.6",
41 41 "axios": "^0.21.1",
42 42 "codemirror": "^5.61.1",
43   - "cropperjs": "^1.5.11",
  43 + "cropperjs": "^1.5.12",
44 44 "crypto-js": "^4.0.0",
45 45 "echarts": "^5.1.2",
46 46 "lodash-es": "^4.17.21",
... ... @@ -92,7 +92,7 @@
92 92 "eslint-define-config": "^1.0.8",
93 93 "eslint-plugin-prettier": "^3.4.0",
94 94 "eslint-plugin-vue": "^7.11.0",
95   - "esno": "^0.7.1",
  95 + "esno": "^0.7.2",
96 96 "fs-extra": "^10.0.0",
97 97 "http-server": "^0.12.3",
98 98 "husky": "^6.0.0",
... ... @@ -100,7 +100,7 @@
100 100 "is-ci": "^3.0.0",
101 101 "less": "^4.1.1",
102 102 "lint-staged": "^11.0.0",
103   - "postcss": "^8.3.2",
  103 + "postcss": "^8.3.4",
104 104 "prettier": "^2.3.1",
105 105 "pretty-quick": "^3.1.0",
106 106 "rimraf": "^3.0.2",
... ... @@ -117,7 +117,7 @@
117 117 "vite-plugin-imagemin": "^0.3.2",
118 118 "vite-plugin-mock": "^2.7.2",
119 119 "vite-plugin-purge-icons": "^0.7.0",
120   - "vite-plugin-pwa": "^0.7.3",
  120 + "vite-plugin-pwa": "^0.8.1",
121 121 "vite-plugin-style-import": "^0.10.1",
122 122 "vite-plugin-svg-icons": "^0.7.0",
123 123 "vite-plugin-theme": "^0.8.1",
... ...
src/components/Modal/src/BasicModal.vue
  View file @655b743
1 1 <template>
2   - <Modal @cancel="handleCancel" v-bind="getBindValue">
  2 + <Modal v-bind="getBindValue">
3 3 <template #closeIcon v-if="!$slots.closeIcon">
4 4 <ModalClose
5 5 :canFullscreen="getProps.canFullscreen"
... ...
yarn.lock
  View file @655b743
... ... @@ -2033,18 +2033,18 @@
2033 2033 resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
2034 2034 integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
2035 2035  
2036   -"@vueuse/core@^5.0.2":
2037   - version "5.0.2"
2038   - resolved "https://registry.npmjs.org/@vueuse/core/-/core-5.0.2.tgz#302389f620c0d4b51fdf157012d9b5b522b605e7"
2039   - integrity sha512-Sp9+7AL4Cg3Tx6I55WoH7zICGRlp6ZUF9NW3EU8SZTkryHm0afAjFfASMwlfV030JFeh45BdqafDOrenVmM9Cw==
  2036 +"@vueuse/core@^5.0.3":
  2037 + version "5.0.3"
  2038 + resolved "https://registry.npmjs.org/@vueuse/core/-/core-5.0.3.tgz#8f3170e2a51ae62fb1725c84d4cc02a7552aad0b"
  2039 + integrity sha512-TMCL11EVMaj2Y5qdYosvuwA+i1aKrerFXs7fhNZiQiLCWxF8XsrNdxzoiaI2n12UcmSOXvd1xdyWs7Nss+p/Hg==
2040 2040 dependencies:
2041   - "@vueuse/shared" "5.0.2"
  2041 + "@vueuse/shared" "5.0.3"
2042 2042 vue-demi "*"
2043 2043  
2044   -"@vueuse/shared@5.0.2":
2045   - version "5.0.2"
2046   - resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-5.0.2.tgz#274c2bf163d25eb7fd2fc51f23088a2b7f060594"
2047   - integrity sha512-S1hRRmEdipjTD4DbXgPdw4ZZYebU/nDi75vNP3Ibpa1irW3NUNUKOT/TWnwRHLQvXquUtdvalhI8D9Db+czZJg==
  2044 +"@vueuse/shared@5.0.3":
  2045 + version "5.0.3"
  2046 + resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-5.0.3.tgz#31613951d5036459650ad8d47a9185e8950ea3c9"
  2047 + integrity sha512-aY93WPygr8H/4RB8YuOmAD83Y+faq7zwW10Kd9i0kD9zf5ysVP+32j09rF/mZVtGCa0CSM8ambPZMsEhCkRbwQ==
2048 2048 dependencies:
2049 2049 vue-demi "*"
2050 2050  
... ... @@ -3525,10 +3525,10 @@ create-require@^1.1.0:
3525 3525 resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
3526 3526 integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
3527 3527  
3528   -cropperjs@^1.5.11:
3529   - version "1.5.11"
3530   - resolved "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.11.tgz#502ae6d8ca098b124de6813601cca70015879fc0"
3531   - integrity sha512-SJUeBBhtNBnnn+UrLKluhFRIXLJn7XFPv8QN1j49X5t+BIMwkgvDev541f96bmu8Xe0TgCx3gON22KmY/VddaA==
  3528 +cropperjs@^1.5.12:
  3529 + version "1.5.12"
  3530 + resolved "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.12.tgz#d9c0db2bfb8c0d769d51739e8f916bbc44e10f50"
  3531 + integrity sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==
3532 3532  
3533 3533 cross-env@^7.0.3:
3534 3534 version "7.0.3"
... ... @@ -4209,12 +4209,12 @@ esbuild-plugin-alias@^0.1.2:
4209 4209 resolved "https://registry.yarnpkg.com/esbuild-plugin-alias/-/esbuild-plugin-alias-0.1.2.tgz#1232fbde807c0c8ad44c44ec859819eb492e12a8"
4210 4210 integrity sha512-WsX0OJy8IGOsGZV+4oHEU5B6XQUpxOsZN1iSoYf9COTDbY7WXcOwd1oCLYNWUIWCExyGXSghIGq2k7sXBldxwQ==
4211 4211  
4212   -esbuild-register@^2.5.0:
4213   - version "2.5.0"
4214   - resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-2.5.0.tgz#b855d8cfa963835a16866146e310691bd8afa4f5"
4215   - integrity sha512-5a8W3rH7IQbIPR9pPXJFkC3+CRMtm/OSpBz3hkWUUU63oPZ3NU6dVDGfaIjKnRizCTIRoGjNE6KEDt5p1sLwEw==
  4212 +esbuild-register@^2.6.0:
  4213 + version "2.6.0"
  4214 + resolved "https://registry.npmjs.org/esbuild-register/-/esbuild-register-2.6.0.tgz#9f19a54c82be751dd87673d6a66d7b9e1cdd8498"
  4215 + integrity sha512-2u4AtnCXP5nivtIxZryiZOUcEQkOzFS7UhAqibUEmaTAThJ48gDLYTBF/Fsz+5r0hbV1jrFE6PQvPDUrKZNt/Q==
4216 4216 dependencies:
4217   - esbuild "^0.11.5"
  4217 + esbuild "^0.12.8"
4218 4218 jsonc-parser "^3.0.0"
4219 4219  
4220 4220 esbuild@0.11.3:
... ... @@ -4232,12 +4232,7 @@ esbuild@^0.11.23:
4232 4232 resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.11.23.tgz#c42534f632e165120671d64db67883634333b4b8"
4233 4233 integrity sha512-iaiZZ9vUF5wJV8ob1tl+5aJTrwDczlvGP0JoMmnpC2B0ppiMCu8n8gmy5ZTGl5bcG081XBVn+U+jP+mPFm5T5Q==
4234 4234  
4235   -esbuild@^0.11.5:
4236   - version "0.11.10"
4237   - resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.11.10.tgz#f5d39e4d9cc130b78d751664fef1b663240f5545"
4238   - integrity sha512-XvGbf+UreVFA24Tlk6sNOqNcvF2z49XAZt4E7A4H80+yqn944QOLTTxaU0lkdYNtZKFiITNea+VxmtrfjvnLPA==
4239   -
4240   -esbuild@^0.12.5:
  4235 +esbuild@^0.12.5, esbuild@^0.12.8:
4241 4236 version "0.12.8"
4242 4237 resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.12.8.tgz#ac90da77cb3bfbf49ab815200bcef7ffe1a3348f"
4243 4238 integrity sha512-sx/LwlP/SWTGsd9G4RlOPrXnIihAJ2xwBUmzoqe2nWwbXORMQWtAGNJNYLBJJqa3e9PWvVzxdrtyFZJcr7D87g==
... ... @@ -4371,15 +4366,15 @@ eslint@^7.28.0:
4371 4366 text-table "^0.2.0"
4372 4367 v8-compile-cache "^2.0.3"
4373 4368  
4374   -esno@^0.7.1:
4375   - version "0.7.1"
4376   - resolved "https://registry.npmjs.org/esno/-/esno-0.7.1.tgz#ccd08436e0ca6e452fac1a994a7f08c61d07b7f1"
4377   - integrity sha512-LzI42UXMSWtt9Z7iLfytY1jqO5Mz0980NI/y8txwpBCQmXLOpkA+KFzhD3IAY+QjBOOtvFmGh2j0VR8EHY57Ww==
  4369 +esno@^0.7.2:
  4370 + version "0.7.2"
  4371 + resolved "https://registry.npmjs.org/esno/-/esno-0.7.2.tgz#64f557e5263ed729f572cabcdfac9bc7cda10fa4"
  4372 + integrity sha512-qNb3hiDZqp84msR0+yrksCu7MIA8aDMkglKvfrOww7DkG9ah1acGJcP5yxUH7EmM5WpwZ0cLPQUw17nvTMY4mA==
4378 4373 dependencies:
4379 4374 cross-spawn "^7.0.3"
4380   - esbuild "^0.12.6"
  4375 + esbuild "^0.12.8"
4381 4376 esbuild-node-loader "^0.0.0"
4382   - esbuild-register "^2.5.0"
  4377 + esbuild-register "^2.6.0"
4383 4378  
4384 4379 espree@^6.2.1:
4385 4380 version "6.2.1"
... ... @@ -8136,10 +8131,10 @@ postcss@^8.3.0:
8136 8131 nanoid "^3.1.23"
8137 8132 source-map-js "^0.6.2"
8138 8133  
8139   -postcss@^8.3.2:
8140   - version "8.3.2"
8141   - resolved "https://registry.npmjs.org/postcss/-/postcss-8.3.2.tgz#ed3ec489f5428af5740cd6effcc216b4d455ee64"
8142   - integrity sha512-y1FK/AWdZlBF5lusS5j5l4/vF67+vQZt1SXPVJ32y1kRGDQyrs1zk32hG1cInRTu14P0V+orPz+ifwW/7rR4bg==
  8134 +postcss@^8.3.4:
  8135 + version "8.3.4"
  8136 + resolved "https://registry.npmjs.org/postcss/-/postcss-8.3.4.tgz#41ece1c43f2f7c74dc7d90144047ce052757b822"
  8137 + integrity sha512-/tZY0PXExXXnNhKv3TOvZAOUYRyuqcCbBm2c17YMDK0PlVII3K7/LKdt3ScHL+hhouddjUWi+1sKDf9xXW+8YA==
8143 8138 dependencies:
8144 8139 colorette "^1.2.2"
8145 8140 nanoid "^3.1.23"
... ... @@ -8871,7 +8866,7 @@ rollup-plugin-visualizer@5.5.0:
8871 8866 source-map "^0.7.3"
8872 8867 yargs "^16.2.0"
8873 8868  
8874   -rollup@^2.38.5, rollup@^2.43.1, rollup@^2.45.2, rollup@^2.51.2:
  8869 +rollup@^2.38.5, rollup@^2.43.1, rollup@^2.51.2:
8875 8870 version "2.51.2"
8876 8871 resolved "https://registry.npmjs.org/rollup/-/rollup-2.51.2.tgz#6de71e28c833089a0bd745a09671a3e2b92af6b7"
8877 8872 integrity sha512-ReV2eGEadA7hmXSzjxdDKs10neqH2QURf2RxJ6ayAlq93ugy6qIvXMmbc5cWMGCDh1h5T4thuWO1e2VNbMq8FA==
... ... @@ -10597,15 +10592,15 @@ vite-plugin-purge-icons@^0.7.0:
10597 10592 "@purge-icons/generated" "^0.7.0"
10598 10593 rollup-plugin-purge-icons "^0.7.0"
10599 10594  
10600   -vite-plugin-pwa@^0.7.3:
10601   - version "0.7.3"
10602   - resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.7.3.tgz#ce3fdd64ac68033ea840bfea41add1af4d13f93a"
10603   - integrity sha512-RgGJW02OxRxziNKYTUtWXr9hF+Px6jcdyMN7IkuOOV9WcFaJQCKb3Pxqizb8GMjIBLtjEebwa0XbKXWDFhZWjw==
  10595 +vite-plugin-pwa@^0.8.1:
  10596 + version "0.8.1"
  10597 + resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.8.1.tgz#8b6fc6c26fcc6fab9d39a087256ba6280173b6eb"
  10598 + integrity sha512-Hrfz+NpZ6yroVm5yiCWQ1N9HX9o6H/CCyg7ZHiaP3ZZC29a0Z9lqnnicEAhZMLkVPJqHM60wowL0EJkyOVyxBg==
10604 10599 dependencies:
10605 10600 debug "^4.3.2"
10606 10601 fast-glob "^3.2.5"
10607 10602 pretty-bytes "^5.6.0"
10608   - rollup "^2.45.2"
  10603 + rollup "^2.51.2"
10609 10604 workbox-build "^6.1.5"
10610 10605 workbox-window "^6.1.5"
10611 10606  
... ...