bri-components 1.4.0 → 1.4.2

package/package.json

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

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

@@ -102,7 +102,7 @@
 
     const prefixCls = "ivu-upload";
     const imageType = ["jpg", "png", "gif", "jpeg", "tiff", "swf"];
-    const documentType = ["txt", "doc", "xls", "ppt", "docx", "xlsx", "pptx", "pdf"];
+    const documentType = ["txt", "doc", "xls", "ppt", "docx", "xlsx", "pptx", "pdf", "xmind"];
     const videoType = ["flv", "rmvb", "mp4", "mvb"];
     const audioType = ["wma", "mp3", "m4a"];
     const packageType = ["rar", "zip"];
@@ -163,7 +163,7 @@
                 return this.selfPropsObj._fileType;
             },
             showMode () {
-                return this.isInTable ? "inline" : this.selfPropsObj._showMode;
+                return this.isInTable ? this.selfPropsObj._inTableStyle == "list" && !this.finalCanEdit ? "tableList" : "inline" : this.selfPropsObj._showMode;
             },
             useType () {
                 return this.selfPropsObj._useType;

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

@@ -58,6 +58,59 @@
             </div>
         </template>
 
+        <!-- 在表格中展开 -->
+        <template v-else-if="showMode ==='tableList'">
+            <!-- 有值 -->
+            <div
+                v-if="files.length"
+                ref="viewerImage"
+                :class="['uploadList-list', `uploadList-list-${propsObj._fileType}`]"
+            >
+                <div
+                    v-for="(fileItem, fileIndex) in files"
+                    :key="fileItem._key || fileItem._id"
+                    :class="{
+                        'item': propsObj._fileType === 'image',
+                        [`item-${propsObj._fileType}`]: true
+                    }"
+                >
+                    <!-- 展示图 -->
+                    <div class="item-show">
+                        <img
+                            v-if="fileItem.mimetype.includes('image')"
+                            :data-original="fileItem.url"
+                            :src="$imageResize(fileItem.url, imageResizeConfig)"
+                            :alt="fileItem.name"
+                        >
+                        <img
+                            v-else
+                            :src="getFileImage(fileItem)"
+                            :alt="fileItem.name"
+                        >
+                    </div>
+
+                    <!-- 展示名称 -->
+                    <p class="item-name-title">{{ fileItem.name }}</p>
+
+                    <!-- 图标 -->
+                    <dsh-icons
+                        class="item-action"
+                        item-class="item-action-icon"
+                        :list="$getOperationList(getBtns(fileItem))"
+                        @click="$dispatchEvent($event, fileItem, fileIndex)"
+                    ></dsh-icons>
+                </div>
+            </div>
+
+            <!-- 无值 -->
+            <div
+                v-else
+                class="uploadList-inline-nodata"
+            >
+                <span>{{ noDataText }}</span>
+            </div>
+        </template>
+
         <div
             v-else-if="propsObj._fileType === 'file'"
             ref="viewerImage"
@@ -73,7 +126,10 @@
                     'uploadList-fileList-fileName-edit': canEdit
                 }">
                     {{ files.length }}个
-                    <Icon v-if="canEdit" type="ios-arrow-down" />
+                    <Icon
+                        v-if="canEdit"
+                        type="ios-arrow-down"
+                    />
                 </div>
 
                 <div
@@ -94,9 +150,7 @@
                         :alt="dropdownItem.name"
                         class="fileItem-img"
                     >
-                    <p
-                        class="fileItem-name-title"
-                    >{{ dropdownItem.name }}</p>
+                    <p class="fileItem-name-title">{{ dropdownItem.name }}</p>
                     <dsh-icons
                         class="fileItem-action"
                         item-class="fileItem-action-icon"
@@ -298,7 +352,7 @@
                 let lastIndex = fileItem.name.lastIndexOf(".");
                 let formate = fileItem.name.substring(lastIndex);
 
-                this.$Modal.info({
+                this.$Modal.confirm({
                     title: "修改名称",
                     render: (h) => {
                         return h("Input", {

package/src/components/controls/base/DshSelect/DshCheckbox.vue

@@ -14,7 +14,7 @@
                         'DshCheckbox-flat-color': useColor,
                         'DshCheckbox-flat-scroll': isHeightAuto
                             ? isUnitUpdate
-                                ? listData.length > 6
+                                ? listData.length > 3
                                 : false
                             : true
                     }"

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

@@ -14,7 +14,7 @@
                         'DshSelect-flat-color': useColor,
                         'DshSelect-flat-scroll': isHeightAuto
                             ? isUnitUpdate
-                                ? listData.length > 4
+                                ? listData.length > 3
                                 : false
                             : true
                     }"

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

@@ -52,7 +52,7 @@ export default {
             return this.selfPropsObj._reverseFilter;
         },
         selectFilterVals () {
-            return this.selfPropsObj._selectFilterVals;
+            return this.selfPropsObj._selectFilterVals || []; // 老版级联表格层级属性那用到单选，缺这些属性，会产生undefined，有问题
         },
         selectFilterKey () {
             return this.selfPropsObj._selectFilterKey;

package/src/components/form/DshForm.vue

@@ -336,7 +336,7 @@
                         _displayType: "show",
                         canEdit: !["createdAt", "updatedAt", "_creaters"].includes(formData._key)
                     }).forEach(arr => {
-                        if (!this.ignoreProperties.includes(arr[0])) {
+                        if (!this.ignoreProperties.includes(arr[0]) && arr[1] !== undefined) {
                             this.$set(formItem, arr[0], arr[1]);
                         }
                     });

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

@@ -11,40 +11,7 @@ export default {
     },
     data () {
         return {
-            boxWidth: 0,
-
-            baseOperationMap: {
-                canCreateCol: {
-                    name: "添加一列",
-                    type: "canCreateCol",
-                    icon: "md-add",
-                    event: "clickCreateCol"
-                },
-                canDeleteCol: {
-                    name: "删除该列",
-                    type: "canDeleteCol",
-                    icon: "md-trash",
-                    color: "red",
-                    event: "clickDeleteCol"
-                }
-            }
-            // otherOperationMap: {
-            //     canChangeNode: {
-            //         name: "改变节点值",
-            //         type: "canChangeNode",
-            //         event: "changeNode"
-            //     },
-            //     canClickNode: {
-            //         name: "点击节点",
-            //         type: "canClickNode",
-            //         event: "clickNode"
-            //     },
-            //     canBlurNode: {
-            //         name: "节点失去焦点",
-            //         type: "canBlurNode",
-            //         event: "blurNode"
-            //     }
-            // }
+            boxWidth: 0
         };
     },
     computed: {
@@ -64,7 +31,7 @@ export default {
         // 替换tableBaseMixin里的
         showCreateBtnColKeys () {
             return [
-                ...this.treeForm.map(treeFormItem => treeFormItem._key),
+                ...this.treeFormKeys,
                 ...(this.selfPropsObj._showCreateBtnColKeys || [])
             ];
         },
@@ -103,35 +70,10 @@ export default {
         init () {
             this.treeColumns.forEach((treeFormItem, treeFormIndex) => {
                 this.$set(treeFormItem, "level", treeFormIndex + 1);
-                this.$set(treeFormItem, "canDelete", true);
+                // this.$set(treeFormItem, "canDelete", true);
             });
         },
 
-        /* ----------- 操作 ---------- */
-        // 表头操作 -树形表头-添加一列
-        clickCreateCol (operationItem, col, colIndex) {
-            this.treeColumns.push({
-                _id: this.$ObjectID().str,
-                _key: this.$randomB36("Field"),
-                _type: "textarea",
-                _name: `${this.$numToChinese(this.treeColumns.length + 1)}级表头`,
-                level: this.treeColumns.length + 1,
-                canDelete: true,
-                _treeSubForm: []
-            });
-            this.tableDataObj._treeForm = this.treeColumns;
-
-            this.change("createCol", null, null, col);
-        },
-        // 表头操作 -树形表头-删除一列
-        clickDeleteCol (operationItem, col, colIndex) {
-            this.isDeleteColStatus = true; // isDeleteStatus不用在data中定义
-            this.treeColumns.pop();
-            this.tableDataObj._treeForm = this.treeColumns;
-
-            this.change("deleteCol", null, null, col);
-        },
-
         /* ----------- 渲染函数（声明：为了代码更加规范清晰，return的是h相关的函数，则函数名get开头；return的是h的直接调用，函数名不要get开头）---------- */
         // 表格表头渲染函数
         tableHeadRender (h) {
@@ -198,9 +140,6 @@ export default {
                                         },
                                         this.rowColumnsArr[rowIndex].map(column => {
                                             return this.tdRender(h, { row: mixedRow[column.nodeKey || column._key], rowIndex, column });
-                                            // return ["tree", "summary"].includes(column.colType)
-                                            //     ? this.treeTdRender(h, { row: mixedRow[column.nodeKey || column._key], rowIndex, column })
-                                            //     : this.contentTdRender(h, { row: mixedRow[column.nodeKey || column._key], rowIndex, column });
                                         })
                                     );
                                 })
@@ -229,9 +168,7 @@ export default {
                     style: this.getThStyle(column)
                 },
                 [
-                    this.contentThCellRender(h, { column, colIndex }),
-
-                    this.treeThDropOperationRender(h, { column, colIndex })
+                    this.contentThCellRender(h, { column, colIndex })
             ]);
         },
         emptyTdRender (h, { row, rowIndex, column }) {
@@ -261,71 +198,21 @@ export default {
                     },
                     on: {
                         mouseenter: (event) => {
-                            this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, true);
+                            this.$set(this.hoverRecordMap, `${row._id}`, true);
+                            // this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, true);
                         },
                         mouseleave: (event) => {
-                            this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, false);
+                            this.$set(this.hoverRecordMap, `${row._id}`, false);
+                            // this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, false);
                         }
                     }
                 },
                 column.colType === "summary"
                     ? h("span", this.getSummaryTdVal(row, rowIndex, column))
-                    : column.colType === "tree"
-                        ? this.contentTdCellRender(h, { row, rowIndex, column }, "tree")
-                        : column.colType === "operation"
-                            ? this.operationTdCellRender(h, { row, rowIndex, column })
-                            : this.contentTdCellRender(h, { row, rowIndex, column })
-            );
-        },
-        // 树形表头最末级列的下拉渲染函数
-        treeThDropOperationRender (h, { column, colIndex }) {
-            const list = this.$getOperationList(
-                column.colType === "tree" && column.level === this.treeColumns.length
-                    ? [
-                        ...(column.level < this.maxLevel ? ["canCreateCol"] : []), // 限制最大添加到几级
-                        ...(column.canDelete === true ? ["canDeleteCol"] : []) // 只有一级和最后两级节点数不一致时，不能删
-                    ]
-                    : []
+                    : column.colType === "operation"
+                        ? this.operationTdCellRender(h, { row, rowIndex, column })
+                        : this.contentTdCellRender(h, { row, rowIndex, column })
             );
-
-            return !this.isSearching &&
-                list.length
-                ? h("dsh-dropdown", {
-                    class: "bri-table-dropdown",
-                    props: {
-                        menuClass: "bri-table-dropdown-list",
-                        trigger: "hover",
-                        list: list
-                    },
-                    on: {
-                        click: (operationItem) => {
-                            this.$dispatchEvent(operationItem, column, colIndex);
-                        }
-                    },
-                    nativeOn: {
-                        click: (e) => {
-                            e.stopPropagation();
-                        }
-                    }
-                }, [
-                    h("a", {
-                        style: {
-                            fontWeight: "500",
-                            color: this.appColor
-                        },
-                        attrs: {
-                            href: "javascript:void(0)"
-                        }
-                    }, [
-                        h("Icon", {
-                            props: {
-                                type: "md-arrow-dropdown-circle",
-                                size: "16"
-                            }
-                        })
-                    ])
-                ])
-                : undefined;
         },
 
         /* ----------- 方法 ---------- */
@@ -343,7 +230,7 @@ export default {
                 maxWidth: `${width}px`,
                 paddingTop: !this.headHeightAuto ? "10px" : undefined,
                 paddingBottom: !this.headHeightAuto ? "10px" : undefined,
-                align: col._align || typeData.align,
+                textAlign: col._align || typeData.align,
                 "word-break": "break-all",
                 cursor: "pointer"
             };
@@ -401,6 +288,18 @@ export default {
             return (this.getIsDftRow(row) ? !this.dftReadonlyTreeColKeys.includes(col._key) : true) && // 默认行的某列是否可编辑
             (row.__old__ === true ? !this.oldReadonlyTreeColKeys.includes(col._key) : true); // 老数据行里某些列不可编辑
         },
+        // getNewRowData时，额外补充的行相关的数据（针对层级属性的列）
+        getRowOtherDft (level, list) {
+            const column = this.treeForm[level - 1];
+            const dftVal = column._default;
+            const initDftVal = this.initDftValMap[column._type];
+
+            return {
+                name: this.$isEmptyData(dftVal)
+                    ? initDftVal
+                    : dftVal
+            };
+        },
 
         /* ----------- 工具方法 ---------- */
         // 合并表头
@@ -440,54 +339,44 @@ export default {
         // 转化树数据
         getCalcuedTree (nodes = [], treeForm = [], subForm = []) {
             treeForm.forEach((treeFormItem, treeFormIndex) => {
-                treeFormItem.canDelete = true; // 每次计算，重置一下
+                // treeFormItem.canDelete = true; // 每次计算，重置一下
                 treeFormItem.level = treeFormIndex + 1; // treeColumns更新,缺少level
             });
 
             // 循环遍树节点
-            const loop = (nodes = []) => {
+            const loop = (nodes = [], parentNodes = []) => {
                 nodes.forEach(rowItem => {
                     // 初始化树节点的数据，给节点加上一些属性并监测，注入到节点对象中
                     let curCol = treeForm[rowItem.level - 1];
                     this.$setObj(rowItem, {
                         _key: curCol._key,
                         level: curCol.level,
-                        isEdit: false,
                         isLeaf: false,
                         total: 1
                     });
 
                     // 最后一列（根节点）
                     if (rowItem.level === treeForm.length) {
-                        // 处理删除了最后一列后，把根节点上的subForm属性值全部给上级节点
-                        if (this.isDeleteColStatus) {
-                            let subNode = rowItem.children[0];
-                            subForm.forEach(subFormItem => {
-                                // 用$set也可以
-                                rowItem[subFormItem._key] = subNode[subFormItem._key];
-                            });
-                        }
-
                         rowItem.children = [];
                         rowItem.isLeaf = true;
+
+                        // TODO：特殊处理-叶子节点上注入对应表头列们的name值
+                        const treeNodes = [...parentNodes, rowItem];
+                        treeForm.forEach((treeFormItem, treeFormIndex) => {
+                            rowItem[treeFormItem._key] = treeNodes[treeFormIndex].name;
+                        });
                     }
                     // 非最后一列（最后一列前的列，非根节点），需继续向下循环
                     else {
-                        // 判断是否能删除最后一列（1.判断条件：判断根节点列的前一列的所有节点 都必须只有一个子结点 2.canDelete放在表头treeForm最后一项，默认true）
-                        if (rowItem.level === treeForm.length - 1) {
-                            if (rowItem.children.length > 1) {
-                                treeForm[rowItem.level].canDelete = false;
-                            }
-                        }
-
                         // 非最后一列的 正常的非根节点
                         if (rowItem.children && rowItem.children.length) {
-                            loop(rowItem.children);
+                            loop(rowItem.children, [...parentNodes, rowItem]);
                         }
                         // 非最后一列的 新增的非根节点(此时是新增一列或新增非根节点行) -添加一个子节点，并把该节点上的subForm属性值全部给下级节点
                         // 特别提示：新增的是根节点行，不会走此处代码
                         else {
                             const newNode = this.getNewRowData(rowItem.level + 1, rowItem.children);
+
                             subForm.forEach(subFormItem => {
                                 // 用$set也可以
                                 newNode[subFormItem._key] = rowItem[subFormItem._key];
@@ -495,7 +384,7 @@ export default {
                             });
                             rowItem.children.push(newNode);
 
-                            loop(rowItem.children);
+                            loop(rowItem.children, [...parentNodes, rowItem]);
                         }
                     }
 
@@ -510,7 +399,7 @@ export default {
         },
         // 转化渲染使用的columns数组
         transformRowColumnsArr (nodes = [], treeForm = []) {
-            let loop = (nodes, rowColumnsArr) => {
+            const loop = (nodes = [], rowColumnsArr = []) => {
                 nodes = this.getFilteredNodes(nodes);
 
                 return nodes.reduce((rowColumnsArr, node, nodeIndex) => {
@@ -528,11 +417,11 @@ export default {
                 }, rowColumnsArr);
             };
 
-            return loop(nodes, []);
+            return loop(nodes);
         },
         // 转化表格数据
         transformRows (nodes = [], treeForm = []) {
-            const loop = (nodes, rows) => {
+            const loop = (nodes = [], rows = []) => {
                 nodes = this.getFilteredNodes(nodes);
 
                 return nodes.reduce((rows, node, nodeIndex) => {
@@ -555,12 +444,16 @@ export default {
                     }
                 }, rows);
             };
-            return loop(nodes, []);
+            return loop(nodes);
         },
         getFilteredNodes (nodes = []) {
             const loop = (nodes = []) => {
                 return nodes.filter(rowItem => {
                     if (rowItem.children && rowItem.children.length) {
+                        if (this.isSearching) {
+                            rowItem.__isSearchShow__ = true;
+                        }
+
                         const children = loop(rowItem.children);
                         return !!children.length;
                     } else {
@@ -571,176 +464,5 @@ export default {
 
             return loop(nodes);
         }
-        // // 树形、汇总节点操作 -点击
-        // clickNode (operationItem, row, rowIndex, col) {
-        //     if (col.colType === "tree") {
-        //         if (
-        //             (this.getIsDftRow(row) ? !this.dftReadonlyTreeColKeys.includes(col._key) : true) && // 默认行的某列是否可编辑
-        //             (row.__old__ === true ? !this.oldReadonlyTreeColKeys.includes(col._key) : true) // 老数据行里某些列不可编辑
-        //         ) {
-        //             row.isEdit = true;
-        //             this.$nextTick(() => {
-        //                 this.$refs[`${col._id}${row._id}`] && this.$refs[`${col._id}${row._id}`].focus();
-        //             });
-        //         }
-        //     }
-        //     else if (col.colType === "summary") {
-        //         this.$Modal.warning({
-        //             title: "该汇总单元格自动计算，不准手动输入！",
-        //             closable: true,
-        //             onOk: () => { },
-        //             onCancel: () => { }
-        //         });
-        //     }
-        // },
-        // // 树形节点操作 -失去焦点
-        // blurNode (operationItem, row, rowIndex, col) {
-        //     row.isEdit = false;
-        // },
-        // // 树形节点操作 -值改变
-        // changeNode (operationItem, row, rowIndex, col) {
-        //     this.change("changeNode", row, rowIndex, col);
-        // },
-
-        // // 树节点单元格、汇总单元格渲染函数
-        // treeTdRender (h, { row, rowIndex, column }) {
-        //     return h("td", {
-        //         class: {
-        //             "bri-table-td": true, // 可以不要，为了position: relative，下面有
-        //             "bri-table-td-edit": this.canEdit,
-        //             "bri-table-td-merge": column.colType === "tree"
-        //         },
-        //         style: this.getTdStyle(row, rowIndex, column),
-        //         attrs: {
-        //             rowspan: this.getTdRowSpan(row, rowIndex, column),
-        //             colspan: this.getTdColSpan(row, rowIndex, column)
-        //         },
-        //         on: {
-        //             click: () => {
-        //                 this.$dispatchEvent(this.operationMap.canClickNode, row, rowIndex, column);
-        //             }
-        //         }
-        //     }, [
-        //         column.colType === "tree"
-        //             // 树节点单元格
-        //             ? row.isEdit
-        //                 // 编辑状态
-        //                 ? h("Input", {
-        //                     ref: `${column._id}${row._id}`,
-        //                     props: {
-        //                         value: row.name,
-        //                         type: "textarea",
-        //                         autosize: {
-        //                             minRows: this.getTdRowSpan(row, rowIndex, column) * 3 - 1,
-        //                             maxRows: 100
-        //                         }
-        //                     },
-        //                     on: {
-        //                         input: val => {
-        //                             row.name = val;
-        //                         },
-        //                         "on-blur": () => {
-        //                             this.$dispatchEvent(this.operationMap.canBlurNode, row, rowIndex, column);
-        //                         },
-        //                         "on-change": () => {
-        //                             this.$dispatchEvent(this.operationMap.canChangeNode, row, rowIndex, column);
-        //                         }
-        //                     }
-        //                 })
-        //                 // 查看状态
-        //                 : [
-        //                     h("bri-tooltip", {
-        //                         props: {
-        //                             content: this.$transformEnterToBr(row.name),
-        //                             transfer: true
-        //                         }
-        //                     }, [
-        //                         h("span", {
-        //                             domProps: {
-        //                                 innerHTML: this.$transformEnterToBr(row.name)
-        //                             }
-        //                         })
-        //                     ]),
-
-        //                     // 操作下拉
-        //                     this.treeTdDropOperationRender(h, { row, rowIndex, column })
-        //                 ]
-        //             // 汇总单元格
-        //             : h("span", this.getSummaryTdVal(row, rowIndex, column))
-        //     ]);
-        // },
-        // // 普通单元格渲染函数
-        // contentTdRender (h, { row, rowIndex, column }) {
-        //     return h(
-        //         "td",
-        //         {
-        //             class: this.bodyCellClass({ row, rowIndex, column }),
-        //             style: this.getTdStyle(row, rowIndex, column),
-        //             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);
-        //                 }
-        //             }
-        //         },
-        //         this.contentTdCellRender(h, { row, rowIndex, column })
-        //     );
-        // },
-        // // 树形单元格的下拉渲染函数
-        // treeTdDropOperationRender (h, { row, rowIndex, column }) {
-        //     const list = this.$getOperationList([
-        //         "canCreate",
-        //         ...(this.getRowDelBtnCanEdit(row, rowIndex) ? ["canDelete"] : []),
-        //         ...(
-        //             row.isLeaf === true
-        //                 ? []
-        //                 : [
-        //                     "canCreateChild",
-        //                     ...(this.getRowDelBtnCanEdit(row, rowIndex) ? ["canDeleteChilds"] : [])
-        //                 ]
-        //         )
-        //     ]);
-
-        //     return !this.isSearching &&
-        //         list.length
-        //         ? h("dsh-dropdown", {
-        //             class: "bri-table-dropdown",
-        //             props: {
-        //                 menuClass: "bri-table-dropdown-list",
-        //                 trigger: "hover",
-        //                 list: list
-        //             },
-        //             on: {
-        //                 click: (operationItem) => {
-        //                     this.$dispatchEvent(operationItem, row, rowIndex, column);
-        //                 }
-        //             },
-        //             nativeOn: {
-        //                 click: (e) => {
-        //                     e.stopPropagation();
-        //                 }
-        //             }
-        //         }, [
-        //             h("a", {
-        //                 style: {
-        //                     fontWeight: "500",
-        //                     color: this.appColor
-        //                 },
-        //                 attrs: {
-        //                     href: "javascript:void(0)"
-        //                 }
-        //             }, [
-        //                 h("Icon", {
-        //                     props: {
-        //                         type: "md-arrow-dropdown-circle",
-        //                         size: "16"
-        //                     }
-        //                 })
-        //             ])
-        //         ])
-        //         : undefined;
-        // }
     }
 };

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

@@ -38,7 +38,7 @@ export default {
                             };
                         }, {
                             _id: this.$ObjectID().str,
-                            __index__: "汇总",
+                            __treeIndex__: "汇总",
                             __isExpand__: "-",
                             __operation__: "——"
                         })
@@ -97,9 +97,9 @@ export default {
         indexColumn () {
             return {
                 title: "序号",
-                _key: "__index__",
-                key: "__index__",
-                field: "__index__",
+                _key: "__treeIndex__",
+                key: "__treeIndex__",
+                field: "__treeIndex__",
                 width: 28 + 16 + (this.maxLevel - 1) * 38,
                 align: "left",
                 fixed: "left",

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

@@ -126,9 +126,9 @@ export default {
                 }
             },
             otherOperationMap: {
-                changeVal: {
+                canChangeVal: {
                     name: "改变输入框值",
-                    type: "changeVal",
+                    type: "canChangeVal",
                     event: "changeVal"
                 }
             },
@@ -166,7 +166,7 @@ export default {
                     event: "clickExport"
                 },
                 canEnlarge: {
-                    name: "全屏展示",
+                    name: "全屏",
                     type: "canEnlarge",
                     icon: "md-expand",
                     size: "small",
@@ -251,14 +251,15 @@ export default {
                 }, // 引用列表筛选条件
                 _isImport: false, // 导入
                 _isExport: false, // 导出
+                _useEnlarge: true, // 全屏
 
                 _default: {
                     rowDefault: {},
                     list: [],
                     tree: []
                 },
-                ...(this.selfBasePropsObj || {}),
 
+                ...(this.selfBasePropsObj || {}),
                 ...this.propsObj
             };
         },
@@ -386,7 +387,7 @@ export default {
                 : this.allListData.length;
         },
         rowsNumStr () {
-            return `当前${this.isSearching ? "筛选" : "全部"}数据, 共 ${this.rowsNum} ${this.showMode === "form" ? "条" : "行"}`;
+            return `当前${this.isSearching ? "筛选" : "全部"}数据, 共 ${this.rowsNum} ${this.showMode === "form" ? "条" : "行"};`;
         },
 
         /* 数据 */
@@ -427,14 +428,14 @@ export default {
         parentDataId () {
             return this.parentObj._id;
         },
-        selfRowDefault () {
+        selfRowDft () {
             return this.selfColumns.reduce((obj, column) => {
                 const dftInRowVal = this.rowDefault[column._key];
                 const dftVal = column._default;
                 const initDftVal = this.initDftValMap[column._type];
 
                 return Object.assign(obj, {
-                    [column._key]: dftInRowVal === undefined
+                    [column._key]: this.$isEmptyData(dftInRowVal)
                         ? this.$isEmptyData(dftVal)
                             ? initDftVal
                             : dftVal
@@ -527,25 +528,7 @@ export default {
                     bodyCellSpan: this.bodyCellSpan
                 },
                 eventCustomOption: {
-                    bodyCellEvents: ({ row, rowIndex, column }) => {
-                        return {
-                            click: (event) => {
-                                // console.log("click::", row, rowIndex, column, event);
-                            },
-                            dblclick: (event) => {
-                                // console.log("dblclick::", row, rowIndex, column, event);
-                            },
-                            contextmenu: (event) => {
-                                // console.log("contextmenu::", row, rowIndex, column, event);
-                            },
-                            mouseenter: (event) => {
-                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, true);
-                            },
-                            mouseleave: (event) => {
-                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, false);
-                            }
-                        };
-                    }
+                    bodyCellEvents: this.eventCustomOption
                 }
             };
         },
@@ -607,6 +590,9 @@ export default {
                 advSearch: this.finalTableAdvSearch
             };
         },
+        useEnlarge () {
+            return this.selfPropsObj._useEnlarge;
+        },
         modalPropsObj () {
             return {
                 mode: "fullscreen",
@@ -649,22 +635,21 @@ export default {
                 this.allOperationMap,
                 undefined,
                 undefined,
-                this.canEdit
-                    ? [
-                        ...(this.disabledBtns ? [] : this.baseOperationBtns),
-                        ...this.otherOperationBtns,
-                        ...(this.isQuote ? ["canQuote"] : []),
-                        ...(this.isImport ? ["canImport"] : []),
-
-                        ...(this.isExport ? ["canExport"] : []),
-                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
-                        "canEnlarge"
-                    ]
-                    : [
-                        ...(this.isExport ? ["canExport"] : []),
-                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
-                        "canEnlarge"
-                    ]
+                [
+                    ...(
+                        this.canEdit
+                            ? [
+                                ...(this.disabledBtns ? [] : this.baseOperationBtns),
+                                ...this.otherOperationBtns,
+                                ...(this.isQuote ? ["canQuote"] : []),
+                                ...(this.isImport ? ["canImport"] : [])
+                            ]
+                            : []
+                    ),
+                    ...(this.isExport ? ["canExport"] : []),
+                    ...(this.useEnlarge ? ["canEnlarge"] : []),
+                    ...(this.hideColKeys.length ? ["canHideOrShow"] : [])
+                ]
             );
         }
     },
@@ -918,7 +903,7 @@ export default {
         },
 
         /* ----------- 渲染函数（声明：为了代码更加规范清晰，return的是h相关的函数，则函数名get开头；return的是h的直接调用，函数名不要get开头）---------- */
-        getTableTopRender (isEnlarge = false) {
+        getTableTopRender (inEnlarge = false) {
             return (h, params) => {
                 return h("div", {
                     style: {
@@ -930,43 +915,29 @@ export default {
                     }
                 }, [
                     // 左 -统计，逻辑
-                    this.topSummaryRender(h, params),
+                    this.topSummaryRender(h),
 
                     // 右 -功能按钮
-                    isEnlarge ? undefined : this.topOperationRender(h, params)
+                    this.topOperationRender(h, inEnlarge)
                 ]);
             };
         },
-        topSearchRender (h) {
-            return this.searchFormList.length
-                ? h("dsh-default-search", {
-                    props: {
-                        formList: this.searchFormList,
-                        initValue: this.dftAdvSearch.conditions,
-                        labelWidth: this.searchLabelWidth
-                    },
-                    on: {
-                        change: this.searchCb
-                    }
-                })
-                : undefined;
-        },
         topSummaryRender (h) {
-            return h("div", {
-                style: {
-                    "display": "flex",
-                    "flex-direction": "row",
-                    "align-items": "center"
-                }
-            }, [
-                h("span", {
+            return this.searchFormList.length
+                ? h("div", {
                     style: {
-                        "font-weight": "500"
+                        "display": "flex",
+                        "flex-direction": "row",
+                        "align-items": "center"
                     }
-                }, this.rowsNumStr + ";"),
+                }, [
+                    h("span", {
+                        style: {
+                            "font-weight": "500"
+                        }
+                    }, this.rowsNumStr),
 
-                this.searchFormList.length
-                    ? h("div", {
+                    h("div", {
                         style: {
                             "display": "flex",
                             "flex-direction": "row",
@@ -991,30 +962,47 @@ export default {
                             }
                         })
                     ])
-                    : undefined
-            ]);
-        },
-        topOperationRender (h) {
-            return h("dsh-buttons", {
-                style: {
-                    "text-align": "right"
-                },
-                props: {
-                    itemClass: undefined,
-                    list: this.$getOperationList(this.topOperationBtns)
-                },
-                on: {
-                    click: (event) => {
-                        this.$dispatchEvent(event);
-                    }
-                },
-                nativeOn: {
-                    click: (e) => {
-                        e.stopPropagation();
+                ])
+                : h("div", "");
+        },
+        // 全屏里不显示功能按钮
+        topOperationRender (h, inEnlarge) {
+            return inEnlarge
+                ? undefined
+                : h("dsh-buttons", {
+                    style: {
+                        "text-align": "right"
+                    },
+                    props: {
+                        itemClass: undefined,
+                        list: this.$getOperationList(this.topOperationBtns)
+                    },
+                    on: {
+                        click: (event) => {
+                            this.$dispatchEvent(event);
+                        }
+                    },
+                    nativeOn: {
+                        click: (e) => {
+                            e.stopPropagation();
+                        }
                     }
-                }
             });
         },
+        topSearchRender (h) {
+            return this.searchFormList.length
+                ? h("dsh-default-search", {
+                    props: {
+                        formList: this.searchFormList,
+                        initValue: this.dftAdvSearch.conditions,
+                        labelWidth: this.searchLabelWidth
+                    },
+                    on: {
+                        change: this.searchCb
+                    }
+                })
+                : undefined;
+        },
         createBtnRender (h) {
             return !this.isSearching && this.disabledFootCreateBtn !== true
                 ? h("dsh-buttons", {
@@ -1042,7 +1030,7 @@ export default {
                 headHeightAuto: this.headHeightAuto
             });
         },
-        contentTdCellRender (h, { row, rowIndex, column }, position) {
+        contentTdCellRender (h, { row, rowIndex, column }) {
             column = this.$transformDynamicProperty(column, row, this.parentObj);
             column = this.getResetCol(row, rowIndex, column);
             const unitCanEdit = this.getUnitCanEdit(row, rowIndex, column);
@@ -1069,8 +1057,15 @@ export default {
                                     formData: row,
                                     formItem: {
                                         ...column,
-                                        _key: position === "tree" ? "name" : column._key,
-                                        _heightAuto: column._heightAuto || position === "tree"
+                                        ...(
+                                            column.colType === "tree"
+                                                ? {
+                                                    _key: "name",
+                                                    _heightAuto: true,
+                                                    _placeholder: " "
+                                                }
+                                                : column
+                                        )
                                     },
                                     allFormList: this.selfColumns,
                                     inTableType: this.inTableType,
@@ -1081,7 +1076,7 @@ export default {
                                 },
                                 on: {
                                     blur: () => this.controlBlur(null, row, rowIndex, column, arguments),
-                                    change: () => this.$dispatchEvent(this.operationMap.changeVal, row, rowIndex, column, arguments)
+                                    change: () => this.$dispatchEvent(this.operationMap.canChangeVal, row, rowIndex, column, arguments)
                                 }
                             })
                         }
@@ -1092,8 +1087,15 @@ export default {
                             formData: row,
                             formItem: {
                                 ...column,
-                                _key: position === "tree" ? "name" : column._key,
-                                _heightAuto: column._heightAuto || position === "tree"
+                                ...(
+                                    column.colType === "tree"
+                                        ? {
+                                            _key: "name",
+                                            _heightAuto: true,
+                                            _placeholder: " "
+                                        }
+                                        : column
+                                )
                             },
                             allFormList: this.selfColumns,
                             inTableType: this.inTableType,
@@ -1104,7 +1106,7 @@ export default {
                         },
                         on: {
                             blur: () => this.controlBlur(null, row, rowIndex, column, arguments),
-                            change: () => this.$dispatchEvent(this.operationMap.changeVal, row, rowIndex, column, arguments)
+                            change: () => this.$dispatchEvent(this.operationMap.canChangeVal, row, rowIndex, column, arguments)
                         }
                     }),
 
@@ -1139,12 +1141,15 @@ export default {
             ];
         },
         operationIconRender (h, { row, rowIndex, column }, iconSize = 14) {
+            const baseBool = !this.isSearching &&
+                (this.showCreateBtnColKeys.length ? this.showCreateBtnColKeys.includes(column._key) : ["__index__", "__treeIndex__"].includes(column._key)) &&
+                this.hoverRecordMap[`${row._id}`];
+            // this.hoverRecordMap[`${row._id}dsh${column._key}`]
+
             return [
                 // 插入一行图标
                 (this.operationMap.canCreate && this.operationMap.canCreate.disabled !== true) &&
-                    !this.isSearching &&
-                    (column._key === "__index__" ? !this.showCreateBtnColKeys.length : this.showCreateBtnColKeys.includes(column._key)) &&
-                    this.hoverRecordMap[`${row._id}dsh${column._key}`]
+                    baseBool
                     ? h("div", {
                         style: {
                             position: "absolute",
@@ -1189,9 +1194,7 @@ export default {
 
                 // 添加一行下级图标
                 (this.operationMap.canCreateChild && this.operationMap.canCreateChild.disabled !== true) &&
-                    !this.isSearching &&
-                    (column._key === "__index__" ? !this.showCreateBtnColKeys.length : this.showCreateBtnColKeys.includes(column._key)) &&
-                    this.hoverRecordMap[`${row._id}dsh${column._key}`] &&
+                    baseBool &&
                     row.level < this.maxLevel &&
                     !["cascaderTable"].includes(this.inTableType) // 老版级联表格类型不要“添加下级”图标
                     ? h("div", {
@@ -1239,9 +1242,7 @@ export default {
 
                 // 删除该行图标
                 (this.operationMap.canDelete && this.operationMap.canDelete.disabled !== true) &&
-                    !this.isSearching &&
-                    (column._key === "__index__" ? !this.showCreateBtnColKeys.length : this.showCreateBtnColKeys.includes(column._key)) &&
-                    this.hoverRecordMap[`${row._id}dsh${column._key}`] &&
+                    baseBool &&
                     this.getRowDelBtnCanEdit(row, rowIndex) &&
                     ["cascaderTable"].includes(this.inTableType)
                     ? h("div", {
@@ -1293,9 +1294,13 @@ export default {
                     ? " bri-table-td-merge"
                     : ""
                 }` +
-                `${this.getRowCanEdit(row, rowIndex)
-                    ? " bri-table-td-edit"
-                    : ""
+                `${["__isExpand__"].includes(column._key)
+                    ? " bri-table-td-expand"
+                    : ["__treeIndex__"].includes(column._key)
+                        ? " bri-table-td-treeIndex"
+                        : this.getRowCanEdit(row, rowIndex)
+                            ? " bri-table-td-edit"
+                            : ""
                 }` +
                 `${this.isSearching
                     ? row.__isSearchShow__ === false
@@ -1306,32 +1311,41 @@ export default {
                             ? " bri-table-td-visible"
                             : ""
                         : " bri-table-td-hide"
-                }` +
-                `${["__isExpand__"].includes(column._key)
-                    ? " bri-table-td-expand"
-                    : ["__index__"].includes(column._key)
-                        ? " bri-table-td-index"
-                        : ""
                 }`;
         },
+        eventCustomOption ({ row, rowIndex, column }) {
+            return {
+                click: (event) => {
+                    // console.log("click::", row, rowIndex, column, event);
+                },
+                dblclick: (event) => {
+                    // console.log("dblclick::", row, rowIndex, column, event);
+                },
+                contextmenu: (event) => {
+                    // console.log("contextmenu::", row, rowIndex, column, event);
+                },
+                mouseenter: (event) => {
+                    this.$set(this.hoverRecordMap, `${row._id}`, true);
+                    // this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, true);
+                },
+                mouseleave: (event) => {
+                    this.$set(this.hoverRecordMap, `${row._id}`, false);
+                    // this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, false);
+                }
+            };
+        },
 
         /* ----------- 方法 ---------- */
         // 生成新的一行数据
         getNewRowData (level, list) {
             if (["cascaderTable"].includes(this.controlType)) {
                 return {
-                    ...this.$deepCopy(this.selfRowDefault),
+                    ...this.$deepCopy(this.selfRowDft),
+                    ...(this.getRowOtherDft ? this.$deepCopy(this.getRowOtherDft(level, list)) : {}),
                     _id: this.$ObjectID().str,
                     level: level,
                     isLeaf: true,
                     children: [],
-                    ...(
-                        ["treeTable"].includes(this.inTableType)
-                            ? {}
-                            : {
-                                name: `${this.$numToChinese(level)}级节点${list.length + 1}`
-                            }
-                    ),
                     // __old__: false,
                     __isDefault__: this.isDftSet,
                     __isRendered__: true,
@@ -1342,7 +1356,7 @@ export default {
                 };
             } else {
                 return {
-                    ...this.$deepCopy(this.selfRowDefault),
+                    ...this.$deepCopy(this.selfRowDft),
                     _id: this.$ObjectID().str,
                     // __old__: false,
                     __isDefault__: this.isDftSet,
@@ -1425,7 +1439,6 @@ export default {
             return {
                 // isShare: this.isShare,
                 ...col,
-                _optionKind: "dropdown",
                 _heightAuto: this.heightAuto
             };
         },

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

@@ -42,6 +42,9 @@ export default {
         treeForm () {
             return this.selfPropsObj._treeForm;
         },
+        treeFormKeys () {
+            return this.treeForm.map(treeFormItem => treeFormItem._key);
+        },
         maxLevel () {
             return this.selfPropsObj._maxLevel || 3;
         },

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

@@ -171,7 +171,7 @@
         &-expand {
 
         }
-        &-index {
+        &-treeIndex {
             padding: 4px 16px 4px 12px!important;
         }
         &-operation {