@truenewx/tnxvue3 3.0.16 → 3.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.0.16",
+  "version": "3.0.18",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "type": "module",
@@ -24,7 +24,7 @@
     "vue-router": "~4.4.0"
   },
   "dependencies": {
-    "@truenewx/tnxcore": "3.0.14",
+    "@truenewx/tnxcore": "3.0.16",
     "@element-plus/icons-vue": "2.3.1",
     "async-validator": "4.2.5",
     "mitt": "3.0.1"

package/src/bootstrap-vue/tnxbsv.js

@@ -52,8 +52,11 @@ export default build('tnxbsv', () => {
         libs: Object.assign({}, tnxjq.libs, tnxvue.libs, {BootstrapVue}),
         components,
         componentDefaultApp: undefined, // 组件的默认app，从服务端获取数据的组件以此为远程请求的默认app
-        _dialogs: [], // 对话框堆栈
+        dialogInstances: [], // 对话框堆栈
         dialog(content, title, buttons, options, contentProps) {
+            // 弹出之前关闭所有加载框
+            this.hideLoading();
+
             let id = new Date().getTime();
             let containerId = 'dialog-container-' + id;
             let componentDefinition = Object.assign({}, Dialog,);
@@ -74,10 +77,10 @@ export default build('tnxbsv', () => {
             let dialog = dialogVm.mount(dialogContainer);
             dialog.onHidden = this.util.function.after(dialog.onHidden, () => {
                 dialogVm.unmount();
-                this._dialogs.remove(dialog);
+                window.tnx.dialogInstances.remove(dialog);
                 document.body.removeChild(dialogContainer);
             });
-            this._dialogs.push(dialog);
+            window.tnx.dialogInstances.push(dialog);
             return dialogVm;
         },
         _closeMessage() {
@@ -189,18 +192,24 @@ export default build('tnxbsv', () => {
             this._closeMessage();
 
             let div = document.createElement('div');
+            div.classList.add('tnxbsv-loading-overlay')
             document.body.appendChild(div);
             let instance = window.tnx.createVueInstance(LoadingOverlay, null, {message});
-            let component = instance.mount(div);
-            window.tnx.loadingInstance = instance;
+            instance.mount(div);
+            window.tnx.loadingInstances.push(instance);
             window.tnx.app.eventBus.emit('tnx.showLoading', options);
-            return component;
         },
+        loadingInstances: [],
         hideLoading() {
-            if (window.tnx.loadingInstance) {
-                window.tnx.loadingInstance.unmount();
-                document.body.removeChild(window.tnx.loadingInstance._container);
-                window.tnx.loadingInstance = null;
+            if (window.tnx.loadingInstances.length) {
+                window.tnx.loadingInstances.forEach(instance => {
+                    instance.unmount();
+                });
+                window.tnx.loadingInstances.length = 0;
+                // 删除所有div.tnxbsv-loading-overlay
+                document.body.querySelectorAll('div.tnxbsv-loading-overlay').forEach(div => {
+                    document.body.removeChild(div);
+                });
             }
         },
         closeLoading() {

package/src/tnxvue.js

@@ -96,10 +96,14 @@ export default build('tnxvue', () => {
             } else if (window.tnx.router.instance) {
                 vm.config.globalProperties.$router = window.tnx.router.instance;
             }
-            window.tnx.app.eventBus = window.tnx.app.eventBus || mitt();
-            window.tnx.app.eventBus.once = function (name, handler) {
-                this.all.set(name, [handler]);
+
+            if (!window.tnx.app.eventBus) {
+                window.tnx.app.eventBus = window.tnx.app.eventBus || mitt();
+                window.tnx.app.eventBus.once = function (name, handler) {
+                    this.all.set(name, [handler]);
+                }
             }
+
             return vm;
         },
         install(vm) {