bri-components 1.3.94 → 1.3.96

package/package.json

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

package/src/components/list/DshCascaderTable.vue

@@ -29,6 +29,9 @@
             </div>
         </div>
 
+        <!-- 添加行 -->
+        <dsh-render :render="createBtnRender"></dsh-render>
+
         <!-- 各种模态框共用 -->
         <dsh-render :render="dshRender"></dsh-render>
 

package/src/components/list/DshFlatTable.vue

@@ -126,7 +126,6 @@
 
 <script>
     import tableBaseMixin from "./mixins/tableBaseMixin.js";
-    import treeTableBaseMixin from "./mixins/treeTableBaseMixin.js";
     import DshFlatTableMixin from "./mixins/DshFlatTableMixin.js";
     import DshDivider from "../controls/base/DshDivider.vue";
 
@@ -134,7 +133,6 @@
         name: "DshFlatTable",
         mixins: [
             tableBaseMixin,
-            treeTableBaseMixin,
             DshFlatTableMixin
         ],
         components: {

package/src/components/list/DshTreeTable.vue

@@ -86,12 +86,14 @@
 
 <script>
     import tableBaseMixin from "./mixins/tableBaseMixin.js";
+    import treeTableBaseMixin from "./mixins/treeTableBaseMixin.js";
     import DshTreeTableMixin from "./mixins/DshTreeTableMixin.js";
 
     export default {
         name: "DshTreeTable",
         mixins: [
             tableBaseMixin,
+            treeTableBaseMixin,
             DshTreeTableMixin
         ],
         components: {},

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

@@ -52,27 +52,26 @@ export default {
                     name: "改变节点值",
                     type: "changeNode",
                     event: "changeNode"
-                },
-
-                canClearNode: {
-                    name: "清除内容",
-                    type: "canClearNode",
-                    icon: "md-trash",
-                    divided: true,
-                    event: "clickClearNode"
-                },
-                canClearChildNodes: {
-                    name: "清除所有下级内容",
-                    type: "canClearChildNodes",
-                    icon: "md-trash",
-                    event: "clickClearChildNodes"
                 }
+
+                // canClearNode: {
+                //     name: "清除内容",
+                //     type: "canClearNode",
+                //     icon: "md-trash",
+                //     divided: true,
+                //     event: "clickClearNode"
+                // },
+                // canClearChildNodes: {
+                //     name: "清除所有下级内容",
+                //     type: "canClearChildNodes",
+                //     icon: "md-trash",
+                //     event: "clickClearChildNodes"
+                // }
             }
         };
     },
     computed: {
         allTreeData () {
-            // console.log("allTreeData");
             return this.getCalcuedTree(this.data, this.treeColumns, this.selfColumns);
         },
         allListData () {
@@ -165,18 +164,18 @@ export default {
         changeNode (operationItem, col, row, rowIndex) {
             this.change("changeNode", col, row, rowIndex);
         },
-        // 节点操作 -清除该节点内容
-        clickClearNode (operationItem, row, rowIndex, col) {
-            row.name = "";
-
-            this.change("clearNode", null, row, rowIndex);
-        },
-        // 节点操作 -清除所有子节点内容
-        clickClearChildNodes (operationItem, row, rowIndex, col) {
-            this.$clearPropertyValToLeaf(row.children);
-
-            this.change("clearChildNodes", null, row, rowIndex);
-        },
+        // // 节点操作 -清除该节点内容
+        // clickClearNode (operationItem, row, rowIndex, col) {
+        //     row.name = "";
+
+        //     this.change("clearNode", null, row, rowIndex);
+        // },
+        // // 节点操作 -清除所有子节点内容
+        // clickClearChildNodes (operationItem, row, rowIndex, col) {
+        //     this.$clearPropertyValToLeaf(row.children);
+
+        //     this.change("clearChildNodes", null, row, rowIndex);
+        // },
         change (eventType, col, row, rowIndex, ...params) {
             this.$emit("change", this.tableDataObj, eventType, col, row, rowIndex, ...params);
         },
@@ -379,7 +378,15 @@ export default {
                     "td",
                     {
                         class: this.tablePropsObj.cellStyleOption.bodyCellClass({ row, rowIndex, column }),
-                        style: this.getTdStyle(column, row, rowIndex)
+                        style: this.getTdStyle(column, row, rowIndex),
+                        on: {
+                            mouseenter: (event) => {
+                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, true);
+                            },
+                            mouseleave: (event) => {
+                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, false);
+                            }
+                        }
                     },
                     column
                         ? column.renderBodyCell({ row, rowIndex, column }, h)
@@ -392,12 +399,14 @@ export default {
             const list = this.$getOperationList(
                 position === "th"
                     ? [
-                        ...(column.level <= this.maxLevel ? ["canCreateCol"] : []), // 限制最大添加到几级
+                        ...(column.level < this.maxLevel ? ["canCreateCol"] : []), // 限制最大添加到几级
                         ...(column.level > 1 && column.canDelete === true ? ["canDeleteCol"] : []) // 只有一级和最后两级节点数不一致时，不能删
                     ]
-                    : row.isLeaf === true
-                        ? ["canCreate", "canDelete", "canClearNode"]
-                        : ["canCreate", "canCreateChild", "canDelete", "canDeleteChilds", "canClearNode", "canClearChildNodes"]
+                    : this.getRowIsDftDisabled(row)
+                        ? []
+                        : row.isLeaf === true
+                            ? ["canCreate", "canDelete"]
+                            : ["canCreate", "canCreateChild", "canDelete", "canDeleteChilds"]
             );
 
             return !this.isSearching &&

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

@@ -79,9 +79,6 @@ export default {
         clickCreate (operationItem, row, rowIndex, col) {
             const list = this.data;
             const newRow = this.getNewRowData();
-            const newRowIndex = row
-                ? list.findIndex(rowItem => rowItem._id === row._id) + 1
-                : list.length;
 
             // 处理单元格合并相关（当前列是合并列，则该列之前的合并列，要复制这一行对应列的值；当前列是普通列，按最后合并列的操作处理）
             if (col) {
@@ -109,7 +106,9 @@ export default {
                     }, newRow);
                 }
             }
-
+            const newRowIndex = row
+                ? list.findIndex(rowItem => rowItem._id === row._id) + 1
+                : list.length;
             list.splice(newRowIndex, 0, newRow);
 
             this.change("createRow", null, newRow, newRowIndex);

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

@@ -64,7 +64,7 @@ export default {
             widthMap: this.$getModFieldPropertyMap("width"),
             initDftValMap: this.$getModFieldPropertyMap("initDefaultVal"),
             saveProperties: ["__readonly__", "__isDefault__", "__old__", "__isQuote__"],
-            resetProperties: ["__treeIndex__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__"],
+            resetProperties: ["__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__", "__isExpand__", "__treeIndex__"],
 
             initFlag: true,
             showRuleMessage: false, // 进行全体校验
@@ -328,10 +328,10 @@ export default {
             return this.controlKey === "_default" ? false : this.selfPropsObj._disabledOldDataRow;
         },
         showCreateBtnColKeys () {
-            return this.selfPropsObj._showCreateBtnColKeys;
+            return this.selfPropsObj._showCreateBtnColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
         },
         hideColKeys () {
-            return this.selfPropsObj._hideColKeys || [];
+            return this.selfPropsObj._hideColKeys;
         },
 
         searchLabelWidth () {
@@ -635,7 +635,7 @@ export default {
                             : undefined,
 
                         // 添加符
-                        ...this.createIconRender(h, { row, rowIndex, column })
+                        ...this.createIconRender(h, { row, rowIndex, column }, 12)
                     ];
                 },
                 ...colItem
@@ -1152,7 +1152,7 @@ export default {
                 })
                 : undefined;
         },
-        createIconRender (h, { row, rowIndex, column }) {
+        createIconRender (h, { row, rowIndex, column }, iconSize = 14) {
             return [
                 // 插入一行添加符
                 (this.operationMap.canCreate && this.operationMap.canCreate.disabled !== true) &&
@@ -1164,11 +1164,11 @@ export default {
                             position: "absolute",
                             bottom: "0px",
                             right: "0px",
-                            width: "16px",
-                            height: "16px",
+                            width: `${iconSize + 2}px`,
+                            height: `${iconSize + 2}px`,
                             border: `1px solid ${this.appColor}`,
                             backgroundColor: "#ffffff",
-                            lineHeight: "12px",
+                            lineHeight: `${iconSize - 2}px`,
                             cursor: "pointer",
                             verticalAlign: "middle",
                             transition: "color .2s ease-in-out,border-color .2s ease-in-out"
@@ -1188,7 +1188,7 @@ export default {
                                 },
                                 props: {
                                     type: this.operationMap.canCreate.icon,
-                                    size: "14"
+                                    size: iconSize
                                 },
                                 on: {
                                     click: () => {
@@ -1201,7 +1201,7 @@ export default {
                     : h("span", ""),
 
                 // 添加一行下级添加符
-                ["cascaderTable"].includes(this.controlType) &&
+                ["treeTable"].includes(this.inTableType) &&
                     (this.operationMap.canCreateChild && this.operationMap.canCreateChild.disabled !== true) &&
                     !this.isSearching &&
                     (column._key === "__index__" ? !this.showCreateBtnColKeys.length : this.showCreateBtnColKeys.includes(column._key)) &&
@@ -1211,13 +1211,13 @@ export default {
                         style: {
                             position: "absolute",
                             bottom: "0px",
-                            right: "17px",
+                            right: `${iconSize + 3}px`,
                             display: "inline-block",
-                            width: "16px",
-                            height: " 16px",
+                            width: `${iconSize + 2}px`,
+                            height: `${iconSize + 2}px`,
                             border: `1px solid ${this.appColor}`,
                             backgroundColor: "#ffffff",
-                            lineHeight: "12px",
+                            lineHeight: `${iconSize - 2}px`,
                             cursor: "pointer",
                             verticalAlign: "middle",
                             transition: "color .2s ease-in-out,border-color .2s ease-in-out"
@@ -1237,7 +1237,7 @@ export default {
                                 },
                                 props: {
                                     type: this.operationMap.canCreateChild.icon,
-                                    size: "14"
+                                    size: iconSize
                                 },
                                 on: {
                                     click: () => {
@@ -1285,7 +1285,8 @@ export default {
                     __isRendered__: true,
                     __isShow__: true,
                     __isTmpShow__: true,
-                    __isSearchShow__: false
+                    __isSearchShow__: false,
+                    __isExpand__: false
                 };
             }
         },
@@ -1451,8 +1452,8 @@ export default {
                     delete row[property];
                 });
                 if (["treeTable"].includes(this.inTableType)) {
-                    // row.__isExpand__ = false;
                     // row.__isSearchShow__ = false;
+                    // row.__isExpand__ = false;
                     // 第一级的需要显示出来
                     if (row.level == 1) {
                         row.__isRendered__ = true;
@@ -1468,6 +1469,7 @@ export default {
                     row.__isShow__ = true;
                     row.__isTmpShow__ = true;
                     row.__isSearchShow__ = false;
+                    row.__isExpand__ = false;
                 }
             }
         }

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

@@ -50,10 +50,10 @@ export default {
             const list = row
                 ? this.getParentRow(row, this.data).children
                 : this.data;
+            const newRow = this.getNewRowData(row ? row.level : 1, list);
             const newRowIndex = row
                 ? list.findIndex(rowItem => rowItem._id === row._id) + 1
                 : list.length;
-            const newRow = this.getNewRowData(row ? row.level : 1, list);
             list.splice(newRowIndex, 0, newRow);
 
             this.change("createRow", null, newRow, newRowIndex);
@@ -61,8 +61,8 @@ export default {
         // 节点操作 -添加子行
         clickCreateChild (operationItem, row, rowIndex, col) {
             const list = row.children;
-            const newRowIndex = list.length;
             const newRow = this.getNewRowData(row.level + 1, list);
+            const newRowIndex = list.length;
             list.splice(newRowIndex, 0, newRow);
 
             // 展开子级
@@ -72,29 +72,29 @@ export default {
         },
         // 节点操作 -删除行
         clickDelete (operationItem, row, rowIndex, col) {
-            // this.$Modal.confirm({
-            //     title: "警告",
-            //     content: "确定删除该行及其所有下级吗？",
-            //     onOk: () => {
-            const parentRow = this.getParentRow(row, this.data);
-            const index = parentRow.children.findIndex(childRowItem => childRowItem._id === row._id);
-            parentRow.children.splice(index, 1);
+            this.$Modal.confirm({
+                title: "警告",
+                content: "确定删除该行及其所有下级吗？",
+                onOk: () => {
+                    const parentRow = this.getParentRow(row, this.data);
+                    const index = parentRow.children.findIndex(childRowItem => childRowItem._id === row._id);
+                    parentRow.children.splice(index, 1);
 
-            this.change("deleteRow", null, row, rowIndex);
-            // }
-            // });
+                    this.change("deleteRow", null, row, rowIndex);
+                }
+            });
         },
         // 节点操作 -删除所有子行
         clickDeleteChilds (operationItem, row, rowIndex, col) {
-            // this.$Modal.confirm({
-            //     title: "警告",
-            //     content: "确定删除该行及其所有下级吗？",
-            //     onOk: () => {
-            row.children.splice(0);
+            this.$Modal.confirm({
+                title: "警告",
+                content: "确定删除该行及其所有下级吗？",
+                onOk: () => {
+                    row.children.splice(0);
 
-            this.change("deleteChildRows", null, row, rowIndex);
-            // }
-            // });
+                    this.change("deleteChildRows", null, row, rowIndex);
+                }
+            });
         },
 
         // 展开／隐藏节点