bri-components 1.4.35 → 1.4.37

package/package.json

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

package/src/components/controls/DshControlInput.vue

@@ -22,7 +22,8 @@
                     :list="value"
                     :propsObj="{
                         disabled: disabled,
-                        closable: true
+                        closable: true,
+                        useDeleteTip: propsObj._useDeleteTip
                     }"
                     @delete="clickDeleteItem"
                     @clickItem="clickItem"

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

@@ -359,12 +359,13 @@
                     &-list {
                         width: 100%;
                         min-height: 280px;
-                        max-height: 340px;
+                        max-height: 360px;
                         padding: 5px 10px 10px;
                         overflow: auto;
 
                         &-menu {
                             .item {
+                                margin: 2px 0px;
                                 padding: 8px 10px;
                                 border-radius: @borderRadius;
                                 line-height: 16px;

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 () {
@@ -103,7 +110,7 @@ export default {
                     ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : "",
                 _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
+                _disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly)
             };
         },
         // 是否为多选模式
@@ -352,6 +359,12 @@ export default {
         // 关闭弹框 ---！！！！pc端的selectUsers、selectDepartments控件，外部调用组件时也在使用，不能轻易删除
         closeModal () {
             this.showModal = false;
+        },
+
+        // 单元格展示 -打开列表模态框
+        openUnitModal (event) {
+            this.showUnitModal = true;
+            event.stopPropagation();
         }
     }
 };

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

@@ -53,6 +53,7 @@ export default {
             return {
                 _highSearch: false,
                 _searchString: "",
+                _useDeleteTip: false, // 删除项进行提示
 
                 _reverseFilter: false, // 反向过滤
                 _userDepartFilterVals: [], // 过滤的数据的第一级选项

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/small/DshTags.vue

@@ -172,10 +172,24 @@
             },
             // 删除标签
             deleteTag (event, item, index) {
-                this.list.splice(index, 1);
-                this.callEliipsis();
-                this.$emit("change", [...this.list]);
-                this.$emit("delete", item, index);
+                const cb = () => {
+                    this.list.splice(index, 1);
+                    this.callEliipsis();
+                    this.$emit("change", [...this.list]);
+                    this.$emit("delete", item, index);
+                };
+
+                if (this.propsObj.useDeleteTip === true) {
+                    this.$Modal.confirm({
+                        title: "提示",
+                        content: `确定删除"${this.getItemName(item)}"吗？`,
+                        onOk: () => {
+                            cb();
+                        }
+                    });
+                } else {
+                    cb();
+                }
             },
             // 改变标签状态
             changeChecked (checked, name) {