bri-components 1.5.6 → 1.5.8

package/package.json

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

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

@@ -33,7 +33,7 @@ export default {
                 ...this.propsObj,
                 ...this.commonDealPropsObj,
 
-                _changeOnSelect: this.isInSearch
+                _changeOnSelect: this.isInAnySearch
                     ? true
                     : this.propsObj._changeOnSelect == undefined ? false : this.propsObj._changeOnSelect, // 每级菜单都可取值 -默认取末级
                 _joinSymbol: _joinSymbol // 级联拼接符

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

@@ -114,7 +114,7 @@ export default {
                 _clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
                 _disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly),
                 // 目前部门、用户在用，以后还会增多
-                _useDeleteTip: this.isInDftSearch || this.isInSearch
+                _useDeleteTip: this.isInAnySearch
                     ? false
                     : this.propsObj._useDeleteTip == undefined
                         ? false
@@ -123,7 +123,7 @@ export default {
         },
         // 是否为多选模式
         multipleMode () {
-            return this.isInDftSearch || this.isInSearch
+            return this.isInAnySearch
                 ? true
                 : ["numberange", "daterange", "checkbox", "regions", "cascaders", "labels", "refCheckbox"].includes(this.controlType)
                     ? true
@@ -139,6 +139,12 @@ export default {
         isTagShow () {
             return ["switch", "select", "checkbox", "regions", "cascaders", "users", "departments", "labels", "refSelect", "refCheckbox"].includes(this.controlType);
         },
+        // 点击行或单元格查看详细内容 -"flatTable", "cascaderTable", "reference", "referenceBy"在用
+        showDetailOnCR () {
+            return !!this.selfPropsObj && [true, false].includes(this.selfPropsObj._showDetailOnCR)
+                ? this.selfPropsObj._showDetailOnCR
+                : true;
+        },
 
         /* ----- 表单相关 ----- */
         clearable () {
@@ -188,14 +194,18 @@ export default {
         isInRefDetail () {
             return !!this.propsObj.inRefDetail;
         },
-        // 高级搜索状态
+        // 在高级搜索下
         isInSearch () {
             return !!this.propsObj.inSearch;
         },
-        // 默认搜索状态
+        // 在默认搜索下
         isInDftSearch () {
             return !!this.propsObj.inDftSearch;
         },
+        // 在任何搜索下
+        isInAnySearch () {
+            return this.isInDftSearch || this.isInSearch;
+        },
         isUnitUpdate () {
             return this.isInTable && !!this.canEdit;
         },
@@ -364,8 +374,10 @@ export default {
 
         // 单元格展示 -打开列表模态框
         openUnitModal (event) {
-            this.showUnitModal = true;
-            event.stopPropagation();
+            if (this.showDetailOnCR) {
+                this.showUnitModal = true;
+                event.stopPropagation();
+            }
         }
     }
 };

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

@@ -37,7 +37,7 @@ export default {
             return this.selfPropsObj._dateType;
         },
         useDynDate () {
-            return this.isInSearch
+            return this.isInAnySearch
                 ? true
                 : this.selfPropsObj._useDynDate;
         },
@@ -45,7 +45,7 @@ export default {
             return this.selfPropsObj._dynDateType;
         },
         dynDateKeys () {
-            return this.isInSearch
+            return this.isInAnySearch
                 ? this.selfPropsObj._dynSearchKeys
                 : this.selfPropsObj._dynDateKeys;
         },

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

@@ -65,7 +65,7 @@ export default {
         },
 
         highSearch () {
-            return this.isInSearch ? true : this.selfPropsObj._highSearch;
+            return this.isInAnySearch ? true : this.selfPropsObj._highSearch;
         },
         searchString () {
             return this.selfPropsObj._searchString;

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

@@ -169,7 +169,7 @@
                 return this.selfPropsObj._labelType;
             },
             onlySelect () {
-                return this.isInSearch ? true : this.selfPropsObj._onlySelect;
+                return this.isInAnySearch ? true : this.selfPropsObj._onlySelect;
             },
             originLabels () {
                 return this.selfPropsObj._originLabels;

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

@@ -4,7 +4,7 @@
         <template v-if="isUnitShow">
             <span
                 class="cascaderTable-unit"
-                @click.stop="openUnitModal"
+                @click="openUnitModal"
             >
                 <dsh-icons :list="[{
                     customIcon: 'bico-Cascadetable'

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

@@ -4,7 +4,7 @@
         <template v-if="isUnitShow">
             <span
                 class="flatTable-unit"
-                @click.stop="openUnitModal"
+                @click="openUnitModal"
             >
                 <dsh-icons :list="[{
                     customIcon: 'bico-internaltable'

package/src/components/form/DshDefaultSearch.vue

@@ -168,7 +168,9 @@
             getFormItem (formItem) {
                 return {
                     ...this.formatFormItem(formItem),
+                    inSearch: false,
                     inDftSearch: true,
+
                     _line: true,
                     _useColor: false,
                     _optionKind: "dropdown"