bri-components 1.4.58 → 1.4.60

package/package.json

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

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

@@ -150,7 +150,7 @@
                     shortcuts: this.getShortCuts(index),
                     disabledDate: (date) => {
                         const curDateStr = this.$transformDate(date, "/", this.subType);
-                        const rangeBool = this.getRangeCompareBool(curDateStr);
+                        const rangeBool = this.$isWithinRange(curDateStr, this.minDate, this.maxDate, this.subType);
 
                         const selfValue = {
                             ...this.value,

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

@@ -91,7 +91,6 @@
             selfPropsObj () {
                 return {
                     // _icon: "ios-calendar-outline",
-                    _transferClassName: "DshDaterange-dropdown",
 
                     ...this.basePropsObj
                 };
@@ -137,7 +136,7 @@
                     shortcuts: this.getShortCuts(index),
                     disabledDate: (date) => {
                         const curDateStr = this.$transformDate(date, "/", this.subType);
-                        const rangeBool = this.getRangeCompareBool(curDateStr);
+                        const rangeBool = this.$isWithinRange(curDateStr, this.minDate, this.maxDate, this.subType);
 
                         return !rangeBool;
                     }
@@ -167,12 +166,3 @@
         }
     }
 </style>
-<style lang="less">
-    .DshDaterange {
-        &-dropdown {
-            .ivu-picker-panel-sidebar {
-                width: 100px;
-            }
-        }
-    }
-</style>

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

@@ -1,5 +1,5 @@
 import controlMixin from "./controlMixin.js";
-import { dynDateData } from "../../../data/index.js";
+import { dynDateData } from "bri-datas";
 
 export default {
     mixins: [
@@ -127,16 +127,6 @@ export default {
                         }
                     }))
                 : [];
-        },
-        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"].includes(this.selfPropsObj._maxDate) ? "lt" : "ltAet");
         }
     }
 };

package/src/styles/reset-iview-controls.less

@@ -137,4 +137,10 @@
             height: auto;
         }
     }
+}
+
+.ivu-date-picker-transfer {
+    .ivu-picker-panel-sidebar {
+        width: 100px;
+    }
 }