@truenewx/tnxvue3 3.0.18 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.0.18",
+  "version": "3.4.0",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "type": "module",
@@ -18,22 +18,22 @@
     "preview": "vite preview"
   },
   "peerDependencies": {
-    "element-plus": "~2.8.0",
-    "bootstrap-vue-next": "~0.26.0",
+    "element-plus": "~2.9.0",
+    "bootstrap-vue-next": "~0.28.0",
     "vue": "~3.5.0",
-    "vue-router": "~4.4.0"
+    "vue-router": "~4.5.0"
   },
   "dependencies": {
-    "@truenewx/tnxcore": "3.0.16",
+    "@truenewx/tnxcore": "3.4.0",
     "@element-plus/icons-vue": "2.3.1",
     "async-validator": "4.2.5",
     "mitt": "3.0.1"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "5.2.1",
-    "vite": "6.2.0",
-    "eslint": "7.32.0",
-    "eslint-plugin-vue": "8.7.1"
+    "@vitejs/plugin-vue": "5.2.3",
+    "vite": "6.2.2",
+    "eslint": "9.22.0",
+    "eslint-plugin-vue": "9.33.0"
   },
   "eslintConfig": {
     "root": true,

package/src/bootstrap-vue/tnxbsv.js

@@ -81,7 +81,24 @@ export default build('tnxbsv', () => {
                 document.body.removeChild(dialogContainer);
             });
             window.tnx.dialogInstances.push(dialog);
-            return dialogVm;
+            return dialog;
+        },
+        closeDialog(all, callback) {
+            if (typeof all === 'function') {
+                callback = all;
+                all = false;
+            }
+            if (window.tnx.dialogInstances.length) {
+                let dialog = window.tnx.dialogInstances.pop();
+                while (dialog) {
+                    dialog.close(callback);
+                    if (all) {
+                        dialog = window.tnx.dialogInstances.pop();
+                    } else {
+                        break;
+                    }
+                }
+            }
         },
         _closeMessage() {
             this.hideLoading();

package/src/element-plus/icon/Icon.vue

@@ -35,7 +35,10 @@
         <Histogram v-else-if="value === 'Histogram'"/>
         <HomeFilled v-else-if="value === 'HomeFilled'"/>
         <InfoFilled v-else-if="value === 'InfoFilled'"/>
+        <Key v-else-if="value === 'Key'"/>
         <List v-else-if="value === 'List'"/>
+        <Location v-else-if="value === 'Location'"/>
+        <LocationFilled v-else-if="value === 'LocationFilled'"/>
         <Management v-else-if="value === 'Management'"/>
         <Memo v-else-if="value === 'Memo'"/>
         <Minus v-else-if="value === 'Minus'"/>
@@ -108,7 +111,10 @@ import {
     Histogram,
     HomeFilled,
     InfoFilled,
+    Key,
     List,
+    Location,
+    LocationFilled,
     Loading,
     Management,
     Memo,
@@ -180,7 +186,10 @@ const components = {
     Histogram,
     HomeFilled,
     InfoFilled,
+    Key,
     List,
+    Location,
+    LocationFilled,
     Management,
     Memo,
     Minus,

package/src/element-plus/tnxel.js

@@ -98,12 +98,12 @@ export default build('tnxel', () => {
     const tnxel = Object.assign({}, tnxbs, tnxvue, {
         components,
         componentDefaultApp: undefined, // 组件的默认app，从服务端获取数据的组件以此为远程请求的默认app
-        _dialogs: [], // 对话框堆栈
+        dialogInstances: [], // 对话框堆栈
         dialog(content, title, buttons, options, contentProps) {
             this._closeMessage();
 
             let componentOptions = {};
-            if (this.util.isComponent(content)) {
+            if (window.tnx.util.isComponent(content)) {
                 componentOptions.components = {
                     'tnxel-dialog-content': content
                 };
@@ -118,7 +118,7 @@ export default build('tnxel', () => {
             }
             const containerSelector = '.' + dialogContainerClass + '#' + dialogId;
             options = options || {};
-            const dialogVm = window.tnx.createVueInstance(componentDefinition, null, {
+            let dialogVm = window.tnx.createVueInstance(componentDefinition, null, {
                 modelValue: true,
                 container: containerSelector,
                 title: title,
@@ -126,37 +126,40 @@ export default build('tnxel', () => {
                 contentProps: contentProps,
                 buttons: buttons,
                 theme: options.theme,
-            }).mount(containerSelector);
-            dialogVm.options = Object.assign(dialogVm.options || {}, options);
-            dialogVm.options.onClosed = this.util.function.around(dialogVm.options.onClosed, function (onClosed) {
+            });
+            const dialog = dialogVm.mount(containerSelector);
+            dialog.options = Object.assign(dialog.options || {}, options);
+            dialog.options.onClosed = window.tnx.util.function.around(dialog.options.onClosed, function (onClosed) {
+                dialogVm.unmount();
+                window.tnx.dialogInstances.remove(dialog);
                 let $container = $(containerSelector);
                 $container.next('.el-overlay').remove();
                 $container.remove();
                 if (onClosed) {
-                    onClosed.call(dialogVm);
+                    onClosed.call(dialog);
                 }
             });
-            this._dialogs.push(dialogVm);
-            return dialogVm;
+            window.tnx.dialogInstances.push(dialog);
+            return dialog;
         },
         closeDialog(all, callback) {
             if (typeof all === 'function') {
                 callback = all;
                 all = false;
             }
-            if (this._dialogs.length) {
-                let dialog = this._dialogs.pop();
+            if (window.tnx.dialogInstances.length) {
+                let dialog = window.tnx.dialogInstances.pop();
                 while (dialog) {
                     dialog.close(callback);
                     if (all) {
-                        dialog = this._dialogs.pop();
+                        dialog = window.tnx.dialogInstances.pop();
                     } else {
                         break;
                     }
                 }
             }
         },
-        _drawers: [], // 抽屉堆栈
+        drawerInstances: [], // 抽屉堆栈
         drawer(content, title, buttons, options, contentProps) {
             this._closeMessage();
 
@@ -176,37 +179,40 @@ export default build('tnxel', () => {
             }
             const containerSelector = '.' + drawerContainerClass + '#' + drawerId;
             options = options || {};
-            const drawerVm = window.tnx.createVueInstance(componentDefinition, null, {
+            let drawerVm = window.tnx.createVueInstance(componentDefinition, null, {
                 content: content,
                 title: title,
                 contentProps: contentProps,
                 buttons: buttons,
                 theme: options.theme,
-            }).mount(containerSelector);
-            drawerVm.id = drawerId;
-            drawerVm.options = Object.assign(drawerVm.options || {}, options);
-            drawerVm.options.onClosed = this.util.function.around(drawerVm.options.onClosed, function (onClosed) {
+            });
+            const drawer = drawerVm.mount(containerSelector);
+            drawer.id = drawerId;
+            drawer.options = Object.assign(drawer.options || {}, options);
+            drawer.options.onClosed = this.util.function.around(drawer.options.onClosed, function (onClosed) {
+                drawerVm.unmount();
+                window.tnx.drawerInstances.remove(drawer);
                 let $container = $(containerSelector);
                 $container.next('.el-overlay').remove();
                 $container.remove();
                 if (onClosed) {
-                    onClosed.call(drawerVm);
+                    onClosed.call(drawer);
                 }
             });
-            this._drawers.push(drawerVm);
-            return drawerVm;
+            window.tnx.drawerInstances.push(drawer);
+            return drawer;
         },
         closeDrawer(all, callback) {
             if (typeof all === 'function') {
                 callback = all;
                 all = false;
             }
-            if (this._drawers.length) {
-                let drawer = this._drawers.pop();
+            if (window.tnx.drawerInstances.length) {
+                let drawer = window.tnx.drawerInstances.pop();
                 while (drawer) {
                     drawer.close(callback);
                     if (all) {
-                        drawer = this._drawers.pop();
+                        drawer = window.tnx.drawerInstances.pop();
                     } else {
                         break;
                     }
@@ -238,6 +244,7 @@ export default build('tnxel', () => {
             });
         },
         alert(message, title, callback, options) {
+            this.closeLoading();
             if (typeof title === 'function') {
                 options = callback;
                 callback = title;
@@ -249,11 +256,12 @@ export default build('tnxel', () => {
                 confirmButtonText: '确定',
             }, options);
             this.closeLoading();
-            ElMessageBox.alert(message, title, options).then(callback);
+            ElMessageBox.alert(message, title || '提示', options).then(callback);
             this._handleZIndex('.el-message-box__wrapper:last');
             this.app.eventBus.emit('tnx.alert', options);
         },
         success(message, callback, options) {
+            this.closeLoading();
             options = Object.assign({
                 dangerouslyUseHTMLString: true,
             }, options, {
@@ -266,6 +274,7 @@ export default build('tnxel', () => {
             this.app.eventBus.emit('tnx.success', options);
         },
         error(message, callback, options) {
+            this.closeLoading();
             options = Object.assign({
                 dangerouslyUseHTMLString: true,
             }, options, {
@@ -282,6 +291,7 @@ export default build('tnxel', () => {
             }
         },
         confirm(message, title, callback, options) {
+            this.closeLoading();
             if (typeof title === 'function') {
                 options = callback;
                 callback = title;
@@ -322,6 +332,7 @@ export default build('tnxel', () => {
             this.app.eventBus.emit('tnx.confirm', options);
         },
         toast(message, timeout, callback, options) {
+            this.closeLoading();
             if (typeof timeout === 'function') {
                 options = callback;
                 callback = timeout;

package/src/tnxvue.js

@@ -2,8 +2,7 @@
 /**
  * 基于Vue 3的扩展支持
  */
-import tnxcore from '@truenewx/tnxcore';
-// import tnxcore from '../../core/src/tnxcore';
+import tnxcore from '../../tnxcore/src/tnxcore';
 import validator from './tnxvue-validator';
 import createRouter from './tnxvue-router';
 import Text from './text/Text.vue';