bri-components 1.2.91 → 1.2.93

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.91",
+    "version": "1.2.93",
     "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/DshAdvSearch.vue

@@ -30,7 +30,7 @@
                             :formList="canSearchFormList"
                             :useChainField="useChainField"
                             :dynamicFormList="dynamicFormList"
-                            @change="change('loopControl', conditionItem, ...arguments)"
+                            @change="change('loopSearch', conditionItem, ...arguments)"
                         >
                             <slot
                                 slot-scope="{ conditionItem }"
@@ -72,6 +72,7 @@
                                 <template v-else-if="['subSearch', 'subTableSearch'].includes(conditionItem.fieldOperator)">
                                     <dsh-adv-search
                                         v-if="conditionItem.finished === true"
+                                        style="padding: 0px 0px 0px 8px;"
                                         :mode="mode"
                                         :isInner="true"
                                         :value="conditionItem.fieldSearch"
@@ -324,7 +325,7 @@
         }
 
         &-logic {
-            margin: 5px 0px 10px;
+            margin: 0px 0px 10px;
             .dsh-flex-row-start-center();
 
             &-title {
@@ -369,7 +370,7 @@
 
             &-item {
                 padding: 0!important;
-                margin-bottom: 10px!important;
+                margin-bottom: 8px!important;
                 cursor: pointer;
 
                 &-loading {

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,7 +148,15 @@ export default {
             }
         },
         // 发生改动
-        change (operationType, conditionItem) {
+        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);
+            }
+
             const advSearchObj = {
                 ...this.advSearchObj,
                 conditions: this.transformConditions(this.advSearchObj.conditions)
@@ -213,6 +221,7 @@ export default {
                     };
                 } else {
                     return {
+                        _id: this.$ObjectID().str,
                         ...initContion,
                         __isDelete__: true, // 前端用它标识对应字段已被删除的筛选项
                         formItem: {
@@ -222,24 +231,30 @@ export default {
                 }
             } else if (["and", "or"].includes(initContion.logic)) {
                 return {
+                    _id: this.$ObjectID().str,
                     logic: "and",
                     conditions: [],
                     ...initContion
                 };
             } else if (["text"].includes(initContion.logic)) {
                 return {
+                    _id: this.$ObjectID().str,
                     logic: "text",
                     textSearch: "",
                     ...initContion
                 };
             } else if (["native"].includes(initContion.logic)) {
                 return {
+                    _id: this.$ObjectID().str,
                     logic: "native",
                     nativeSearch: {},
                     ...initContion
                 };
             } else {
-                return initContion;
+                return {
+                    _id: this.$ObjectID().str,
+                    ...initContion
+                };
             }
         },
         // 获取表单配置
@@ -326,7 +341,7 @@ export default {
                                             : item[key]
                                 )
                                 : item[key]
-                    }), {})
+                        }), {})
                 );
             };