bri-components 1.3.26 → 1.3.28

package/package.json

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

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

@@ -15,7 +15,7 @@
             'BriUpload-disabled': canEdit && !finalCanEdit,
             'BriUpload-readonly': !canEdit,
             'BriUpload-unit': !canEdit && isInTable,
-            [`BriUpload-${showType}`]: true,
+            [`BriUpload-${showMode}`]: true,
         }"
     >
         <!-- 编辑 -->
@@ -40,11 +40,11 @@
             >
 
             <slot>
-                <div :class="`BriUpload-${showType}-add`">
+                <div :class="`BriUpload-${showMode}-add`">
                     <!-- 上传 -->
                     <i-circle
                         v-if="percent"
-                        :class="`BriUpload-${showType}-circle`"
+                        :class="`BriUpload-${showMode}-circle`"
                         :percent="percent"
                         :stroke-color="percentColor"
                     >
@@ -54,7 +54,7 @@
                             type="ios-checkmark"
                         ></Icon>
                         <!-- 上传中 -->
-                        <span v-else-if="showType === 'old'">
+                        <span v-else-if="showMode === 'old'">
                             {{ percent }}%
                         </span>
                     </i-circle>
@@ -66,7 +66,7 @@
                             @click="clickUpload"
                         ></dsh-icons>
 
-                        <span v-if="showType !== 'inline'">
+                        <span v-if="showMode !== 'inline'">
                             点击上传{{ subType === 'image' ? "图片" : "文件" }}
                         </span>
                     </template>
@@ -80,7 +80,7 @@
                 :canEdit="finalCanEdit"
                 :files="curValList"
                 :emptyShowVal="emptyShowVal"
-                :showType="showType"
+                :showMode="showMode"
                 :propsObj="propsObj"
                 @deleteItem="clickDeteItem"
             ></upload-list>
@@ -138,7 +138,7 @@
             selfPropsObj () {
                 return {
                     _fileType: "file",
-                    _showType: this.isHeightAuto ? "old" : "inline", // 宽度为100%、且不在级联表格或内部表格里的 显示老版
+                    _showMode: this.isHeightAuto ? "old" : "inline", // 宽度为100%、且不在级联表格或内部表格里的 显示老版
                     // _multiple: true,
                     _useType: "drag",
                     _maxSize: 1024 * 1024,
@@ -153,8 +153,8 @@
             subType () {
                 return this.selfPropsObj._fileType;
             },
-            showType () {
-                return this.isInTable ? "inline" : this.selfPropsObj._showType;
+            showMode () {
+                return this.isInTable ? "inline" : this.selfPropsObj._showMode;
             },
             useType () {
                 return this.selfPropsObj._useType;
@@ -178,7 +178,7 @@
                     [`${prefixCls}-select`]: this.useType === "select",
                     [`${prefixCls}-drag`]: this.useType === "drag",
                     [`${prefixCls}-dragOver`]: this.useType === "drag" && this.dragOver,
-                    [`BriUpload-${this.showType}-wrapper`]: true
+                    [`BriUpload-${this.showMode}-wrapper`]: true
                 };
             }
         },

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -1,10 +1,10 @@
 <template>
     <div
         class="uploadList"
-        :class="`uploadList-${showType}`"
+        :class="`uploadList-${showMode}`"
     >
         <!-- 普通文本模式 -->
-        <template v-if="showType ==='old'">
+        <template v-if="showMode ==='old'">
             <!-- 有值 -->
             <div
                 v-if="files.length"
@@ -116,7 +116,7 @@
                     return [];
                 }
             },
-            showType: {
+            showMode: {
                 type: String,
                 default: "old" // inline, old, normal
             },

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

@@ -5,7 +5,7 @@
         class="DshCascader"
     >
         <component
-            :is="showTypeMap[showType]"
+            :is="showTypeMap[showMode]"
             v-model="showModal"
             :activeValue="curValList"
             :data="cascaderData"
@@ -77,7 +77,7 @@
         class="DshCascaders"
     >
         <component
-            :is="showTypeMap[showType]"
+            :is="showTypeMap[showMode]"
             v-model="showModal"
             :multipleMode="multipleMode"
             :data="cascaderData"

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

@@ -40,11 +40,11 @@
                                 <div
                                     v-if="canUseModeSwitch"
                                     class="mode"
-                                    @click="showMode = showMode === 'default' ? 'flat' : 'default'"
+                                    @click="searchMode = searchMode === 'default' ? 'flat' : 'default'"
                                 >
                                     <dsh-icons :list="[{ icon: 'md-swap' }]" />
                                     <span class="mode-name">
-                                        {{ showMode === "default" ? "按层级" : "按平级" }}
+                                        {{ searchMode === "default" ? "按层级" : "按平级" }}
                                     </span>
                                 </div>
 
@@ -206,7 +206,7 @@
 
             search () {
                 this.selectedValue = [];
-                this.showMode = "default";
+                this.searchMode = "default";
             },
             clickItem (node) {
                 // 避免重复点击

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

@@ -51,11 +51,11 @@
                                 <div
                                     v-if="canUseModeSwitch"
                                     class="mode"
-                                    @click="showMode = showMode === 'default' ? 'flat' : 'default'"
+                                    @click="searchMode = searchMode === 'default' ? 'flat' : 'default'"
                                 >
                                     <dsh-icons :list="[{ icon: 'md-swap' }]" />
                                     <span class="mode-name">
-                                        {{ showMode === "default" ? "按层级" : "按平级" }}
+                                        {{ searchMode === "default" ? "按层级" : "按平级" }}
                                     </span>
                                 </div>
 
@@ -243,7 +243,7 @@
 
             search () {
                 this.selectedValue = [];
-                this.showMode = "default";
+                this.searchMode = "default";
                 this.curTabIndex = 0;
             },
             clickItem (node) {
@@ -261,7 +261,7 @@
                 }
 
                 // 区分展示方式
-                if (this.showMode === "default" && node.children.length) {
+                if (this.searchMode === "default" && node.children.length) {
                     this.curTabIndex = this.curTabIndex + 1;
                 }
             }

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

@@ -191,13 +191,14 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _showType: "marker", // "marker", "multipleMarker", "polyline", "polygon", "rectangle"
                     _icon: "ios-map-outline",
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
             },
-            showType () {
+            showMode () {
                 return this.selfPropsObj._showType;
             },
 
@@ -323,7 +324,7 @@
                 if (!this.$isEmptyData(this.newVal)) {
                     this.handleAddMarker(this.newVal.lnglat, true);
 
-                    if (this.showType === "multipleMarker") { // 多选打开绘图功能
+                    if (this.showMode === "multipleMarker") { // 多选打开绘图功能
                         this.finalCanEdit && this.handleOpenDraw();
                     }
                 } else {
@@ -332,10 +333,10 @@
             },
             handleMouseToolCallback (e) {
                 if (e.obj.CLASS_NAME === "AMap.Marker") {
-                    if (this.showType === "marker") {
+                    if (this.showMode === "marker") {
                         this.plot = e.obj;
                         this.handleCloseDraw();
-                    } else if (this.showType === "multipleMarker") {
+                    } else if (this.showMode === "multipleMarker") {
                         if (this.plot) {
                             this.plot.push(e.obj);
                         } else {
@@ -369,7 +370,7 @@
                 }
             },
             // 打开绘图
-            handleOpenDraw (type = this.showType) {
+            handleOpenDraw (type = this.showMode) {
                 switch (type) {
                 case "marker": {
                     this.mouseTool.marker(markerOpt);
@@ -402,7 +403,7 @@
                 this.mouseTool.close();
             },
             // 添加图形
-            handleAddMarker (location, centerView = true, type = this.showType) {
+            handleAddMarker (location, centerView = true, type = this.showMode) {
                 location = JSON.parse(JSON.stringify(location));
                 // 分类型添加
                 if (["polygon", "rectangle", "circle"].includes(type)) {
@@ -417,12 +418,12 @@
                     !this.marker && (this.marker = new AMap.Marker());
                     this.marker.setPosition(location);
                     this.marker.setMap(this.map);
-                    if (this.showType === "marker") {
+                    if (this.showMode === "marker") {
                         this.handleRmoveMarker();
                         this.handleCloseDraw();
                         this.newVal.lnglat = [location];
                         this.getRegeoCode();
-                    } else if (this.showType === "multipleMarker") {
+                    } else if (this.showMode === "multipleMarker") {
                         this.newVal.lnglat.push(location);
                         this.getRegeoCode();
                     }
@@ -445,7 +446,7 @@
                 }
             },
             // 移除图形
-            handleRmoveMarker (type = this.showType) {
+            handleRmoveMarker (type = this.showMode) {
                 if (["default"].includes(type)) {
                     this.marker && this.map.remove(this.marker);
                     this.plot && this.map.remove(this.plot);

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

@@ -155,8 +155,8 @@
 
         &-edit {
             &-suffix {
-                min-width: 32px;
-                padding: 0px 6px;
+                min-width: 30px;
+                padding: 0px 5px;
                 border-left: 1px solid @borderColor;
                 background-color: #F0F0F0;
                 text-align: center;

package/src/components/controls/base/DshSelect/DshCheckbox.vue

@@ -5,7 +5,7 @@
         class="DshCheckbox"
     >
         <!-- flat方式 -->
-        <template v-if="showType === 'flat'">
+        <template v-if="showMode === 'flat'">
             <!-- 有选项 -->
             <template v-if="listData.length">
                 <CheckboxGroup

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

@@ -5,7 +5,7 @@
         class="DshSelect"
     >
         <!-- flat方式 -->
-        <template v-if="['flat', 'button'].includes(showType)">
+        <template v-if="['flat', 'button'].includes(showMode)">
             <!-- 有选项 -->
             <template v-if="listData.length">
                 <RadioGroup
@@ -161,7 +161,7 @@
                 };
             },
             radioGroupType () {
-                return this.showType === "button" ? "button" : undefined;
+                return this.showMode === "button" ? "button" : undefined;
             }
         },
         created () {},

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

@@ -35,7 +35,7 @@ export default {
                 _joinSymbol: _joinSymbol // 级联拼接符
             };
         },
-        showType () {
+        showMode () {
             return this.selfPropsObj._showMode;
         },
         colorMap () {

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

@@ -33,7 +33,7 @@ export default {
     data () {
         return {
             searchName: "",
-            showMode: "default", // "flat", "default"
+            searchMode: "default", // "flat", "default"
             maxFlatModeSearchNum: 80,
 
             inputStr: "",
@@ -102,7 +102,7 @@ export default {
         useFlatMode () {
             return this.filterable &&
                 this.canUseModeSwitch &&
-                this.showMode === "flat";
+                this.searchMode === "flat";
         },
         modeTip () {
             return `在搜索时，会出现层级和平级切换开关，但搜索出的结果超${this.maxFlatModeSearchNum}个时，\

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

@@ -132,7 +132,7 @@ export default {
             return {
                 // TODO: 此处的请输入可能还有请选择之类的，待处理
                 _placeholder: this.canEdit && this.propsObj._enterType !== "calculate"
-                    ? (this.propsObj._placeholder || `请${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
+                    ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : undefined,
                 _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
                 _disabled: this.propsObj._disabled || ["serialNumber"].includes(this.controlType) || !this.finalCanEdit

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

@@ -36,7 +36,7 @@ export default {
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
-        showType () {
+        showMode () {
             return this.selfPropsObj._optionKind;
         },
         colorMap () {

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

@@ -32,9 +32,12 @@
                         v-else
                         :canEdit="finalCanEdit"
                         :data="curVal"
-                        :treeColumns="treeColumns"
+                        :treeColumns="treeForm"
                         :subColumns="subForm"
-                        :propsObj="propsObj"
+                        :propsObj="{
+                            ...propsObj,
+                            _useCol: false
+                        }"
                         :parentFormList="allFormList"
                         :parentObj="value"
                         @change="change"
@@ -68,10 +71,9 @@
                     <dsh-cascader-table
                         v-else
                         ref="table"
-                        useCol
                         :canEdit="finalCanEdit"
                         :data="curVal"
-                        :treeColumns="treeColumns"
+                        :treeColumns="treeForm"
                         :subColumns="subForm"
                         :propsObj="propsObj"
                         :parentFormList="allFormList"
@@ -100,10 +102,9 @@
                         ></dsh-tree-table>
                         <dsh-cascader-table
                             v-else
-                            useCol
                             :canEdit="finalCanEdit"
                             :data="curVal"
-                            :treeColumns="treeColumns"
+                            :treeColumns="treeForm"
                             :subColumns="subForm"
                             :propsObj="propsObj"
                             :parentFormList="allFormList"
@@ -175,17 +176,18 @@
             subForm () {
                 return this.propsObj._subForm;
             },
-            treeForm () {
-                return this.propsObj._treeForm;
-            },
             // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
-            treeColumns () {
+            treeForm () {
                 return this.curVal && this.curVal._treeForm
                     ? this.curVal._treeForm
-                    : this.treeForm;
+                    : this.propsObj._treeForm;
+            },
+            isExport () {
+                return this.propsObj._isExport;
             },
+
             operationBtns () {
-                return this.propsObj._isExport
+                return this.isExport
                     ? ["canExport", "canEnlarge"]
                     : ["canEnlarge"];
             },

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

@@ -172,11 +172,21 @@
                     _highSearch: false,
                     _changeOnSelect: true,
                     _searchString: "",
+                    _reverseFilter: false,
+                    _userDepartFilterVals: [],
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
             },
+            // 反向过滤
+            reverseFilter () {
+                return this.selfPropsObj._reverseFilter;
+            },
+            // 禁止显示的部门以及部门下人员
+            listFilterVals () {
+                return this.selfPropsObj._userDepartFilterVals;
+            },
             highSearch () {
                 return this.isOnSearch ? true : this.selfPropsObj._highSearch;
             },
@@ -295,7 +305,14 @@
                     },
                     callback: data => {
                         this.loading = false;
-                        this.departmentList = data.list;
+                        this.departmentList = this.listFilterVals.length
+                            ? data.list.filter(
+                                item =>
+                                    this.reverseFilter
+                                        ? !this.listFilterVals.includes(item._key)
+                                        : this.listFilterVals.includes(item._key)
+                            )
+                            : data.list;
                     }
                 });
             }

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

@@ -337,7 +337,6 @@
                 };
                 this.curDepartment = {};
                 this.pagePropsObj.page = 1;
-                this.getUserListData();
                 this.getDepartmentListData();
             },
             search () {
@@ -421,11 +420,11 @@
                     },
                     loadingName: "loading",
                     callback: data => {
-                        this.userList = this.listFilterVals.length
+                        this.userList = this.allListFilterVals.length
                             ? data.list.filter(item =>
                                 this.reverseFilter
-                                    ? !this.listFilterVals.includes(item.departmentKey)
-                                    : this.listFilterVals.includes(item.departmentKey)
+                                    ? !this.allListFilterVals.includes(item.departmentKey)
+                                    : this.allListFilterVals.includes(item.departmentKey)
                             )
                             : data.list;
                         this.total = data.total;
@@ -471,6 +470,10 @@
                         searchString: this.propsObj.searchString
                     },
                     callback: data => {
+                        // 当前部门被过滤，所有子级部门同样过滤
+                        const depts = data.list.filter(item => this.listFilterVals.includes(item._key));
+                        this.allListFilterVals = this.getAllListFilterVals(depts).map(item => item._key);
+
                         this.departmentList = [
                             ...(
                                 this.highSearch
@@ -512,8 +515,20 @@
                                     : data.list
                             )
                         ];
+
+                        this.getUserListData();
                     }
                 });
+            },
+
+            getAllListFilterVals (list) {
+                if (list.length) {
+                    let stack = [...list];
+                    return stack.reduce((prev, item) => {
+                        return prev.concat(item.children && item.children.length ? this.getAllListFilterVals(item.children) : []);
+                    }, stack);
+                }
+                return [];
             }
         },
         filters: {

package/src/components/list/DshBox/DshCrossTable.vue

@@ -196,6 +196,7 @@
                                 :key="dataItem._id"
                                 class="DshCrossTable-td-checkbox"
                                 :style="{
+                                    width: colWidth ? colWidth + 'px' : '200px',
                                     background: '#f4f4f4',
                                     textAlign: 'center'
                                 }"
@@ -217,6 +218,7 @@
                             :key="dataItem._id"
                             class="DshCrossTable-td-index"
                             :style="{
+                                width: colWidth ? colWidth + 'px' : '200px',
                                 background: '#f4f4f4',
                                 textAlign: 'center'
                             }"
@@ -232,6 +234,9 @@
             <div
                 v-if="showTable"
                 class="DshCrossTable-right-body"
+                :style="showScrollX === false ? {
+                    overflowX: 'hidden'
+                } : {}"
                 @scroll="tableScroll($event)"
             >
                 <!-- 无数据 -->
@@ -333,6 +338,7 @@
                             :key="dataItem._id"
                             class="DshCrossTable-td-operation"
                             :style="{
+                                width: colWidth ? colWidth + 'px' : '200px',
                                 background: '#f4f4f4',
                             }"
                         >
@@ -403,6 +409,7 @@
                 rowWidth: 0,
                 colWidth: 0,
                 titleWidth: 200,
+                showScrollX: false,
                 showTable: false,
                 currentPage: 1,
                 pagesize: 10,
@@ -557,14 +564,16 @@
                 let that = this;
                 erd.listenTo(document.getElementById("DshCrossTable-right"), function (element) {
                     // 计算宽度
-                    let tableWidth = that.$refs["DshCrossTable-right"].clientWidth;
+                    let tableWidth = that.$refs["DshCrossTable-right"].clientWidth - 10;
                     let nums = tableWidth / 200;
                     let dataTotal = that.data.length;
                     if (nums >= dataTotal) {
                         that.rowWidth = tableWidth;
-                        that.colWidth = (tableWidth - 10) / dataTotal;
+                        that.colWidth = tableWidth / dataTotal;
+                        that.showScrollX = false;
                     } else {
                         that.rowWidth = dataTotal * 200;
+                        that.showScrollX = true;
                     }
 
                     // that.rowWidth = 200 * that.data.length;