bri-components 1.4.83 → 1.4.85

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

@@ -3,7 +3,14 @@ import { resourceData } from "bri-datas";
 export default {
     mixins: [],
     components: {},
-    props: {},
+    props: {
+        treeColumns: {
+            type: Array,
+            default () {
+                return [];
+            }
+        }
+    },
     data () {
         return {
             searchMode: "flat", // "flat", "tree"
@@ -34,27 +41,25 @@ export default {
     computed: {
         treeTableBasePropsObj () {
             return {
-                _treeForm: [],
+                // _treeForm: [],
                 _maxLevel: 3 // 最大级数
             };
         },
-        treeForm () {
-            return this.selfPropsObj._treeForm;
-        },
-        treeFormKeys () {
-            return this.treeForm.map(treeFormItem => treeFormItem._key);
-        },
         maxLevel () {
             return this.selfPropsObj._maxLevel || 3;
         },
+        treeColKeys () {
+            return this.treeColumns.map(colItem => colItem._key);
+        },
 
+        /* --- 列字段 --- */
         selfColumns () {
             return this.columns.map(column => {
                 // 层级表格类型，level字段的进行特殊处理（treeForm加工成_data）
                 return column._key === "level"
                     ? {
                         ...column,
-                        _data: this.treeForm.map((treeFormItem, treeFormIndex) => ({
+                        _data: this.treeColumns.map((treeFormItem, treeFormIndex) => ({
                             name: treeFormItem._name,
                             _key: (treeFormIndex + 1),
                             color: Object.keys(resourceData.colorMap)[treeFormIndex + 1]
@@ -63,6 +68,7 @@ export default {
                     : column;
             });
         },
+
         selfAllOperationMap () {
             return {
                 canCreateChild: {
@@ -109,7 +115,7 @@ export default {
             list.splice(newRowIndex, 0, newRow);
 
             // 展开子级
-            this.toggleExpand(row, true);
+            this.toggleExpand && this.toggleExpand(row, true);
 
             this.change("createChildRow", newRow, newRowIndex, null);
         },
@@ -126,7 +132,7 @@ export default {
                     this.change("deleteRow", row, rowIndex, null);
                 }
             });
-        },
+        }
         // // 节点操作 -删除所有子行
         // clickDeleteChilds (operationItem, row, rowIndex, col) {
         //     this.$Modal.confirm({
@@ -139,43 +145,5 @@ export default {
         //         }
         //     });
         // },
-
-        selfFixRowItem (row, levelNum) {
-            if (this.initFlag) {
-                // TODO：修正数据level属性，后期可以删除
-                row.level = row.level || levelNum;
-            }
-        },
-        // 展开／隐藏节点
-        toggleExpand (row, bool = true) {
-            this.isExpandAction = true;
-            this.$set(row, "__isExpand__", bool);
-
-            this.toggleDescendantsShow(row, bool);
-        },
-        // 切换子孙后代的显示／隐藏
-        toggleDescendantsShow (row, bool) {
-            const loop = (row, isFirstSon) => {
-                if (row.children && row.children.length) {
-                    row.children.forEach(subRow => {
-                        if (isFirstSon) {
-                            this.$set(subRow, "__isRendered__", true);
-                            this.$set(subRow, "__isShow__", bool);
-                            this.$set(subRow, "__isTmpShow__", bool);
-                        } else {
-                            if (bool) {
-                                this.$set(subRow, "__isShow__", subRow.__isTmpShow__);
-                            } else {
-                                this.$set(subRow, "__isShow__", false);
-                            }
-                        }
-
-                        loop(subRow);
-                    });
-                }
-            };
-
-            loop(row, true);
-        }
     }
 };

package/src/styles/components/BriTable.less

@@ -196,9 +196,9 @@
         padding: 4px 16px;
         position: relative;
         
-        &-expand {
+        // &-expand {
 
-        }
+        // }
         &-treeIndex {
             padding: 4px 16px 4px 12px!important;
         }