bri-components 1.3.17 → 1.3.19

package/package.json

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

package/src/components/controls/controlMap.js

@@ -70,7 +70,7 @@ const pathMap = {
         selectDepartments: "./senior/selectDepartments.vue",
         BriLabels: "./senior/BriLabels.vue",
         DshPackage: "./senior/DshPackage.vue",
-        flatTable: "./senior/flatTable.vue",
+        flatTable: "./senior/flatTable/flatTable.vue",
         cascaderTable: "./senior/cascaderTable"
     },
     special: {

package/src/components/controls/senior/{flatTable.vue → flatTable/flatTable.vue}

@@ -88,9 +88,9 @@
 </template>
 
 <script>
-    import controlMixin from "../mixins/controlMixin.js";
-    import DshBtnModal from "../../small/DshBtnModal.vue";
-    import BriFlatTable from "../../list/BriFlatTable.vue";
+    import controlMixin from "../../mixins/controlMixin.js";
+    import DshBtnModal from "../../../small/DshBtnModal.vue";
+    import BriFlatTable from "../../../list/BriFlatTable.vue";
     import flatTableImportModal from "./flatTableImportModal.vue";
 
     export default {

package/src/components/form/DshAdvSearch.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="DshAdvSearch">
-        <!-- 无可筛选字段 -->
+        <!-- 有可选择字段 -->
         <template v-if="canSearchFormList.length">
-            <!-- 筛选逻辑 -->
+            <!-- 逻辑 -->
             <div class="DshAdvSearch-logic">
-                <div class="DshAdvSearch-logic-title">筛选逻辑</div>
+                <div class="DshAdvSearch-logic-title">{{ logicStr }}</div>
                 <dsh-select
                     class="DshAdvSearch-logic-option"
                     :value="advSearchObj"
@@ -13,8 +13,8 @@
                 ></dsh-select>
             </div>
 
-            <!-- 筛选条件 -->
-            <div class="DshAdvSearch-title">筛选条件</div>
+            <!-- 条件 -->
+            <div class="DshAdvSearch-title">{{ conditionStr }}</div>
             <div class="DshAdvSearch-conditions">
                 <template v-for="(conditionItem, conditionIndex) in advSearchObj.conditions">
                     <!-- 'and', 'or' 循环模式 -->
@@ -90,7 +90,7 @@
 
                                 <!-- 其它条件 -->
                                 <template v-else>
-                                    <!-- 动态文本 -匹配的动态筛选字段 -->
+                                    <!-- 动态文本 -匹配的动态字段 -->
                                     <template v-if="conditionItem.parameterType === 'dynamicText'">
                                         <dsh-select
                                             v-if="useChainField"
@@ -117,7 +117,7 @@
                                         ></dsh-checkbox>
                                     </template>
 
-                                    <!-- 固定文本 -筛选条件对应的显示 -->
+                                    <!-- 固定文本 -->
                                 </template>
                             </slot>
                         </template>
@@ -147,7 +147,7 @@
                                 </span>
                             </dsh-dropdown>
 
-                            <!-- operators 筛选条件 -->
+                            <!-- operators 操作类型 -->
                             <dsh-dropdown
                                 v-if="conditionItem.operators.length"
                                 class="extra-operator"
@@ -195,7 +195,7 @@
 
             <!-- 按钮s -->
             <div class="DshAdvSearch-btns">
-                <!-- 添加筛选项 -->
+                <!-- 添加条件项 -->
                 <dsh-dropdown
                     class="DshAdvSearch-btns-field"
                     menuClass="DshAdvSearch-btns-field-list"
@@ -219,7 +219,7 @@
             </div>
         </template>
 
-        <!-- 无可筛选字段 -->
+        <!-- 无可选择字段 -->
         <div
             v-else
             :class="{
@@ -227,7 +227,7 @@
                 'DshAdvSearch-nodata-small': isInner
             }"
         >
-            当前无可筛选的字段
+            {{ noFormListStr }}
         </div>
     </div>
 </template>
@@ -250,6 +250,10 @@
                     return ["default", "set"].includes(val);
                 }
             },
+            themeWord: {
+                type: String,
+                default: "筛选"
+            },
             useLoop: {
                 type: Boolean,
                 default: true
@@ -261,9 +265,20 @@
         },
         data () {
             return {
+                selfLogicPropsObj: {
+                    _name: `添加${this.themeWord}逻辑`,
+                    _key: "logic",
+                    _optionKind: "flat",
+                    _clearable: false,
+                    _data: [
+                        { _key: "and", name: "且" },
+                        { _key: "or", name: "或" }
+                    ]
+                },
+
                 allOperationMap: {
                     createCondition: {
-                        name: "添加筛选条件",
+                        name: `添加${this.themeWord}条件`,
                         type: "createCondition",
                         icon: "md-add",
                         size: this.isInner ? "small" : "default",
@@ -271,7 +286,7 @@
                         event: "createCondition"
                     },
                     createLoopContion: {
-                        name: "添加筛选层",
+                        name: `添加${this.themeWord === "筛选" ? this.themeWord : "逻辑"}层`,
                         type: "createLoopContion",
                         icon: "md-add",
                         size: this.isInner ? "small" : "default",
@@ -279,19 +294,19 @@
                         event: "createCondition"
                     },
                     deleteCondition: {
-                        name: "删除筛选条件",
+                        name: `删除${this.themeWord}条件`,
                         type: "deleteCondition",
                         customIcon: "bico-delete",
                         size: "16",
                         event: "deleteCondition"
                     },
                     selectOperator: {
-                        name: "选择筛选类型",
+                        name: `选择${this.themeWord}类型`,
                         type: "selectOperator",
                         event: "changeOperator"
                     },
                     selectParameterType: {
-                        name: "选择筛选方式",
+                        name: `选择${this.themeWord}方式`,
                         type: "selectParameterType",
                         event: "changeParameterType"
                     }
@@ -299,6 +314,16 @@
             };
         },
         computed: {
+            logicStr () {
+                return `${this.themeWord}逻辑`;
+            },
+            conditionStr () {
+                return `${this.themeWord}条件`;
+            },
+            noFormListStr () {
+                return "当前无可选择的字段";
+            },
+
             operationMap () {
                 return this.$categoryMapToMap(
                     this.allOperationMap,

package/src/components/form/DshDefaultSearch.vue

@@ -1,6 +1,5 @@
 <template>
     <div class="DshDefaultSearch">
-        <!-- 筛选表单 -->
         <div
             class="DshDefaultSearch-form"
             :style="{
@@ -86,6 +85,8 @@
         },
         data () {
             return {
+                isSimpleSearch: true,
+
                 conditionList: [],
                 isSpreadStatus: false, // 是否展开
 

package/src/components/form/searchMixin.js

@@ -46,16 +46,6 @@ export default {
                 logic: "and",
                 conditions: []
             },
-            selfLogicPropsObj: {
-                _name: "筛选逻辑",
-                _key: "logic",
-                _optionKind: "flat",
-                _clearable: false,
-                _data: [
-                    { _key: "and", name: "且" },
-                    { _key: "or", name: "或" }
-                ]
-            },
             parameterPropsObj: {
                 _name: "参数类型",
                 _key: "parameterType",
@@ -94,7 +84,7 @@ export default {
             });
         },
 
-        // 新增筛选条件
+        // 新增条件项
         createCondition (operationItem, isLoop, formItem, list) {
             const newConditionItem = this.createContionFunc({ logic: isLoop ? "and" : "field" }, formItem);
             this.dealSubSearch(newConditionItem);
@@ -102,7 +92,7 @@ export default {
 
             this.change(operationItem.type, newConditionItem);
         },
-        // 删除筛选条件
+        // 删除条件项
         deleteCondition (operationItem, conditionItem, conditionIndex, list) {
             list.splice(conditionIndex, 1);
 
@@ -118,7 +108,7 @@ export default {
 
             this.change(operationItem.type, conditionItem);
         },
-        // 选择某控件的筛选类型
+        // 选择某控件的操作类型
         changeOperator (operationItem, conditionItem, conditionIndex, list, optionItem) {
             if (optionItem._key !== conditionItem.fieldOperator) {
                 conditionItem.fieldOperator = optionItem._key;
@@ -165,7 +155,7 @@ export default {
         },
 
         /* -------- 方法 ----------- */
-        // 生成筛选条件的值
+        // 生成条件项的值
         createContionFunc (initContion = { logic: "field" }, curFormItem, fieldKey) {
             if (["field", undefined].includes(initContion.logic)) {
                 curFormItem = curFormItem || this.canSearchFormList.find(formItem => formItem._key === fieldKey);
@@ -191,10 +181,12 @@ export default {
                     const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
 
                     const operators = fieldData[!dynamicList.length && ["set"].includes(this.mode) ? "operatorsSet" : "operators"] || fieldData.operators || [];
-                    const fieldOperator = initContion.fieldOperator || (
-                        ["reference"].includes(fieldType) && !["set"].includes(this.mode)
-                            ? "eq"
-                            : (operators[0] || {})._key
+                    const fieldOperator = ["_id"].includes(curFormItem._key)
+                        ? "eq"
+                        : initContion.fieldOperator || (
+                            ["reference"].includes(fieldType) && this.isSimpleSearch
+                                ? "eq"
+                                : (operators[0] || {})._key
                     );
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 
@@ -227,7 +219,7 @@ export default {
                     return {
                         _id: this.$ObjectID().str,
                         ...initContion,
-                        __isDelete__: true, // 前端用它标识对应字段已被删除的筛选项
+                        __isDelete__: true, // 前端用它标识对应字段已被删除的条件项
                         formItem: {
                             __realKey__: initContion.fieldKey
                         }
@@ -345,7 +337,7 @@ export default {
                                             : item[key]
                                 )
                                 : item[key]
-                        }), {})
+                    }), {})
                 );
             };
 

package/src/components/list/BriFlatTable.vue

@@ -181,11 +181,11 @@
                 return !!this.oldListData.length;
             },
             filterColumns () {
-                return this.columns.filter(column => {
-                    return column._isRelyParent
-                        ? this.$isFormItemShow(column, this.parentObj, true)
-                        : !["hide"].includes(column._displayType);
-                });
+                return this.columns.filter(column =>
+                    column._isRelyByParent
+                        ? this.$isAdvRelyShow(column, this.parentObj, true, true, this.listData)
+                        : !["hide"].includes(column._displayType)
+                );
             },
             showColumns () {
                 const operationList = this.$getOperationList(["delete"]);
@@ -226,7 +226,7 @@
                             filter: undefined,
                             sortBy: undefined,
                             renderBodyCell: ({ row, column, rowIndex }, h) => {
-                                column = this.$transformFieldProperty(column, row);
+                                column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
 
                                 return [
                                     this.isShowCompare(column, row, this.oldListData[rowIndex])
@@ -371,7 +371,7 @@
 
                 return this.listData.every(row =>
                     this.filterColumns.every(column => {
-                        column = this.$transformFieldProperty(column, row);
+                        column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
                         return this.getRuleResult(column, row).bool;
                     })
                 );
@@ -432,7 +432,7 @@
                     ...(resetMap[col._type] || {}),
                     isShare: this.isShare,
                     _heightAuto: this.heightAuto
-                    // canEdit: this.$isAdvRelyShow(col, row, true)
+                    // canEdit: col._isRelyByParent ? true : this.$isAdvRelyShow(col, row, true)
                 };
             },
             getUnitCanEdit (col, row) {
@@ -440,7 +440,7 @@
                     // (!this.disabledOldDataRow || !!this.createRowMap[row._id]) && // 是否让老数据行置灰
                     (!this.disabledOldDataRow || !!row.__isCreate__) && // 是否让老数据行置灰
                     (!col.dependRowCanEdit || row.canEdit !== false) &&
-                    this.$isAdvRelyShow(col, row, true); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
+                (col._isRelyByParent ? true : this.$isAdvRelyShow(col, row, true)); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
             },
             isShowCompare (col, row, oldRow = {}) {
                 return this.useCampare && ["number"].includes(col._type) &&