@truenewx/tnxvue3 2.6.2 → 2.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "publishConfig": {

package/src/element-plus/tnxel.js

@@ -2,7 +2,7 @@
 /**
  * 基于ElementPlus的扩展支持
  */
-import ElementPlus, {ElLoading, ElMessage, ElMessageBox} from 'element-plus';
+import ElementPlus, { ElLoading, ElMessage, ElMessageBox } from 'element-plus';
 import ElementPlus_zh_CN from 'element-plus/es/locale/lang/zh-cn';
 import tnxbs from '@truenewx/tnxcore/src/tnxbs'; // 二次封装组件中使用了Bootstrap的基础样式
 import tnxvue from '../tnxvue.js';
@@ -87,7 +87,6 @@ const dialogContainerClass = 'tnxel-dialog-container';
 const drawerContainerClass = 'tnxel-drawer-container';
 
 const tnxel = Object.assign({}, tnxbs, tnxvue, {
-    libs: Object.assign({}, tnxbs.libs, tnxvue.libs, {ElementPlus}),
     components,
     _dialogs: [], // 对话框堆栈
     dialog(content, title, buttons, options, contentProps) {
@@ -119,7 +118,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
             theme: options.theme,
         }).mount(containerSelector);
         dialogVm.options = Object.assign(dialogVm.options || {}, options);
-        dialogVm.options.onClosed = this.util.function.around(dialogVm.options.onClosed, function (onClosed) {
+        dialogVm.options.onClosed = this.util.function.around(dialogVm.options.onClosed, function(onClosed) {
             let $container = $(containerSelector);
             $container.next('.el-overlay').remove();
             $container.remove();
@@ -176,7 +175,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
         }).mount(containerSelector);
         drawerVm.id = drawerId;
         drawerVm.options = Object.assign(drawerVm.options || {}, options);
-        drawerVm.options.onClosed = this.util.function.around(drawerVm.options.onClosed, function (onClosed) {
+        drawerVm.options.onClosed = this.util.function.around(drawerVm.options.onClosed, function(onClosed) {
             let $container = $(containerSelector);
             $container.next('.el-overlay').remove();
             $container.remove();
@@ -210,7 +209,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
     },
     _handleZIndex(selector) {
         const util = this.util;
-        setTimeout(function () {
+        setTimeout(function() {
             const topZIndex = util.dom.minTopZIndex(2);
             const element = $(selector);
             const zIndex = Number(element.css('zIndex'));
@@ -282,7 +281,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
             options.cancelButtonText = buttonText;
         }
         if (typeof callback === 'function') {
-            options.callback = function (action) {
+            options.callback = function(action) {
                 let yes = undefined;
                 if (action === 'confirm') {
                     yes = options.reverse ? false : true;
@@ -374,14 +373,19 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
     }
 });
 
-tnxel.install = tnxel.util.function.around(tnxel.install, function (install, vm) {
-    vm.use(ElementPlus, {
+tnxel.install = tnxel.util.function.around(tnxel.install, function(install, vm) {
+    install.call(window.tnx, vm);
+    let ElementComponent = ElementPlus;
+    if (window.tnx.libs && window.tnx.libs.ElementPlus) {
+        ElementComponent = window.tnx.libs.ElementPlus;
+    }
+    vm.use(ElementComponent, {
         locale: ElementPlus_zh_CN,
     });
-    install.call(window.tnx, vm);
+    window.tnx.libs = Object.assign({}, window.tnx.libs, {ElementPlus: ElementComponent});
 });
 
-tnxel.router.beforeLeave = tnxel.util.function.around(tnxel.router.beforeLeave, function (beforeLeave, router, from) {
+tnxel.router.beforeLeave = tnxel.util.function.around(tnxel.router.beforeLeave, function(beforeLeave, router, from) {
     // 页面跳转前关闭当前页面中可能存在的所有消息框和对话框
     window.tnx._closeMessage();
     window.tnx.closeDialog(true);
@@ -389,19 +393,19 @@ tnxel.router.beforeLeave = tnxel.util.function.around(tnxel.router.beforeLeave,
 });
 
 tnxel.date = {
-    formatDateTime: function (row, column, cellValue) {
+    formatDateTime: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDateTime();
         }
         return undefined;
     },
-    formatDate: function (row, column, cellValue) {
+    formatDate: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDate();
         }
         return undefined;
     },
-    formatTime: function (row, column, cellValue) {
+    formatTime: function(row, column, cellValue) {
         if (typeof cellValue === 'number') {
             cellValue = new Date(cellValue);
         }
@@ -413,7 +417,7 @@ tnxel.date = {
         }
         return undefined;
     },
-    formatTimeMinute: function (row, column, cellValue) {
+    formatTimeMinute: function(row, column, cellValue) {
         if (typeof cellValue === 'number') {
             cellValue = new Date(cellValue);
         }
@@ -428,19 +432,19 @@ tnxel.date = {
         }
         return undefined;
     },
-    formatDateMinute: function (row, column, cellValue) {
+    formatDateMinute: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDateMinute();
         }
         return undefined;
     },
-    formatDateMonth: function (row, column, cellValue) {
+    formatDateMonth: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDateMonth();
         }
         return undefined;
     },
-    formatPermanentableDate: function (row, column, cellValue) {
+    formatPermanentableDate: function(row, column, cellValue) {
         if (Array.isArray(cellValue)) {
             cellValue = cellValue[column];
         }
@@ -457,7 +461,7 @@ tnxel.date = {
 };
 
 tnxel.number = {
-    formatPercent: function (row, column, cellValue) {
+    formatPercent: function(row, column, cellValue) {
         if (typeof cellValue !== 'number') {
             cellValue = parseFloat(cellValue);
         }
@@ -489,13 +493,13 @@ tnxel.boolean = {
             text: '无',
         }]
     },
-    format: function (row, column, cellValue) {
+    format: function(row, column, cellValue) {
         if (typeof cellValue === 'boolean') {
             cellValue = cellValue.toText();
         }
         return cellValue;
     },
-    formatHas: function (row, column, cellValue) {
+    formatHas: function(row, column, cellValue) {
         if (typeof cellValue === 'boolean') {
             cellValue = tnxel.boolean.items.getText('has', cellValue);
         }
@@ -506,7 +510,7 @@ tnxel.boolean = {
 tnxel.table = {}
 
 const rpc = tnxel.app.rpc;
-rpc.handleErrors = tnxel.util.function.around(rpc.handleErrors, function (handleErrors, errors, options) {
+rpc.handleErrors = tnxel.util.function.around(rpc.handleErrors, function(handleErrors, errors, options) {
     if (options && options.form) {
         let forms;
         if (Array.isArray(options.form)) {

package/src/tnxvue.js

@@ -27,9 +27,6 @@ const components = {
 };
 
 const tnxvue = Object.assign({}, tnxcore, {
-    libs: Object.assign({}, tnxcore.libs, {
-        Vue: Vue
-    }),
     components,
     router: {
         instance: null,
@@ -62,6 +59,7 @@ const tnxvue = Object.assign({}, tnxcore, {
             const component = this.components[key];
             vm.component(component.name, component);
         }
+        this.libs.Vue = Vue;
     },
     dialog(content, title, buttons, options, contentProps) {
         // 默认不实现，由UI框架扩展层实现