bri-components 1.3.97 → 1.4.0

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

@@ -6,30 +6,53 @@ export default {
     props: {},
     data () {
         return {
-            searchMode: "flat" // "flat", "tree"
+            searchMode: "flat", // "flat", "tree"
+
+            baseOperationMap: {
+                canCreateChild: {
+                    name: "添加一行下级",
+                    type: "canCreateChild",
+                    btnType: "default",
+                    icon: "md-add-circle",
+                    size: "default",
+                    color: "#3DB8C5",
+                    disabled: false,
+                    event: "clickCreateChild"
+                }
+                // canDeleteChilds: {
+                //     name: "删除所有子级",
+                //     type: "canDeleteChilds",
+                //     btnType: "errorText",
+                //     icon: "ios-trash-outline",
+                //     size: "small",
+                //     color: "#E83636",
+                //     disabled: false,
+                //     event: "clickDeleteChilds"
+                // }
+            }
         };
     },
     computed: {
-        selfPropsObj () {
+        treeTableBasePropsObj () {
             return {
                 _treeForm: [],
-                ...(this.typePropsObj || {}),
-                ...this.commonPropsObj,
-
-                _maxLevel: this.commonPropsObj._maxLevel || 3 // 最大级数
+                _maxLevel: 3 // 最大级数
             };
         },
+        treeForm () {
+            return this.selfPropsObj._treeForm;
+        },
         maxLevel () {
-            return this.selfPropsObj._maxLevel;
+            return this.selfPropsObj._maxLevel || 3;
         },
 
         selfColumns () {
             return this.columns.map(column => {
-                // 层级表格类型，level字段的进行特殊处理（_treeForm加工成_data）
+                // 层级表格类型，level字段的进行特殊处理（treeForm加工成_data）
                 return column._key === "level"
                     ? {
                         ...column,
-                        _data: this.selfPropsObj._treeForm.map((treeFormItem, treeFormIndex) => ({
+                        _data: this.treeForm.map((treeFormItem, treeFormIndex) => ({
                             name: treeFormItem._name,
                             _key: (treeFormIndex + 1),
                             color: Object.keys(resourceData.colorMap)[treeFormIndex + 1]
@@ -37,6 +60,17 @@ export default {
                     }
                     : column;
             });
+        },
+        selfAllOperationMap () {
+            return {
+                canCreateChild: {
+                    ...this.baseOperationMap.canCreateChild,
+                    name: this.showMode === "form"
+                        ? this.baseOperationMap.canCreateChild.name.replace("行", "条")
+                        : this.baseOperationMap.canCreateChild.name
+                        // disabled: !!this.disabledCreateBtn
+                }
+            };
         }
     },
     created () { },
@@ -57,7 +91,7 @@ export default {
                 : list.length;
             list.splice(newRowIndex, 0, newRow);
 
-            this.change("createRow", null, newRow, newRowIndex);
+            this.change("createRow", newRow, newRowIndex, null);
         },
         // 节点操作 -添加子行
         clickCreateChild (operationItem, row, rowIndex, col) {
@@ -69,7 +103,7 @@ export default {
             // 展开子级
             this.toggleExpand(row, true);
 
-            this.change("createChildRow", null, newRow, newRowIndex);
+            this.change("createChildRow", newRow, newRowIndex, null);
         },
         // 节点操作 -删除行
         clickDelete (operationItem, row, rowIndex, col) {
@@ -81,22 +115,22 @@ export default {
                     const index = parentRow.children.findIndex(childRowItem => childRowItem._id === row._id);
                     parentRow.children.splice(index, 1);
 
-                    this.change("deleteRow", null, row, rowIndex);
+                    this.change("deleteRow", row, rowIndex, null);
                 }
             });
         },
-        // 节点操作 -删除所有子行
-        clickDeleteChilds (operationItem, row, rowIndex, col) {
-            this.$Modal.confirm({
-                title: "警告",
-                content: "确定删除所有下级吗？",
-                onOk: () => {
-                    row.children.splice(0);
+        // // 节点操作 -删除所有子行
+        // clickDeleteChilds (operationItem, row, rowIndex, col) {
+        //     this.$Modal.confirm({
+        //         title: "警告",
+        //         content: "确定删除所有下级吗？",
+        //         onOk: () => {
+        //             row.children.splice(0);
 
-                    this.change("deleteChildRows", null, row, rowIndex);
-                }
-            });
-        },
+        //             this.change("deleteChildRows", row, rowIndex, null);
+        //         }
+        //     });
+        // },
 
         // 展开／隐藏节点
         toggleExpand (row, bool = true) {

package/src/components/small/DshDropdown.vue

@@ -48,7 +48,7 @@
                     class="list"
                 >
                     <DropdownItem
-                        v-for="dropdownItem in showList"
+                        v-for="(dropdownItem, dropdownIndex) in showList"
                         :key="dropdownItem._id || dropdownItem._key || dropdownItem.type"
                         :class="{
                             'list-item': true,
@@ -63,6 +63,7 @@
                         <slot
                             name="dropdownItem"
                             :dropdownItem="dropdownItem"
+                            :dropdownIndex="dropdownIndex"
                         >
                             <dsh-icons
                                 v-if="dropdownItem.icon || dropdownItem.customIcon"

package/src/styles/components/list/BriTable.less

@@ -224,8 +224,9 @@
             display: none!important;
         }
 
-        &-tree,
         &-merge {
+            background-color: #fbfbfb!important;
+
             textarea.ivu-input {
                 min-height: 18px;
                 padding: 0px;

package/src/utils/table.js

@@ -123,7 +123,7 @@ const transformToColumns = function (form, {
                         }
                         : undefined
                     : undefined,
-                renderHeaderCell: ({ row, column }, h) => {
+                renderHeaderCell: ({ column }, h) => {
                     return getHeadRender(h, column, {
                         showRequired,
                         showDescription,