bri-components 1.3.67 → 1.3.69

package/package.json

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

package/src/components/controls/DshControlInput.vue

@@ -1,6 +1,10 @@
 <template>
     <div
         class="DshControlInput"
+        :style="{
+            height: heightAuto ? 'auto' : '32px',
+            minHeight: heightAuto ? '32px' : undefined,
+        }"
         @mouseenter="isHover = true"
         @mouseleave="isHover = false"
     >
@@ -11,6 +15,10 @@
                 <dsh-tags
                     v-if="Array.isArray(value)"
                     class="overflow"
+                    :class="{
+                        overflow: true,
+                        'overflow-auto': heightAuto
+                    }"
                     :list="value"
                     :propsObj="{
                         disabled: disabled,
@@ -65,11 +73,16 @@
     export default {
         name: "DshControlInput",
         props: {
+            value: [Array, Object, String],
+
+            heightAuto: {
+                type: Boolean,
+                default: false
+            },
             disabled: {
                 type: Boolean,
                 default: false
             },
-            value: [Array, Object, String],
             propsObj: {
                 type: Object,
                 default () {
@@ -101,7 +114,6 @@
 
 <style lang="less" scoped>
     .DshControlInput {
-        height: 32px;
         padding: 0px 0px 0px 7px;
         line-height: 24px;
         .dsh-flex-row-between-center();
@@ -117,6 +129,11 @@
             overflow-x: auto;
             overflow-y: hidden;
             white-space: nowrap;
+
+            &-auto {
+                height: auto;
+                white-space: normal;
+            }
         }
 
         .placeholder {

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

@@ -88,6 +88,7 @@
                 :class="commonClass"
                 :value="curValNameList"
                 :disabled="inputPropsObj._disabled"
+                :heightAuto="isHeightAuto"
                 :propsObj="inputPropsObj"
                 @deleteItem="clickDeleteItem"
                 @clear="clickClear"

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

@@ -14,18 +14,21 @@ export default {
         basePropsObj () {
             const _joinSymbol = this.propsObj._joinSymbol || "/";
             return {
+                _saveKey: "_key",
+                _valueKey: "code",
+                _nameKey: "name",
+
                 _regionType: "default", // "default", "benji", "userIndustry"
                 _showMode: "default", // "default", "custom", "simple"
                 colorMap: resourceData.colorMap,
                 _useColor: false,
-                _saveKey: "_key",
-                _valueKey: "code",
-                _nameKey: "name",
                 _filterable: true, // 是否支持搜索
-                _data: [],
+                _cascaderLevel: undefined, // 级联数据取到第几级
                 _reverseFilter: false, // 是否反向过滤，默认正向过滤
-                _cascaderFilterVals: [], // 过滤的级联数据
+                _cascaderFilterVals: [], // 过滤的数据的第一级选项
+                _cascaderSelectVals: [], // 过滤的数据的级联选项
                 _renderFormat: (labels) => labels.join(_joinSymbol),
+                _data: [],
 
                 ...this.propsObj,
                 ...this.commonDealPropsObj,
@@ -36,6 +39,16 @@ export default {
                 _joinSymbol: _joinSymbol // 级联拼接符
             };
         },
+        saveKey () {
+            return this.selfPropsObj._saveKey;
+        },
+        valueKey () {
+            return this.selfPropsObj._valueKey;
+        },
+        nameKey () {
+            return this.selfPropsObj._nameKey;
+        },
+
         regionType () {
             return this.selfPropsObj._regionType;
         },
@@ -48,24 +61,21 @@ export default {
         useColor () {
             return this.selfPropsObj._useColor;
         },
-        saveKey () {
-            return this.selfPropsObj._saveKey;
-        },
-        valueKey () {
-            return this.selfPropsObj._valueKey;
-        },
-        nameKey () {
-            return this.selfPropsObj._nameKey;
-        },
+        // filterable () {
+        //     return this.selfPropsObj._filterable;
+        // },
         cascaderLevel () {
             return this.selfPropsObj._cascaderLevel;
         },
         reverseFilter () {
             return this.selfPropsObj._reverseFilter;
         },
-        cascaderFilterVals () {
+        filterVals () {
             return this.selfPropsObj._cascaderFilterVals;
         },
+        cascaderVals () {
+            return this.selfPropsObj._cascaderSelectVals;
+        },
         renderFormat () {
             return this.selfPropsObj._renderFormat;
         },
@@ -80,51 +90,79 @@ export default {
                     : this.selfPropsObj._data;
         },
         cascaderAllData () {
-            const loop = (arr = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
-                if (filterVals.length) {
-                    arr = arr.filter(item =>
-                        this.reverseFilter
-                            ? !filterVals.includes(item[this.saveKey])
-                            : filterVals.includes(item[this.saveKey])
-                    );
-                }
+            const loop = (arr = [], level, parentKeys = [], filterVals = [], cascaderVals = [], reverseFilter = false, isMobile = false, saveKey = "_key", valueKey = "code", nameKey = "name") => {
+                arr = cascaderVals.length
+                    ? arr.filter(item => {
+                        const itemKey = item[saveKey];
+                        const keys = [...parentKeys, itemKey]; // ！！此处就是用_key拼，不会用别的属性
 
-                return arr
-                    ? arr.reduce((arr, item) => {
-                        let newItem = {
-                            keys: [...parentKeys, item[this.saveKey]], // ！！此处就是用_key拼，不会用别的属性
-                            code: [...parentKeys, item._key].join(""),
-                            ...item
-                        };
-                        newItem = {
-                            ...newItem,
-                            value: newItem[this.valueKey],
-                            label: newItem[this.nameKey]
-                        };
+                        return reverseFilter
+                            ? !cascaderVals.some(valArr =>
+                                keys.length < valArr.length
+                                    ? false
+                                    : valArr.every((valArrKey, index) => valArrKey === keys[index])
+                            )
+                            : cascaderVals.some(valArr =>
+                                keys.length < valArr.length
+                                    ? keys.every((levelKey, index) => levelKey === valArr[index])
+                                    : valArr.every((valArrKey, index) => valArrKey === keys[index])
+                        );
+                    })
+                    : filterVals.length
+                        ? arr.filter(item => {
+                            const itemKey = item[saveKey];
+
+                            return reverseFilter
+                                ? !filterVals.includes(itemKey)
+                                : filterVals.includes(itemKey);
+                        })
+                        : arr;
+
+                return arr.reduce((newArr, item) => {
+                    const itemKey = item[saveKey];
+                    const keys = [...parentKeys, itemKey]; // ！！此处就是用_key拼，不会用别的属性
+                    let newItem = {
+                        keys: keys,
+                        code: keys.join(""),
+                        ...item
+                    };
+                    newItem = {
+                        ...newItem,
+                        value: newItem[valueKey],
+                        label: newItem[nameKey]
+                    };
+
+                    if (
+                        (!level || level > newItem.level) &&
+                        (newItem.children && newItem.children.length)
+                    ) {
+                        newItem.children = loop(newItem.children, level, newItem.keys, [], cascaderVals, reverseFilter, isMobile, saveKey, valueKey, nameKey);
 
-                        if (
-                            (!level || level > newItem.level) &&
-                            (newItem.children && newItem.children.length)
-                        ) {
+                        if (newItem.children.length) {
                             newItem.loading = false; // 此代码pc端在用：为了所请求的级，出现继续加载的箭头图标
-                            newItem.children = loop(newItem.children, level, newItem.keys, undefined, isMobile);
+                            newItem.isLeaf = false;
                         } else {
                             newItem.children = isMobile ? undefined : [];
                             newItem.isLeaf = true;
                         }
-                        arr.push(newItem);
+                    } else {
+                        newItem.children = isMobile ? undefined : [];
+                        newItem.isLeaf = true;
+                    }
 
-                        return arr;
-                    }, [])
-                    : [];
+                    return [
+                        ...newArr,
+                        newItem
+                    ];
+                }, []);
             };
 
-            return loop(this.originData, this.cascaderLevel, undefined, this.cascaderFilterVals, this.isMobile);
+            return loop(this.originData, this.cascaderLevel, [], this.filterVals, this.cascaderVals, this.reverseFilter, this.isMobile, this.saveKey, this.valueKey, this.nameKey);
         },
         cascaderData () {
             const loop = (arr = [], isMobile) => {
                 return arr
-                    ? arr.reduce((arr, item) => {
+                    ? arr.reduce((newArr, item) => {
                         if (item.rm !== 1) {
                             let newItem = {
                                 ...item
@@ -132,13 +170,20 @@ export default {
 
                             if (newItem.children && newItem.children.length) {
                                 newItem.children = loop(newItem.children, isMobile);
+
+                                if (newItem.children.length) {
+                                    // 无需处理
+                                } else {
+                                    newItem.children = isMobile ? undefined : [];
+                                }
                             } else {
                                 newItem.children = isMobile ? undefined : [];
                             }
-                            arr.push(newItem);
+
+                            newArr.push(newItem);
                         }
 
-                        return arr;
+                        return newArr;
                     }, [])
                     : [];
             };

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

@@ -32,13 +32,14 @@
                     <dsh-cascader-table
                         v-else
                         :canEdit="finalCanEdit"
+                        :data="curVal.tree"
                         :rowDefault="curVal.rowDefault"
                         :columns="subForm"
-                        :data="curVal"
-                        :treeColumns="treeForm"
                         :propsObj="defaultPropsObj"
                         :allFormList="allFormList"
                         :parentObj="value"
+                        :tableDataObj="curVal"
+                        :treeColumns="treeForm"
                         @change="change"
                     ></dsh-cascader-table>
                 </template>
@@ -65,13 +66,14 @@
                     v-else
                     ref="table"
                     :canEdit="finalCanEdit"
+                    :data="curVal.tree"
                     :rowDefault="curVal.rowDefault"
                     :columns="subForm"
-                    :data="curVal"
-                    :treeColumns="treeForm"
                     :propsObj="selfPropsObj"
                     :allFormList="allFormList"
                     :parentObj="value"
+                    :tableDataObj="curVal"
+                    :treeColumns="treeForm"
                     @change="change"
                 ></dsh-cascader-table>
             </template>