bri-components 1.3.47 → 1.3.48

package/package.json

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

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/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/list/DshFlatTable.vue

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

package/src/components/list/DshTreeTable.vue

@@ -34,18 +34,22 @@
         <!-- 添加行 -->
         <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
@@ -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 () {
@@ -599,7 +577,13 @@
         }
 
         &-create {
-            margin-top: 8px;
+            margin-top: 3px;
+        }
+
+        &-fullscreen {
+            &-inner {
+                padding: 10px 20px;
+            }
         }
     }
 </style>

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

@@ -59,6 +59,11 @@ export default {
             showRuleMessage: false, // 进行全体校验
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
 
+            advSearchObj: {
+                logic: "and",
+                conditions: []
+            },
+
             dshRenderName: undefined,
             showQuoteModal: false,
             showImportModal: false,
@@ -153,6 +158,8 @@ export default {
             return {
                 // isShare: false, // 是否是分享页在用
 
+                _searchList: [], // 作为搜索的字段
+                _searchLabelWidth: 100, // 搜索的label宽度
                 _showRequired: true, // 表头显示校验符号*
                 _showDescription: true, // 表头显示提示
                 _headHeightAuto: false, // 表头高度自适应
@@ -180,6 +187,18 @@ export default {
         // isShare () {
         //     return this.selfPropsObj.isShare;
         // },
+        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;
+        },
         contentHeight () {
             return this.selfPropsObj._contentHeight;
         },
@@ -301,6 +320,18 @@ export default {
             };
         },
 
+        searchFormList () {
+            return this.$filterList(this.searchListFields, this.columns).map(formItem => ({
+                ...formItem,
+                ...this.searchListMap[formItem._key],
+                _name: formItem._name
+            }));
+        },
+        isSearching () {
+            return this.searchFormList.length && this.advSearchObj.conditions.some(conditionItem =>
+                conditionItem.fieldValue.length && conditionItem.fieldValue.some(valItem => !this.$isEmptyData(valItem))
+            );
+        },
         filterColumns () {
             return this.columns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
         },
@@ -672,7 +703,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) {