@truenewx/tnxvue3 3.0.0-alpha.16 → 3.0.0-alpha.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.0.0-alpha.16",
+  "version": "3.0.0-alpha.17",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "publishConfig": {
@@ -20,7 +20,6 @@
   },
   "peerDependencies": {
     "element-plus": "~2.8.0",
-    "tdesign-vue-next": "~1.9.0",
     "vue": "~3.4.0",
     "vue-router": "~4.4.0"
   },

package/src/tnxvue-router.js

@@ -1,7 +1,7 @@
 /**
  * 基于Vue的路由器构建函数
  */
-import { FunctionUtil, NetUtil } from '@truenewx/tnxcore/src/tnxcore-util';
+import {FunctionUtil, NetUtil} from '@truenewx/tnxcore/src/tnxcore-util';
 
 function addRoute(routes, superiorPath, item, fnImportPage) {
     if (item && item.path) {
@@ -14,12 +14,15 @@ function addRoute(routes, superiorPath, item, fnImportPage) {
                 cache: {}, // 路由级缓存
                 isHistory() { // 通过setTimeout()方式调用才能确保获得正确结果
                     return this.historyFrom !== undefined;
-                }
-            },
-            component() {
-                return fnImportPage(page);
+                },
             },
+            component: item.component,
         };
+        if (!route.component) {
+            route.component = () => {
+                return fnImportPage(page);
+            };
+        }
         // 如果直接定义route的redirect/alias字段，则item的redirect/alias为undefined时，route仍然有redirect/alias字段，只是其值为undefined，这将导致VueRouter报错
         if (item.redirect) {
             route.redirect = item.redirect;
@@ -48,7 +51,8 @@ function instantiatePath(path, params) {
             });
         }
         if (path.contains('/:')) { // 参数替换完之后，还有路径参数，则为无效路径，返回首页
-            console.warn('路径中的参数无法获得参数值，请确保具有参数的路径所属菜单项的下级菜单路径包含相同的参数：' + path);
+            console.warn(
+                '路径中的参数无法获得参数值，请确保具有参数的路径所属菜单项的下级菜单路径包含相同的参数：' + path);
             return '/';
         }
     }
@@ -59,11 +63,11 @@ function getCurrentRoute(router) {
     return router.currentRoute._value;
 }
 
-export default function(VueRouter, menu, fnImportPage) {
+export default function (VueRouter, menu, fnImportPage) {
     let items;
     if (Array.isArray(menu)) {
         items = [];
-        menu.forEach(function(m) {
+        menu.forEach(function (m) {
             items = items.concat(m.items);
         });
     } else {
@@ -84,7 +88,7 @@ export default function(VueRouter, menu, fnImportPage) {
     // if (window.history && window.history.pushState) {
     //     window.history.pushState(null, null, document.URL);
     // }
-    window.addEventListener('popstate', function() {
+    window.addEventListener('popstate', function () {
         let $route = getCurrentRoute(router);
         if ($route) {
             $route.meta.historyFrom = router.history.state.forward;
@@ -93,7 +97,7 @@ export default function(VueRouter, menu, fnImportPage) {
 
     // 注册离开页面前事件处理支持
     router.$beforeLeaveHandlers = {};
-    router.beforeLeave = function(handler) {
+    router.beforeLeave = function (handler) {
         if (typeof handler === 'function') {
             let $route = getCurrentRoute(router);
             let path = $route.path;
@@ -101,7 +105,7 @@ export default function(VueRouter, menu, fnImportPage) {
         }
     };
 
-    router.beforeEach(function(to, from, next) {
+    router.beforeEach(function (to, from, next) {
         if (typeof window.tnx.router.beforeLeave === 'function') {
             window.tnx.router.beforeLeave(router, from);
         }
@@ -118,7 +122,7 @@ export default function(VueRouter, menu, fnImportPage) {
         }
     });
 
-    router.afterEach(function(to, from) {
+    router.afterEach(function (to, from) {
         router.prev = from;
         // 前后hash相同，但全路径不同（意味着参数不同），则需要刷新页面，否则页面不会刷新
         if (to.href === from.href && to.fullPath !== from.fullPath) {
@@ -126,7 +130,7 @@ export default function(VueRouter, menu, fnImportPage) {
         }
     });
 
-    router.back = FunctionUtil.around(router.back, function(back, path) {
+    router.back = FunctionUtil.around(router.back, function (back, path) {
         if (!router.prev || !router.prev.href) { // 没有href，说明当前页面为刷新后进入的第一个页面，无法简单返回
             let $route = getCurrentRoute(router);
             if (!path) { // 未指定默认返回路径，则返回上一级页面
@@ -141,21 +145,21 @@ export default function(VueRouter, menu, fnImportPage) {
         back.call(router);
     });
 
-    router.pushState = function(path) {
+    router.pushState = function (path) {
         let success = NetUtil.pushState('#' + path);
         if (!success) {
             this.push(path);
         }
         return success;
-    }
+    };
 
-    router.replaceState = function(path) {
+    router.replaceState = function (path) {
         let success = NetUtil.replaceState('#' + path);
         if (!success) {
             this.replace(path);
         }
         return success;
-    }
+    };
 
     return router;
 }

package/src/tdesign/tnxtd.css

@@ -1,4 +0,0 @@
-/**
- * tnxtd.css
- * 对Tencent TDesign样式的调整
- */

package/src/tdesign/tnxtd.js

@@ -1,22 +0,0 @@
-/**
- * 对Tencent TDesign Vue3组件库的扩展支持
- */
-import TDesign from 'tdesign-vue-next';
-import tnxvue from '../tnxvue.js';
-
-import 'tdesign-vue-next/es/style/index.css';
-import './tnxtd.css';
-
-export const build = tnxvue.build;
-
-export default build('tnxtd', () => {
-    const tnxtd = Object.assign({}, tnxvue, {});
-    tnxtd.install = tnxtd.util.function.around(tnxtd.install, function (install, vm) {
-        install.call(tnxtd, vm);
-        if (!tnxtd.libs.TDesign) {
-            vm.use(TDesign);
-            tnxtd.libs = Object.assign({}, tnxtd.libs, {TDesign});
-        }
-    });
-    return tnxtd;
-});