bri-components 1.3.31 → 1.3.33

package/src/components/list/DshTreeTable.vue

@@ -1,21 +1,24 @@
 <template>
     <div class="DshTreeTable">
-        <dsh-buttons
-            class="DshTreeTable-btns"
-            itemClass="DshTreeTable-btns-item"
-            :list="$getOperationList(topOperationBtns)"
-            @click="$dispatchEvent($event)"
-        ></dsh-buttons>
+        <div class="DshTreeTable-top">
+            <div class="DshTreeTable-top-total">{{ rowsNumStr }}</div>
+
+            <dsh-buttons
+                class="DshTreeTable-top-btns"
+                itemClass="DshTreeTable-top-btns-item"
+                :list="$getOperationList(topOperationBtns)"
+                @click="$dispatchEvent($event)"
+            ></dsh-buttons>
+        </div>
 
         <!-- 搜索条件 -->
-        <template v-if="searchFormList.length">
-            <dsh-default-search
-                :formList="searchFormList"
-                :initValue="advSearchObj.conditions"
-                :labelWidth="searchLabelWidth"
-                @change="searchCb"
-            ></dsh-default-search>
-        </template>
+        <dsh-default-search
+            v-if="searchFormList.length && !isEnlarge"
+            :formList="searchFormList"
+            :initValue="advSearchObj.conditions"
+            :labelWidth="searchLabelWidth"
+            @change="searchCb"
+        ></dsh-default-search>
 
         <!-- 表格 -->
         <bri-table
@@ -42,7 +45,7 @@
             mode="custom"
             :propsObj="modalPropsObj"
         >
-            <template v-if="enlargeFlag">
+            <template v-if="isEnlargeFlag">
                 <!-- 搜索条件 -->
                 <template v-if="searchFormList.length">
                     <dsh-default-search
@@ -72,6 +75,9 @@
                 ></dsh-buttons>
             </template>
         </dsh-modal>
+
+        <!-- 各种模态框共用 -->
+        <dsh-render :render="dshRender"></dsh-render>
     </div>
 </template>
 
@@ -89,7 +95,7 @@
         props: {},
         data () {
             return {
-                deleteProperties: ["__treeIndex__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchingShow__"], // 除了__old__
+                deleteProperties: ["__treeIndex__", "__old__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchingShow__"], // 除了__old__
                 isExpandAction: false,
 
                 searchMode: "flat", // "flat", "tree"
@@ -101,53 +107,75 @@
         },
         computed: {
             isSearching () {
-                return this.searchFormList.length && this.advSearchObj.conditions.some(conditionItem => conditionItem.fieldValue.length);
+                return this.searchFormList.length && this.advSearchObj.conditions.some(conditionItem =>
+                    conditionItem.fieldValue.length && conditionItem.fieldValue.some(valItem => !this.$isEmptyData(valItem))
+                );
+            },
+            allTreeData () {
+                console.log("allTreeData");
+                return this.getCalcuedTree(this.data, this.filterColumns);
+            },
+            allListData () {
+                return this.$getTreeFlatArr(this.allTreeData);
             },
             listData () {
-                console.log("listData");
-                const treeData = this.getCalcuedTree(this.data, this.filterColumns);
-                return this.$getTreeFlatArr(treeData, node => {
+                return this.allListData.filter(row => {
                     if (this.isSearching) {
-                        if (node.__isRendered__ === true) {
-                            node.__isSearchingShow__ = false;
-                        }
+                        // 重置__isSearchingShow__为false
+                        row.__isSearchingShow__ = false;
 
-                        const bool = this.$isAdvRelyAccord(this.advSearchObj, node);
+                        const bool = this.$isAdvRelyAccord(this.advSearchObj, row);
                         if (bool) {
-                            node.__isRendered__ = true;
-                            node.__isSearchingShow__ = true;
+                            row.__isRendered__ = true;
+                            row.__isSearchingShow__ = true;
                         }
-                        return bool || node.__isRendered__;
+
+                        return bool || row.__isRendered__;
                     } else {
-                        return node.__isRendered__;
+                        return row.__isRendered__;
                     }
                 });
             },
+            showListData () {
+                return this.listData.filter(row =>
+                    this.isSearching ? !!row.__isSearchingShow__ : !!row.__isShow__
+                );
+            },
+            rowsNum () {
+                return this.isSearching
+                    ? this.showListData.length
+                    : this.allListData.length;
+            },
+            rowsNumStr () {
+                return `当前范围“${this.isSearching ? "筛选" : "全部"}”, 共 ${this.rowsNum} 行`;
+            },
             footerData () {
                 console.log("footerData");
-                return this.useSummary && this.listData.length
-                    ? [
-                        this.filterColumns.reduce((obj, col) => {
-                            return {
-                                ...obj,
-                                [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
-                                    ? this.$calNumList(
-                                        this.listData
-                                            .filter(item => item.level === 1)
-                                            .map(item => item[col._key]),
-                                        col._summaryType,
-                                        { ...col, _defaultDigit: 2 }
-                                    )
-                                    : (obj[col._key] || "--")
-                            };
-                        }, {
-                            _id: this.$ObjectID().str,
-                            __index__: "汇总",
-                            __isExpand__: "-",
-                            __operation__: "——"
-                        })
-                    ]
-                    : [];
+                return this.isSearching
+                    ? []
+                    : this.useSummary && this.listData.length
+                        ? [
+                            this.filterColumns.reduce((obj, col) => {
+                                return {
+                                    ...obj,
+                                    [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                        ? this.$calNumList(
+                                            this.listData
+                                                .filter(item => item.level === 1)
+                                                .map(item => item[col._key]),
+                                            col._summaryType,
+                                            { ...col, _defaultDigit: 2 }
+                                        )
+                                        : (obj[col._key] || "--")
+                                };
+                            }, {
+                                _id: this.$ObjectID().str,
+                                __index__: "汇总",
+                                __isExpand__: "-",
+                                __operation__: "——"
+                            })
+                        ]
+                        : [];
             },
 
             selfPropsObj () {
@@ -189,7 +217,7 @@
                         bodyCellClass: ({ row, column, rowIndex }) => {
                             return "bri-table-td" +
                                 `${
-                                    this.canEdit
+                                    this.getRowCanEdit(row)
                                         ? " bri-table-td-edit"
                                         : " bri-table-td-show"
                                 }` +
@@ -200,7 +228,7 @@
                                             : ""
                                         : !row.__isShow__
                                             ? " bri-table-td-hide"
-                                            : row.__isShow__ === true && this.isExpandAction
+                                            : this.isExpandAction
                                                 ? " bri-table-td-visible"
                                                 : ""
                                 }` +
@@ -228,7 +256,11 @@
                     this.expandColumn,
                     ...(this.useIndex === true ? [this.indexColumn] : []),
                     ...this.$transformToColumns(this.contentColumns),
-                    ...(!this.isSearching && this.$getOperationList(["canDelete"]).length ? [this.operationColumn] : [])
+                    ...(this.isSearching
+                        ? []
+                        : this.$getOperationList(["canDelete"]).length
+                            ? [this.operationColumn]
+                            : [])
                 ];
             },
             expandColumn () {
@@ -241,26 +273,28 @@
                     align: "center",
                     fixed: "left",
                     renderBodyCell: ({ row, column, rowIndex }, h) => {
-                        return row.children && row.children.length && (this.isSearching ? this.searchMode === "tree" : true)
-                            ? h("Icon", {
-                                style: {
-                                    width: "16px",
-                                    height: "16px",
-                                    cursor: "pointer",
-                                    transform: row.__isExpand__ ? "rotate(90deg)" : "rotate(0deg)",
-                                    transition: "transform 0.3s"
-                                },
-                                props: {
-                                    type: "ios-arrow-forward",
-                                    size: "18"
-                                },
-                                on: {
-                                    click: () => {
-                                        this.toggleExpand(row, !row.__isExpand__);
+                        return this.isSearching && this.searchMode === "flat"
+                            ? h("span", "")
+                            : row.children && row.children.length
+                                ? h("Icon", {
+                                    style: {
+                                        width: "16px",
+                                        height: "16px",
+                                        cursor: "pointer",
+                                        transform: row.__isExpand__ ? "rotate(90deg)" : "rotate(0deg)",
+                                        transition: "transform 0.3s"
+                                    },
+                                    props: {
+                                        type: "ios-arrow-forward",
+                                        size: "18"
+                                    },
+                                    on: {
+                                        click: () => {
+                                            this.toggleExpand(row, !row.__isExpand__);
+                                        }
                                     }
-                                }
-                            })
-                            : h("span", "");
+                                })
+                                : h("span", "");
                     }
                 };
             },
@@ -323,6 +357,16 @@
         },
         created () {},
         methods: {
+            // 本身的初始化
+            selfReset () {
+                this.isExpandAction = false;
+                this.searchMode = "flat";
+                this.advSearchObj = {
+                    logic: "and",
+                    conditions: []
+                };
+            },
+
             // 筛选回调
             searchCb (conditions) {
                 this.isExpandAction = false;
@@ -334,12 +378,11 @@
             // 展开／隐藏节点
             toggleExpand (row, bool = true) {
                 this.isExpandAction = true;
-                // this.$set(row, "__isRendered__", true);
-                // this.$set(row, "__isShow__", true);
                 this.$set(row, "__isExpand__", bool);
 
                 this.toggleDescendantsShow(row, bool);
             },
+
             // 点击 -添加一行
             clickCreate (operationItem, row, rowIndex) {
                 // !row代表最上级节点
@@ -377,19 +420,15 @@
                     }
                 });
             },
-            // 点击导出
-            clickExport (operationItem) {
-                // operationItem.disabled = true;
-            },
 
             /* ------ 工具方法 ------- */
             // 加工树形数据
             getCalcuedTree (treeData = [], columns) {
                 const loop = (list = []) =>
-                    list.reduce((newList, node) => {
+                    list.forEach((node) => {
                         if (node.children && node.children.length) {
                             node.isLeaf = false;
-                            node.children = loop(node.children);
+                            loop(node.children);
 
                             columns.reduce((newNode, col) => {
                                 if (col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)) {
@@ -409,26 +448,25 @@
                             node.isLeaf = true;
                         }
 
-                        // 初次进来把前端存的状态值全部清除，除了__old__
-                        if (!this.initFlag) {
+                        // 初次进来把前端存的状态值全部清除（除了__readonly__）
+                        if (this.initFlag) {
                             this.deleteProperties.forEach(property => {
                                 delete node[property];
                             });
 
+                            node.__old__ = true; // 老的数据都打上标记 尽管不一定会用
+                            // 第一级的需要显示出来
                             if (node.level == 1) {
                                 node.__isRendered__ = true;
                                 node.__isShow__ = true;
+                                node.__isTmpShow__ = true;
                             }
                         }
+                    });
 
-                        return [
-                            ...newList,
-                            node
-                        ];
-                    }, []);
-
-                treeData = loop(treeData);
-                this.initFlag = true;
+                loop(treeData);
+                console.log("treeee");
+                this.initFlag = false;
                 return treeData;
             },
             // 获取父节点
@@ -451,8 +489,8 @@
                             }
                         });
                     };
-
                     loop(tree);
+
                     return parentNode;
                 }
             },
@@ -464,11 +502,11 @@
                             if (isFirstSon) {
                                 this.$set(subNode, "__isRendered__", true);
                                 this.$set(subNode, "__isShow__", bool);
+                                this.$set(subNode, "__isTmpShow__", bool);
                             } else {
                                 if (bool) {
                                     this.$set(subNode, "__isShow__", subNode.__isTmpShow__);
                                 } else {
-                                    this.$set(subNode, "__isTmpShow__", subNode.__isShow__);
                                     this.$set(subNode, "__isShow__", false);
                                 }
                             }
@@ -486,13 +524,23 @@
 
 <style lang="less" scoped>
     .DshTreeTable {
-        &-btns {
-            margin-bottom: 5px;
-            text-align: right;
-            color: @textColor;
+        &-top {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            align-items: center;
+
+            &-total {
+                font-weight: 500;
+            }
 
-            &-item {
+            &-btns {
+                text-align: right;
+                color: @textColor;
 
+                &-item {
+
+                }
             }
         }
 

package/src/components/list/common/flatTableImportModal.vue

@@ -237,15 +237,7 @@
 </script>
 
 <style lang="less">
-    .sheetBatchImportModal {
-        &-file {
-            position: relative;
+    .flatTableImportModal {
 
-            &-cancel {
-                cursor: pointer;
-                float: right;
-                font-size: @titleSize;
-            }
-        }
     }
 </style>

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

@@ -32,7 +32,13 @@ export default {
         listData () {
             this.data.forEach(item => {
                 !item._id && this.$set(item, "_id", this.$ObjectID().str);
+
+                if (!this.initFlag) {
+                    item.__old__ = true; // 标记老数据（initFlag不用在data中声明）
+                }
             });
+
+            this.initFlag = true;
             return this.data;
         },
         oldListData () {
@@ -78,7 +84,7 @@ export default {
                 cellStyleOption: {
                     bodyCellClass: ({ row, column, rowIndex }) => {
                         return "bri-table-td" +
-                            `${this.canEdit
+                            `${this.getRowCanEdit(row)
                                 ? " bri-table-td-edit"
                                 : " bri-table-td-show"
                             }`;
@@ -137,7 +143,7 @@ export default {
                         props: {
                             list: operationList.map(btnItem => ({
                                 ...btnItem,
-                                disabled: this.disabledOldDataRow && !row.__isCreate__
+                                disabled: !this.getRowCanEdit(row)
                             }))
                         },
                         on: {
@@ -231,13 +237,12 @@ export default {
     created () { },
     methods: {
         // 点击 -添加行
-        clickCreate (operationItem, row, index, list) {
+        clickCreate (operationItem, row, rowIndex, list) {
             const newRow = {
                 ...this.$deepCopy(this.selfRowDefault),
-                __isCreate__: true,
                 _id: this.$ObjectID().str
             };
-            const newRowIndex = index == null ? list.length : index + 1;
+            const newRowIndex = rowIndex == null ? list.length : rowIndex + 1;
             list.splice(newRowIndex, 0, newRow);
             this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
 
@@ -246,7 +251,7 @@ export default {
         // 点击 -删除行
         clickDelete (operationItem, row, rowIndex, list) {
             this.$Modal.confirm({
-                title: "警告",
+                title: "提示",
                 content: "确定删除吗？",
                 onOk: () => {
                     list.splice(rowIndex, 1);

package/src/components/list/mixins/quoteListModal.vue

@@ -0,0 +1,215 @@
+<template>
+    <div class="quoteListModal">
+        <Drawer
+            v-model="showModal"
+            class="quoteListModal-drawer"
+            width="400"
+            :title="'引用列表'"
+            :mask-closable="true"
+            :closable="true"
+            :draggable="true"
+        >
+            <div class="quoteListModal-drawer-body">
+                <div class="list">
+                    <template v-if="listData.length">
+                        <div
+                            v-for="dataItem in listData"
+                            :key="dataItem._id"
+                            :class="{
+                                'list-item': true,
+                                'list-item-active': curDataItem && curDataItem._id === dataItem._id
+                            }"
+                            @click="clickItem(dataItem)"
+                        >
+                            {{ listFields.length ? dataItem[listFields[0]] : dataItem.createdAt }}
+                        </div>
+                    </template>
+
+                    <div
+                        v-else
+                        class="list-nodata"
+                    >
+                        暂无数据…
+                    </div>
+                </div>
+
+                <dsh-buttons
+                    class="quoteListModal-drawer-body-btns"
+                    itemClass="quoteListModal-drawer-body-btns-item"
+                    :list="$getOperationList()"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
+            </div>
+        </Drawer>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "quoteListModal",
+        props: {
+            value: {
+                type: Boolean,
+                default: false
+            },
+            propsObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
+            listParams: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            }
+        },
+        data () {
+            return {
+                listData: [],
+                listPropsObj: {
+                    isLoading: false
+                },
+                curDataItem: undefined,
+
+                operationMap: {
+                    canReset: {
+                        name: "重 置",
+                        type: "canReset",
+                        size: "small",
+                        event: "clickReset"
+                    },
+                    confirm: {
+                        name: "确 认",
+                        type: "confirm",
+                        btnType: "primary",
+                        size: "small",
+                        event: "clickConfirm"
+                    }
+                }
+            };
+        },
+        computed: {
+            showModal: {
+                get () {
+                    return this.value;
+                },
+                set (val) {
+                    this.$emit("input", val);
+                }
+            },
+
+            modKey () {
+                return this.propsObj.modKey;
+            },
+            screenKey () {
+                return this.propsObj.screenKey;
+            },
+            listFields () {
+                return this.propsObj._quoteListFields || [];
+            }
+        },
+        created () {
+            this.init();
+        },
+        methods: {
+            init () {
+                this.getListData();
+            },
+            clickItem (dataItem) {
+                if (this.curDataItem && this.curDataItem._id === dataItem._id) {
+                    this.curDataItem = undefined;
+                } else {
+                    this.curDataItem = dataItem;
+                }
+            },
+            // 点击重置
+            clickReset () {
+
+            },
+            // 点击确认
+            clickConfirm () {
+                this.showModal = false;
+                this.$emit("confirm", this.curDataItem);
+            },
+
+            getListData () {
+                this.$https({
+                    url: {
+                        module: "sheet",
+                        name: "index"
+                    },
+                    params: this.listParams,
+                    loadingName: "listPropsObj.isLoading",
+                    callback: data => {
+                        this.listData = data.list;
+                        this.curDataItem = this.listData[0];
+                    }
+                });
+            }
+        }
+    };
+</script>
+
+<style lang="less">
+    .quoteListModal {
+        &-drawer {
+            &-body {
+                width: 100%;
+                height: 100%;
+                padding: 20px;
+                overflow: auto;
+
+                .list {
+                    &-item {
+                        padding: 8px 12px;
+                        margin-bottom: 8px;
+                        border-radius: 4px;
+                        cursor: pointer;
+
+                        &-active {
+                            background-color: @theme-hover;
+                        }
+                    }
+
+                    &-nodata {
+                        #dsh-nodata();
+                    }
+                }
+
+                &-btns {
+                    position: absolute;
+                    bottom: 0px;
+                    left: 0px;
+                    .dsh-flex-row-start-stretch();
+                    width: calc(100% - 48px);
+                    height: 51px;
+                    margin: 25px 20px 25px 28px;
+
+                    &-item {
+                        flex: 1;
+                        margin: 5px;
+                        height: 40px;
+                    }
+                }
+            }
+
+            .ivu-drawer-mask,
+            .ivu-drawer-wrap {
+                // z-index: 88888888;
+            }
+            .ivu-drawer-body {
+                padding: 0px;
+                padding-bottom: 50px;
+                overflow: hidden;
+            }
+            .ivu-drawer-header-inner {
+                font-size: @titleSize;
+                font-family: @titleFontFamily;
+                color: #333;
+                font-weight: bold;
+            }
+        }
+    }
+</style>