bri-components 1.4.29 → 1.4.31

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.29",
+    "version": "1.4.31",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/list/mixins/tableBaseMixin.js

@@ -985,7 +985,11 @@ export default {
                 this.parentObj[this.controlKey] = dataObj;
             }
 
-            this.change("import");
+            // 因为data和rowspanMap不马上更新
+            this.$nextTick(() => {
+                this.reset();
+                this.change("import");
+            });
         },
 
         /* ----------- 导出 ---------- */
@@ -1131,7 +1135,7 @@ export default {
                             e.stopPropagation();
                         }
                     }
-                });
+            });
         },
         topSearchRender (h) {
             return this.searchFormList.length
@@ -1421,7 +1425,7 @@ export default {
         getRowDelBtnCanEdit (row, rowIndex) {
             return row.__readonly__ !== true && // 不能为只读数据
                 (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-                (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {

package/src/components/small/DshTabs.vue

@@ -85,7 +85,7 @@
                 },
                 set (tabKey) {
                     // iview的组件有问题，重复点击tab的某一项，set函数还是会触发！
-                    if (tabKey !== this.tmpTabKey) {
+                    if (tabKey !== this.curTabKey) {
                         this.init(tabKey);
 
                         this.$emit("input", tabKey);
@@ -93,6 +93,7 @@
                     }
                 }
             },
+
             rightTabList () {
                 return this.list.filter(item => item.slot === "extra");
             }
@@ -103,7 +104,6 @@
         mounted () {},
         methods: {
             init (tabKey) {
-                this.tmpTabKey = tabKey;
                 this.$set(this.renderStatusMap, tabKey, true);
             },