bri-components 1.5.8 → 1.5.9

package/package.json

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

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

@@ -139,10 +139,10 @@ 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
+        // 全称showDetailOnClickUnitContent，点击行或单元格查看详细内容 -"flatTable", "cascaderTable", "reference", "referenceBy"在用
+        showDetailOnCUC () {
+            return !!this.selfPropsObj && [true, false].includes(this.selfPropsObj._showDetailOnCUC)
+                ? this.selfPropsObj._showDetailOnCUC
                 : true;
         },
 
@@ -372,12 +372,19 @@ export default {
             this.showModal = false;
         },
 
-        // 单元格展示 -打开列表模态框
-        openUnitModal (event) {
-            if (this.showDetailOnCR) {
-                this.showUnitModal = true;
+        // 点击外层dom（主要针对单元格空白处）
+        clickControlWrapper (event) {
+            // 点击行是选择数据效果时，点击单元格空白和点击行效果一样（啥也不做）；点击表格行进的是详情的话，点某列单元格空白处，显示谁都有争议，没有效果最好
+            if ((this.isUnitShow && this.showDetailOnCUC) || !this.isUnitShow) {
                 event.stopPropagation();
             }
+        },
+        // 点击单元格里的内容 -打开详情模态框
+        clickUnitContent (event) {
+            if ((this.isUnitShow && this.showDetailOnCUC) || this.isUnitUpdate) {
+                // event.stopPropagation(); // 可有可无，最外层已经阻止冒泡
+                this.showUnitModal = true;
+            }
         }
     }
 };

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

@@ -1,10 +1,13 @@
 <template>
-    <div class="cascaderTable">
+    <div
+        class="cascaderTable"
+        @click="clickControlWrapper"
+    >
         <!-- 查看 单元格内 -->
         <template v-if="isUnitShow">
             <span
                 class="cascaderTable-unit"
-                @click="openUnitModal"
+                @click="clickUnitContent"
             >
                 <dsh-icons :list="[{
                     customIcon: 'bico-Cascadetable'

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

@@ -1,10 +1,13 @@
 <template>
-    <div class="flatTable">
+    <div
+        class="flatTable"
+        @click="clickControlWrapper"
+    >
         <!-- 查看 单元格内 -->
         <template v-if="isUnitShow">
             <span
                 class="flatTable-unit"
-                @click="openUnitModal"
+                @click="clickUnitContent"
             >
                 <dsh-icons :list="[{
                     customIcon: 'bico-internaltable'