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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.0.0-alpha.16",
+  "version": "3.0.0-alpha.18",
   "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/element-plus/dialog/Dialog.vue

@@ -258,7 +258,7 @@ export default {
 }
 
 .tnxel-dialog .tnxel-dialog-footer {
-    padding: 1rem;
+    padding: 0 1rem 1rem 1rem;
     display: flex;
     justify-content: flex-end;
 }

package/src/element-plus/dropdown-item/DropdownItem.vue

@@ -13,8 +13,11 @@
 </template>
 
 <script>
+import TnxelIcon from '../icon/Icon.vue'
+
 export default {
     name: 'TnxelDropdownItem',
+    components: {TnxelIcon},
     props: {
         icon: String,
         iconSize: Number,

package/src/element-plus/fss-upload/FssUpload.vue

@@ -161,7 +161,7 @@ export default {
                                 fileList.push({
                                     name: meta.name,
                                     url: vm._getFullReadUrl(meta.thumbnailReadUrl || meta.readUrl),
-                                    previewUrl: vm._getFullReadUrl(meta.readUrl),
+                                    previewUrl: vm.tnx.fss.getClientConfig().baseUrl + meta.downloadUrl,
                                     locationUrl: meta.locationUrl,
                                 });
                             }
@@ -241,7 +241,7 @@ export default {
                 file.downloadUrl = result.downloadUrl;
                 // 构建Upload组件用到的文件字段
                 file.url = result.readUrl;
-                file.previewUrl = (process.env.VUE_APP_API_BASE_URL + result.downloadUrl) || result.readUrl;
+                file.previewUrl = this.tnx.fss.getClientConfig().baseUrl + result.downloadUrl;
 
                 this.fileList = fileList;
                 this.emitInput();

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

@@ -17,6 +17,7 @@
         <Close v-else-if="value === 'Close'"/>
         <CloseBold v-else-if="value === 'CloseBold'"/>
         <CopyDocument v-else-if="value === 'CopyDocument'"/>
+        <DArrowRight v-else-if="value === 'DArrowRight'"/>
         <Delete v-else-if="value === 'Delete'"/>
         <DeleteFilled v-else-if="value === 'DeleteFilled'"/>
         <Document v-else-if="value === 'Document'"/>
@@ -26,6 +27,7 @@
         <Folder v-else-if="value === 'Folder'"/>
         <HomeFilled v-else-if="value === 'HomeFilled'"/>
         <InfoFilled v-else-if="value === 'InfoFilled'"/>
+        <List v-else-if="value === 'List'"/>
         <MoreFilled v-else-if="value === 'MoreFilled'"/>
         <OfficeBuilding v-else-if="value === 'OfficeBuilding'"/>
         <Picture v-else-if="value === 'Picture'"/>
@@ -70,6 +72,7 @@ import {
     Close,
     CloseBold,
     CopyDocument,
+    DArrowRight,
     Delete,
     DeleteFilled,
     Document,
@@ -79,6 +82,7 @@ import {
     Folder,
     HomeFilled,
     InfoFilled,
+    List,
     Loading,
     MoreFilled,
     OfficeBuilding,
@@ -122,6 +126,7 @@ const components = {
     Close,
     CloseBold,
     CopyDocument,
+    DArrowRight,
     Delete,
     DeleteFilled,
     Document,
@@ -131,6 +136,7 @@ const components = {
     Folder,
     HomeFilled,
     InfoFilled,
+    List,
     MoreFilled,
     Loading,
     OfficeBuilding,

package/src/element-plus/select/Select.vue

@@ -331,7 +331,7 @@ export default {
                 } else { // 如果当前值找不到匹配的选项，则需要考虑是设置为空还是默认选项
                     if (!this.empty) { // 如果不能为空，则默认选中第一个可用选项
                         let firstItem = this.firstEnabledItem;
-                        if (firstItem[this.valueName]) {
+                        if (firstItem && firstItem[this.valueName]) {
                             return firstItem[this.valueName];
                         }
                     }

package/src/element-plus/tnxel.css

@@ -268,7 +268,7 @@
 
 .el-dropdown-menu__item .el-icon {
     text-align: center;
-    margin-right: 0.25rem;
+    margin-right: 6px;
 }
 
 .el-dropdown-menu__item .el-icon:before {
@@ -650,21 +650,21 @@ el-card {
     padding: 0;
 }
 
-.el-message-box__header {
-    padding: 1rem;
-    border-bottom: 1px solid var(--el-border-color);
+.el-message-box {
+    padding: 0;
 }
 
-.el-message-box {
-    padding-bottom: 0;
+.el-message-box__header {
+    padding: 12px 1rem;
+    border-bottom: 1px solid var(--el-border-color);
 }
 
 .el-message-box__title {
-    font-size: 1rem;
+    font-size: 14px;
 }
 
 .el-message-box__headerbtn {
-    margin-top: -3px;
+    margin-top: 4px;
 }
 
 .el-message-box__content {
@@ -811,7 +811,7 @@ el-card {
     left: 1rem;
 }
 
-.el-icon {
+.el-icon:not(.el-message-box__status) {
     font-size: unset;
 }
 
@@ -836,6 +836,10 @@ i svg {
     border-radius: 0;
 }
 
+.el-dialog {
+    --el-dialog-padding-primary: 0;
+}
+
 .el-dialog__header {
     margin-right: 0;
 }

package/src/element-plus/tnxel.js

@@ -44,11 +44,11 @@ import Upload from './upload/Upload.vue';
 
 import './tnxel.css';
 
+const $ = tnxbs.libs.$;
+
 export const build = tnxvue.build;
 
 export default build('tnxel', () => {
-    const $ = tnxbs.libs.$;
-
     const components = Object.assign({}, tnxvue.components, {
         Avatar,
         Alert,
@@ -215,7 +215,13 @@ export default build('tnxel', () => {
             const util = this.util;
             setTimeout(function () {
                 const topZIndex = util.dom.minTopZIndex(2);
-                const element = $(selector);
+                if (selector.endsWith(':last')) {
+                    selector = selector.substring(0, selector.length - ':last'.length);
+                }
+                let element = $(selector);
+                if (element.length > 0) {
+                    element = $(element[element.length - 1]);
+                }
                 const zIndex = Number(element.css('zIndex'));
                 if (isNaN(zIndex) || topZIndex > zIndex) {
                     element.css('zIndex', topZIndex);
@@ -291,9 +297,9 @@ export default build('tnxel', () => {
                 options.callback = function (action) {
                     let yes = undefined;
                     if (action === 'confirm') {
-                        yes = options.reverse ? false : true;
+                        yes = !options.reverse;
                     } else if (action === 'cancel') {
-                        yes = options.reverse ? true : false;
+                        yes = !!options.reverse;
                     }
                     callback(yes);
                 }
@@ -385,12 +391,11 @@ export default build('tnxel', () => {
 
     tnxel.install = tnxel.util.function.around(tnxel.install, function (install, vm) {
         install.call(tnxel, vm);
-        if (!tnxel.libs.ElementPlus) {
-            vm.use(ElementPlus, {
-                locale: ElementPlus_zh_CN,
-            });
-            tnxel.libs = Object.assign({}, tnxel.libs, {ElementPlus});
-        }
+        // 始终安装ElementPlus，以避免对于不同Vue实例未安装的问题
+        vm.use(ElementPlus, {
+            locale: ElementPlus_zh_CN,
+        });
+        tnxel.libs = Object.assign({}, tnxel.libs, {ElementPlus});
     });
 
     tnxel.router.beforeLeave =

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/tnxvue.js

@@ -111,18 +111,18 @@ export default build('tnxvue', () => {
                     return [];
                 } else if (type === 'confirm') {
                     return [{
-                        text: '取消',
+                        text: '确定',
+                        type: theme || 'primary',
                         click(close) {
                             if (typeof callback === 'function') {
-                                return callback.call(this, false, close);
+                                return callback.call(this, true, close);
                             }
                         }
                     }, {
-                        text: '确定',
-                        type: theme || 'primary',
+                        text: '取消',
                         click(close) {
                             if (typeof callback === 'function') {
-                                return callback.call(this, true, close);
+                                return callback.call(this, false, close);
                             }
                         }
                     }];
@@ -154,10 +154,12 @@ export default build('tnxvue', () => {
     });
 
     tnxvue.app.isProduction = function () {
-        if (process && process.env && process.env.NODE_ENV !== 'production') {
-            return false;
+        try {
+            return !(process && process.env && process.env.NODE_ENV !== 'production');
+        } catch (e) {
+            // process未定义时会出错，此时为生产模式
+            return true;
         }
-        return true;
     };
 
     tnxvue.app.toDevUrl = function (url, portIndex, replacement) {

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;
-});