bri-components 1.4.50 → 1.4.52

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.50",
+    "version": "1.4.52",
     "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/cascaderTableMixin.js

@@ -0,0 +1,130 @@
+import controlMixin from "./controlMixin.js";
+import DshCascaderTable from "../../list/DshCascaderTable.vue";
+import DshTreeTable from "../../list/DshTreeTable.vue";
+
+export default {
+    mixins: [
+        controlMixin
+    ],
+    components: {
+        DshCascaderTable,
+        DshTreeTable
+    },
+    props: {},
+    data () {
+        return {};
+    },
+    computed: {
+        selfPropsObj () {
+            return {
+                _subType: "default", // "default", "cross", "old"
+                _subForm: [],
+                _treeForm: [],
+                _searchList: [], // 作为搜索的字段
+                _tableAdvSearch: {
+                    logic: "and",
+                    conditions: []
+                },
+                ...this.propsObj
+            };
+        },
+        defaultPropsObj () {
+            return {
+                ...this.selfPropsObj,
+                _tableAdvSearch: {
+                    logic: "and",
+                    conditions: []
+                }
+            };
+        },
+        subType () {
+            return this.selfPropsObj._subType;
+        },
+        subForm () {
+            return this.selfPropsObj._subForm;
+        },
+        // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
+        treeForm () {
+            return this.curVal && this.curVal._treeForm
+                ? this.curVal._treeForm
+                : this.selfPropsObj._treeForm;
+        },
+
+        searchList () {
+            return this.selfPropsObj._searchList;
+        },
+        searchListMap () {
+            return this.$arrToMap(this.searchList, "_key");
+        },
+        searchListFields () {
+            return this.searchList.map(searchItem => searchItem._key);
+        },
+        tableAdvSearch () {
+            return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.value);
+        },
+        dftAdvSearch () {
+            return {
+                logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
+                conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
+                    this.searchListFields.includes(conditionItem.fieldKey)
+                )
+            };
+        },
+        // 配置的默认筛选值里 隐藏的看不到的筛选条件
+        hideAdvSearch () {
+            return {
+                logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
+                conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
+                    !this.searchListFields.includes(conditionItem.fieldKey)
+                )
+            };
+        },
+        // 过滤行数据的 最终的筛选条件
+        finalTableAdvSearch () {
+            return {
+                logic: "and",
+                conditions: [
+                    this.hideAdvSearch,
+                    this.dftAdvSearch
+                ]
+            };
+        },
+        isSearching () {
+            return this.$isAdvSearching(this.finalTableAdvSearch);
+        },
+
+        curVal () {
+            return this.value[this.controlKey] || {
+                tree: []
+            };
+        },
+        showVal () {
+            return `${this.curVal
+                ? this.$getTreeFlatArr(this.curVal.tree, (row) =>
+                    (
+                        this.subType === "old"
+                            ? row.isLeaf === true
+                            : true
+                    ) && (
+                        this.isSearching
+                            ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
+                            : true
+                    )
+                ).length
+                : 0
+            } 行`;
+        }
+    },
+    created () { },
+    methods: {
+        // 校验方法 -供外部使用
+        validate () {
+            return this.$refs.table.validate();
+        },
+
+        // 发生变动
+        change (...params) {
+            this.$emit("change", ...params);
+        }
+    }
+};

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/controls/senior/cascaderTable.vue

@@ -66,6 +66,7 @@
             </dsh-modal>
         </template>
 
+        <!-- 编辑 和 查看-表单内 -->
         <template v-else>
             <!-- 配置端 设置默认值用-->
             <dsh-btn-modal v-if="controlKey === '_default'">
@@ -149,139 +150,24 @@
 </template>
 
 <script>
-    import controlMixin from "../mixins/controlMixin.js";
-    import DshCascaderTable from "../../list/DshCascaderTable.vue";
-    import DshTreeTable from "../../list/DshTreeTable.vue";
+    import cascaderTableMixin from "../mixins/cascaderTableMixin.js";
     import DshBtnModal from "../../small/DshBtnModal.vue";
 
     export default {
         name: "cascaderTable",
         mixins: [
-            controlMixin
+            cascaderTableMixin
         ],
         components: {
-            DshCascaderTable,
-            DshTreeTable,
             DshBtnModal
         },
         props: {},
         data () {
             return {};
         },
-        computed: {
-            selfPropsObj () {
-                return {
-                    _subType: "default", // "default", "cross", "old"
-                    _subForm: [],
-                    _treeForm: [],
-                    _searchList: [], // 作为搜索的字段
-                    _tableAdvSearch: {
-                        logic: "and",
-                        conditions: []
-                    },
-                    ...this.propsObj
-                };
-            },
-            defaultPropsObj () {
-                return {
-                    ...this.selfPropsObj,
-                    _tableAdvSearch: {
-                        logic: "and",
-                        conditions: []
-                    }
-                };
-            },
-            subType () {
-                return this.selfPropsObj._subType;
-            },
-            subForm () {
-                return this.selfPropsObj._subForm;
-            },
-            // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
-            treeForm () {
-                return this.curVal && this.curVal._treeForm
-                    ? this.curVal._treeForm
-                    : this.selfPropsObj._treeForm;
-            },
-
-            searchList () {
-                return this.selfPropsObj._searchList;
-            },
-            searchListMap () {
-                return this.$arrToMap(this.searchList, "_key");
-            },
-            searchListFields () {
-                return this.searchList.map(searchItem => searchItem._key);
-            },
-            tableAdvSearch () {
-                return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.value);
-            },
-            dftAdvSearch () {
-                return {
-                    logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
-                    conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
-                        this.searchListFields.includes(conditionItem.fieldKey)
-                    )
-                };
-            },
-            // 配置的默认筛选值里 隐藏的看不到的筛选条件
-            hideAdvSearch () {
-                return {
-                    logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
-                    conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
-                        !this.searchListFields.includes(conditionItem.fieldKey)
-                    )
-                };
-            },
-            // 过滤行数据的 最终的筛选条件
-            finalTableAdvSearch () {
-                return {
-                    logic: "and",
-                    conditions: [
-                        this.hideAdvSearch,
-                        this.dftAdvSearch
-                    ]
-                };
-            },
-            isSearching () {
-                return this.$isAdvSearching(this.finalTableAdvSearch);
-            },
-
-            curVal () {
-                return this.value[this.controlKey] || {
-                    tree: []
-                };
-            },
-            showVal () {
-                return `${
-                    this.curVal
-                        ? this.$getTreeFlatArr(this.curVal.tree, (row) =>
-                            (
-                                this.subType === "old"
-                                    ? row.isLeaf === true
-                                    : true
-                            ) && (
-                                this.isSearching
-                                    ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
-                                    : true
-                            )
-                        ).length
-                        : 0
-                } 行`;
-            }
-        },
+        computed: {},
         created () {},
-        methods: {
-            // 校验方法 -供外部使用
-            validate () {
-                return this.$refs.table.validate();
-            },
-
-            // 发生变动
-            change (...params) {
-                this.$emit("change", ...params);
-            }
-        }
+        methods: {}
     };
 </script>
 

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: [],