bri-components 1.4.59 → 1.4.61

package/package.json

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

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

@@ -20,16 +20,6 @@
 
             <!-- 日期、日期时间、年、月 -->
             <template v-else>
-                <!-- <DatePicker
-                    class="DshDate-edit"
-                    v-model="curVal"
-                    :type="subType"
-                    :placeholder="selfPropsObj._placeholder"
-                    :disabled="disabled"
-                    :clearable="clearable"
-                    :options="options"
-                    :transfer="selfPropsObj._transfer"
-                    ></DatePicker> -->
                 <DatePicker
                     class="DshDate-edit"
                     :model-value="curVal"
@@ -150,7 +140,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", "dyn_quarter_end", "dyn_year_end", "dyn_nextyear_end"].includes(this.selfPropsObj._maxDate) ? "lt" : "ltAet");
         }
     }
 };

package/src/components/list/mixins/tableBaseMixin.js

@@ -234,6 +234,9 @@ export default {
         allScreenKey () {
             return this.propsObj.allScreenKey;
         },
+        flowInstId () {
+            return this.propsObj.flowInstId;
+        },
 
         commonPropsObj () {
             return {
@@ -689,6 +692,7 @@ export default {
                 screenKey: this.screenKey,
                 _id: this.parentDataId,
                 _key: this.controlKey,
+                flowinst: this.flowInstId,
                 advSearch: this.finalTableAdvSearch
             };
         },

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

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