bri-components 1.4.57 → 1.4.59

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.57",
+    "version": "1.4.59",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.2.31",
+        "bri-datas": "^1.2.34",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

package/src/components/controls/base/DshDate/DshDate.vue

@@ -9,29 +9,51 @@
             <template v-if="['time'].includes(subType)">
                 <TimePicker
                     class="DshDate-edit"
-                    v-model="curValDate"
+                    v-model="curVal"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
                     :disabled="disabled"
                     :clearable="clearable"
                     :transfer="selfPropsObj._transfer"
-                    @on-change="change"
                 ></TimePicker>
             </template>
 
             <!-- 日期、日期时间、年、月 -->
             <template v-else>
-                <DatePicker
+                <!-- <DatePicker
                     class="DshDate-edit"
-                    v-model="curValDate"
+                    v-model="curVal"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
                     :disabled="disabled"
                     :clearable="clearable"
                     :options="options"
                     :transfer="selfPropsObj._transfer"
-                    @on-change="change"
-                ></DatePicker>
+                    ></DatePicker> -->
+                <DatePicker
+                    class="DshDate-edit"
+                    :model-value="curVal"
+                    :type="subType"
+                    :disabled="disabled"
+                    :options="options"
+                    :open="open"
+                    :transfer="selfPropsObj._transfer"
+                    :transfer-class-name="selfPropsObj._transferClassName"
+                    @on-change="changeVal($event, '')"
+                    @on-open-change="changeOpen($event, '')"
+                >
+                    <dsh-control-input
+                        :class="{
+                            ...commonClass,
+                            'bri-control-nodata': this.$isEmptyData(this.curVal)
+                        }"
+                        :value="showVal"
+                        :disabled="disabled"
+                        :propsObj="selfPropsObj"
+                        @clear="clickClear('', '')"
+                        @click.native="changeOpen(true, '')"
+                    ></dsh-control-input>
+                </DatePicker>
             </template>
         </template>
     </div>
@@ -89,71 +111,82 @@
 </template>
 
 <script>
-    import controlMixin from "../../mixins/controlMixin.js";
+    import dateMixin from "../../mixins/dateMixin.js";
     import DshDaterange from "./DshDaterange.vue";
 
     export default {
         name: "DshDate",
         mixins: [
-            controlMixin
+            dateMixin
         ],
         components: {
             DshDaterange
         },
         props: {},
         data () {
-            return {};
+            return {
+                open: false
+            };
         },
         computed: {
             selfPropsObj () {
                 return {
                     _writeSort: undefined, // 表格里字段的 该列上下行汇总限制顺序 "downToUp", "upToDown"
                     _compareOperator: "gt", // 表格里字段的 该列上下行的对比条件 "gt", "lt", "et", "gtAet", "ltAet",
-                    _transfer: true,
+                    _transferClassName: undefined,
 
-                    ...this.propsObj,
-                    ...this.commonDealPropsObj
+                    ...this.basePropsObj
                 };
             },
-            subType () {
-                return this.selfPropsObj._dateType; // 5种，"date", "datetime", "year", "month", "time"
-            },
+
             options () {
+                const index = this.dynDateType === "start"
+                    ? 0
+                    : this.dynDateType === "end"
+                        ? 1
+                        : undefined;
+
                 return {
-                    shortcuts: [],
+                    shortcuts: this.getShortCuts(index),
                     disabledDate: (date) => {
+                        const curDateStr = this.$transformDate(date, "/", this.subType);
+                        const rangeBool = this.getRangeCompareBool(curDateStr);
+
                         const selfValue = {
                             ...this.value,
-                            [this.controlKey]: this.$transformDate(date, "/", this.subType)
+                            [this.controlKey]: curDateStr
                         };
-
                         // 日期字段的平级对比
                         const compareBool = this.$normalComparedFunc(this.selfPropsObj, selfValue, this.allFormList, this.parentObj, this.parentFormList, this.inTableType);
                         // 层级表格里-日期字段的上下级对比
                         const caluBool = this.$levelComparedFunc(this.selfPropsObj, selfValue, this.allListRows, this.inTableType, undefined, true);
 
-                        return !compareBool || !caluBool;
+                        return !(rangeBool && compareBool && caluBool);
                     }
                 };
             },
 
-            curValDate: {
+            curVal: {
                 get () {
-                    const val = this.value[this.controlKey];
-                    return this.$transformDateCompatible(val, this.subType);
+                    return this.getVal(this.value[this.controlKey]);
                 },
                 set (val) {
-                    this.$set(this.value, this.controlKey, this.$transformDate(val, "-", this.subType));
+                    this.$set(this.value, this.controlKey, this.transformVal(val));
+                    this.change();
                 }
             },
             showVal () {
-                return this.$isEmptyData(this.curVal)
-                    ? this.emptyShowVal
-                    : this.$transformDate(this.curVal, "-", this.subType);
+                return this.getShowVal(this.curVal);
             }
         },
         created () {},
-        methods: {}
+        methods: {
+            // 点击快捷日期
+            clickDynDate (val) {
+                this.curVal = val;
+                this.open = false;
+            }
+        }
     };
 </script>
 

package/src/components/controls/base/DshDate/DshDaterange.vue

@@ -8,7 +8,7 @@
                 :placeholder="selfPropsObj._placeholder"
                 type="timerange"
                 :disabled="disabled"
-                :transfer="true"
+                :transfer="selfPropsObj._transfer"
                 :transfer-class-name="selfPropsObj._transferClassName"
                 @on-change="change"
             ></TimePicker>
@@ -18,13 +18,12 @@
         <template v-else-if="['date', 'datetime', 'year', 'month'].includes(subType)">
             <DatePicker
                 class="DshDaterange-left"
-                :model-value="val0"
-                :placeholder="selfPropsObj._placeholder"
+                :model-value="curVal0"
                 :type="subType"
                 :disabled="disabled"
                 :options="options0"
                 :open="open0"
-                :transfer="true"
+                :transfer="selfPropsObj._transfer"
                 :transfer-class-name="selfPropsObj._transferClassName"
                 @on-change="changeVal($event, 0)"
                 @on-open-change="changeOpen($event, 0)"
@@ -32,7 +31,7 @@
                 <dsh-control-input
                     :class="{
                         ...commonClass,
-                        'bri-control-nodata': this.$isEmptyData(this.showVal0)
+                        'bri-control-nodata': this.$isEmptyData(this.curVal0)
                     }"
                     :value="showVal0"
                     :disabled="disabled"
@@ -46,13 +45,12 @@
 
             <DatePicker
                 class="DshDaterange-right"
-                :model-value="val1"
-                :placeholder="selfPropsObj._placeholder"
+                :model-value="curVal1"
                 :type="subType"
                 :disabled="disabled"
                 :options="options1"
                 :open="open1"
-                :transfer="true"
+                :transfer="selfPropsObj._transfer"
                 :transfer-class-name="selfPropsObj._transferClassName"
                 @on-change="changeVal($event, 1)"
                 @on-open-change="changeOpen($event, 1)"
@@ -60,7 +58,7 @@
                 <dsh-control-input
                     :class="{
                         ...commonClass,
-                        'bri-control-nodata': this.$isEmptyData(this.showVal1)
+                        'bri-control-nodata': this.$isEmptyData(this.curVal1)
                     }"
                     :value="showVal1"
                     :disabled="disabled"
@@ -74,14 +72,14 @@
 </template>
 
 <script>
-    import controlMixin from "../../mixins/controlMixin.js";
-    import { dateDynSearchs } from "../../../../data/index.js";
+    import dateMixin from "../../mixins/dateMixin.js";
 
     export default {
         name: "DshDaterange",
         mixins: [
-            controlMixin
+            dateMixin
         ],
+        components: {},
         props: {},
         data () {
             return {
@@ -92,31 +90,13 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _icon: "ios-calendar-outline",
-                    _useShortcuts: true, // 是否使用动态筛选
-                    _dynSearchKeys: [], // 动态筛选条件列表
+                    // _icon: "ios-calendar-outline",
                     _transferClassName: "DshDaterange-dropdown",
 
-                    ...this.propsObj,
-                    ...this.commonDealPropsObj
+                    ...this.basePropsObj
                 };
             },
-            subType () {
-                return this.selfPropsObj._dateType; // 5种，"date", "datetime", "year", "month", "time"
-            },
-            useShortcuts () {
-                return this.selfPropsObj._useShortcuts;
-            },
-            dynSearchKeys () {
-                return this.selfPropsObj._dynSearchKeys;
-            },
-            dynSearchList () {
-                return this.dynSearchKeys.length
-                    ? this.dynSearchKeys.map(dynSearchKey =>
-                        dateDynSearchs.find(dynSearchItem => dynSearchItem._key === dynSearchKey) || { _key: dynSearchKey }
-                    )
-                    : dateDynSearchs;
-            },
+
             options0 () {
                 return this.getOptions(0);
             },
@@ -124,97 +104,44 @@
                 return this.getOptions(1);
             },
 
-            val0: {
+            curVal0: {
                 get () {
-                    return this.getVal(0);
+                    return this.getVal(this.value[this.controlKey][0]);
                 },
                 set (val) {
-                    this.setVal(val, 0);
+                    this.$set(this.value, this.controlKey, [this.transformVal(val), this.value[this.controlKey][1] || ""]);
+                    this.change();
                 }
             },
-            val1: {
+            curVal1: {
                 get () {
-                    return this.getVal(1);
+                    return this.getVal(this.value[this.controlKey][1]);
                 },
                 set (val) {
-                    this.setVal(val, 1);
+                    this.$set(this.value, this.controlKey, [this.value[this.controlKey][0] || "", this.transformVal(val)]);
+                    this.change();
                 }
             },
             showVal0 () {
-                return this.getShowVal(this.val0);
+                return this.getShowVal(this.curVal0);
             },
             showVal1 () {
-                return this.getShowVal(this.val1);
+                return this.getShowVal(this.curVal1);
             }
         },
         created () {},
         methods: {
-            // 点击快捷日期
-            clickDynDate (val, index) {
-                this[`val${index}`] = val;
-                this.changeOpen(false, index);
-            },
-            // 点击清空
-            clickClear (val, index) {
-                this[`val${index}`] = val;
-                this.changeOpen(false, index);
-            },
-            // 日期值变化回调
-            changeVal (val, index) {
-                this[`val${index}`] = val;
-                this.subType !== "datetime" && this.changeOpen(false, index);
-            },
-            changeOpen (bool, index) {
-                this[`open${index}`] = bool;
-            },
-
             /* -------- 方法 ------- */
-            getVal (index) {
-                const val = this.value[this.controlKey][index];
-
-                return this.isDynSearch(val)
-                    ? val
-                    : this.$transformDateCompatible(val, this.subType);
-            },
-            setVal (val, index) {
-                const newVal = this.isDynSearch(val) ? val : this.$transformDate(val, "-", this.subType);
-                this.value[this.controlKey] = index === 0
-                    ? [newVal, this.value[this.controlKey][1] || ""]
-                    : [this.value[this.controlKey][0] || "", newVal];
-
-                this.change();
-            },
             getOptions (index) {
-                const compareDateStr = this[`val${index === 0 ? 1 : 0}`];
-                const compareOperator = index === 0 ? "ltAet" : "gtAet";
-
                 return {
-                    shortcuts: this.useShortcuts
-                        ? this.dynSearchList
-                            .filter(dynItem => dynItem.numbers.includes(index) && dynItem.dateTypes.includes(this.subType))
-                            .map(dynItem => ({
-                                text: dynItem.name,
-                                onClick: () => this.clickDynDate(dynItem._key, index)
-                            }))
-                        : [],
+                    shortcuts: this.getShortCuts(index),
                     disabledDate: (date) => {
                         const curDateStr = this.$transformDate(date, "/", this.subType);
+                        const rangeBool = this.getRangeCompareBool(curDateStr);
 
-                        return compareDateStr
-                            ? this.isDynSearch(compareDateStr)
-                                ? true
-                                : !this.$isComparedAccord(curDateStr, compareDateStr, compareOperator, "date", this.subType, this.subType)
-                            : false;
+                        return !rangeBool;
                     }
                 };
-            },
-            getShowVal (val) {
-                return this.isDynSearch(val)
-                    ? (this.dynSearchList.find(dynItem => dynItem._key === val) || { name: `"${val}"动态条件不存在` }).name
-                    : this.$transformDate(val, "-", this.subType);
-            },
-            isDynSearch (dynKey) {
-                return this.dynSearchList.some(dynItem => dynItem._key === dynKey);
             }
         }
     };

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

@@ -0,0 +1,142 @@
+import controlMixin from "./controlMixin.js";
+import { dynDateData } from "../../../data/index.js";
+
+export default {
+    mixins: [
+        controlMixin
+    ],
+    components: {},
+    props: {},
+    data () {
+        return {};
+    },
+    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.isInSearch
+                ? true
+                : this.selfPropsObj._useDynDate;
+        },
+        dynDateType () {
+            return this.selfPropsObj._dynDateType;
+        },
+        dynDateKeys () {
+            return this.isInSearch
+                ? 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));
+        },
+
+        minDate () {
+            const date = this.selfPropsObj._minDate;
+            return this.isDynDate(date)
+                ? this.$transformDynToNormalDate(date, "-", this.subType)
+                : date;
+        },
+        maxDate () {
+            const date = this.selfPropsObj._maxDate;
+            return this.isDynDate(date)
+                ? this.$transformDynToNormalDate(date, "-", this.subType)
+                : date;
+        }
+    },
+    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) {
+            this[`open${index}`] = bool;
+        },
+
+        /* -------- 方法 ------- */
+        getVal (val) {
+            return this.isDynDate(val)
+                ? val
+                : this.$transformDateCompatible(val, this.subType);
+        },
+        transformVal (val) {
+            return this.isDynDate(val)
+                ? val
+                : this.$transformDate(val, "-", this.subType);
+        },
+        getShowVal (val) {
+            return this.isDynDate(val)
+                ? (this.dynDateList.find(dynDateItem => dynDateItem._key === val) || { name: `"${val}"动态时间不存在` }).name
+                : this.$transformDate(val, "-", this.subType);
+        },
+        isDynDate (val) {
+            return val && typeof val === "string" && (
+                this.dynDateList.some(dynDateItem => dynDateItem._key === val) ||
+                ["dyn", "year", "month", "days", "start", "end"].some(str => val.includes(str))
+            );
+        },
+
+        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);
+                        }
+                    }))
+                : [];
+        },
+        getRangeCompareBool (curDateStr) {
+            const compareFunc = (curDateStr, compareDateStr, compareOperator) => {
+                return curDateStr && compareDateStr
+                    ? this.$isComparedAccord(curDateStr, compareDateStr, compareOperator, "date", this.subType, this.subType)
+                    : true;
+            };
+
+            return compareFunc(curDateStr, this.minDate, "gtAet") &&
+                compareFunc(curDateStr, this.maxDate, ["last_month_end", "dyn_month_end", "dyn_nextmonth_end", "dyn_quarter_end", "dyn_year_end", "dyn_nextyear_end"].includes(this.selfPropsObj._maxDate) ? "lt" : "ltAet");
+        }
+    }
+};

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

@@ -24,8 +24,8 @@ export default {
 
                 _round: "decimal", // 取值方式 "decimal", "round", "normal"
                 _digit: "2", // 保留小数位数 "1", "2", "3", "4"
-                _max: null, // 最大值
                 _min: null, // 最小值
+                _max: null, // 最大值
 
                 ...this.propsObj,
                 ...this.commonDealPropsObj

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

@@ -32,10 +32,10 @@ export default {
                 ...this.commonDealPropsObj
             };
         },
+
         showMode () {
             return this.selfPropsObj._optionKind;
         },
-
         saveKey () {
             return this.selfPropsObj._saveKey;
         },

package/src/data/index.js

@@ -1,9 +1,9 @@
 import {
     resourceData, regionData, benjiRegionData, userIndustryData,
-    dateDynSearchs
+    dynDateData
 } from "bri-datas";
 
 export {
     resourceData, regionData, benjiRegionData, userIndustryData,
-    dateDynSearchs
+    dynDateData
 };