bri-components 1.4.50 → 1.4.51

package/package.json

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

package/src/components/controls/mixins/cascaderMixin.js

@@ -1,5 +1,5 @@
 import controlMixin from "./controlMixin.js";
-import { resourceData, regionData, benjiRegionData, userIndustryData } from "../../../data/index.js";
+import { resourceData, regionData, benjiRegionData, userIndustryData } from "bri-datas";
 
 export default {
     mixins: [

package/src/components/controls/mixins/selectMixin.js

@@ -1,5 +1,5 @@
 import controlMixin from "./controlMixin.js";
-import { resourceData } from "../../../data/index.js";
+import { resourceData } from "bri-datas";
 
 export default {
     mixins: [

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

@@ -321,7 +321,7 @@ export default {
             });
         },
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            if (this.isUseQuickChange({ row, rowIndex, column })) {
+            if (["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
                 this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
                 this.dealSameRowsVal({ row, rowIndex, column });
 
@@ -329,7 +329,7 @@ export default {
             }
         },
         changeVal (operationItem, row, rowIndex, column, params) {
-            if (!this.isUseQuickChange({ row, rowIndex, column })) {
+            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
                 this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
                 this.dealSameRowsVal({ row, rowIndex, column });
 
@@ -385,19 +385,22 @@ export default {
 
             return rowspan;
         },
-        // 是都满足使用quickChange
-        isUseQuickChange ({ row, rowIndex, column }) {
-            return ["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type) &&
-                this.mergeRowColKeys.includes(column._key) &&
-                this.rowspanMap[this.getMixKey(row, column)] > 1;
-        },
+        // // 是都满足使用quickChange
+        // isUseQuickChange ({ row, rowIndex, column }) {
+        //     return ["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type) &&
+        //         this.mergeRowColKeys.includes(column._key) &&
+        //         this.rowspanMap[this.getMixKey(row, column)] > 1;
+        // },
         // 合并单元格的行，某列的值全部跟着修改
         dealSameRowsVal ({ row, rowIndex, column }, list = this.allListData) {
-            const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
-            list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
-                .forEach(rowItem => {
-                    rowItem[column._key] = this.$deepCopy(row[column._key]);
-            });
+            if (this.mergeRowColKeys.includes(column._key) && this.rowspanMap[this.getMixKey(row, column)] > 1) {
+                const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
+                list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
+                    .forEach(rowItem => {
+                        console.log(rowItem[column._key]);
+                        rowItem[column._key] = this.$deepCopy(row[column._key]);
+                });
+            }
         }
     }
 };

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

@@ -856,12 +856,17 @@ export default {
         },
         // 输入框值改变立即
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            // 啥也不做，平级表格合并单元格时用这个方法
+            if (["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.change("quickChangeVal", row, rowIndex, column, ...params);
+            }
         },
         // 输入框值改变
         changeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            this.change("changeVal", row, rowIndex, column, ...params);
+            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.change("changeVal", row, rowIndex, column, ...params);
+            }
         },
         change (eventType, row, rowIndex, column, ...params) {
             this.$emit("change", this.tableDataObj, eventType, column, row, rowIndex, ...params);

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

@@ -1,4 +1,4 @@
-import { resourceData } from "../../../data/index.js";
+import { resourceData } from "bri-datas";
 
 export default {
     mixins: [],