bri-components 1.3.60 → 1.3.62

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

@@ -1,10 +1,12 @@
 import DshListUnit from "../../unit/DshListUnit.vue";
+import importModal from "../common/importModal.vue";
 import quoteListModal from "../common/quoteListModal.vue";
 
 export default {
     mixins: [],
     components: {
         DshListUnit,
+        importModal,
         quoteListModal
     },
     props: {
@@ -12,7 +14,7 @@ export default {
             type: Boolean,
             default: true
         },
-        compareData: {
+        data: {
             type: Array,
             default () {
                 return [];
@@ -24,6 +26,12 @@ export default {
                 return {};
             }
         },
+        compareData: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
         columns: {
             type: Array,
             default () {
@@ -36,13 +44,13 @@ export default {
                 return {};
             }
         },
+
         allFormList: {
             type: Array,
             default () {
                 return [];
             }
         },
-
         parentObj: {
             type: Object,
             default () {
@@ -164,6 +172,7 @@ export default {
         allScreenKey () {
             return this.propsObj.allScreenKey;
         },
+
         commonPropsObj () {
             return {
                 // isShare: false, // 是否是分享页在用
@@ -199,6 +208,11 @@ export default {
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
             };
         },
+        selfPropsObj () {
+            return {
+                ...this.commonPropsObj
+            };
+        },
         // isShare () {
         //     return this.selfPropsObj.isShare;
         // },
@@ -263,9 +277,6 @@ export default {
         searchListFields () {
             return this.searchList.map(searchItem => searchItem._key);
         },
-        searchLabelWidth () {
-            return this.selfPropsObj._searchLabelWidth;
-        },
         tableAdvSearch () {
             return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.parentObj);
         },
@@ -288,6 +299,9 @@ export default {
                 ]
             };
         },
+        isSearching () {
+            return this.$isAdvSearching(this.finalTableAdvSearch);
+        },
         searchFormList () {
             return this.$filterList(this.searchListFields, this.columns).map(formItem => ({
                 ...formItem,
@@ -295,10 +309,45 @@ export default {
                 _name: formItem._name
             }));
         },
-        isSearching () {
-            return this.$isAdvSearching(this.finalTableAdvSearch);
+        searchLabelWidth () {
+            return this.selfPropsObj._searchLabelWidth;
+        },
+        rowsNum () {
+            return this.showListData.length;
         },
+        rowsNumStr () {
+            return `当前“${this.isSearching ? "筛选" : "全部"}”范围, 共 ${this.rowsNum} 行`;
+        },
+
+        showListData () {
+            console.log("showListData");
+            return this.allListData.filter(row => {
+                if (this.isSearching) {
+                    const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
 
+                    // 重置
+                    row.__isSearchShow__ = false;
+                    if (bool) {
+                        row.__isRendered__ = true;
+                        row.__isSearchShow__ = true;
+                    }
+
+                    return bool;
+                } else {
+                    return true;
+                }
+            });
+        },
+        renderedListData () {
+            console.log("renderedListData");
+            return this.allListData.filter(row =>
+                row.__isRendered__ || (
+                    this.isSearching
+                        ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
+                        : false
+                )
+            );
+        },
         parentDataId () {
             return this.parentObj._id;
         },
@@ -347,7 +396,11 @@ export default {
         quoteParams () {
             return {
                 screenKey: this.allScreenKey,
-                fields: [...this.quoteListFields, this.controlKey, "createdAt"],
+                fields: [
+                    ...this.quoteListFields,
+                    this.controlKey,
+                    "createdAt"
+                ],
                 advSearch: {
                     logic: "and",
                     conditions: [
@@ -369,6 +422,7 @@ export default {
         },
 
         filterColumns () {
+            console.log("filterColumns");
             return this.columns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
         },
         contentColumns () {
@@ -450,6 +504,45 @@ export default {
                 ...colItem
             }));
         },
+        selectionColumn () {
+            return {
+                _key: "__selection__",
+                key: "__selection__",
+                field: "__selection__",
+                type: "checkbox",
+                width: 66,
+                align: "center",
+                fixed: "left"
+            };
+        },
+        operationColumn () {
+            return {
+                title: "操作",
+                _key: "__operation__",
+                key: "__operation__",
+                field: "__operation__",
+                align: "center",
+                fixed: "right",
+                width: 100,
+                renderBodyCell: ({ column, row, rowIndex }, h) => {
+                    const operationList = this.$getOperationList(["canDelete"]);
+
+                    return h("dsh-buttons", {
+                        props: {
+                            list: operationList.map(btnItem => ({
+                                ...btnItem,
+                                disabled: !this.getRowBtnCanEdit(row)
+                            }))
+                        },
+                        on: {
+                            click: (operationItem) => {
+                                this.$dispatchEvent(operationItem, row, rowIndex);
+                            }
+                        }
+                    });
+                }
+            };
+        },
 
         topOperationBtns () {
             return Object.keys(this.topOperationMap);
@@ -525,6 +618,9 @@ export default {
             this.isExpandAction = false;
             this.dftAdvSearch.conditions = conditions;
         },
+        changeSelect (list) {
+            this.$emit("changeSelect", list);
+        },
         // 表单控件失去焦点
         controlBlur (operationItem, col, row, rowIndex, params) {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
@@ -534,24 +630,22 @@ export default {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
             this.change("changeVal", col, row, rowIndex, ...params);
         },
-        // 点击引用
-        clickQuote () {
-            this.dshRenderName = "quoteModalRender";
-            this.showQuoteModal = true;
-        },
-        // 点击导入
-        clickImport () {
-            this.showImportModal = true;
-        },
-        // 点击导出
-        clickExport (operationItem) {
-            this.handleExport(operationItem);
+        change (...params) {
+            this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, ...params);
         },
+
+        /* ----------- 全屏 ---------- */
         // 打开全屏模态框
         clickEnlarge (operationItem) {
             this.isEnlarge = true;
         },
 
+        /* ----------- 引用 ---------- */
+        // 点击引用
+        clickQuote () {
+            this.dshRenderName = "quoteModalRender";
+            this.showQuoteModal = true;
+        },
         // 引用模态框渲染函数
         quoteModalRender (h, params) {
             return this.showQuoteModal
@@ -591,7 +685,7 @@ export default {
                             const loop = (list = []) =>
                                 list.map(item => ({
                                     ...item,
-                                    children: item.children && item.children.length ? loop(item.children) : item.children,
+                                    children: item.children ? loop(item.children) : item.children,
                                     __isQuote__: true
                                 }));
 
@@ -626,11 +720,42 @@ export default {
                 this.$Message.error("未选择引用数据！");
             }
         },
+
+        /* ----------- 导入 ---------- */
+        // 点击导入
+        clickImport () {
+            this.dshRenderName = "importModalRender";
+            this.showImportModal = true;
+        },
+        // 导入模态框渲染函数
+        importModalRender (h, params) {
+            return this.showImportModal
+                ? h("import-modal", {
+                    props: {
+                        value: this.showImportModal,
+                        propsObj: this.propsObj,
+                        listParams: this.importParams
+                    },
+                    on: {
+                        input: bool => {
+                            this.showImportModal = bool;
+                        },
+                        importCb: this.importCb
+                    }
+                })
+                : undefined;
+        },
         // 导入回调
         importCb (dataObj) {
             this.parentObj[this.controlKey] = dataObj;
             this.change("import");
         },
+
+        /* ----------- 导出 ---------- */
+        // 点击导出
+        clickExport (operationItem) {
+            this.handleExport(operationItem);
+        },
         // 接口 -导出
         handleExport (operationItem) {
             operationItem.disabled = true;
@@ -682,7 +807,118 @@ export default {
             });
         },
 
-        /* --------------- 工具方法 ------------- */
+        /* ----------- 渲染函数 ---------- */
+        getTableTopRender (isEnlarge = false) {
+            return (h, params) => {
+                return h("div", {
+                    style: {
+                        "margin-bottom": "3px",
+                        "display": "flex",
+                        "flex-direction": "row",
+                        "justify-content": "space-between",
+                        "align-items": "center"
+                    }
+                }, [
+                    // 左 -统计，逻辑
+                    this.topSummaryRender(h, params),
+
+                    // 右 -功能按钮
+                    isEnlarge ? undefined : this.topOperationRender(h, params)
+                ]);
+            };
+        },
+        topSearchRender (h, params) {
+            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, params) {
+            return h("div", {
+                style: {
+                    "display": "flex",
+                    "flex-direction": "row",
+                    "align-items": "center"
+                }
+            }, [
+                h("span", {
+                    style: {
+                        "font-weight": "500"
+                    }
+                }, this.rowsNumStr + ";"),
+
+                this.searchFormList.length
+                    ? h("div", {
+                        style: {
+                            "display": "flex",
+                            "flex-direction": "row",
+                            "align-items": "center",
+                            "margin-left": "16px"
+                        }
+                    }, [
+                        h("div", {
+                            style: {
+                                "font-weight": "500"
+                            }
+                        }, this.selfLogicPropsObj._name + "："),
+                        h("dsh-select", {
+                            style: {
+                                "margin-left": "8px",
+                                "margin-top": "-4px"
+                            },
+                            props: {
+                                value: this.dftAdvSearch,
+                                propsObj: this.selfLogicPropsObj
+                            }
+                        })
+                    ])
+                    : undefined
+            ]);
+        },
+        topOperationRender (h, params) {
+            return h("dsh-buttons", {
+                style: {
+                    "text-align": "right"
+                },
+                props: {
+                    itemClass: undefined,
+                    list: this.$getOperationList(this.topOperationBtns)
+                },
+                on: {
+                    click: (event) => {
+                        this.$dispatchEvent(event);
+                    }
+                }
+            });
+        },
+        createOperationRender (h, params) {
+            return !this.isSearching
+                ? h("dsh-buttons", {
+                    style: {
+                        "margin-top": "3px"
+                    },
+                    props: {
+                        itemClass: undefined,
+                        list: this.$getOperationList(["canCreate"])
+                    },
+                    on: {
+                        click: (event) => {
+                            this.$dispatchEvent(event);
+                        }
+                    }
+                })
+                : undefined;
+        },
+
+        /* ----------- 工具方法 ---------- */
         resetCol (col, row) {
             let resetMap = {
                 select: {

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

@@ -1,154 +0,0 @@
-export default {
-    mixins: [],
-    components: {},
-    props: {
-        data: {
-            type: Array,
-            default () {
-                return [];
-            }
-        }
-    },
-    model: {
-        prop: "data",
-        event: "change"
-    },
-    data () {
-        return {};
-    },
-    computed: {
-        selfPropsObj () {
-            return {
-                ...this.commonPropsObj
-            };
-        },
-
-        allListData () {
-            this.data.forEach(item => {
-                !item._id && this.$set(item, "_id", this.$ObjectID().str);
-
-                if (this.initFlag) {
-                    item.__old__ = true; // 标记老数据（initFlag不用在data中声明）
-                }
-            });
-
-            this.initFlag = false;
-            return this.data;
-        },
-        footerData () {
-            return this.useSummary && this.allListData.length
-                ? [
-                    this.filterColumns.reduce((obj, col) => {
-                        return {
-                            ...obj,
-                            [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
-                                ? this.$calNumList(
-                                    this.allListData.map(item => item[col._key]),
-                                    col._summaryType,
-                                    { ...col, _defaultDigit: 2 }
-                                )
-                                : (obj[col._key] || "--")
-                        };
-                    }, {
-                        _id: this.$ObjectID().str,
-                        __index__: "汇总",
-                        __operation__: "——"
-                    })
-                ]
-                : [];
-        },
-
-        showColumns () {
-            return [
-                ...(this.useSelection === true ? [this.selectionColumn] : []),
-                ...(this.useIndex === true ? [this.indexColumn] : []),
-                ...this.$transformToColumns(this.contentColumns),
-                ...(this.$getOperationList(["canDelete"]).length ? [this.operationColumn] : [])
-            ];
-        },
-        selectionColumn () {
-            return {
-                _key: "__selection__",
-                key: "__selection__",
-                field: "__selection__",
-                type: "checkbox",
-                width: 66,
-                align: "center",
-                fixed: "left"
-            };
-        },
-        indexColumn () {
-            return {
-                title: "序号",
-                _key: "__index__",
-                key: "__index__",
-                field: "__index__",
-                width: 76,
-                align: "center",
-                fixed: "left",
-                renderBodyCell: ({ column, row, rowIndex }) => ++rowIndex
-            };
-        },
-        operationColumn () {
-            return {
-                title: "操作",
-                _key: "__operation__",
-                key: "__operation__",
-                field: "__operation__",
-                align: "center",
-                fixed: "right",
-                width: 100,
-                renderBodyCell: ({ column, row, rowIndex }, h) => {
-                    const operationList = this.$getOperationList(["canDelete"]);
-
-                    return h("dsh-buttons", {
-                        props: {
-                            list: operationList.map(btnItem => ({
-                                ...btnItem,
-                                disabled: !this.getRowBtnCanEdit(row)
-                            }))
-                        },
-                        on: {
-                            click: (operationItem) => {
-                                this.$dispatchEvent(operationItem, row, rowIndex, this.allListData);
-                            }
-                        }
-                    });
-                }
-            };
-        }
-    },
-    created () { },
-    methods: {
-        // 点击 -添加行
-        clickCreate (operationItem, row, rowIndex, list) {
-            const newRow = {
-                ...this.$deepCopy(this.selfRowDefault),
-                _id: this.$ObjectID().str
-            };
-            const newRowIndex = rowIndex == null ? list.length : rowIndex + 1;
-            list.splice(newRowIndex, 0, newRow);
-            this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
-
-            this.change("createRow", null, newRow, newRowIndex);
-        },
-        // 点击 -删除行
-        clickDelete (operationItem, row, rowIndex, list) {
-            this.$Modal.confirm({
-                title: "提示",
-                content: "确定删除吗？",
-                onOk: () => {
-                    list.splice(rowIndex, 1);
-
-                    this.change("deleteRow", null, row, rowIndex);
-                }
-            });
-        },
-        changeSelect (list) {
-            this.$emit("changeSelect", list);
-        },
-        change (...params) {
-            this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, ...params);
-        }
-    }
-};