bri-components 1.3.55 → 1.3.57

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.55",
+    "version": "1.3.57",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.1.57",
+        "bri-datas": "^1.1.65",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

package/src/components/form/searchMixin.js

@@ -201,20 +201,16 @@ export default {
 
                     const fieldOperator = ["_id"].includes(fieldKey)
                         ? "eq"
-                        : initContion.fieldOperator
-                            ? initContion.fieldOperator
-                            : ["reference"].includes(fieldType) && this.isSimpleSearch
-                                ? "eq"
-                                : (operators[0] || {})._key;
+                        : ["reference"].includes(fieldType) && this.isSimpleSearch
+                            ? "eq"
+                            : (operators[0] || {})._key;
                     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 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 {
@@ -222,16 +218,16 @@ export default {
                         logic: "field",
                         fieldKey: fieldKey,
                         fieldType: fieldType,
-                        fieldValue: [],
                         fieldOperator: fieldOperator,
+                        fieldValue: [],
                         fieldSearch: {
                             logic: "and",
                             conditions: []
                         },
+                        parameterType: parameterType,
                         fieldParams: [],
                         chainFieldKey: "",
                         ...initContion,
-                        parameterType: parameterType,
 
                         // 下面的是前端所用
                         dynamicList: dynamicList,

package/src/components/list/DshTreeTable.vue

@@ -1,7 +1,21 @@
 <template>
     <div class="DshTreeTable">
         <div class="DshTreeTable-top">
-            <div class="DshTreeTable-top-total">{{ rowsNumStr }}</div>
+            <div class="DshTreeTable-top-status">
+                <span class="summary">{{ rowsNumStr }};</span>
+
+                <div
+                    v-if="searchFormList.length"
+                    class="logic"
+                >
+                    <div class="logic-title">{{ selfLogicPropsObj._name }}:</div>
+                    <dsh-select
+                        class="logic-option"
+                        :value="dftAdvSearch"
+                        :propsObj="selfLogicPropsObj"
+                    ></dsh-select>
+                </div>
+            </div>
 
             <dsh-buttons
                 class="DshTreeTable-top-btns"
@@ -50,6 +64,24 @@
                 v-if="isEnlargeFlag"
                 class="DshTreeTable-fullscreen-inner"
             >
+                <div class="DshTreeTable-top">
+                    <div class="DshTreeTable-top-status">
+                        <span class="summary">{{ rowsNumStr }};</span>
+
+                        <div
+                            v-if="searchFormList.length"
+                            class="logic"
+                        >
+                            <div class="logic-title">{{ selfLogicPropsObj._name }}:</div>
+                            <dsh-select
+                                class="logic-option"
+                                :value="dftAdvSearch"
+                                :propsObj="selfLogicPropsObj"
+                            ></dsh-select>
+                        </div>
+                    </div>
+                </div>
+
                 <!-- 搜索条件 -->
                 <template v-if="searchFormList.length">
                     <dsh-default-search
@@ -118,7 +150,7 @@
 
             allTreeData () {
                 console.log("allTreeData");
-                return this.getCalcuedTree(this.data, this.filterColumns);
+                return this.getCalcuedTree(this.data, this.columns);
             },
             allListData () {
                 return this.$getTreeFlatArr(this.allTreeData);
@@ -225,9 +257,6 @@
                     }
                 };
             },
-            filterColumns () {
-                return this.columns;
-            },
             showColumns () {
                 return [
                     ...(this.useSelection === true ? [this.selectionColumn] : []),
@@ -554,8 +583,30 @@
             justify-content: space-between;
             align-items: center;
 
-            &-total {
-                font-weight: 500;
+            &-status {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+
+                .summary {
+                    font-weight: 500;
+                }
+
+                .logic {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    margin-left: 16px;
+
+                    &-title {
+
+                    }
+
+                    &-option {
+                        margin-left: 8px;
+                        margin-top: -4px;
+                    }
+                }
             }
 
             &-btns {

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

@@ -1,5 +1,5 @@
 import DshListUnit from "../../unit/DshListUnit.vue";
-import quoteListModal from "./quoteListModal.vue";
+import quoteListModal from "../common/quoteListModal.vue";
 
 export default {
     mixins: [],
@@ -63,6 +63,16 @@ export default {
                 logic: "and",
                 conditions: []
             },
+            selfLogicPropsObj: {
+                _name: "逻辑",
+                _key: "logic",
+                _optionKind: "flat",
+                _clearable: false,
+                _data: [
+                    { _key: "and", name: "且" },
+                    { _key: "or", name: "或" }
+                ]
+            },
 
             dshRenderName: undefined,
             showQuoteModal: false,
@@ -183,7 +193,7 @@ export default {
                 _tableAdvSearch: {
                     logic: "and",
                     conditions: []
-                }, // 筛选默认值
+                }, // 筛选默认值（cascaderTable和flatTable组件里默认值情使用时，以及modSetForm里，会重置_tableAdvSearch）
                 ...this.propsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
@@ -293,7 +303,7 @@ export default {
             return this.parentObj._id;
         },
         selfRowDefault () {
-            return this.filterColumns.reduce((obj, column) => {
+            return this.columns.reduce((obj, column) => {
                 const defaultVal = this.rowDefault[column._key];
                 const initDftVal = this.initDftValMap[column._type];
 
@@ -490,9 +500,12 @@ export default {
     },
     methods: {
         baseInit () {
-            this.dftAdvSearch.conditions = this.tableAdvSearch.conditions.filter(conditionItem =>
-                this.searchListFields.includes(conditionItem.fieldKey)
-            );
+            this.dftAdvSearch = {
+                logic: this.tableAdvSearch.logic || "and",
+                conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
+                    this.searchListFields.includes(conditionItem.fieldKey)
+                )
+            };
         },
         // 重置
         reset () {

package/src/index.js

@@ -38,6 +38,7 @@ import BriAvatar from "./components/other/BriAvatar.vue";
 import BriLoading from "./components/other/BriLoading.vue";
 import BriIframe from "./components/other/BriIframe.vue";
 import BriSvg from "./components/other/BriSvg.vue";
+import DshColorPanel from "./components/other/DshColorPanel.vue";
 
 // small
 import DshRender from "./components/small/render.js";
@@ -91,7 +92,6 @@ import DshMenuNav from "./components/other/DshMenuNav.vue";
 import BriCode from "./components/other/BriCode.vue";
 import BriCollapseTree from "./components/other/BriCollapseTree.vue";
 import BriGantt from "./components/other/BriGantt.vue";
-import DshColorPanel from "./components/other/DshColorPanel.vue";
 
 // small
 import DshBtnModal from "./components/small/DshBtnModal.vue";
@@ -128,6 +128,7 @@ const map = {
     BriLoading,
     BriIframe,
     BriSvg,
+    DshColorPanel,
 
     // small
     BriButton,
@@ -208,6 +209,7 @@ export {
     BriLoading,
     BriIframe,
     BriSvg,
+    DshColorPanel,
 
     // small
     BriButton,
@@ -258,7 +260,6 @@ export {
     BriCode,
     BriCollapseTree,
     BriGantt,
-    DshColorPanel,
 
     // small
     DshBtnModal