bri-components 1.4.51 → 1.4.52

package/package.json

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

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/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>