bri-components 1.4.7 → 1.4.8

package/README.md

@@ -28,3 +28,57 @@ npm test
 ```
 
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+保证npm登录状态
+npm login
+
+~前端正常npm包发布流程~
+bri-components:(此包简单，不用压缩）
+npm version patch
+npm publish
+
+bri-datas和bri-utils:
+第一次操作的，先准备以下（之后发包不用重复操作）
+-package.json里改成"main": "lib/bri-datas.min.js"（指向压缩文件）
+-git stash save
+发包步骤
+npm version patch
+git stash apply
+npm run lib:prod
+npm publish
+git push
+git reset origin/dev --hard
+
+
+~前端项目应急npm包发布流程~(尽量避免发应急包)
+需发布npm预发布号的包：
+找到项目包使用包的version
+git checkout -b <branch name> <version name>（eg: git checkout -b dsh v1.4.7）
+git push --set-upstream origin <branch name>
+修改 => commit
+发包(此时用npm version release)
+git checkout dev
+git merge <branch name>
+git branch <branch name> -d
+git push origin <branch name> -d
+git checkout dev
+
+
+除外需将所有tag推向remote（偶尔操作一下即可）
+git push --tags
+
+另：修改npm包前最好先git pull（频繁发包，这种习惯log记录清晰）

package/package.json

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

package/src/components/list/DshFlatTable.vue

@@ -50,7 +50,7 @@
         <!-- 表格展示模式 -->
         <template v-else>
             <bri-table
-                v-show="showListData.length"
+                v-show="showListData.length && !isSearching"
                 ref="briTable"
                 class="DshFlatTable-main"
                 :columns="showColumns"
@@ -60,6 +60,17 @@
                 @changeSelect="changeSelect"
                 @selectAll="changeSelect"
             ></bri-table>
+            <bri-table
+                v-show="showListData.length && isSearching"
+                ref="briTable"
+                class="DshFlatTable-main"
+                :columns="showColumns"
+                :data="showListData"
+                :footer-data="footerData"
+                :propsObj="tablePropsObj"
+                @changeSelect="changeSelect"
+                @selectAll="changeSelect"
+            ></bri-table>
             <bri-table
                 v-show="!showListData.length"
                 class="DshFlatTable-main"

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

@@ -169,26 +169,24 @@ export default {
                 // 非底部按钮添加时
                 if (row) {
                     // 寻找对应的行数据 -当前列是合并列会寻找，普通列不用找（就是row）
-                    if (this.mergeRowColKeys.includes(curColKey)) {
-                        const newList = this.allListData.slice(rowIndex); // 从该行开始截取
-                        const nextRowIndex = this.$isEmptyData(row[curColKey])
-                            ? 1
-                            : newList.findIndex(rowItem => !this.isCompareSame(column, row, rowItem)); // 寻找该单元格值开始不一样的行(特殊情况是最后一行，nextRowIndex为-1)
+                    if (this.mergeRowColKeys.includes(curColKey) && this.rowspanMap[this.getMixKey(row, column)] > 1) {
+                        const newList = this.allListData.slice(rowIndex + 1); // 从下一行开始截取
+                        const nextRowIndex = newList.findIndex(rowItem => this.rowspanMap[this.getMixKey(rowItem, column)] > 0); // 寻找该单元格值开始不一样的行
+                        // nextRowIndex为-1，代表最后一行
                         row = nextRowIndex < 0
                             ? newList[newList.length - 1]
-                            : newList[nextRowIndex - 1]; // 取该单元格值一样的最后一行
+                            : newList[nextRowIndex];
+                        rowIndex = list.findIndex(dataItem => dataItem._id === row._id);
                     }
 
                     // 寻找要复制值的列
                     // 当前列：一级合并列，不复制值；
                     if (this.firstMergeRowColKeys.includes(curColKey)) {
-                        // 新增的行做rowspan记录
                         this.mergeRowColKeys.forEach(colKey => {
-                            this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 1; // 新增的行做rowspan记录
+                            this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 1;
                         });
                     }
-                    // 当前列：普通合并列(非一级合并列)，该列之前的合并列和一级合并列 复制值给新的行
-                    // 当前列：非合并列 -全部复制值给新的行
+                    // 当前列：普通合并列(非一级合并列)-该列之前的合并列和一级合并列复制值给新的行；非合并列-全部复制值给新的行
                     else {
                         const notFirstCopyColKeys = this.notFirstMergeRowColKeys.includes(curColKey)
                             ? this.notFirstMergeRowColKeys.filter((colKey, colIndex, list) => colIndex < list.findIndex(colKey => colKey === curColKey))
@@ -205,21 +203,26 @@ export default {
                             });
                         }, newRow);
 
-                        // 做rowspan记录
+                        // rowspan记录
                         copyColKeys.forEach(colKey => {
-                            this.createMergeUnitRowspan({ row, rowIndex, column: { _key: colKey } });
-                            this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 0; // 新增的行做rowspan记录
-                        }, newRow);
+                            // 合并的单元格更新rowspan记录
+                            const fistMergeRow = this.rowspanMap[this.getMixKey(row, { _key: colKey })] === 0
+                                ? list.slice(0, rowIndex).findLast(rowItem => this.rowspanMap[this.getMixKey(rowItem, { _key: colKey })] > 1)
+                                : row;
+                            this.rowspanMap[this.getMixKey(fistMergeRow, { _key: colKey })] = this.rowspanMap[this.getMixKey(fistMergeRow, { _key: colKey })] + 1;
+
+                            // 新增的单元格做rowspan记录
+                            this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 0;
+                        });
                         noCopyColKeys.forEach(colKey => {
-                            this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 1; // 新增的行做rowspan记录
+                            this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 1;
                         });
                     }
                 }
                 // 底部按钮添加时
                 else {
-                    // 新增的行做rowspan记录
                     this.mergeRowColKeys.forEach(colKey => {
-                        this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 1; // 新增的行做rowspan记录
+                        this.rowspanMap[this.getMixKey(newRow, { _key: colKey })] = 1;
                     });
                 }
             }
@@ -237,13 +240,35 @@ export default {
                 title: "提示",
                 content: "确定删除吗？",
                 onOk: () => {
+                    const list = this.data;
+
                     // 处理单元格合并相关
                     if (this.mergeRowColKeys.length) {
                         this.mergeRowColKeys.forEach(colKey => {
-                            this.deleteMergeUnitRowspan({ row, rowIndex, column: { _key: colKey } });
+                            const column = { _key: colKey };
+                            const rowIndex = list.findIndex(dataItem => dataItem._id === row._id);
+
+                            // 当前单元格合并了下面的 -把合并数减去1给下一单元格
+                            if (this.rowspanMap[this.getMixKey(row, column)] > 1) {
+                                const nextRow = list[rowIndex + 1];
+                                this.rowspanMap[this.getMixKey(nextRow, column)] = this.rowspanMap[this.getMixKey(row, column)] - 1;
+                            }
+                            // 当前单元格被上面的合并了 -最上面的合并单元格合并数减去1
+                            else if (this.rowspanMap[this.getMixKey(row, column)] === 0) {
+                                const fistMergeRow = list.slice(0, rowIndex).findLast(rowItem => this.rowspanMap[this.getMixKey(rowItem, column)] > 1);
+                                this.rowspanMap[this.getMixKey(fistMergeRow, column)] = this.rowspanMap[this.getMixKey(fistMergeRow, column)] - 1;
+                            }
+                            // 当前单元格单独存在（无合并）
+                            else if (this.rowspanMap[this.getMixKey(row, column)] === 1) {
+                                // 无处理
+                            }
+
+                            // 清除被删除单元格的rowspan记录
+                            delete this.rowspanMap[this.getMixKey(row, column)];
                         });
                     }
-                    this.data.splice(rowIndex, 1);
+
+                    list.splice(rowIndex, 1);
 
                     this.change("deleteRow", row, rowIndex, null);
                 }
@@ -296,61 +321,24 @@ export default {
             let rowspan = 1;
             rowIndex = list.findIndex(dataItem => dataItem._id === row._id);
 
-            if (
-                this.mergeRowColKeys.includes(column._key) &&
-                rowIndex > -1 // 代表显示出来的行
-            ) {
-                if (rowIndex !== 0 && this.isCompareSame(column, row, list[rowIndex - 1])) {
-                    rowspan = 0;
-                } else {
-                    const newList = list.slice(rowIndex + 1);
-                    const newIndex = newList.findIndex(rowItem => !this.isCompareSame(column, row, rowItem));
-                    rowspan = 1 + (newIndex === -1 ? newList.length : newIndex);
+            // 合并单元格的列走这
+            if (this.mergeRowColKeys.includes(column._key)) {
+                rowIndex = list.findIndex(dataItem => dataItem._id === row._id);
+
+                // 代表显示出来的行
+                if (rowIndex > -1) {
+                    if (rowIndex !== 0 && this.isCompareSame(column, row, list[rowIndex - 1])) {
+                        rowspan = 0;
+                    } else {
+                        const newList = list.slice(rowIndex + 1);
+                        const newIndex = newList.findIndex(rowItem => !this.isCompareSame(column, row, rowItem));
+                        rowspan = 1 + (newIndex === -1 ? newList.length : newIndex);
+                    }
                 }
             }
 
             return rowspan;
         },
-        // 添加一行后 处理合并单元格的rowspan
-        createMergeUnitRowspan ({ row, rowIndex, column }, list = this.allListData) {
-            rowIndex = list.findIndex(dataItem => dataItem._id === row._id);
-
-            if (rowIndex > -1) {
-                let fistMergeRow = this.rowspanMap[this.getMixKey(row, column)] === 0
-                    ? list.slice(0, rowIndex).findLast(rowItem => this.rowspanMap[this.getMixKey(rowItem, column)] > 1)
-                    : row;
-
-                this.rowspanMap[this.getMixKey(fistMergeRow, column)] = this.rowspanMap[this.getMixKey(fistMergeRow, column)] + 1;
-            }
-            else {
-                this.rowspanMap[this.getMixKey(row, column)] = 1;
-            }
-        },
-        // 删除一行后 处理合并单元格的rowspan
-        deleteMergeUnitRowspan ({ row, rowIndex, column }, list = this.allListData) {
-            rowIndex = list.findIndex(dataItem => dataItem._id === row._id);
-            let fistMergeRow = this.rowspanMap[this.getMixKey(row, column)] === 0
-                ? list.slice(0, rowIndex).findLast(rowItem => this.rowspanMap[this.getMixKey(rowItem, column)] > 1)
-                : row;
-
-            // 当前单元格合并了下面的 -把合并数减去1给下一单元格
-            if (this.rowspanMap[this.getMixKey(row, column)] > 1) {
-                nextRow = list[rowIndex + 1];
-                this.rowspanMap[this.getMixKey(nextRow, column)] = this.rowspanMap[this.getMixKey(row, column)] - 1;
-            }
-            // 当前单元格被上面的合并了 -最上面的合并单元格合并数减去1
-            else if (this.rowspanMap[this.getMixKey(row, column)] === 0) {
-                this.rowspanMap[this.getMixKey(fistMergeRow, column)] = this.rowspanMap[this.getMixKey(fistMergeRow, column)] - 1;
-            }
-            // 当前单元格单独存在（无合并）
-            else if (this.rowspanMap[this.getMixKey(row, column)] === 1) {
-                // 无处理
-            }
-
-            // 清除被删除单元格的rowspan记录
-            delete this.rowspanMap[this.getMixKey(row, column)];
-        },
-
         // 合并单元格的行，某列的值全部跟着修改
         dealSameRowsVal ({ row, rowIndex, column }, list = this.allListData) {
             if (this.mergeRowColKeys.includes(column._key) && this.rowspanMap[this.getMixKey(row, column)] > 1) {