bri-components 1.2.87 → 1.2.89

package/package.json

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

package/src/components/form/DshAdvSearch.vue

@@ -131,7 +131,7 @@
                             <dsh-dropdown
                                 v-if="conditionItem.dynamicList.length"
                                 class="extra-dynamic"
-                                :list="parameterPropsObj._data"
+                                :list="['set'].includes(mode) && ['reference', 'flatTable'].includes(conditionItem.fieldType) ? [] : parameterPropsObj._data"
                                 @click="$dispatchEvent(operationMap.selectParameterType, conditionItem, conditionIndex, value.conditions, $event)"
                             >
                                 <span class="extra-operator-wrap">
@@ -139,6 +139,7 @@
                                         {{ conditionItem.parameterTypeName }}
                                     </span>
                                     <Icon
+                                        v-if="!(['set'].includes(mode) && ['reference', 'flatTable'].includes(conditionItem.fieldType))"
                                         class="extra-operator-icon"
                                         type="ios-arrow-down"
                                     />
@@ -305,20 +306,8 @@
                 );
             }
         },
-        created () {
-            this.init();
-        },
-        methods: {
-            // 初始化
-            init () {
-                this.value.conditions = this.value.conditions.map(conditionItem => {
-                    const newConditionItem = this.createContionFunc(conditionItem, undefined, conditionItem.fieldKey);
-                    this.dealSubSearch(newConditionItem);
-
-                    return newConditionItem;
-                });
-            }
-        }
+        created () {},
+        methods: {}
     };
 </script>
 

package/src/components/form/searchMixin.js

@@ -5,6 +5,12 @@ export default {
         DshFormUnit
     },
     props: {
+        initFields: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
         value: {
             type: Object,
             default () {
@@ -67,8 +73,22 @@ export default {
             return this.$arrToCategoryArr(this.dynamicFormList);
         }
     },
-    created () { },
+    created () {
+        this.init();
+    },
     methods: {
+        // 初始化
+        init () {
+            this.value.conditions = [...this.initFields, ...this.value.conditions].map(conditionItem => {
+                const newConditionItem = typeof conditionItem === "string"
+                    ? this.createContionFunc(undefined, undefined, conditionItem)
+                    : this.createContionFunc(conditionItem, undefined, conditionItem.fieldKey);
+                this.dealSubSearch(newConditionItem);
+
+                return newConditionItem;
+            });
+        },
+
         // 新增筛选条件
         createCondition (operationItem, isLoop, formItem, list) {
             const newConditionItem = this.createContionFunc({ logic: isLoop ? "and" : "field" }, formItem);
@@ -138,21 +158,26 @@ export default {
                 curFormItem = curFormItem || this.canSearchFormList.find(formItem => formItem._key === fieldKey);
 
                 if (curFormItem) {
-                    const fieldData = this.fieldMap[curFormItem._type];
+                    const fieldType = curFormItem._type;
+                    const fieldData = this.fieldMap[fieldType];
 
-                    const dynamicTypes = this.useChainField ? [...new Set([...(fieldData.categoryTypes || []), curFormItem._type])] : [curFormItem._type];
-                    let dynamicList = dynamicTypes.reduce((list, type) => [...list, ...(this.dynamicFieldsMap[type] || [])], []);
+                    const dynamicTypes = this.useChainField ? [...new Set([...(fieldData.categoryTypes || []), fieldType])] : [fieldType];
+                    let dynamicList = dynamicTypes.reduce((list, type) => list.concat(this.dynamicFieldsMap[type] || []), []);
                     dynamicList = this.useChainField
-                        ? ["select", "checkbox", "cascader", "cascaders"].includes(curFormItem._type)
+                        ? ["select", "checkbox", "cascader", "cascaders"].includes(fieldType)
                             ? dynamicList.filter(dynamicItem => dynamicItem._resourceKey === curFormItem._resourceKey)
-                            : ["reference"].includes(curFormItem._type) && !!curFormItem._ref
+                            : ["reference"].includes(fieldType) && !!curFormItem._ref
                                 ? dynamicList.filter(dynamicItem => dynamicItem._ref === curFormItem._ref)
                                 : dynamicList
                         : dynamicList;
-                    const parameterType = initContion.parameterType || ((initContion.fieldParams || []).length || initContion.chainFieldKey ? "dynamicText" : "fixedText");
+                    const parameterType = initContion.parameterType || (
+                        (initContion.fieldParams || []).length || initContion.chainFieldKey || (!!dynamicList.length && ["set"].includes(this.mode) && ["reference", "flatTable"].includes(fieldType))
+                            ? "dynamicText"
+                            : "fixedText"
+                    );
                     const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
 
-                    const operators = fieldData[this.mode === "default" || dynamicList.length ? "operators" : "operatorsSet"] || fieldData.operators || [];
+                    const operators = fieldData[!dynamicList.length && ["set"].includes(this.mode) ? "operatorsSet" : "operators"] || fieldData.operators || [];
                     const fieldOperator = initContion.fieldOperator || (operators[0] || {})._key;
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 
@@ -160,7 +185,7 @@ export default {
                         _id: this.$ObjectID().str,
                         logic: "field",
                         fieldKey: curFormItem._key,
-                        fieldType: curFormItem._type,
+                        fieldType: fieldType,
                         fieldValue: [],
                         fieldOperator: fieldOperator,
                         fieldSearch: {
@@ -246,7 +271,9 @@ export default {
                 if (conditionItem.finished !== true) {
                     this.getModData(conditionItem.formItem, data => {
                         conditionItem.finished = true;
-                        conditionItem.subFormList = data.screens[0].form;
+                        conditionItem.subFormList = (data.screens.find(screenItem =>
+                            this.mode === "set" ? screenItem.screenType === "all" : screenItem._key === conditionItem.formItem._screen
+                        ) || { form: [] }).form;
                     });
                 }
             } else if (conditionItem.fieldOperator === "subTableSearch") {
@@ -262,8 +289,7 @@ export default {
                     name: "schema"
                 },
                 params: {
-                    _key: obj._ref,
-                    fields: obj._refFields
+                    _key: obj._ref
                 },
                 callback: data => {
                     cb(data);
@@ -294,7 +320,7 @@ export default {
                                             : item[key]
                                 )
                                 : item[key]
-                        }), {})
+                    }), {})
                 );
             };