bri-components 1.4.34 → 1.4.36

package/package.json

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

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

@@ -235,13 +235,6 @@
                 this.showModal = false;
                 this.curVal = this.newVal;
             },
-            // 点击删除
-            clickClear () {
-                this.curVal = {
-                    name: "",
-                    lnglat: []
-                };
-            },
             // 清除已选内容
             clickModalClear () {
                 this.newVal = {

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

@@ -228,10 +228,6 @@ export default {
     },
     created () { },
     methods: {
-        // 点击清除
-        clickClear () {
-            this.curValList = [];
-        },
         confirmCb (selectedValue, selectedOptions) {
             this.curValList = selectedValue;
 

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

@@ -54,6 +54,7 @@ export default {
     data () {
         return {
             showModal: false,
+            showUnitModal: false,
 
             tagStyle: {
                 display: "inline-block",
@@ -75,6 +76,12 @@ export default {
         typeInfoData () {
             return this.$modFieldMap[this.controlType] || {};
         },
+        unitModalPropsObj () {
+            return {
+                mode: "fullscreen",
+                title: this.controlName
+            };
+        },
 
         /* ----- 基本 ----- */
         finalCanEdit () {
@@ -110,7 +117,7 @@ export default {
         multipleMode () {
             return this.isOnDftSearch || this.isOnSearch
                 ? true
-                : ["checkbox", "regions", "cascaders"].includes(this.controlType)
+                : ["checkbox", "regions", "cascaders", "labels", "refCheckbox"].includes(this.controlType)
                     ? true
                     : !!this.selfPropsObj && !!this.selfPropsObj._multiple;
         },
@@ -122,7 +129,7 @@ export default {
         },
         // 是否为tag显示
         isTagShow () {
-            return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch", "labels", "refSelect"].includes(this.controlType);
+            return ["switch", "select", "checkbox", "regions", "cascaders", "users", "departments", "labels", "refSelect", "refCheckbox"].includes(this.controlType);
         },
 
         /* ----- 表单相关 ----- */
@@ -325,6 +332,21 @@ export default {
                 this.openModal();
             }
         },
+        // 点击清除
+        clickClear () {
+            if (this.controlType === "coordinates") {
+                this.curVal = {
+                    name: "",
+                    lnglat: []
+                };
+            }
+            else if (this.typeInfoData.dataType === "array" || this.multipleMode) {
+                this.curValList = [];
+            } else {
+                this.curVal = "";
+            }
+        },
+
         /* ----- 工具方法 ------- */
         // 切换弹框
         toggleModal (bool) {
@@ -337,6 +359,12 @@ export default {
         // 关闭弹框 ---！！！！pc端的selectUsers、selectDepartments控件，外部调用组件时也在使用，不能轻易删除
         closeModal () {
             this.showModal = false;
+        },
+
+        // 单元格展示 -打开列表模态框
+        openUnitModal (event) {
+            this.showUnitModal = true;
+            event.stopPropagation();
         }
     }
 };

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

@@ -121,10 +121,6 @@ export default {
             this.getListData();
         },
 
-        // 点击清除
-        clickClear () {
-            this.curVal = "";
-        },
         // 单选模式 点击选项
         clickRadioItem (item, index) {
             if (!this.getRadioItemDisabled(item)) {

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

@@ -110,20 +110,10 @@ export default {
     },
     created () { },
     methods: {
-        // 点击输入框 打开选择模态框
-        clickInput () {
-            if (!this.disabled) {
-                this.openModal();
-            }
-        },
         // 点击删除某项
         clickDeleteItem (selectItem) {
             this.curValList = this.curValList.filter(item => item._key !== selectItem._key);
         },
-        // 点击清除选择项
-        clickClear () {
-            this.curValList = [];
-        },
         clickItem (item, index) {
             this.itemTipRender = this.getItemTipRender(item, index);
         },

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

@@ -211,10 +211,6 @@
             clickDeleteItem (deleteItem) {
                 this.curValList = this.curValList.filter(item => item._key !== deleteItem._key);
             },
-            // 点击清除选择项
-            clickClear () {
-                this.curValList = [];
-            },
 
             // 接口 -获取列表数据
             getListData () {

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

@@ -1,17 +1,70 @@
 <template>
     <div class="cascaderTable">
-        <!-- 在表格内的查看 -->
-        <span
-            v-if="isUnitShow"
-            class="cascaderTable-unit"
-        >
-            <dsh-icons :list="[{
-                customIcon: 'bico-Cascadetable'
-            }]"></dsh-icons>
-            <span class="cascaderTable-unit-text">
-                {{ showVal }}
+        <!-- 查看 单元格内 -->
+        <template v-if="isUnitShow">
+            <span
+                class="cascaderTable-unit"
+                @click.stop="openUnitModal"
+            >
+                <dsh-icons :list="[{
+                    customIcon: 'bico-Cascadetable'
+                }]"></dsh-icons>
+                <span class="cascaderTable-unit-text">
+                    {{ showVal }}
+                </span>
             </span>
-        </span>
+
+            <dsh-modal
+                class="cascaderTable-unit-fullscreen"
+                v-model="showUnitModal"
+                :mode="unitModalPropsObj.mode"
+                :propsObj="unitModalPropsObj"
+                @click.stop="0"
+            >
+                <div
+                    v-if="showUnitModal"
+                    class="cascaderTable-unit-fullscreen-inner"
+                >
+                    <!-- 老版级联表格 -->
+                    <dsh-cascader-table
+                        v-if="subType === 'old'"
+                        :canEdit="false"
+                        :tableDataObj="curVal"
+                        :data="curVal.tree"
+                        :rowDefault="curVal.rowDefault"
+                        :columns="subForm"
+                        :propsObj="{
+                            ...selfPropsObj,
+                            _useEnlarge: false
+                        }"
+                        :allFormList="allFormList"
+                        :parentObj="value"
+                        :treeColumns="treeForm"
+                    ></dsh-cascader-table>
+
+                    <!-- 横向层级表格 -->
+                    <div v-else-if="subType === 'cross'">
+                        横向层级表格还未开发……
+                    </div>
+
+                    <!-- 层级表格 -->
+                    <dsh-tree-table
+                        v-else
+                        :canEdit="false"
+                        :tableDataObj="curVal"
+                        :data="curVal.tree"
+                        :rowDefault="curVal.rowDefault"
+                        :columns="subForm"
+                        :propsObj="{
+                            ...selfPropsObj,
+                            _useEnlarge: false
+                        }"
+                        :allFormList="allFormList"
+                        :parentObj="value"
+                    ></dsh-tree-table>
+                </div>
+            </dsh-modal>
+        </template>
 
         <template v-else>
             <!-- 配置端 设置默认值用-->
@@ -194,6 +247,11 @@
                 return this.$isAdvSearching(this.finalTableAdvSearch);
             },
 
+            curVal () {
+                return this.value[this.controlKey] || {
+                    tree: []
+                };
+            },
             showVal () {
                 return `${
                     this.curVal
@@ -235,6 +293,27 @@
             &-text {
 
             }
+
+            &-fullscreen {
+                &-inner {
+                    width: 100%;
+                    height: 100%;
+                    padding: 10px 20px;
+
+                    .DshCasTable,
+                    .DshTreeTable {
+                        width: 100%;
+                        height: 100%;
+                        display: flex;
+                        flex-direction: column;
+
+                        &-main {
+                            flex: 1;
+                            min-height: 0px;
+                        }
+                    }
+                }
+            }
         }
     }
 </style>

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

@@ -1,17 +1,47 @@
 <template>
     <div class="flatTable">
         <!-- 查看 单元格内 -->
-        <span
-            v-if="isUnitShow"
-            class="flatTable-unit"
-        >
-            <dsh-icons :list="[{
-                customIcon: 'bico-internaltable'
-            }]"></dsh-icons>
-            <span class="flatTable-unit-text">
-                {{ showVal }}
+        <template v-if="isUnitShow">
+            <span
+                class="flatTable-unit"
+                @click.stop="openUnitModal"
+            >
+                <dsh-icons :list="[{
+                    customIcon: 'bico-internaltable'
+                }]"></dsh-icons>
+                <span class="flatTable-unit-text">
+                    {{ showVal }}
+                </span>
             </span>
-        </span>
+
+            <dsh-modal
+                class="flatTable-unit-fullscreen"
+                v-model="showUnitModal"
+                :mode="unitModalPropsObj.mode"
+                :propsObj="unitModalPropsObj"
+                @click.stop="0"
+            >
+                <div
+                    v-if="showUnitModal"
+                    class="flatTable-unit-fullscreen-inner"
+                >
+                    <dsh-flat-table
+                        :canEdit="false"
+                        :tableDataObj="curVal"
+                        :data="curVal.list"
+                        :rowDefault="curVal.rowDefault"
+                        :compareData="curVal.oldList"
+                        :columns="subForm"
+                        :propsObj="{
+                            ...propsObj,
+                            _useEnlarge: false
+                        }"
+                        :allFormList="allFormList"
+                        :parentObj="value"
+                    ></dsh-flat-table>
+                </div>
+            </dsh-modal>
+        </template>
 
         <!-- 编辑、查看（查看页内） -->
         <template v-else>
@@ -135,6 +165,11 @@
                 return this.$isAdvSearching(this.finalTableAdvSearch);
             },
 
+            curVal () {
+                return this.value[this.controlKey] || {
+                    list: []
+                };
+            },
             showVal () {
                 return `${
                     this.curVal
@@ -171,6 +206,26 @@
             &-text {
 
             }
+
+            &-fullscreen {
+                &-inner {
+                    width: 100%;
+                    height: 100%;
+                    padding: 10px 20px;
+
+                    .DshFlatTable {
+                        width: 100%;
+                        height: 100%;
+                        display: flex;
+                        flex-direction: column;
+
+                        &-main {
+                            flex: 1;
+                            min-height: 0px;
+                        }
+                    }
+                }
+            }
         }
     }
 </style>

package/src/components/list/DshCascaderTable.vue

@@ -37,6 +37,7 @@
 
         <!-- 全屏查看 -->
         <dsh-modal
+            v-if="useEnlarge"
             class="DshCasTable-fullscreen"
             v-model="isEnlarge"
             :mode="modalPropsObj.mode"

package/src/components/list/DshFlatTable.vue

@@ -81,6 +81,7 @@
 
         <!-- 全屏模式 -->
         <dsh-modal
+            v-if="useEnlarge"
             class="DshFlatTable-fullscreen"
             v-model="isEnlarge"
             :mode="modalPropsObj.mode"

package/src/components/list/DshTreeTable.vue

@@ -40,6 +40,7 @@
 
         <!-- 全屏模式 -->
         <dsh-modal
+            v-if="useEnlarge"
             class="DshTreeTable-fullscreen"
             v-model="isEnlarge"
             :mode="modalPropsObj.mode"

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

@@ -1135,7 +1135,7 @@ export default {
                             e.stopPropagation();
                         }
                     }
-                });
+            });
         },
         topSearchRender (h) {
             return this.searchFormList.length
@@ -1425,7 +1425,7 @@ export default {
         getRowDelBtnCanEdit (row, rowIndex) {
             return row.__readonly__ !== true && // 不能为只读数据
                 (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-                (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {