bri-components 1.3.86 → 1.3.87

package/package.json

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

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

@@ -143,6 +143,7 @@
                 return {
                     _fileType: "file",
                     _showMode: this.isHeightAuto ? "old" : "inline", // 宽度为100%、且不在级联表格或内部表格里的 显示老版
+
                     _multiple: true,
                     _useType: "drag",
                     _maxSize: 1024 * 1024,

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

@@ -169,7 +169,6 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _showMode: "default", // 值为"default", "custom", "simple"
                     _transfer: true,
                     _transferClassName: "",
 

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

@@ -14,12 +14,12 @@ export default {
         basePropsObj () {
             const _joinSymbol = this.propsObj._joinSymbol || "/";
             return {
+                _regionType: "default", // "default", "benji", "userIndustry"
+                _showMode: "default", // "default", "custom", "simple"
+
                 _saveKey: "_key",
                 _valueKey: "code",
                 _nameKey: "name",
-
-                _regionType: "default", // "default", "benji", "userIndustry"
-                _showMode: "default", // "default", "custom", "simple"
                 colorMap: resourceData.colorMap,
                 _useColor: false,
                 _filterable: true, // 是否支持搜索
@@ -39,6 +39,13 @@ export default {
                 _joinSymbol: _joinSymbol // 级联拼接符
             };
         },
+        regionType () {
+            return this.selfPropsObj._regionType;
+        },
+        showMode () {
+            return this.selfPropsObj._showMode;
+        },
+
         saveKey () {
             return this.selfPropsObj._saveKey;
         },
@@ -48,13 +55,6 @@ export default {
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
-
-        regionType () {
-            return this.selfPropsObj._regionType;
-        },
-        showMode () {
-            return this.selfPropsObj._showMode;
-        },
         colorMap () {
             return this.selfPropsObj.colorMap;
         },

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

@@ -28,7 +28,7 @@ export default {
         inTableType: {
             type: String,
             validator (val) {
-                return ["flatTable", "cascaderTable", "treeTable"].includes(val);
+                return ["flatTable", "treeTable", "cascaderTable"].includes(val);
             }
         },
         allListRows: {

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

@@ -15,9 +15,10 @@ export default {
     computed: {
         basePropsObj () {
             return {
+                _optionKind: "dropdown", // "flat"、"dropdown"
+
                 _saveKey: "_key",
                 _nameKey: "name",
-                _optionKind: "dropdown", // "flat"、"dropdown"
                 colorMap: resourceData.colorMap,
                 _useColor: false,
                 _filterable: true, // 是否支持搜索
@@ -30,15 +31,16 @@ export default {
                 ...this.commonDealPropsObj
             };
         },
+        showMode () {
+            return this.selfPropsObj._optionKind;
+        },
+
         saveKey () {
             return this.selfPropsObj._saveKey;
         },
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
-        showMode () {
-            return this.selfPropsObj._optionKind;
-        },
         colorMap () {
             return this.selfPropsObj.colorMap;
         },

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

@@ -17,8 +17,9 @@
             <!-- 配置端 设置默认值用-->
             <dsh-btn-modal v-if="controlKey === '_default'">
                 <template>
-                    <dsh-tree-table
-                        v-if="showMode === 'treeTable'"
+                    <!-- 老版级联表格 -->
+                    <dsh-cascader-table
+                        v-if="subType === 'old'"
                         :canEdit="finalCanEdit"
                         :data="curVal.tree"
                         :rowDefault="curVal.rowDefault"
@@ -26,10 +27,18 @@
                         :propsObj="defaultPropsObj"
                         :allFormList="allFormList"
                         :parentObj="value"
+                        :tableDataObj="curVal"
+                        :treeColumns="treeForm"
                         @change="change"
-                    ></dsh-tree-table>
+                    ></dsh-cascader-table>
 
-                    <dsh-cascader-table
+                    <!-- 横向层级表格 -->
+                    <div v-if="subType === 'cross'">
+                        横向层级表格还未开发……
+                    </div>
+
+                    <!-- 层级表格 -->
+                    <dsh-tree-table
                         v-else
                         :canEdit="finalCanEdit"
                         :data="curVal.tree"
@@ -38,18 +47,16 @@
                         :propsObj="defaultPropsObj"
                         :allFormList="allFormList"
                         :parentObj="value"
-                        :tableDataObj="curVal"
-                        :treeColumns="treeForm"
                         @change="change"
-                    ></dsh-cascader-table>
+                    ></dsh-tree-table>
                 </template>
             </dsh-btn-modal>
 
             <!-- 正常使用 -->
             <template v-else>
-                <!-- 层级表 -->
-                <dsh-tree-table
-                    v-if="showMode === 'treeTable'"
+                <!-- 老版级联表格 -->
+                <dsh-cascader-table
+                    v-if="subType === 'old'"
                     ref="table"
                     :canEdit="finalCanEdit"
                     :data="curVal.tree"
@@ -58,11 +65,18 @@
                     :propsObj="selfPropsObj"
                     :allFormList="allFormList"
                     :parentObj="value"
+                    :tableDataObj="curVal"
+                    :treeColumns="treeForm"
                     @change="change"
-                ></dsh-tree-table>
+                ></dsh-cascader-table>
 
-                <!-- 级联表 -->
-                <dsh-cascader-table
+                <!-- 横向层级表格 -->
+                <div v-if="subType === 'cross'">
+                    横向层级表格还未开发……
+                </div>
+
+                <!-- 层级表格 -->
+                <dsh-tree-table
                     v-else
                     ref="table"
                     :canEdit="finalCanEdit"
@@ -72,10 +86,8 @@
                     :propsObj="selfPropsObj"
                     :allFormList="allFormList"
                     :parentObj="value"
-                    :tableDataObj="curVal"
-                    :treeColumns="treeForm"
                     @change="change"
-                ></dsh-cascader-table>
+                ></dsh-tree-table>
             </template>
         </template>
     </div>
@@ -104,7 +116,7 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _showMode: "default", // "default", "treeTable"
+                    _subType: "default", // "default", "cross", "old"
                     _subForm: [],
                     _treeForm: [],
                     _searchList: [], // 作为搜索的字段
@@ -124,8 +136,8 @@
                     }
                 };
             },
-            showMode () {
-                return this.selfPropsObj._showMode;
+            subType () {
+                return this.selfPropsObj._subType;
             },
             subForm () {
                 return this.selfPropsObj._subForm;
@@ -185,9 +197,9 @@
                     this.curVal
                         ? this.$getTreeFlatArr(this.curVal.tree, (row) =>
                             (
-                                this.showMode === "treeTable"
-                                    ? true
-                                    : row.isLeaf === true
+                                this.subType === "old"
+                                    ? row.isLeaf === true
+                                    : true
                             ) && (
                                 this.isSearching
                                     ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)

package/src/components/form/DshForm.vue

@@ -139,7 +139,7 @@
             inTableType: {
                 type: String,
                 validator (val) {
-                    return ["flatTable", "cascaderTable", "treeTable"].includes(val);
+                    return ["flatTable", "treeTable", "cascaderTable"].includes(val);
                 }
             },
             allListRows: {

package/src/components/form/searchMixin.js

@@ -172,7 +172,6 @@ export default {
                 if (curFormItem) {
                     const fieldType = curFormItem._type;
                     fieldKey = curFormItem._key;
-                    const cascaderTableMode = curFormItem._showMode;
                     const fieldData = this.fieldMap[fieldType];
 
                     const dynamicTypes = this.useChainField
@@ -191,9 +190,9 @@ export default {
                         ["_id"].includes(fieldKey)
                             ? []
                             : ["cascaderTable"].includes(fieldType)
-                                ? cascaderTableMode === "treeTable"
-                                    ? fieldData.operators.filter(operator => !["cascaderTableSearch"].includes(operator._key))
-                                    : fieldData.operators.filter(operator => !["treeTableSearch"].includes(operator._key))
+                                ? curFormItem._subType === "old"
+                                    ? fieldData.operators.filter(operator => !["treeTableSearch"].includes(operator._key))
+                                    : fieldData.operators.filter(operator => !["cascaderTableSearch"].includes(operator._key))
                                 // 单条关联类型 -配置端：无动态字段的地方过滤掉“是”和“不是”筛选条件，有动态字段的地方用的全部条件；用户端：用的全部条件，
                                 : ["reference"].includes(fieldType)
                                     ? this.mode === "set" && !dynamicList.length

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

@@ -202,6 +202,9 @@ export default {
         commonPropsObj () {
             return {
                 // isShare: false, // 是否是分享页在用
+                _subType: "default", // "default", "cross", "old"
+                _showMode: "default", // "default", "form"
+
                 _showRequired: true, // 表头显示校验符号*
                 _showDescription: true, // 表头显示提示
                 _headHeightAuto: false, // 表头高度自适应
@@ -240,17 +243,21 @@ export default {
                 ...this.commonPropsObj
             };
         },
+        // isShare () {
+        //     return this.selfPropsObj.isShare;
+        // },
+        subType () {
+            return this.selfPropsObj._subType;
+        },
         showMode () {
             return this.selfPropsObj._showMode;
         },
         inTableType () {
-            return this.controlType === "cascaderTable" && ["treeTable"].includes(this.showMode)
-                ? this.showMode
+            return this.controlType === "cascaderTable" && !["old"].includes(this.subType)
+                ? "treeTable"
                 : this.controlType;
         },
-        // isShare () {
-        //     return this.selfPropsObj.isShare;
-        // },
+
         contentHeight () {
             return this.selfPropsObj._contentHeight;
         },

package/src/components/unit/unitMixin.js

@@ -30,7 +30,7 @@ export default {
         inTableType: {
             type: String,
             validator (val) {
-                return ["flatTable", "cascaderTable", "treeTable"].includes(val);
+                return ["flatTable", "treeTable", "cascaderTable"].includes(val);
             }
         },
         allListRows: {