bri-components 1.3.47 → 1.3.49

package/package.json

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

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

@@ -201,7 +201,7 @@
         &-show {
             &-auto,
             &-ellipsis {
-                margin: 6px;
+                margin: 5px 0px;
             }
         }
     }

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

@@ -24,7 +24,7 @@
                     ...commonClass
                 }"
             >
-                {{ showVal }}
+               <span class="text"> {{ showVal }}</span>
             </div>
         </bri-tooltip>
 

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

@@ -119,7 +119,7 @@
                         const curDateStr = this.$transformDate(date, "/", this.subType);
 
                         // 日期字段的对比
-                        const compareResultObj = this.$validateComparedRuleFunc(
+                        const compareResult = this.$validateComparedRuleFunc(
                             this.selfPropsObj,
                             {
                                 ...this.value,
@@ -142,7 +142,7 @@
                             calResultObj = this.$isComparedAccord(curDateStr, parentDateStr, this.compareOperator, "date", this.subType, this.subType);
                         }
 
-                        return !compareResultObj.bool && !calResultObj.bool;
+                        return !compareResult || !calResultObj.bool;
                     }
                 };
             }

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

@@ -223,7 +223,7 @@ export default {
                 : {
                     [this.saveKey]: val,
                     [this.nameKey]: `提示：选项${val}已不存在`
-                };
+            };
 
             return !this.$isEmptyData(val)
                 ? {

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

@@ -130,7 +130,7 @@ export default {
         },
         // 是否为tag显示
         tagShow () {
-            return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch"].includes(this.controlType);
+            return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch", "labels", "refSelect"].includes(this.controlType);
         },
         commonDealPropsObj () {
             const selectControlTypes = ["date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "coordinates", "users", "departments"];

package/src/components/form/DshAdvSearch.vue

@@ -25,6 +25,9 @@
                     >
                         <dsh-adv-search
                             :mode="mode"
+                            :isSimpleSearch="isSimpleSearch"
+                            :themeWord="themeWord"
+                            :useLoop="useLoop"
                             :isInner="true"
                             :value="conditionItem"
                             :formList="canSearchFormList"
@@ -74,6 +77,9 @@
                                         v-if="conditionItem.finished === true"
                                         style="padding: 0px 0px 0px 8px;"
                                         :mode="mode"
+                                        :isSimpleSearch="isSimpleSearch"
+                                        :themeWord="themeWord"
+                                        :useLoop="useLoop"
                                         :isInner="true"
                                         :value="conditionItem.fieldSearch"
                                         :formList="conditionItem.subFormList"
@@ -149,7 +155,7 @@
 
                             <!-- operators 操作类型 -->
                             <dsh-dropdown
-                                v-if="conditionItem.operators.length"
+                                v-if="!isSimpleSearch && conditionItem.operators.length"
                                 class="extra-operator"
                                 :list="conditionItem.operators"
                                 @click="$dispatchEvent(operationMap.selectOperator, conditionItem, conditionIndex, advSearchObj.conditions, $event)"
@@ -250,6 +256,11 @@
                     return ["default", "set"].includes(val);
                 }
             },
+            // 用高级筛选 但简单的像默认筛选那样使用（不要逻辑条件，筛选层，右上筛选条件）
+            isSimpleSearch: {
+                type: Boolean,
+                default: false
+            },
             themeWord: {
                 type: String,
                 default: "筛选"
@@ -270,6 +281,7 @@
                     _key: "logic",
                     _optionKind: "flat",
                     _clearable: false,
+                    _disabled: this.isSimpleSearch,
                     _data: [
                         { _key: "and", name: "且" },
                         { _key: "or", name: "或" }
@@ -328,7 +340,7 @@
                 return this.$categoryMapToMap(
                     this.allOperationMap,
                     undefined,
-                    this.useLoop === false ? ["createLoopContion"] : []
+                    this.isSimpleSearch === true || this.useLoop === false ? ["createLoopContion"] : []
                 );
             }
         },

package/src/components/form/searchMixin.js

@@ -26,7 +26,6 @@ export default {
                 return [];
             }
         },
-
         useChainField: {
             type: Boolean,
             default: false

package/src/components/list/DshFlatTable.vue

@@ -106,7 +106,7 @@
         }
 
         &-create {
-            margin-top: 8px;
+            margin-top: 3px;
         }
     }
 </style>

package/src/components/list/DshTreeTable.vue

@@ -15,7 +15,7 @@
         <dsh-default-search
             v-if="searchFormList.length && !isEnlarge"
             :formList="searchFormList"
-            :initValue="advSearchObj.conditions"
+            :initValue="dftConditions"
             :labelWidth="searchLabelWidth"
             @change="searchCb"
         ></dsh-default-search>
@@ -34,23 +34,27 @@
         <!-- 添加行 -->
         <dsh-buttons
             v-if="!isSearching"
-            class="DshFlatTable-create"
+            class="DshTreeTable-create"
             :list="$getOperationList(['canCreate'])"
             @click="$dispatchEvent($event)"
         ></dsh-buttons>
 
         <!-- 全屏模式 -->
         <dsh-modal
+            class="DshTreeTable-fullscreen"
             v-model="isEnlarge"
             :mode="modalPropsObj.mode"
             :propsObj="modalPropsObj"
         >
-            <template v-if="isEnlargeFlag">
+            <div
+                v-if="isEnlargeFlag"
+                class="DshTreeTable-fullscreen-inner"
+            >
                 <!-- 搜索条件 -->
                 <template v-if="searchFormList.length">
                     <dsh-default-search
                         :formList="searchFormList"
-                        :initValue="advSearchObj.conditions"
+                        :initValue="dftConditions"
                         :labelWidth="searchLabelWidth"
                         @change="searchCb"
                     ></dsh-default-search>
@@ -69,11 +73,11 @@
 
                 <!-- 添加行 -->
                 <dsh-buttons
-                    class="DshFlatTable-create"
+                    class="DshTreeTable-create"
                     :list="$getOperationList(['canCreate'])"
                     @click="$dispatchEvent($event)"
                 ></dsh-buttons>
-            </template>
+            </div>
         </dsh-modal>
 
         <!-- 各种模态框共用 -->
@@ -98,44 +102,18 @@
                 deleteProperties: ["__treeIndex__", "__old__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__"], // 除了__readonly__和__isQuote__不处理
                 isExpandAction: false,
 
-                searchMode: "flat", // "flat", "tree"
-                advSearchObj: {
-                    logic: "and",
-                    conditions: []
-                }
+                searchMode: "flat" // "flat", "tree"
             };
         },
         computed: {
             selfPropsObj () {
                 return {
-                    _searchFields: [], // 作为搜索的字段
-                    _searchLabelWidth: 100, // 搜索的label宽度
-                    ...this.commonPropsObj,
-
-                    _maxLevel: this.commonPropsObj._maxLevel || 3
+                    _maxLevel: 3, // 最大级数
+                    ...this.commonPropsObj
                 };
             },
             maxLevel () {
-                return this.selfPropsObj._maxLevel;
-            },
-            searchLabelWidth () {
-                return this.selfPropsObj._searchLabelWidth;
-            },
-            searchFormList () {
-                return (this.selfPropsObj._searchFields || []) // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
-                    .map(fieldKey => this.columns.find(column => column._key === fieldKey))
-                    .filter(column => !!column)
-                    .map(column => {
-                        return {
-                            ...column,
-                            _span: 6
-                        };
-                });
-            },
-            isSearching () {
-                return this.searchFormList.length && this.advSearchObj.conditions.some(conditionItem =>
-                    conditionItem.fieldValue.length && conditionItem.fieldValue.some(valItem => !this.$isEmptyData(valItem))
-                );
+                return this.selfPropsObj._maxLevel || 3;
             },
 
             allTreeData () {
@@ -148,7 +126,7 @@
             renderedListData () {
                 return this.allListData.filter(row => {
                     if (this.isSearching) {
-                        const bool = this.$isAdvRelyAccord(this.advSearchObj, row);
+                        const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
 
                         // 重置
                         row.__isSearchShow__ = false;
@@ -361,19 +339,13 @@
             selfReset () {
                 this.isExpandAction = false;
                 this.searchMode = "flat";
-                this.advSearchObj = {
-                    logic: "and",
-                    conditions: []
-                };
+                this.dftConditions = [];
             },
 
             // 筛选回调
             searchCb (conditions) {
                 this.isExpandAction = false;
-                this.advSearchObj = {
-                    ...this.advSearchObj,
-                    conditions: conditions
-                };
+                this.dftConditions = conditions;
             },
             // 展开／隐藏节点
             toggleExpand (row, bool = true) {
@@ -599,7 +571,13 @@
         }
 
         &-create {
-            margin-top: 8px;
+            margin-top: 3px;
+        }
+
+        &-fullscreen {
+            &-inner {
+                padding: 10px 20px;
+            }
         }
     }
 </style>

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

@@ -59,6 +59,8 @@ export default {
             showRuleMessage: false, // 进行全体校验
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
 
+            dftConditions: [],
+
             dshRenderName: undefined,
             showQuoteModal: false,
             showImportModal: false,
@@ -152,7 +154,6 @@ export default {
         commonPropsObj () {
             return {
                 // isShare: false, // 是否是分享页在用
-
                 _showRequired: true, // 表头显示校验符号*
                 _showDescription: true, // 表头显示提示
                 _headHeightAuto: false, // 表头高度自适应
@@ -165,6 +166,7 @@ export default {
                 _disabledOldDataRow: false, // 置灰老数据行包含删除
                 _isImport: false, // 导入
                 _isExport: false, // 导出
+
                 _isQuote: false, // 引用
                 _quoteDataCanEdit: false, // 引用的数据是否能编辑
                 _quoteListFields: [], // 引用列表的显示字段
@@ -172,6 +174,13 @@ export default {
                     logic: "and",
                     conditions: []
                 }, // 引用列表筛选条件
+
+                _searchList: [], // 作为搜索的字段
+                _searchLabelWidth: 100, // 搜索的label宽度
+                _tableAdvSearch: {
+                    logic: "and",
+                    conditions: []
+                }, // 筛选默认值
                 ...this.propsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
@@ -232,6 +241,50 @@ export default {
             return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.parentFormList, this.parentObj);
         },
 
+        searchList () {
+            return this.selfPropsObj._searchList || []; // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
+        },
+        searchListMap () {
+            return this.$arrToMap(this.searchList, "_key");
+        },
+        searchListFields () {
+            return this.searchList.map(searchItem => searchItem._key);
+        },
+        searchLabelWidth () {
+            return this.selfPropsObj._searchLabelWidth;
+        },
+        tableAdvSearch () {
+            return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.parentFormList, this.parentObj);
+        },
+        // 配置的默认筛选值里 隐藏的看不到的筛选条件
+        hideConditions () {
+            return this.tableAdvSearch.conditions.filter(conditionItem =>
+                !this.searchListFields.includes(conditionItem.fieldKey)
+            );
+        },
+        // 过滤行数据的 最终的筛选条件
+        finalTableAdvSearch () {
+            return {
+                logic: "and",
+                conditions: [
+                    ...this.dftConditions,
+                    ...this.hideConditions
+                ]
+            };
+        },
+        searchFormList () {
+            return this.$filterList(this.searchListFields, this.columns).map(formItem => ({
+                ...formItem,
+                ...this.searchListMap[formItem._key],
+                _name: formItem._name
+            }));
+        },
+        isSearching () {
+            return this.searchFormList.length && this.finalTableAdvSearch.conditions.some(conditionItem =>
+                conditionItem.fieldValue.length && conditionItem.fieldValue.some(valItem => !this.$isEmptyData(valItem))
+            );
+        },
+
         parentDataId () {
             return this.parentObj._id;
         },
@@ -428,13 +481,12 @@ export default {
             }, 0);
         }
     },
-    created () { },
+    created () {
+        this.baseInit();
+    },
     methods: {
-        // 共外部使用
-        validate () {
-            this.showRuleMessage = true;
-
-            return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
+        baseInit () {
+            this.dftConditions = this.tableAdvSearch.conditions;
         },
         // 重置
         reset () {
@@ -442,6 +494,12 @@ export default {
             this.showRuleMessage = false;
             this.ruleRecordMap = {};
         },
+        // 共外部使用
+        validate () {
+            this.showRuleMessage = true;
+
+            return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
+        },
 
         // 表单控件失去焦点
         controlBlur (operationItem, col, row, rowIndex, params) {
@@ -672,7 +730,8 @@ export default {
                 (col._oldReadonly ? !row.__old__ : true) && // 老数据行里某些列不可编辑
                 (row.__isQuote__ ? this.quoteDataCanEdit : true) && // 引用过来的数据是否可编辑
                 col._enterType !== "calculate" && // 计算的不可编辑
-                col._readonly !== true; // 不能为只读
+                col._readonly !== true && // 不能为只读
+                col.canEdit;
         },
         // 单元格最终编辑状态
         getUnitCanEdit (col, row) {

package/src/styles/components/list/BriTable.less

@@ -42,16 +42,34 @@
                             padding: 4px 8px;
     
                             .ve-table-filter .ve-table-filter-icon {
+                                position: absolute;
+                                top: 0px;
+                                left: 0px;
+
                                 &:hover {
                                     color: @themeColor;
                                 }
                             }
+
+                            // 过滤
+                            .ve-dropdown {
+                                position: absolute;
+                                top: 0px;
+                                bottom: 0px;
+                                margin-top: auto;
+                                margin-bottom: auto;
+                                right: 17px;
+                            }
                             
                             // 排序
                             .ve-table-sort {
-                                position: absolute !important;
-                                top: 5px;
-                                right: 4px;
+                                height: 30px;
+                                position: absolute;
+                                top: 0px;
+                                bottom: 0px;
+                                margin-top: auto;
+                                margin-bottom: auto;
+                                right: 0px;
     
                                 .icon-vet-sort-top-arrow:before {
                                     content: "\e6347";

package/src/styles/global/control.less

@@ -47,6 +47,10 @@
     border: 1px solid @border-readonly;
     background: @inputBg-readonly;
     border-radius: @borderRadius;
+
+    &.bri-control-nodata {
+        .dsh-ellipsis();
+    }
 }
 
 // 带边框 frame
@@ -60,6 +64,11 @@
         #custom-show ();
         background: transparent;
         padding: 1px 4px;
+
+        &.bri-control-nodata {
+            padding: 3px 7px;
+            line-height: 24px
+        }
     }
 }
 
@@ -74,6 +83,11 @@
         #custom-show ();
         border: none;
         padding: 2px 4px;
+
+        &.bri-control-nodata {
+            padding: 4px 7px;
+            line-height: 24px
+        }
     }
 }
 

package/src/utils/table.js

@@ -8,12 +8,12 @@ const getHeadRender = function (h, column, {
     return h("div", {
         style: {
             display: "inline-block",
-            maxWidth: "100%",
+            maxWidth: `calc(100% - ${column.sortBy || column.sortBy === "" || !!column.filter ? 10 : 0}px)`,
             paddingLeft: "8px",
-            paddingRight: column._description ? "26px" : "8px",
+            paddingRight: `${(column.sortBy || column.sortBy === "" || !!column.filter ? 0 : 8) + (column._description ? 18 : 0)}px`,
             verticalAlign: "middle",
             position: "relative",
-            marginRight: ["number", "date"].includes(column._type) && column.align === "right" ? "10px" : 0
+            marginRight: `${column.sortBy || column.sortBy === "" || !!column.filter ? 10 : 0}px`
         }
     }, [
         showRequired && column._required && h("i", {
@@ -132,16 +132,16 @@ const transformToColumns = function (form, {
                 },
                 renderBodyCell: col._type
                     ? col._type === "operation"
-                        ? (params, h) => {
+                        ? ({ row, column, rowIndex }, h) => {
                             return h("dsh-buttons", {
                                 class: "bri-table-td-operation",
                                 props: {
-                                    list: col._getBtnList ? col._getBtnList.call(this, params.row) : this.$getOperationList(col._list),
+                                    list: col._getBtnList ? col._getBtnList.call(this, row) : this.$getOperationList(col._list),
                                     itemClass: "bri-table-td-operation-btn"
                                 },
                                 on: {
                                     click: (operationItem) => {
-                                        this.$dispatchEvent(operationItem, params);
+                                        this.$dispatchEvent(operationItem, { row, column, rowIndex });
                                     }
                                 }
                             });