@truenewx/tnxvue3 3.0.0-alpha.41 → 3.0.0-alpha.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.0.0-alpha.41",
+  "version": "3.0.0-alpha.43",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "publishConfig": {
@@ -24,7 +24,7 @@
     "vue-router": "~4.4.0"
   },
   "dependencies": {
-    "@truenewx/tnxcore": "3.0.0-alpha.26",
+    "@truenewx/tnxcore": "3.0.0-alpha.28",
     "@element-plus/icons-vue": "2.3.1",
     "async-validator": "4.2.5",
     "mitt": "3.0.1"

package/src/element-plus/edit-table/EditTable.vue

@@ -10,6 +10,9 @@
             border
             @current-change="onSelectRow"
         >
+            <template #empty v-if="!tableDataList">
+                <tnxel-icon class="text-placeholder" value="Loading"/>
+            </template>
             <slot></slot>
             <el-table-column label="排序" align="center" width="60px" v-if="sortable">
                 <template #default="{row, $index}">
@@ -103,13 +106,15 @@ export default {
     },
     computed: {
         tableDataList() {
-            for (let rowIndex = 0; rowIndex < this.data.length; rowIndex++) {
-                let row = this.data[rowIndex];
-                this.indexes[this.getRowKey(row, rowIndex)] = rowIndex;
-                if (this.rowKey && row.children) {
-                    for (let j = 0; j < row.children.length; j++) {
-                        let child = row.children[j];
-                        this.indexes[this.getRowKey(child)] = [rowIndex, j];
+            if (this.data) {
+                for (let rowIndex = 0; rowIndex < this.data.length; rowIndex++) {
+                    let row = this.data[rowIndex];
+                    this.indexes[this.getRowKey(row, rowIndex)] = rowIndex;
+                    if (this.rowKey && row.children) {
+                        for (let j = 0; j < row.children.length; j++) {
+                            let child = row.children[j];
+                            this.indexes[this.getRowKey(child)] = [rowIndex, j];
+                        }
                     }
                 }
             }
@@ -148,16 +153,18 @@ export default {
             return this.rowKey ? row[this.rowKey] : (rowIndex + '');
         },
         initElements() {
-            this.focusRowFirstInput(this.tableDataList[0], 0);
-            // 为富文本输入框添加默认title
-            let table = this.$refs.table?.$el;
-            if (table) {
-                let textareas = table.getElementsByTagName('textarea');
-                for (let textarea of textareas) {
-                    if (!textarea.title) {
-                        textarea.addEventListener('input', event => {
-                            event.target.title = event.target.value;
-                        });
+            if (this.tableDataList) {
+                this.focusRowFirstInput(this.tableDataList[0], 0);
+                // 为富文本输入框添加默认title
+                let table = this.$refs.table?.$el;
+                if (table) {
+                    let textareas = table.getElementsByTagName('textarea');
+                    for (let textarea of textareas) {
+                        if (!textarea.title) {
+                            textarea.addEventListener('input', event => {
+                                event.target.title = event.target.value;
+                            });
+                        }
                     }
                 }
             }

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

@@ -1,5 +1,5 @@
 <template>
-    <span class="tnxel-icon" :style="style" v-if="value.length === 1">{{ value }}</span>
+    <span class="tnxel-icon" :style="style" v-if="value?.length === 1">{{ value }}</span>
     <el-icon :class="className" :color="color" :style="style" v-else>
         <Loading v-if="value === 'Loading'"/>
         <ArrowDown v-else-if="value === 'ArrowDown'"/>
@@ -49,6 +49,7 @@
         <Pointer v-else-if="value === 'Pointer'"/>
         <QuestionFilled v-else-if="value === 'QuestionFilled'"/>
         <Rank v-else-if="value === 'Rank'"/>
+        <Reading v-else-if="value === 'Reading'"/>
         <Refresh v-else-if="value === 'Refresh'"/>
         <Remove v-else-if="value === 'Remove'"/>
         <RemoveFilled v-else-if="value === 'RemoveFilled'"/>
@@ -61,6 +62,7 @@
         <SuccessFilled v-else-if="value === 'SuccessFilled'"/>
         <Switch v-else-if="value === 'Switch'"/>
         <Top v-else-if="value === 'Top'"/>
+        <User v-else-if="value === 'User'"/>
         <UserFilled v-else-if="value === 'UserFilled'"/>
         <View v-else-if="value === 'View'"/>
         <WarningFilled v-else-if="value === 'WarningFilled'"/>
@@ -118,6 +120,7 @@ import {
     Pointer,
     QuestionFilled,
     Rank,
+    Reading,
     Refresh,
     Remove,
     RemoveFilled,
@@ -130,6 +133,7 @@ import {
     SuccessFilled,
     Switch,
     Top,
+    User,
     UserFilled,
     View,
     WarningFilled,
@@ -185,6 +189,7 @@ const components = {
     Pointer,
     QuestionFilled,
     Rank,
+    Reading,
     Refresh,
     Remove,
     RemoveFilled,
@@ -197,6 +202,7 @@ const components = {
     SuccessFilled,
     Switch,
     Top,
+    User,
     UserFilled,
     View,
     WarningFilled,

package/src/element-plus/tabs/Tabs.vue

@@ -94,3 +94,15 @@ export default {
     }
 }
 </script>
+
+<style>
+.tnxel-tabs:not(.el-tabs--border-card):not(.el-tabs--card) .el-tabs__item {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+}
+
+.tnxel-tabs-pane-label {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+}
+</style>

package/src/element-plus/tnxel.css

@@ -447,7 +447,7 @@
 }
 
 div.form-item-tip {
-    margin-top: 0.5rem;
+    margin-top: 4px;
     width: 100%;
 }
 
@@ -475,7 +475,7 @@ span.form-item-tip {
 
 div.form-item-tip + .el-form-item__error {
     position: absolute;
-    top: calc(100% - 0.75rem);
+    top: calc(100% - 14px);
     margin: 0;
     padding-top: 0;
 }
@@ -751,16 +751,6 @@ el-card {
     cursor: pointer;
 }
 
-.tnxel-tabs:not(.el-tabs--border-card):not(.el-tabs--card) .el-tabs__item {
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-}
-
-.tnxel-tabs-pane-label {
-    margin-left: 0.5rem;
-    margin-right: 0.5rem;
-}
-
 .el-tabs--border-card {
     box-shadow: none;
 }

package/src/element-plus/tnxel.js

@@ -404,13 +404,14 @@ export default build('tnxel', () => {
         }
     });
 
+    tnxel.libs.ElementPlus = ElementPlus;
+
     tnxel.install = tnxel.util.function.around(tnxel.install, function (install, vm) {
         install.call(tnxel, vm);
         // 始终安装ElementPlus，以避免对于不同Vue实例未安装的问题
         vm.use(ElementPlus, {
             locale: ElementPlus_zh_CN,
         });
-        tnxel.libs = Object.assign({}, tnxel.libs, {ElementPlus});
     });
 
     tnxel.router.beforeLeave =

package/src/tnxvue.js

@@ -107,7 +107,6 @@ export default build('tnxvue', () => {
                 const component = this.components[key];
                 vm.component(component.name, component);
             }
-            this.libs.Vue = Vue;
         },
         dialog(content, title, buttons, options, contentProps) {
             // 默认不实现，由UI框架扩展层实现
@@ -199,6 +198,8 @@ export default build('tnxvue', () => {
         },
     });
 
+    tnxvue.libs.Vue = Vue;
+
     Object.assign(tnxvue.util, {
         /**
          * 判断指定对象是否组件实例