Browse Source

修复异步组件中AntV控件不能打开的BUG。

YangZhiJie 1 year ago
parent
commit
b23fccb96e
4 changed files with 28 additions and 48 deletions
  1. 19 42
      package-lock.json
  2. 3 0
      package.json
  3. 4 2
      src/main.js
  4. 2 4
      src/window1/tabGridView/NewTabButton.vue

+ 19 - 42
package-lock.json

@@ -1,12 +1,15 @@
 {
   "name": "client-base-v4",
-  "version": "4.0.77",
+  "version": "4.0.78",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client-base-v4",
-      "version": "4.0.77",
+      "version": "4.0.78",
+      "dependencies": {
+        "ant-design-vue": "^4.2.1"
+      },
       "devDependencies": {
         "@babel/core": "^7.17.5",
         "@babel/eslint-parser": "^7.17.0",
@@ -68,7 +71,6 @@
       "resolved": "http://wuzhixin.vip:4873/@ant-design/colors/-/colors-6.0.0.tgz",
       "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ctrl/tinycolor": "^3.4.0"
       }
@@ -77,15 +79,13 @@
       "version": "4.4.2",
       "resolved": "http://wuzhixin.vip:4873/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz",
       "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@ant-design/icons-vue": {
       "version": "7.0.1",
       "resolved": "http://wuzhixin.vip:4873/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz",
       "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ant-design/colors": "^6.0.0",
         "@ant-design/icons-svg": "^4.2.1"
@@ -1876,7 +1876,6 @@
       "resolved": "http://wuzhixin.vip:4873/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
       "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -1895,15 +1894,13 @@
       "version": "0.9.2",
       "resolved": "http://wuzhixin.vip:4873/@emotion/hash/-/hash-0.9.2.tgz",
       "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@emotion/unitless": {
       "version": "0.8.1",
       "resolved": "http://wuzhixin.vip:4873/@emotion/unitless/-/unitless-0.8.1.tgz",
       "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
@@ -2328,7 +2325,6 @@
       "resolved": "http://wuzhixin.vip:4873/@simonwep/pickr/-/pickr-1.8.2.tgz",
       "integrity": "sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "core-js": "^3.15.1",
         "nanopop": "^2.1.0"
@@ -3080,7 +3076,6 @@
       "resolved": "http://wuzhixin.vip:4873/ant-design-vue/-/ant-design-vue-4.2.5.tgz",
       "integrity": "sha512-dh5CBXSaxJZBFQBd156sOUuZPfxI7pZsNXDYpHNBt/JyKZoYlbetRp/nJmSragS2Oo0mVC23Ote+TQSGc0TX6g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ant-design/colors": "^6.0.0",
         "@ant-design/icons-vue": "^7.0.0",
@@ -3148,8 +3143,7 @@
       "version": "2.1.0",
       "resolved": "http://wuzhixin.vip:4873/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
       "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/array-union": {
       "version": "1.0.2",
@@ -3178,8 +3172,7 @@
       "version": "4.2.5",
       "resolved": "http://wuzhixin.vip:4873/async-validator/-/async-validator-4.2.5.tgz",
       "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/babel-loader": {
       "version": "8.3.0",
@@ -3717,8 +3710,7 @@
       "version": "1.0.20",
       "resolved": "http://wuzhixin.vip:4873/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
       "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -3872,7 +3864,6 @@
       "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -4035,8 +4026,7 @@
       "version": "1.11.13",
       "resolved": "http://wuzhixin.vip:4873/dayjs/-/dayjs-1.11.13.tgz",
       "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/debounce": {
       "version": "1.2.1",
@@ -4238,8 +4228,7 @@
       "version": "1.12.4",
       "resolved": "http://wuzhixin.vip:4873/dom-align/-/dom-align-1.12.4.tgz",
       "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/dom-converter": {
       "version": "0.2.0",
@@ -4255,8 +4244,7 @@
       "version": "2.0.1",
       "resolved": "http://wuzhixin.vip:4873/dom-scroll-into-view/-/dom-scroll-into-view-2.0.1.tgz",
       "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/dom-serializer": {
       "version": "1.4.1",
@@ -6152,7 +6140,6 @@
       "resolved": "http://wuzhixin.vip:4873/is-plain-object/-/is-plain-object-3.0.1.tgz",
       "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6488,8 +6475,7 @@
       "version": "4.17.21",
       "resolved": "http://wuzhixin.vip:4873/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
@@ -6510,7 +6496,6 @@
       "resolved": "http://wuzhixin.vip:4873/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -6841,8 +6826,7 @@
       "version": "2.4.2",
       "resolved": "http://wuzhixin.vip:4873/nanopop/-/nanopop-2.4.2.tgz",
       "integrity": "sha512-NzOgmMQ+elxxHeIha+OG/Pv3Oc3p4RU2aBhwWwAqDpXrdTbtRylbRLQztLy8dMMwfl6pclznBdfUhccEn9ZIzw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
@@ -7771,8 +7755,7 @@
       "version": "1.5.1",
       "resolved": "http://wuzhixin.vip:4873/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
       "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/resolve": {
       "version": "1.22.8",
@@ -7935,7 +7918,6 @@
       "resolved": "http://wuzhixin.vip:4873/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
       "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "compute-scroll-into-view": "^1.0.20"
       }
@@ -8177,8 +8159,7 @@
       "version": "1.2.1",
       "resolved": "http://wuzhixin.vip:4873/shallow-equal/-/shallow-equal-1.2.1.tgz",
       "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
@@ -8425,8 +8406,7 @@
       "version": "4.3.4",
       "resolved": "http://wuzhixin.vip:4873/stylis/-/stylis-4.3.4.tgz",
       "integrity": "sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
@@ -8610,7 +8590,6 @@
       "resolved": "http://wuzhixin.vip:4873/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
       "integrity": "sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12.22"
       }
@@ -9157,7 +9136,6 @@
       "resolved": "http://wuzhixin.vip:4873/vue-types/-/vue-types-3.0.2.tgz",
       "integrity": "sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-plain-object": "3.0.1"
       },
@@ -9186,7 +9164,6 @@
       "resolved": "http://wuzhixin.vip:4873/warning/-/warning-4.0.3.tgz",
       "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.0.0"
       }

+ 3 - 0
package.json

@@ -63,5 +63,8 @@
   "repository": {
     "type": "http",
     "url": "https://a.leanwo.com:3000/prodog-client-2023/client-base-v4.git"
+  },
+  "dependencies": {
+    "ant-design-vue": "^4.2.1"
   }
 }

+ 4 - 2
src/main.js

@@ -6,10 +6,12 @@ import { createApp, defineAsyncComponent } from 'vue';
 //import { createApp, defineAsyncComponent } from 'vue/dist/vue.runtime.esm-browser.prod.js';
 
 
-import Antd from 'ant-design-vue';
-// import 'ant-design-vue/dist/antd.css';
+// 修复异步组件中AntV控件不能打开的BUG。
+// import Antd from 'ant-design-vue';
+import * as Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/reset.css';
 window.Antd = Antd;
+//console.log(Antd);
 
 
 import './assets/common.css';

+ 2 - 4
src/window1/tabGridView/NewTabButton.vue

@@ -102,9 +102,7 @@
     </template>
   </Modal>
 
-  <a-modal v-model:open="modal1Open">
-    <component :is="modal1Component" v-model:open="modal1Open" />
-  </a-modal>
+  <component :is="modal1Component" v-model:open="modal1Open" />
 </template>
 
 <script setup>
@@ -490,7 +488,7 @@ const openRemoteComponentModule = async function (tabButton) {
       errorComponent: AEmpty,
       // 如果提供了一个 timeout 时间限制,并超时了
       // 也会显示这里配置的报错组件,默认值是:Infinity
-      timeout: 3000,
+      timeout: 10000,
     });
 
     modal1Component.value = testAsyncRemoteComponent;