bri-components 1.4.46 → 1.4.48

package/package.json

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

package/src/components/controls/extra/themeIcon.vue

@@ -80,6 +80,7 @@
 
         &-icons {
             display: flex;
+            flex-wrap: wrap;
 
             .item {
                 min-width: 54px;

package/src/components/list/DshFlatTable.vue

@@ -17,7 +17,7 @@
                 class="DshFlatTable-form"
             >
                 <div
-                    v-for="(row, rowIndex) in curPageListData"
+                    v-for="(row, rowIndex) in selfShowListData"
                     :key="row._id"
                     class="item"
                 >
@@ -52,22 +52,22 @@
             <!-- 表格展示模式 -->
             <template v-else>
                 <bri-table
-                    v-show="curPageListData.length && !isSearching"
+                    v-show="selfShowListData.length && !isSearching"
                     ref="briTable"
                     class="DshFlatTable-main"
                     :columns="showColumns"
-                    :data="renderedShowListData"
+                    :data="selfRenderedListData"
                     :footer-data="footerData"
                     :propsObj="tablePropsObj"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
                 <bri-table
-                    v-show="!curPageListData.length || isSearching"
+                    v-show="!selfShowListData.length || isSearching"
                     ref="briTable"
                     class="DshFlatTable-main"
                     :columns="showColumns"
-                    :data="curPageListData"
+                    :data="selfShowListData"
                     :footer-data="footerData"
                     :propsObj="tablePropsObj"
                     @changeSelect="changeSelect"
@@ -80,7 +80,10 @@
         <dsh-render :render="createBtnRender"></dsh-render>
 
         <!-- 分页 -->
-        <div class="DshFlatTable-page">
+        <div
+            v-if="!isMergeRowTable"
+            class="DshFlatTable-page"
+        >
             <dsh-page
                 :mode="pageMode"
                 :total="total"
@@ -129,20 +132,20 @@
 
                 <!-- 表格 -->
                 <bri-table
-                    v-show="curPageListData.length && !isSearching"
+                    v-show="selfShowListData.length && !isSearching"
                     class="DshFlatTable-fullscreen-inner-main"
                     :columns="showColumns"
-                    :data="renderedShowListData"
+                    :data="selfRenderedListData"
                     :footer-data="footerData"
                     :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
                 <bri-table
-                    v-show="!curPageListData.length || isSearching"
+                    v-show="!selfShowListData.length || isSearching"
                     class="DshFlatTable-fullscreen-inner-main"
                     :columns="showColumns"
-                    :data="curPageListData"
+                    :data="selfShowListData"
                     :footer-data="footerData"
                     :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"
@@ -153,7 +156,11 @@
                 <dsh-render :render="createBtnRender"></dsh-render>
 
                 <!-- 分页 -->
-                <div class="DshFlatTable-page">
+                <div
+                    v-if="!isMergeRowTable"
+                    class="DshFlatTable-page"
+                    style="padding: 16px 0px;"
+                >
                     <dsh-page
                         :mode="pageMode"
                         :total="total"

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

@@ -36,7 +36,7 @@ export default {
             ];
         },
         // 顶替tableBaseMixin里的
-        rowsNumStr () {
+        searchTitle () {
             return `${this.isSearching ? "筛选" : "全部"}数据，共 ${this.total} 条；`;
         },
 

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

@@ -3,15 +3,7 @@ export default {
     components: {},
     props: {},
     data () {
-        return {
-            isUseDescSort: false,
-            pageMode: "small",
-            pagePropsObj: {
-                page: 1,
-                pagesize: 10,
-                pagesizeOpts: [10, 20, 30, 50]
-            }
-        };
+        return {};
     },
     computed: {
         rowspanMap () {
@@ -35,7 +27,7 @@ export default {
         },
         // 是不是合并行表格
         isMergeRowTable () {
-            return this.mergeRowColKeys.length;
+            return !!this.mergeRowColKeys.length;
         },
         // 一级合并列keys（一级合并列：左侧第一合并列和右侧和并列）
         firstMergeRowColKeys () {
@@ -59,7 +51,7 @@ export default {
             return this.mergeRowColKeys.filter(colKey => !this.firstMergeRowColKeys.includes(colKey));
         },
         // 顶替tableBaseMixin里的
-        rowsNumStr () {
+        searchTitle () {
             return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.total}条；` : "；"}`;
         },
 
@@ -78,17 +70,15 @@ export default {
         allListMap () {
             return this.$arrToMap(this.allListData, "_id");
         },
-        // 渲染过的行 -但显示当前页
-        renderedShowListData () {
+        selfRenderedListData () {
             return this.isMergeRowTable
                 ? this.renderedListData
-                : this.curPageListData;
+                : this.curPageShowListData;
         },
-        // 全部数据或筛选时符合条件的数据
-        curPageListData () {
+        selfShowListData () {
             return this.isMergeRowTable
                 ? this.showListData
-                : this.showListData.slice((this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize, this.pagePropsObj.page * this.pagePropsObj.pagesize);
+                : this.curPageShowListData;
         },
         footerData () {
             return this.isSearching
@@ -114,12 +104,6 @@ export default {
                     ]
                     : [];
         },
-        // 共多少分页
-        PageNum () {
-            return this.total % this.pagePropsObj.pagesize > 0
-                ? Math.ceil(this.total / this.pagePropsObj.pagesize)
-                : Math.floor(this.total / this.pagePropsObj.pagesize);
-        },
 
         showColumns () {
             return [
@@ -198,20 +182,6 @@ export default {
             }
         },
 
-        // 切换正倒序
-        changeSort () {
-            this.isUseDescSort = !this.isUseDescSort;
-            this.pagePropsObj.page = 1;
-        },
-        // 切换分页
-        changePage (page) {
-            this.pagePropsObj.page = page;
-        },
-        // 切换分页条数
-        changePageSize (pagesize) {
-            this.pagePropsObj.page = 1;
-            this.pagePropsObj.pagesize = pagesize;
-        },
         // 点击 -添加行
         clickCreate (operationItem, row, rowIndex, column) {
             const curColKey = column ? column._key : undefined;
@@ -343,7 +313,8 @@ export default {
                         });
                     }
 
-                    list.splice(rowIndex, 1);
+                    const listIndex = list.findIndex(rowItem => rowItem._id === row._id);
+                    list.splice(listIndex, 1);
 
                     this.change("deleteRow", row, rowIndex, null);
                 }

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

@@ -95,6 +95,14 @@ export default {
                 conditions: []
             },
 
+            isUseDescSort: false,
+            pageMode: "small",
+            pagePropsObj: {
+                page: 1,
+                pagesize: 10,
+                pagesizeOpts: [10, 20, 30, 50]
+            },
+
             dshRenderName: undefined,
             hideStatus: true,
             showQuoteModal: false,
@@ -415,15 +423,15 @@ export default {
         isSearching () {
             return this.$isAdvSearching(this.finalTableAdvSearch);
         },
-        rowsNumStr () {
+        searchTitle () {
             return `${this.isSearching ? "筛选" : "全部"}数据；`;
-            // return `${this.isSearching ? "筛选" : "全部"}数据；共 ${this.total}条；`;
         },
         controlShowKey () {
             return this.isSearching ? "__isSearchShow__" : "__isShow__";
         },
 
         /* --- 数据 --- */
+        // 默认数据
         defaultListData () {
             const loop = (tree = [], list = []) => {
                 return tree.reduce((newList, rowItem) => {
@@ -452,7 +460,7 @@ export default {
                 return rowItem.__isRendered__;
             });
         },
-        // 全部数据或筛选时符合条件的数据 -但显示当前页
+        // 全部数据 或 筛选时符合条件的数据
         showListData () {
             return this.renderedListData
                 .filter(rowItem => !!rowItem[this.controlShowKey])
@@ -461,10 +469,23 @@ export default {
                     return rowItem;
             });
         },
-        // 全部数据或筛选时符合条件的数据 总数
+        //  全部数据 或 筛选时符合条件的数据 -当前页的
+        curPageShowListData () {
+            return this.showListData.slice(
+                (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
+                this.pagePropsObj.page * this.pagePropsObj.pagesize
+            );
+        },
+        // 全部数据 或 筛选时符合条件的数据 -总数
         total () {
             return this.showListData.length;
         },
+        // 全部数据 或 筛选时符合条件的数据 -共多少分页
+        PageNum () {
+            return this.total % this.pagePropsObj.pagesize > 0
+                ? Math.ceil(this.total / this.pagePropsObj.pagesize)
+                : Math.floor(this.total / this.pagePropsObj.pagesize);
+        },
 
         parentDataId () {
             return this.parentObj._id;
@@ -788,11 +809,13 @@ export default {
             this.hoverRecordMap = {};
             this.ruleRecordMap = {};
 
+            this.changePage(1);
             this.dftAdvSearch = {
                 logic: "and",
                 conditions: []
             };
             this.hideStatus = true;
+
             this.selfReset && this.selfReset();
         },
         // 共外部使用
@@ -806,11 +829,26 @@ export default {
         searchCb (conditions) {
             this.isExpandAction = false;
             this.dftAdvSearch.conditions = conditions;
+            this.changePage(1);
         },
         // 列表选择项改变
         changeSelect (list) {
             this.$emit("changeSelect", list);
         },
+        // 切换正倒序
+        changeSort () {
+            this.isUseDescSort = !this.isUseDescSort;
+            this.changePage(1);
+        },
+        // 切换分页
+        changePage (page) {
+            this.pagePropsObj.page = page;
+        },
+        // 切换分页条数
+        changePageSize (pagesize) {
+            this.pagePropsObj.page = 1;
+            this.pagePropsObj.pagesize = pagesize;
+        },
 
         // 输入框失去焦点
         controlBlur (operationItem, row, rowIndex, column, params) {
@@ -1087,7 +1125,7 @@ export default {
                         style: {
                             "font-weight": "500"
                         }
-                    }, this.rowsNumStr),
+                    }, this.searchTitle),
 
                     h("div", {
                         style: {