bri-components 1.2.92 → 1.2.94

package/package.json

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

package/src/components/controls/special/DshBack.vue

@@ -21,15 +21,15 @@
             return {};
         },
         computed: {
-            modForm () {
-                return this.propsObj.modForm;
+            modFormList () {
+                return this.propsObj.modForm || [];
             }
         },
         created () {},
         methods: {
             // 字段 -点击返回
             clickBack (operationItem, formItem, formIndex) {
-                this.$emit("changeField", this.modForm.find(formItem => formItem._key === this.value[this.propsObj._key]), null, null);
+                this.$emit("changeField", this.modFormList.find(formItem => formItem._key === this.value[this.controlKey]), null, null);
             }
         }
     };

package/src/components/form/DshDefaultSearch.vue

@@ -168,16 +168,7 @@
                     onDftSearch: true,
                     _line: true,
                     _useColor: false,
-                    _optionKind: "dropdown",
-
-                    ...(
-                        // date、daterange类型的(formItem._type基本不会为daterange)
-                        ["date", "daterange"].includes(formItem._type)
-                            ? {
-                                _useShortcuts: false
-                            }
-                                : {}
-                    )
+                    _optionKind: "dropdown"
                 };
             }
         }

package/src/components/form/searchMixin.js

@@ -148,10 +148,12 @@ export default {
             }
         },
         // 发生改动
-        change (operationType, conditionItem, subAdvSearchObj) {
+        change (operationType, conditionItem, ...params) {
             if (operationType === "loopSearch") {
+                const subAdvSearchObj = params[0];
                 Object.assign(conditionItem, subAdvSearchObj);
             } else if (operationType === "subSearch") {
+                const subAdvSearchObj = params[0];
                 Object.assign(conditionItem.fieldSearch, subAdvSearchObj);
             }
 
@@ -339,7 +341,7 @@ export default {
                                             : item[key]
                                 )
                                 : item[key]
-                    }), {})
+                        }), {})
                 );
             };
 

package/src/components/list/DshBox/DshBox.vue

@@ -173,6 +173,13 @@
             changePageSize (...params) {
                 this.$emit("changePageSize", ...params);
             }
+        },
+        watch: {
+            "listPropsObj.checkboxOption.selectedRowKeys" (newVal) {
+                if (!newVal.length && this.$refs.list.selections) {
+                    this.$refs.list.selections = [];
+                }
+            }
         }
     };
 </script>