bri-components 1.5.22 → 1.6.1

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

@@ -1,149 +1,149 @@
-import controlMixin from "./controlMixin.js";
-import { dynDateData } from "bri-datas";
-
-export default {
-    mixins: [
-        controlMixin
-    ],
-    components: {},
-    props: {},
-    data () {
-        return {
-            open: false,
-            open0: false,
-            open1: false
-        };
-    },
-    computed: {
-        basePropsObj () {
-            return {
-                _dateType: "date", // 子类型5种，"date", "datetime", "year", "month", "time"
-
-                _useDynDate: false, // 使用动态时间
-                _dynDateType: undefined, // 使用什么类型的动态时间，"start"，"end"
-                _dynDateKeys: [], // 仅使用一些指定的动态时间
-                _dynSearchKeys: [], // 筛选时-仅使用一些指定的动态时间
-
-                _minDate: undefined, // 最小日期
-                _maxDate: undefined, // 最大日期
-                _transfer: true,
-
-                ...this.propsObj,
-                ...this.commonDealPropsObj
-            };
-        },
-
-        subType () {
-            return this.selfPropsObj._dateType;
-        },
-        useDynDate () {
-            return this.isInAnySearch
-                ? true
-                : this.selfPropsObj._useDynDate;
-        },
-        dynDateType () {
-            return this.selfPropsObj._dynDateType;
-        },
-        dynDateKeys () {
-            return this.isInAnySearch
-                ? this.selfPropsObj._dynSearchKeys
-                : this.selfPropsObj._dynDateKeys;
-        },
-        dynDateList () {
-            return (
-                this.dynDateKeys.length
-                    ? this.dynDateKeys
-                        .map(dynDateKey =>
-                            dynDateData.find(dynDateItem => dynDateItem._key === dynDateKey)
-                        )
-                        .filter(dynDateItem => !!dynDateItem)
-                    : dynDateData
-            ).filter(dynDateItem => dynDateItem.dateTypes.includes(this.subType));
-        },
-
-        curVal0: {
-            get () {
-                return this.getVal(this.value[this.controlKey][0]);
-            },
-            set (val) {
-                this.$set(this.value, this.controlKey, [this.transformVal(val), this.value[this.controlKey][1] || ""]);
-                this.change();
-            }
-        },
-        curVal1: {
-            get () {
-                return this.getVal(this.value[this.controlKey][1]);
-            },
-            set (val) {
-                this.$set(this.value, this.controlKey, [this.value[this.controlKey][0] || "", this.transformVal(val)]);
-                this.change();
-            }
-        },
-        showVal0 () {
-            return this.getShowVal(this.curVal0);
-        },
-        showVal1 () {
-            return this.getShowVal(this.curVal1);
-        },
-        mulShowVal () {
-            return this.$isEmptyData(this.curValList[0]) && this.$isEmptyData(this.curValList[1])
-                ? this.emptyShowVal
-                : `${this.$transformToDateStr(this.curValList[0], "-", this.subType)} - ${this.$transformToDateStr(this.curValList[1], "-", this.subType)}`;
-        }
-    },
-    created () { },
-    methods: {
-        // 点击快捷日期
-        clickDynDate (val, index) {
-            this[`curVal${index}`] = val;
-            this.changeOpen(false, index);
-        },
-        // 点击清空
-        clickClear (val, index) {
-            this[`curVal${index}`] = val;
-            // this.changeOpen(false, index);
-        },
-        // 日期值变化回调
-        changeVal (val, index) {
-            this[`curVal${index}`] = val;
-            this.subType !== "datetime" && this.changeOpen(false, index);
-        },
-        changeOpen (bool, index) {
-            if (!this.disabled) {
-                this[`open${index}`] = bool;
-            }
-        },
-
-        /* -------- 方法 ------- */
-        getVal (val) {
-            return this.$isDynDate(val)
-                ? val
-                : this.$transformToDateObj(val);
-        },
-        transformVal (val) {
-            return this.$isDynDate(val)
-                ? val
-                : this.$transformToDateStr(val, "-", this.subType);
-        },
-        getShowVal (val) {
-            return this.$isDynDate(val)
-                ? (this.dynDateList.find(dynDateItem => dynDateItem._key === val) || { name: `"${val}"动态时间不存在` }).name
-                : this.$transformToDateStr(val, "-", this.subType);
-        },
-
-        getShortCuts (index) {
-            return this.useDynDate
-                ? this.dynDateList
-                    .filter(dynDateItem =>
-                        index || index === 0 ? dynDateItem.numbers.includes(index) : true
-                    )
-                    .map(dynDateItem => ({
-                        text: dynDateItem.name,
-                        onClick: () => {
-                            this.clickDynDate(dynDateItem._key, index);
-                        }
-                    }))
-                : [];
-        }
-    }
-};
+import controlMixin from "./controlMixin.js";
+import { dynDateData } from "bri-datas";
+
+export default {
+    mixins: [
+        controlMixin
+    ],
+    components: {},
+    props: {},
+    data () {
+        return {
+            open: false,
+            open0: false,
+            open1: false
+        };
+    },
+    computed: {
+        basePropsObj () {
+            return {
+                _dateType: "date", // 子类型5种，"date", "datetime", "year", "month", "time"
+
+                _useDynDate: false, // 使用动态时间
+                _dynDateType: undefined, // 使用什么类型的动态时间，"start"，"end"
+                _dynDateKeys: [], // 仅使用一些指定的动态时间
+                _dynSearchKeys: [], // 筛选时-仅使用一些指定的动态时间
+
+                _minDate: undefined, // 最小日期
+                _maxDate: undefined, // 最大日期
+                _transfer: true,
+
+                ...this.propsObj,
+                ...this.commonDealPropsObj
+            };
+        },
+
+        subType () {
+            return this.selfPropsObj._dateType;
+        },
+        useDynDate () {
+            return this.isInAnySearch
+                ? true
+                : this.selfPropsObj._useDynDate;
+        },
+        dynDateType () {
+            return this.selfPropsObj._dynDateType;
+        },
+        dynDateKeys () {
+            return this.isInAnySearch
+                ? this.selfPropsObj._dynSearchKeys
+                : this.selfPropsObj._dynDateKeys;
+        },
+        dynDateList () {
+            return (
+                this.dynDateKeys.length
+                    ? this.dynDateKeys
+                        .map(dynDateKey =>
+                            dynDateData.find(dynDateItem => dynDateItem._key === dynDateKey)
+                        )
+                        .filter(dynDateItem => !!dynDateItem)
+                    : dynDateData
+            ).filter(dynDateItem => dynDateItem.dateTypes.includes(this.subType));
+        },
+
+        curVal0: {
+            get () {
+                return this.getVal(this.value[this.controlKey][0]);
+            },
+            set (val) {
+                this.$set(this.value, this.controlKey, [this.transformVal(val), this.value[this.controlKey][1] || ""]);
+                this.change();
+            }
+        },
+        curVal1: {
+            get () {
+                return this.getVal(this.value[this.controlKey][1]);
+            },
+            set (val) {
+                this.$set(this.value, this.controlKey, [this.value[this.controlKey][0] || "", this.transformVal(val)]);
+                this.change();
+            }
+        },
+        showVal0 () {
+            return this.getShowVal(this.curVal0);
+        },
+        showVal1 () {
+            return this.getShowVal(this.curVal1);
+        },
+        mulShowVal () {
+            return this.$isEmptyData(this.curValList[0]) && this.$isEmptyData(this.curValList[1])
+                ? this.emptyShowVal
+                : `${this.$transformToDateStr(this.curValList[0], "-", this.subType)} - ${this.$transformToDateStr(this.curValList[1], "-", this.subType)}`;
+        }
+    },
+    created () { },
+    methods: {
+        // 点击快捷日期
+        clickDynDate (val, index) {
+            this[`curVal${index}`] = val;
+            this.changeOpen(false, index);
+        },
+        // 点击清空
+        clickClear (val, index) {
+            this[`curVal${index}`] = val;
+            // this.changeOpen(false, index);
+        },
+        // 日期值变化回调
+        changeVal (val, index) {
+            this[`curVal${index}`] = val;
+            this.subType !== "datetime" && this.changeOpen(false, index);
+        },
+        changeOpen (bool, index) {
+            if (!this.disabled) {
+                this[`open${index}`] = bool;
+            }
+        },
+
+        /* -------- 方法 ------- */
+        getVal (val) {
+            return this.$isDynDate(val)
+                ? val
+                : this.$transformToDateObj(val);
+        },
+        transformVal (val) {
+            return this.$isDynDate(val)
+                ? val
+                : this.$transformToDateStr(val, "-", this.subType);
+        },
+        getShowVal (val) {
+            return this.$isDynDate(val)
+                ? (this.dynDateList.find(dynDateItem => dynDateItem._key === val) || { name: `"${val}"动态时间不存在` }).name
+                : this.$transformToDateStr(val, "-", this.subType);
+        },
+
+        getShortCuts (index) {
+            return this.useDynDate
+                ? this.dynDateList
+                    .filter(dynDateItem =>
+                        index || index === 0 ? dynDateItem.numbers.includes(index) : true
+                    )
+                    .map(dynDateItem => ({
+                        text: dynDateItem.name,
+                        onClick: () => {
+                            this.clickDynDate(dynDateItem._key, index);
+                        }
+                    }))
+                : [];
+        }
+    }
+};

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

@@ -1,111 +1,111 @@
-import controlMixin from "./controlMixin.js";
-import DshFlatTable from "../../list/DshFlatTable.vue";
-
-export default {
-    mixins: [
-        controlMixin
-    ],
-    components: {
-        DshFlatTable
-    },
-    props: {},
-    data () {
-        return {};
-    },
-    computed: {
-        selfPropsObj () {
-            return {
-                _subForm: [],
-                _searchList: [], // 作为搜索的字段
-                _tableAdvSearch: {
-                    logic: "and",
-                    conditions: []
-                },
-                ...this.propsObj
-            };
-        },
-        defaultPropsObj () {
-            return {
-                ...this.selfPropsObj,
-                _tableAdvSearch: {
-                    logic: "and",
-                    conditions: []
-                }
-            };
-        },
-        subForm () {
-            return this.selfPropsObj._subForm;
-        },
-
-        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] || {
-                list: []
-            };
-        },
-        showVal () {
-            return `${this.curVal
-                ? this.curVal.list.filter((row) =>
-                    this.isSearching
-                        ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
-                        : true
-                ).length
-                : 0
-            } 行`;
-        }
-    },
-    created () { },
-    methods: {
-        // 校验方法 -供外部使用
-        validate () {
-            return this.$refs.table.validate();
-        },
-
-        // 发生变动
-        change (...params) {
-            this.$emit("change", ...params);
-        }
-    }
-};
+import controlMixin from "./controlMixin.js";
+import DshFlatTable from "../../list/DshFlatTable.vue";
+
+export default {
+    mixins: [
+        controlMixin
+    ],
+    components: {
+        DshFlatTable
+    },
+    props: {},
+    data () {
+        return {};
+    },
+    computed: {
+        selfPropsObj () {
+            return {
+                _subForm: [],
+                _searchList: [], // 作为搜索的字段
+                _tableAdvSearch: {
+                    logic: "and",
+                    conditions: []
+                },
+                ...this.propsObj
+            };
+        },
+        defaultPropsObj () {
+            return {
+                ...this.selfPropsObj,
+                _tableAdvSearch: {
+                    logic: "and",
+                    conditions: []
+                }
+            };
+        },
+        subForm () {
+            return this.selfPropsObj._subForm;
+        },
+
+        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] || {
+                list: []
+            };
+        },
+        showVal () {
+            return `${this.curVal
+                ? this.curVal.list.filter((row) =>
+                    this.isSearching
+                        ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
+                        : true
+                ).length
+                : 0
+            } 行`;
+        }
+    },
+    created () { },
+    methods: {
+        // 校验方法 -供外部使用
+        validate () {
+            return this.$refs.table.validate();
+        },
+
+        // 发生变动
+        change (...params) {
+            this.$emit("change", ...params);
+        }
+    }
+};