bri-components 1.3.51 → 1.3.53

package/package.json

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

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

@@ -135,7 +135,7 @@
                             bool: true
                         };
                         if (this.isInTable && this.writeSort === "upToDown" && this.value.level !== 1) {
-                            const parentRow = this.parentListData.find(row =>
+                            const parentRow = this.allListRows.find(row =>
                                 row.level === this.value.level - 1 && row.children.some(childNode => childNode._id === this.value._id)
                             ) || {};
                             const parentDateStr = parentRow[this.controlKey];

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/flatTable.vue",
+        flatTable: "./senior/flatTable.vue",
         cascaderTable: "./senior/cascaderTable"
     },
     special: {

package/src/components/controls/mixins/controlMixin.js

@@ -25,13 +25,13 @@ export default {
         },
 
         /* 内部表，层级表内的字段用到的 */
-        rowIndex: Number,
-        parentListData: {
+        allListRows: {
             type: Array,
             default () {
                 return [];
             }
         },
+        rowIndex: Number,
         parentFormList: {
             type: Array,
             default () {

package/src/components/controls/senior/cascaderTable.vue

@@ -15,7 +15,7 @@
 
         <template v-else>
             <!-- 配置端 设置默认值用-->
-            <dsh-btn-modal v-if="propsObj._key === '_default'">
+            <dsh-btn-modal v-if="selfPropsObj._key === '_default'">
                 <template>
                     <dsh-tree-table
                         v-if="showMode === 'treeTable'"
@@ -23,8 +23,8 @@
                         :data="curVal.tree"
                         :rowDefault="curVal.rowDefault"
                         :columns="subForm"
-                        :propsObj="propsObj"
-                        :parentFormList="allFormList"
+                        :propsObj="defaultPropsObj"
+                        :allFormList="allFormList"
                         :parentObj="value"
                         @change="change"
                     ></dsh-tree-table>
@@ -35,9 +35,8 @@
                         :rowDefault="curVal.rowDefault"
                         :columns="subForm"
                         :data="curVal"
-                        :treeColumns="treeForm"
-                        :propsObj="propsObj"
-                        :parentFormList="allFormList"
+                        :propsObj="defaultPropsObj"
+                        :allFormList="allFormList"
                         :parentObj="value"
                         @change="change"
                     ></dsh-cascader-table>
@@ -54,8 +53,8 @@
                     :data="curVal.tree"
                     :rowDefault="curVal.rowDefault"
                     :columns="subForm"
-                    :propsObj="propsObj"
-                    :parentFormList="allFormList"
+                    :propsObj="selfPropsObj"
+                    :allFormList="allFormList"
                     :parentObj="value"
                     @change="change"
                 ></dsh-tree-table>
@@ -69,8 +68,8 @@
                     :columns="subForm"
                     :data="curVal"
                     :treeColumns="treeForm"
-                    :propsObj="propsObj"
-                    :parentFormList="allFormList"
+                    :propsObj="selfPropsObj"
+                    :allFormList="allFormList"
                     :parentObj="value"
                     @change="change"
                 ></dsh-cascader-table>
@@ -108,17 +107,26 @@
                     ...this.propsObj
                 };
             },
+            defaultPropsObj () {
+                return {
+                    ...this.selfPropsObj,
+                    _tableAdvSearch: {
+                        logic: "and",
+                        conditions: []
+                    }
+                };
+            },
             showMode () {
-                return this.propsObj._showMode;
+                return this.selfPropsObj._showMode;
             },
             subForm () {
-                return this.propsObj._subForm;
+                return this.selfPropsObj._subForm;
             },
             // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
             treeForm () {
                 return this.curVal && this.curVal._treeForm
                     ? this.curVal._treeForm
-                    : this.propsObj._treeForm;
+                    : this.selfPropsObj._treeForm;
             },
 
             showVal () {

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

@@ -23,7 +23,7 @@
                     :rowDefault="curVal.rowDefault"
                     :columns="subForm"
                     :propsObj="propsObj"
-                    :parentFormList="allFormList"
+                    :allFormList="allFormList"
                     :parentObj="value"
                     @change="change"
                 ></dsh-flat-table>
@@ -39,7 +39,7 @@
                 :rowDefault="curVal.rowDefault"
                 :columns="subForm"
                 :propsObj="propsObj"
-                :parentFormList="allFormList"
+                :allFormList="allFormList"
                 :parentObj="value"
                 @change="change"
             ></dsh-flat-table>
@@ -48,9 +48,9 @@
 </template>
 
 <script>
-    import controlMixin from "../../mixins/controlMixin.js";
-    import DshFlatTable from "../../../list/DshFlatTable.vue";
-    import DshBtnModal from "../../../small/DshBtnModal.vue";
+    import controlMixin from "../mixins/controlMixin.js";
+    import DshFlatTable from "../../list/DshFlatTable.vue";
+    import DshBtnModal from "../../small/DshBtnModal.vue";
 
     export default {
         name: "flatTable",

package/src/components/form/DshAdvSearch.vue

@@ -65,14 +65,15 @@
                     >
                         <template v-if="!conditionItem.__isDelete__">
                             <slot :conditionItem="conditionItem">
-                                <!-- 为空和不为空时 啥不显示 -->
+                                <!-- 为空和不为空时 啥内容也不显示 -->
                                 <div
                                     v-if="['isnull', 'notnull', 'nosize', 'size', 'nolist', 'list'].includes(conditionItem.fieldOperator)"
                                     class="DshAdvSearch-conditions-item-blank"
                                 >请选择右上角条件</div>
 
-                                <!-- 子表的筛选，出现是有条件的，递归 -->
-                                <template v-else-if="['subSearch', 'subTableSearch'].includes(conditionItem.fieldOperator)">
+                                <!-- 子表的筛选，递归 -->
+                                <template v-else-if="['subSearch', 'subTableSearch', 'cascaderTableSearch', 'treeTableSearch'].includes(conditionItem.fieldOperator)">
+                                    <!-- 出现是有条件的 -->
                                     <dsh-adv-search
                                         v-if="conditionItem.finished === true"
                                         style="padding: 0px 0px 0px 8px;"
@@ -94,7 +95,7 @@
                                     >加载中……</div>
                                 </template>
 
-                                <!-- 其它条件 -->
+                                <!-- 其他 -->
                                 <template v-else>
                                     <!-- 动态文本 -匹配的动态字段 -->
                                     <template v-if="conditionItem.parameterType === 'dynamicText'">
@@ -134,11 +135,15 @@
                             slot="extra"
                             class="DshAdvSearch-conditions-item-extra"
                         >
-                            <!-- 动态or固定 参数类型 -->
+                            <!-- 动态类型 or 固定类型 -->
                             <dsh-dropdown
-                                v-if="conditionItem.dynamicList.length"
+                                v-if="
+                                    conditionItem.dynamicList.length &&
+                                    !['isnull', 'notnull', 'nosize', 'size', 'nolist', 'list'].includes(conditionItem.fieldOperator) &&
+                                    !['subSearch', 'subTableSearch', 'cascaderTableSearch', 'treeTableSearch'].includes(conditionItem.fieldOperator)
+                                "
                                 class="extra-dynamic"
-                                :list="['set'].includes(mode) && ['reference', 'flatTable'].includes(conditionItem.fieldType) ? [] : parameterPropsObj._data"
+                                :list="getParameterData(conditionItem)"
                                 @click="$dispatchEvent(operationMap.selectParameterType, conditionItem, conditionIndex, advSearchObj.conditions, $event)"
                             >
                                 <span class="extra-operator-wrap">
@@ -146,7 +151,7 @@
                                         {{ conditionItem.parameterTypeName }}
                                     </span>
                                     <Icon
-                                        v-if="!(['set'].includes(mode) && ['reference', 'flatTable'].includes(conditionItem.fieldType))"
+                                        v-if="getParameterData(conditionItem).length"
                                         class="extra-operator-icon"
                                         type="ios-arrow-down"
                                     />
@@ -281,7 +286,7 @@
                     _key: "logic",
                     _optionKind: "flat",
                     _clearable: false,
-                    _disabled: this.isSimpleSearch,
+                    // _disabled: this.isSimpleSearch,
                     _data: [
                         { _key: "and", name: "且" },
                         { _key: "or", name: "或" }

package/src/components/form/DshForm.vue

@@ -27,8 +27,8 @@
                                 :formData="formData"
                                 :formItem="formItem"
                                 :allFormList="allFormList"
+                                :allListRows="allListRows"
                                 :rowIndex="rowIndex"
-                                :parentListData="parentListData"
                                 :parentFormList="parentFormList"
                                 :parentObj="parentObj"
                                 :changedFields="changedFields"
@@ -134,13 +134,14 @@
                 }
             },
 
-            rowIndex: Number,
-            parentListData: {
+            /* 内部表，层级表内的字段用到的 */
+            allListRows: {
                 type: Array,
                 default () {
                     return [];
                 }
             },
+            rowIndex: Number,
             parentFormList: {
                 type: Array,
                 default () {

package/src/components/form/searchMixin.js

@@ -97,6 +97,13 @@ export default {
 
             this.change(operationItem.type, conditionItem);
         },
+        // 获取动态文本或固定文本类型 选项列表
+        getParameterData (conditionItem) {
+            // 配置端 且 含有子集的
+            return !!conditionItem.dynamicList.length && conditionItem.operators.some(operator => ["subSearch", "subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(operator._key))
+                ? []
+                : this.parameterPropsObj._data;
+        },
         // 选择某控件的动态文本或固定文本类型
         changeParameterType (operationItem, conditionItem, conditionIndex, list, optionItem) {
             conditionItem.parameterType = optionItem._key;
@@ -121,7 +128,7 @@ export default {
                         logic: "and",
                         conditions: []
                     };
-                } else if (["subSearch", "subTableSearch"].includes(conditionItem.fieldOperator)) {
+                } else if (["subSearch", "subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(conditionItem.fieldOperator)) {
                     conditionItem.fieldParams = [];
                     conditionItem.chainFieldKey = "";
                     conditionItem.fieldValue = [];
@@ -161,6 +168,8 @@ export default {
 
                 if (curFormItem) {
                     const fieldType = curFormItem._type;
+                    fieldKey = curFormItem._key;
+                    const cascaderTableMode = curFormItem._showMode;
                     const fieldData = this.fieldMap[fieldType];
 
                     const dynamicTypes = this.useChainField ? [...new Set([...(fieldData.categoryTypes || []), fieldType])] : [fieldType];
@@ -172,18 +181,20 @@ export default {
                                 ? dynamicList.filter(dynamicItem => dynamicItem._ref === curFormItem._ref)
                                 : dynamicList
                         : dynamicList;
-                    const parameterType = initContion.parameterType || (
-                        (initContion.fieldParams || []).length || initContion.chainFieldKey || (!!dynamicList.length && ["reference", "flatTable"].includes(fieldType))
-                            ? "dynamicText"
-                            : "fixedText"
-                    );
-                    const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
 
-                    const operators = ["_id"].includes(curFormItem._key)
+                    const operators = ["_id"].includes(fieldKey)
                         ? []
-                        : (fieldData[!dynamicList.length && ["set"].includes(this.mode) ? "operatorsSet" : "operators"] ||
-                            fieldData.operators || []);
-                    const fieldOperator = ["_id"].includes(curFormItem._key)
+                        : ["cascaderTable"].includes(fieldType)
+                            ? cascaderTableMode === "treeTable"
+                                ? fieldData.operators.filter(operator => !["cascaderTableSearch"].includes(operator._key))
+                                : fieldData.operators.filter(operator => !["treeTableSearch"].includes(operator._key))
+                            : (
+                                fieldData[!dynamicList.length ? "operatorsSet" : "operators"] ||
+                                fieldData.operators ||
+                                []
+                    );
+
+                    const fieldOperator = ["_id"].includes(fieldKey)
                         ? "eq"
                         : (
                             initContion.fieldOperator || (
@@ -194,10 +205,19 @@ export default {
                     );
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 
+                    const parameterType = initContion.parameterType || (
+                        (
+                            (initContion.fieldParams || []).length ||
+                            initContion.chainFieldKey ||
+                            (!!dynamicList.length && operators.some(operator => ["subSearch", "subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(operator._key)))
+                        ) ? "dynamicText" : "fixedText"
+                    );
+                    const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
+
                     return {
                         _id: this.$ObjectID().str,
                         logic: "field",
-                        fieldKey: curFormItem._key,
+                        fieldKey: fieldKey,
                         fieldType: fieldType,
                         fieldValue: [],
                         fieldOperator: fieldOperator,
@@ -296,7 +316,7 @@ export default {
                         ) || { form: [] }).form;
                     });
                 }
-            } else if (conditionItem.fieldOperator === "subTableSearch") {
+            } else if (["subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(conditionItem.fieldOperator)) {
                 conditionItem.finished = true;
                 conditionItem.subFormList = conditionItem.formItem._subForm;
             }

package/src/components/list/DshCascaderTable.vue

@@ -472,6 +472,22 @@
             allTreeData () {
                 return this.getCalcuedTree();
             },
+            showAllTreeData () {
+                const loop = (list = []) => {
+                    return list.filter(row => {
+                        if (row.children && row.children.length) {
+                            row.children = loop(row.children);
+                            return !!row.children.length;
+                        } else {
+                            return this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
+                        }
+                    });
+                };
+
+                return this.isSearching
+                    ? loop(this.allTreeData)
+                    : this.allTreeData;
+            },
             allListData () {
                 return this.$getTreeFlatArr(this.data.tree, node => !(node.children && node.children.length));
             },
@@ -736,7 +752,7 @@
                 return this.data.tree;
             },
             // 转化渲染使用的columns数组
-            transformRowColumnsArr (nodes = this.allTreeData, treeForm = this.treeColumns) {
+            transformRowColumnsArr (nodes = this.showAllTreeData, treeForm = this.treeColumns) {
                 let loop = (nodes, rowColumnsArr) => {
                     return nodes.reduce((rowColumnsArr, node, nodeIndex) => {
                         if (nodeIndex !== 0 || rowColumnsArr.length === 0) {
@@ -753,7 +769,7 @@
                 return loop(nodes, []);
             },
             // 转化表格数据
-            transformRows (nodes = this.allTreeData, treeForm = this.treeColumns) {
+            transformRows (nodes = this.showAllTreeData, treeForm = this.treeColumns) {
                 const loop = (nodes, rows) => {
                     return nodes.reduce((rows, node, nodeIndex) => {
                         // 创建行，并把节点数据（对象类型）注入到行对象内

package/src/components/list/DshTreeTable.vue

@@ -15,7 +15,7 @@
         <dsh-default-search
             v-if="searchFormList.length && !isEnlarge"
             :formList="searchFormList"
-            :initValue="dftConditions"
+            :initValue="dftAdvSearch.conditions"
             :labelWidth="searchLabelWidth"
             @change="searchCb"
         ></dsh-default-search>
@@ -54,7 +54,7 @@
                 <template v-if="searchFormList.length">
                     <dsh-default-search
                         :formList="searchFormList"
-                        :initValue="dftConditions"
+                        :initValue="dftAdvSearch.conditions"
                         :labelWidth="searchLabelWidth"
                         @change="searchCb"
                     ></dsh-default-search>
@@ -339,13 +339,16 @@
             selfReset () {
                 this.isExpandAction = false;
                 this.searchMode = "flat";
-                this.dftConditions = [];
+                this.dftAdvSearch = {
+                    logic: "and",
+                    conditions: []
+                };
             },
 
             // 筛选回调
             searchCb (conditions) {
                 this.isExpandAction = false;
-                this.dftConditions = conditions;
+                this.dftAdvSearch.conditions = conditions;
             },
             // 展开／隐藏节点
             toggleExpand (row, bool = true) {
@@ -401,7 +404,7 @@
 
             /* ------ 工具方法 ------- */
             // 加工树形数据
-            getCalcuedTree (treeData = [], columns) {
+            getCalcuedTree (treeData = [], columns = []) {
                 const loop = (list = [], parentRow) =>
                     list.forEach((row) => {
                         // 递归到叶子节点前 从上往下要处理的

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

@@ -36,13 +36,13 @@ export default {
                 return {};
             }
         },
-
-        parentFormList: {
+        allFormList: {
             type: Array,
             default () {
                 return [];
             }
         },
+
         parentObj: {
             type: Object,
             default () {
@@ -59,7 +59,10 @@ export default {
             showRuleMessage: false, // 进行全体校验
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
 
-            dftConditions: [],
+            dftAdvSearch: {
+                logic: "and",
+                conditions: []
+            },
 
             dshRenderName: undefined,
             showQuoteModal: false,
@@ -238,7 +241,7 @@ export default {
             return this.selfPropsObj._quoteListFields;
         },
         quoteAdvSearch () {
-            return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.parentFormList, this.parentObj);
+            return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.allFormList, this.parentObj);
         },
 
         searchList () {
@@ -254,21 +257,24 @@ export default {
             return this.selfPropsObj._searchLabelWidth;
         },
         tableAdvSearch () {
-            return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.parentFormList, this.parentObj);
+            return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.parentObj);
         },
         // 配置的默认筛选值里 隐藏的看不到的筛选条件
-        hideConditions () {
-            return this.tableAdvSearch.conditions.filter(conditionItem =>
-                !this.searchListFields.includes(conditionItem.fieldKey)
-            );
+        hideAdvSearch () {
+            return {
+                logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
+                conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
+                    !this.searchListFields.includes(conditionItem.fieldKey)
+                )
+            };
         },
         // 过滤行数据的 最终的筛选条件
         finalTableAdvSearch () {
             return {
                 logic: "and",
                 conditions: [
-                    ...this.dftConditions,
-                    ...this.hideConditions
+                    this.hideAdvSearch,
+                    this.dftAdvSearch
                 ]
             };
         },
@@ -280,9 +286,7 @@ export default {
             }));
         },
         isSearching () {
-            return this.searchFormList.length && this.finalTableAdvSearch.conditions.some(conditionItem =>
-                conditionItem.fieldValue.length && conditionItem.fieldValue.some(valItem => !this.$isEmptyData(valItem))
-            );
+            return this.$isAdvSearching(this.finalTableAdvSearch);
         },
 
         parentDataId () {
@@ -386,10 +390,10 @@ export default {
                                             canEdit: unitCanEdit,
                                             formData: row,
                                             formItem: column,
-                                            rowIndex: rowIndex,
                                             allFormList: this.columns,
-                                            parentListData: this.allListData,
-                                            parentFormList: this.parentFormList,
+                                            allListRows: this.allListData,
+                                            rowIndex: rowIndex,
+                                            parentFormList: this.allFormList,
                                             parentObj: this.parentObj
                                         },
                                         on: {
@@ -404,10 +408,10 @@ export default {
                                     canEdit: unitCanEdit,
                                     formData: row,
                                     formItem: column,
-                                    rowIndex: rowIndex,
                                     allFormList: this.columns,
-                                    parentListData: this.allListData,
-                                    parentFormList: this.parentFormList,
+                                    allListRows: this.allListData,
+                                    rowIndex: rowIndex,
+                                    parentFormList: this.allFormList,
                                     parentObj: this.parentObj
                                 },
                                 on: {
@@ -486,7 +490,9 @@ export default {
     },
     methods: {
         baseInit () {
-            this.dftConditions = this.tableAdvSearch.conditions;
+            this.dftAdvSearch.conditions = this.tableAdvSearch.conditions.filter(conditionItem =>
+                this.searchListFields.includes(conditionItem.fieldKey)
+            );
         },
         // 重置
         reset () {
@@ -501,6 +507,11 @@ export default {
             return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
         },
 
+        // 筛选回调
+        searchCb (conditions) {
+            this.isExpandAction = false;
+            this.dftAdvSearch.conditions = conditions;
+        },
         // 表单控件失去焦点
         controlBlur (operationItem, col, row, rowIndex, params) {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });

package/src/components/unit/DshFormUnit.vue

@@ -77,8 +77,8 @@
                     :value="formData"
                     :propsObj="formItem"
                     :allFormList="allFormList"
+                    :allListRows="allListRows"
                     :rowIndex="rowIndex"
-                    :parentListData="parentListData"
                     :parentFormList="parentFormList"
                     :parentObj="parentObj"
                     @change="change"

package/src/components/unit/DshListUnit.vue

@@ -24,8 +24,8 @@
                     inTable: true
                 }"
                 :allFormList="allFormList"
+                :allListRows="allListRows"
                 :rowIndex="rowIndex"
-                :parentListData="parentListData"
                 :parentFormList="parentFormList"
                 :parentObj="parentObj"
                 @blur="blur"

package/src/components/unit/unitMixin.js

@@ -26,8 +26,9 @@ export default {
             }
         },
 
+        /* 内部表，层级表内的字段用到的 */
         rowIndex: Number,
-        parentListData: {
+        allListRows: {
             type: Array,
             default () {
                 return [];