@truenewx/tnxvue3 3.0.0-alpha.34 → 3.0.0-alpha.36

package/package.json

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

package/src/element-plus/button/Button.vue

@@ -30,6 +30,7 @@
             :loading="loading"
             :plain="plain"
             :link="link"
+            :text="text"
             :bg="bg"
             :autofocus="autofocus"
             :round="round"
@@ -75,6 +76,7 @@ export default {
         loading: Boolean,
         plain: Boolean,
         link: Boolean,
+        text: Boolean,
         bg: Boolean,
         autofocus: Boolean,
         round: Boolean,

package/src/element-plus/dialog/Dialog.vue

@@ -42,7 +42,10 @@ export default {
         'tnxel-dialog-content': DialogContent,
     },
     props: {
-        id: window.tnx.util.string.uuid32(),
+        id: {
+            type: String,
+            default: () => window.tnx.util.string.uuid32(),
+        },
         modelValue: Boolean,
         container: String,
         title: String,
@@ -153,7 +156,7 @@ export default {
                 }
             }
             if (!$dialog || !$dialog.length) {
-                $dialog = $('.el-dialog__wrapper[data-v-id="' + this.id + '"] .el-dialog:last');
+                $dialog = $('.tnxel-dialog[data-v-id="' + this.id + '"]');
             }
             if ($dialog.length) {
                 let top = window.tnx.util.dom.getTopVerticallyCenteredOnPage($dialog[0]);

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

@@ -146,7 +146,7 @@ export default {
             return this.rowKey ? row[this.rowKey] : (rowIndex + '');
         },
         initElements() {
-            this.focusRowFirstInput(this.tableDataList[0]);
+            this.focusRowFirstInput(this.tableDataList[0], 0);
             // 为富文本输入框添加默认title
             let table = this.$refs.table.$el;
             let textareas = table.getElementsByTagName('textarea');
@@ -305,10 +305,10 @@ export default {
             }
         },
         tableRowClassName(data) {
-            let classNames = [this.getRowClassName(data.row, data.$index)];
+            let classNames = [this.getRowClassName(data.row, data.rowIndex)];
             if (typeof this.rowClassName === 'function') {
                 classNames.push(this.rowClassName(data));
-            } else {
+            } else if (this.rowClassName) {
                 classNames.push(this.rowClassName);
             }
             return classNames.join(' ');
@@ -317,10 +317,10 @@ export default {
             let index = this.indexes[this.getRowKey(row, rowIndex)];
             return 'tnxel-edit-table__row--' + (Array.isArray(index) ? index.join('_') : index);
         },
-        focusRowFirstInput(row) {
-            if (row) {
+        focusRowFirstInput(row, rowIndex) {
+            if (row && this.$refs.table) {
                 let table = this.$refs.table.$el;
-                let rowClassName = this.getRowClassName(row);
+                let rowClassName = this.getRowClassName(row, rowIndex);
                 let rowDoms = table.getElementsByClassName(rowClassName);
                 if (rowDoms.length) {
                     let rowDom = rowDoms[0];
@@ -353,7 +353,7 @@ export default {
                 this.$nextTick(() => {
                     setTimeout(() => {
                         this.bindElementRules();
-                        this.focusRowFirstInput(row);
+                        this.focusRowFirstInput(row, rowIndex);
                     });
                 });
             }
@@ -376,8 +376,13 @@ export default {
                 this.$emit('removed', row, rowIndex);
                 this.$nextTick(() => {
                     setTimeout(() => {
-                        let next = dataList[index] || dataList[index - 1];
-                        this.focusRowFirstInput(next);
+                        let next = dataList[index];
+                        let nextIndex = rowIndex;
+                        if (!next) {
+                            next = dataList[index - 1];
+                            nextIndex = rowIndex - 1;
+                        }
+                        this.focusRowFirstInput(next, nextIndex);
                     });
                 });
             });
@@ -466,6 +471,10 @@ export default {
     padding: 0 16px;
 }
 
+.tnxel-edit-table-container .el-table.padding-none .el-table__body-wrapper .el-button {
+    border-radius: 0;
+}
+
 .tnxel-edit-table-container .el-table.padding-none .el-table__body-wrapper .el-input--small .el-input__wrapper,
 .tnxel-edit-table-container .el-table.padding-none .el-table__body-wrapper .el-input--small .el-select__wrapper {
     height: 24px;

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

@@ -38,9 +38,11 @@
         <Management v-else-if="value === 'Management'"/>
         <Memo v-else-if="value === 'Memo'"/>
         <Minus v-else-if="value === 'Minus'"/>
+        <More v-else-if="value === 'More'"/>
         <MoreFilled v-else-if="value === 'MoreFilled'"/>
         <Notebook v-else-if="value === 'Notebook'"/>
         <OfficeBuilding v-else-if="value === 'OfficeBuilding'"/>
+        <Operation v-else-if="value === 'Operation'"/>
         <Picture v-else-if="value === 'Picture'"/>
         <PictureFilled v-else-if="value === 'PictureFilled'"/>
         <Plus v-else-if="value === 'Plus'"/>
@@ -105,9 +107,11 @@ import {
     Management,
     Memo,
     Minus,
+    More,
     MoreFilled,
     Notebook,
     OfficeBuilding,
+    Operation,
     Picture,
     PictureFilled,
     Plus,
@@ -169,10 +173,12 @@ const components = {
     Management,
     Memo,
     Minus,
+    More,
     MoreFilled,
     Notebook,
     Loading,
     OfficeBuilding,
+    Operation,
     Picture,
     PictureFilled,
     Plus,

package/src/element-plus/input-number/InputNumber.vue

@@ -124,7 +124,7 @@ export default {
 }
 
 .tnxel-input-number .el-input__inner {
-    min-width: 50px;
+    min-width: 20px;
 }
 
 .tnxel-input-number .el-input-number.text-start .el-input__inner {

package/src/element-plus/tnxel.js

@@ -350,9 +350,14 @@ export default build('tnxel', () => {
                 text: message,
             });
             this._closeMessage();
-            window.tnx.loadingInstance = ElLoading.service(options);
-            this._handleZIndex('.el-loading-mask');
-            this.app.eventBus.emit('tnx.showLoading', options);
+            try {
+                window.tnx.loadingInstance = ElLoading.service(options);
+                this._handleZIndex('.el-loading-mask');
+                this.app.eventBus.emit('tnx.showLoading', options);
+            } catch (e) {
+                window.tnx.loadingInstance = null;
+                console.error(e);
+            }
             return window.tnx.loadingInstance;
         },
         closeLoading() {

package/src/tnxvue.js

@@ -45,11 +45,22 @@ export default build('tnxvue', () => {
          * @param handler 处理函数
          */
         deepWatch(vm, target, handler) {
-            vm.$watch(() => JSON.stringify(target), (newValue, oldValue) => {
-                if (newValue !== oldValue) {
-                    const newObject = JSON.parse(newValue);
-                    const oldObject = JSON.parse(oldValue);
-                    this.deepCompare(newObject, oldObject, '', handler);
+            vm.$watch(() => {
+                try {
+                    return JSON.stringify(target);
+                } catch (e) {
+                    console.error(e);
+                }
+                return undefined;
+            }, (newValue, oldValue) => {
+                try {
+                    if (newValue !== oldValue) {
+                        const newObject = JSON.parse(newValue);
+                        const oldObject = JSON.parse(oldValue);
+                        this.deepCompare(newObject, oldObject, '', handler);
+                    }
+                } catch (e) {
+                    console.error(e);
                 }
             }, {deep: true});
         },
@@ -85,7 +96,7 @@ export default build('tnxvue', () => {
                 vm.config.globalProperties.$router = window.tnx.router.instance;
             }
             // vm.config.unwrapInjectedRef = true;
-            window.tnx.app.eventBus = mitt();
+            window.tnx.app.eventBus = window.tnx.app.eventBus || mitt();
             window.tnx.app.eventBus.once = function (name, handler) {
                 this.all.set(name, [handler]);
             }