bri-components 1.4.75 → 1.4.77

package/package.json

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

package/src/components/list/DshBox/DshTable.vue

@@ -165,7 +165,7 @@
                             },
                             on: {
                                 click: (operationItem) => {
-                                    this.$dshEmit(operationItem, params.row, params.row);
+                                    this.$dshEmit(operationItem, params.row, params.index);
                                 }
                             },
                             nativeOn: {

package/src/components/list/DshFlatTable.vue

@@ -84,7 +84,7 @@
                 <span
                     class="DshFlatTable-sort"
                     :style="{ color: appColor }"
-                    @click="changeSort()"
+                    @click="changeDescSort()"
                 >
                     <dsh-icons
                         class="DshFlatTable-sort-icons"
@@ -194,7 +194,7 @@
                         <span
                             class="DshFlatTable-sort"
                             :style="{ color: appColor }"
-                            @click="changeSort()"
+                            @click="changeDescSort()"
                         >
                             <dsh-icons
                                 class="DshFlatTable-sort-icons"

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

@@ -3,7 +3,15 @@ export default {
     components: {},
     props: {},
     data () {
-        return {};
+        return {
+            isUseDescSort: false,
+            pageMode: "small",
+            pagePropsObj: {
+                page: 1,
+                pagesize: 10,
+                pagesizeOpts: [10, 20, 30, 50]
+            }
+        };
     },
     computed: {
         rowspanMap () {
@@ -11,14 +19,10 @@ export default {
         },
         selfBasePropsObj () {
             return {
+                _isUseDescSort: false, // 是否使用使用倒序
                 _mergeRowColKeys: [] // 合并行的列
-                // _isUseDescSort: false // 是否使用使用倒序
             };
         },
-        // // 是否使用倒序
-        // isUseDescSort () {
-        //     return this.selfPropsObj._isUseDescSort;
-        // },
         mergeRowColKeys () {
             const mergeRowColKeys = this.selfPropsObj._mergeRowColKeys || []; // 配置端有问题，高级依赖时值成undefined了
             return this.selfColumns
@@ -75,6 +79,26 @@ export default {
                 ? this.showListData
                 : this.curPageShowListData;
         },
+        //  全部数据 或 筛选时符合条件的数据 -当前页的
+        curPageShowListData () {
+            return this.pagePropsObj.page >= 1
+                ? (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize >= this.showListData.length
+                    ? this.showListData.slice(
+                        (this.pagePropsObj.page - 2) * this.pagePropsObj.pagesize,
+                        (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize
+                    )
+                    : this.showListData.slice(
+                        (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
+                        this.pagePropsObj.page * this.pagePropsObj.pagesize
+                    )
+                : [];
+        },
+        // 全部数据 或 筛选时符合条件的数据 -共多少分页
+        PageNum () {
+            return this.selfTotal % this.pagePropsObj.pagesize > 0
+                ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
+                : Math.floor(this.selfTotal / this.pagePropsObj.pagesize);
+        },
         footerData () {
             return this.isSearching
                 ? []
@@ -129,6 +153,7 @@ export default {
         }
     },
     created () {
+        this.isUseDescSort = this.selfPropsObj._isUseDescSort;
         this.initRowspan();
     },
     methods: {
@@ -136,45 +161,21 @@ export default {
         selfReset () {
             this.initRowspan();
         },
-        // 初始化合并单元格的rowspan
-        initRowspan () {
-            if (this.isMergeRowTable) {
-                this.$set(this.tableDataObj, "rowspanMap", this.tableDataObj.rowspanMap || {});
-
-                // TODO: 待删除
-                Object.entries(this.rowspanMap).forEach(arr => {
-                    if (arr[0].includes("dsh")) {
-                        this.rowspanMap[arr[0].split("dsh").join("--")] = this.rowspanMap[arr[1]];
-                        delete this.rowspanMap[arr[0]];
-                    }
-                });
-
-                this.allListData.forEach((rowItem, rowIndex) => {
-                    this.mergeRowColKeys.forEach(colKey => {
-                        const column = { _key: colKey };
-
-                        // 新增页 -行的_id被置换，rowspanMap也要相应置换，还要清除rowspanMap里和默认行老_id相关的
-                        const oldId = this.idRecordMap[rowItem._id];
-                        const oldRow = { ...rowItem, _id: oldId };
-                        if (oldId && ![undefined, null].includes(this.rowspanMap[this.getMixKey(oldRow, column)])) {
-                            this.rowspanMap[this.getMixKey(rowItem, column)] = this.getRealRowspan({ row: oldRow, rowIndex, column });
-                            delete this.rowspanMap[this.getMixKey(oldRow, column)];
-                        } else {
-                            this.rowspanMap[this.getMixKey(rowItem, column)] = this.getRealRowspan({ row: rowItem, rowIndex, column });
-                        }
-                    });
-                });
 
-                // 清除rowspanMap无用的（针对来回改mergeRowColKeys）
-                Object.entries(this.rowspanMap).forEach(arr => {
-                    const keyArr = arr[0].split("--");
-                    const id = keyArr[0];
-                    const colKey = keyArr.slice(1).join("--");
-                    if (!this.allListMap[id] || !this.mergeRowColKeys.includes(colKey)) {
-                        delete this.rowspanMap[arr[0]];
-                    }
-                });
-            }
+        // 切换正倒序
+        changeDescSort () {
+            this.isUseDescSort = !this.isUseDescSort;
+            this.changePage(1);
+        },
+        // 切换分页
+        changePage (page) {
+            this.pagePropsObj.page = page;
+            this.loadingFunc();
+        },
+        // 切换分页条数
+        changePageSize (pagesize) {
+            this.pagePropsObj.page = 1;
+            this.pagePropsObj.pagesize = pagesize;
         },
 
         // 点击 -添加行
@@ -341,6 +342,46 @@ export default {
         },
 
         /* ----------- 方法 ---------- */
+        // 初始化合并单元格的rowspan
+        initRowspan () {
+            if (this.isMergeRowTable) {
+                this.$set(this.tableDataObj, "rowspanMap", this.tableDataObj.rowspanMap || {});
+
+                // TODO: 待删除
+                Object.entries(this.rowspanMap).forEach(arr => {
+                    if (arr[0].includes("dsh")) {
+                        this.rowspanMap[arr[0].split("dsh").join("--")] = this.rowspanMap[arr[1]];
+                        delete this.rowspanMap[arr[0]];
+                    }
+                });
+
+                this.allListData.forEach((rowItem, rowIndex) => {
+                    this.mergeRowColKeys.forEach(colKey => {
+                        const column = { _key: colKey };
+
+                        // 新增页 -行的_id被置换，rowspanMap也要相应置换，还要清除rowspanMap里和默认行老_id相关的
+                        const oldId = this.idRecordMap[rowItem._id];
+                        const oldRow = { ...rowItem, _id: oldId };
+                        if (oldId && ![undefined, null].includes(this.rowspanMap[this.getMixKey(oldRow, column)])) {
+                            this.rowspanMap[this.getMixKey(rowItem, column)] = this.getRealRowspan({ row: oldRow, rowIndex, column });
+                            delete this.rowspanMap[this.getMixKey(oldRow, column)];
+                        } else {
+                            this.rowspanMap[this.getMixKey(rowItem, column)] = this.getRealRowspan({ row: rowItem, rowIndex, column });
+                        }
+                    });
+                });
+
+                // 清除rowspanMap无用的（针对来回改mergeRowColKeys）
+                Object.entries(this.rowspanMap).forEach(arr => {
+                    const keyArr = arr[0].split("--");
+                    const id = keyArr[0];
+                    const colKey = keyArr.slice(1).join("--");
+                    if (!this.allListMap[id] || !this.mergeRowColKeys.includes(colKey)) {
+                        delete this.rowspanMap[arr[0]];
+                    }
+                });
+            }
+        },
         // 加工单元格对应的配置
         getSelfResetCol ({ row, rowIndex, column }) {
             return this.mergeRowColKeys.includes(column._key)

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

@@ -45,10 +45,6 @@ export default {
             }
         },
 
-        total: {
-            type: Number,
-            default: 0
-        },
         compareData: {
             type: Array,
             default () {
@@ -101,13 +97,6 @@ export default {
             },
 
             isLoading: false,
-            isUseDescSort: false,
-            pageMode: "small",
-            pagePropsObj: {
-                page: 1,
-                pagesize: 10,
-                pagesizeOpts: [10, 20, 30, 50]
-            },
 
             dshRenderName: undefined,
             hideStatus: true,
@@ -482,24 +471,9 @@ export default {
                     return rowItem;
             });
         },
-        //  全部数据 或 筛选时符合条件的数据 -当前页的
-        curPageShowListData () {
-            return this.pagePropsObj.page >= 1
-                ? this.showListData.slice(
-                    (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
-                    this.pagePropsObj.page * this.pagePropsObj.pagesize
-                )
-                : [];
-        },
         // 全部数据 或 筛选时符合条件的数据 -总数
         selfTotal () {
-            return this.total || this.showListData.length;
-        },
-        // 全部数据 或 筛选时符合条件的数据 -共多少分页
-        PageNum () {
-            return this.selfTotal % this.pagePropsObj.pagesize > 0
-                ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
-                : Math.floor(this.selfTotal / this.pagePropsObj.pagesize);
+            return this.showListData.length;
         },
 
         parentDataId () {
@@ -512,11 +486,16 @@ export default {
                 const initDftVal = this.initDftValMap[column._type];
 
                 return Object.assign(obj, {
-                    [column._key]: this.$isEmptyData(dftInRowVal)
-                        ? this.$isEmptyData(dftVal)
+                    [column._key]: dftInRowVal === undefined
+                        ? dftVal === undefined
                             ? initDftVal
                             : dftVal
                         : dftInRowVal
+                        // [column._key]: this.$isEmptyData(dftInRowVal)
+                        //     ? this.$isEmptyData(dftVal)
+                        //         ? initDftVal
+                        //         : dftVal
+                        //     : dftInRowVal
                 });
             }, {});
         },
@@ -602,6 +581,13 @@ export default {
                 //     clickHighlight: true,
                 //     stripe: true // 斑马纹
                 // },
+                ...(
+                    this.selfPropsObj.checkboxOption
+                        ? {
+                            checkboxOption: this.selfPropsObj.checkboxOption
+                        }
+                        : {}
+                ),
                 maxHeight: this.contentHeight,
                 // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
                 columnHiddenOption: {
@@ -854,23 +840,8 @@ export default {
             }
         },
         // 列表选择项改变
-        changeSelect (list) {
-            this.$emit("changeSelect", list);
-        },
-        // 切换正倒序
-        changeSort () {
-            this.isUseDescSort = !this.isUseDescSort;
-            this.changePage(1);
-        },
-        // 切换分页
-        changePage (page) {
-            this.pagePropsObj.page = page;
-            this.loadingFunc();
-        },
-        // 切换分页条数
-        changePageSize (pagesize) {
-            this.pagePropsObj.page = 1;
-            this.pagePropsObj.pagesize = pagesize;
+        changeSelect (...params) {
+            this.$emit("changeSelect", params[0].map(item => item._id), ...params);
         },
         loadingFunc () {
             this.isLoading = true;