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

package/package.json

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

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

@@ -2,7 +2,7 @@
     <el-checkbox-group class="tnxel-select tnxel-checkbox-group" v-model="model" :theme="theme" :size="size"
         :disabled="disabled" :key="groupKey" v-if="selector === 'checkbox'">
         <template v-if="items">
-            <el-checkbox v-for="item in items" :key="item[valueName]" :label="item[valueName]"
+            <el-checkbox v-for="item in items" :key="item[valueName]" :value="item[valueName]"
                 :data-value="item[valueName]"
                 :disabled="item.disabled === true || typeof item.disabled === 'string'"
                 :title="typeof item.disabled === 'string' ? item.disabled : item.title">
@@ -196,7 +196,7 @@ export default {
         },
         emptyValue: {
             type: [String, Number, Boolean, Array],
-            default: null,
+            default: '', // 设为null会告警，暂时先设为空字符，在非字符串类型的情况下是否有问题，有待检验
         },
         emptyClass: String,
         placeholder: String,
@@ -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,21 +268,13 @@
 
 .el-dropdown-menu__item .el-icon {
     text-align: center;
-    margin-right: 0.25rem;
+    margin-right: 6px;
 }
 
 .el-dropdown-menu__item .el-icon:before {
     width: calc(100vw); /* 尽可能撑开，以与高度保持一致 */
 }
 
-.el-alert {
-    margin-bottom: 1rem;
-}
-
-.el-alert.w-100 .el-alert__content {
-    width: 100%;
-}
-
 .el-form-item {
     margin-bottom: 1rem;
 }
@@ -300,12 +292,6 @@
     padding-right: 1rem;
 }
 
-.el-form--label-right .el-form-item__label:before {
-    content: '*';
-    color: transparent;
-    margin-right: 4px;
-}
-
 .el-form--label-top .el-form-item__label {
     padding-bottom: 0;
     margin-bottom: 0.25rem;
@@ -638,8 +624,11 @@ el-card {
 }
 
 .el-alert {
-    --el-alert-padding: 0.75rem 1rem;
-    --el-alert-title-font-size: 14px;
+    margin-bottom: 1rem;
+}
+
+.el-alert.w-100 .el-alert__content {
+    width: 100%;
 }
 
 .el-alert .el-alert__icon {
@@ -650,21 +639,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 +800,7 @@ el-card {
     left: 1rem;
 }
 
-.el-icon {
+.el-icon:not(.el-message-box__status) {
     font-size: unset;
 }
 
@@ -836,6 +825,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.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) {