bri-components 1.4.80 → 1.4.81

package/package.json

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

package/src/components/list/BriTable.vue

@@ -21,7 +21,7 @@
             :cellStyleOption="cellStyleOption"
             :rowStyleOption="rowStyleOption"
             :expandOption="selfPropsObj.expandOption"
-            :checkbox-option="checkboxOption"
+            :checkbox-option="selfCheckboxOption"
             :radioOption="selfPropsObj.radioOption"
             :sortOption="sortOption"
             :cellSelectionOption="selfPropsObj.cellSelectionOption"
@@ -50,25 +50,31 @@
     export default {
         name: "BriTable",
         props: {
+            isLoading: Boolean,
+            data: Array,
+            footerData: Array,
+            columns: Array,
+
+            noDataText: {
+                type: String,
+                default: "暂无数据…"
+            },
             propsObj: {
                 type: Object,
                 default () {
                     return {};
                 }
             },
-            isLoading: Boolean,
-            noDataText: {
-                type: String,
-                default: "暂无数据…"
-            },
-            columns: Array,
-            data: Array,
-            footerData: Array
+            checkboxOption: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            }
         },
         data () {
             // 中文文档https://happy-coding-clans.github.io/vue-easytable/#/zh/doc/table/api
-            return {
-            };
+            return { };
         },
         computed: {
             selfPropsObj () {
@@ -138,7 +144,7 @@
                 };
             },
             // 全选配置项
-            checkboxOption () {
+            selfCheckboxOption () {
                 return {
                     // 行选择改变事件
                     selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
@@ -156,7 +162,8 @@
                             { isSelected, selectedRowKeys }
                         );
                     },
-                    ...(this.propsObj.checkboxOption || {})
+                    ...(this.propsObj.checkboxOption || {}),
+                    ...this.checkboxOption
                 };
             },
             // 列宽改变设置项

package/src/components/list/DshFlatTable.vue

@@ -58,6 +58,7 @@
                     :data="isLoading ? [] : selfShowListData"
                     :footer-data="footerData"
                     :propsObj="tablePropsObj"
+                    :checkboxOption="checkboxOption"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
@@ -167,6 +168,7 @@
                             :data="isLoading ? [] : selfShowListData"
                             :footer-data="footerData"
                             :propsObj="tableInModalPropsObj"
+                            :checkboxOption="checkboxOption"
                             @changeSelect="changeSelect"
                             @selectAll="changeSelect"
                         ></bri-table>

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

@@ -233,7 +233,6 @@ export default {
             return loop(nodes);
         },
 
-
         bodyCellSpan ({ row, rowIndex, column }) {
             row = row[column.nodeKey || column._key];
             return {

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

@@ -1,7 +1,13 @@
 export default {
     mixins: [],
     components: {},
-    props: {},
+    props: {
+        // 使用多选列
+        useSelection: {
+            type: Boolean,
+            default: false
+        }
+    },
     data () {
         return {
             isUseDescSort: false,
@@ -283,6 +289,7 @@ export default {
                 }
             }
 
+            this.changeSelect();
             this.change("createRow", newRow, newRowIndex, null);
         },
         // 点击 -删除行
@@ -443,7 +450,6 @@ export default {
                 const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
                 list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
                     .forEach(rowItem => {
-                        console.log(rowItem[column._key]);
                         rowItem[column._key] = this.$deepCopy(row[column._key]);
                 });
             }

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

@@ -48,7 +48,6 @@ export default {
 
         showColumns () {
             return [
-                ...(this.useSelection === true ? [this.selectionColumn] : []),
                 this.expandColumn,
                 ...(this.useIndex === true ? [this.indexColumn] : []),
                 ...this.$transformToColumns(this.showContentColumns),

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

@@ -77,7 +77,7 @@ export default {
             showRuleMessage: false, // 进行全体校验
 
             idRecordMap: {}, // 默认id转换映射
-            hoverRecordMap: {},
+            // hoverRecordMap: {},
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
 
             showTopSearch: true,
@@ -97,6 +97,7 @@ export default {
             },
 
             isLoading: false,
+            selectIds: [],
 
             dshRenderName: undefined,
             hideStatus: true,
@@ -244,7 +245,6 @@ export default {
                 _contentHeight: 500, // 表格最大高度
                 _headHeightAuto: false, // 表头高度自适应
                 _heightAuto: false, // 单元格高度自适应
-                _useSelection: false, // 使用选择列 -配置端暂时用不到
                 _useIndex: true, // 使用序号列
                 _useSummary: false, // 使用汇总行
                 _noborderColKeys: [], // 无边线的列
@@ -330,9 +330,6 @@ export default {
         heightAuto () {
             return this.selfPropsObj._heightAuto;
         },
-        useSelection () {
-            return this.selfPropsObj._useSelection;
-        },
         useIndex () {
             return this.selfPropsObj._useIndex;
         },
@@ -543,7 +540,6 @@ export default {
                     : true
             );
         },
-
         selectionColumn () {
             return {
                 _key: "__selection__",
@@ -573,6 +569,11 @@ export default {
             };
         },
 
+        checkboxOption () {
+            return {
+                selectedRowKeys: this.selectIds
+            };
+        },
         tablePropsObj () {
             return {
                 // isLoading: false,
@@ -581,13 +582,6 @@ export default {
                 //     clickHighlight: true,
                 //     stripe: true // 斑马纹
                 // },
-                ...(
-                    this.selfPropsObj.checkboxOption
-                        ? {
-                            checkboxOption: this.selfPropsObj.checkboxOption
-                        }
-                        : {}
-                ),
                 maxHeight: this.contentHeight,
                 // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
                 columnHiddenOption: {
@@ -818,7 +812,7 @@ export default {
             this.showRuleMessage = false;
 
             this.idRecordMap = {};
-            this.hoverRecordMap = {};
+            // this.hoverRecordMap = {};
             this.ruleRecordMap = {};
 
             this.dftAdvSearch = {
@@ -832,8 +826,9 @@ export default {
         },
         loadingFunc () {
             this.isLoading = true;
+            this.changeSelect();
+
             setTimeout(() => {
-                this.changeSelect();
                 this.isLoading = false;
             });
         },
@@ -847,9 +842,10 @@ export default {
                 this.changePage && this.changePage(1);
             }
         },
-        // 列表选择项改变
+        // 列表选择项改变 (！！！外部在使用)
         changeSelect (selections = [], ...params) {
-            this.$emit("changeSelect", selections.map(item => item._id), selections, ...params);
+            this.selectIds = selections.map(item => item._id);
+            this.$emit("changeSelect", this.selectIds, selections, ...params);
         },
 
         // 输入框失去焦点
@@ -1438,10 +1434,10 @@ export default {
                     // console.log("contextmenu::", row, rowIndex, column, event);
                 },
                 mouseenter: (event) => {
-                    this.$set(this.hoverRecordMap, `${row._id}`, true);
+                    // this.$set(this.hoverRecordMap, `${row._id}`, true);
                 },
                 mouseleave: (event) => {
-                    this.$set(this.hoverRecordMap, `${row._id}`, false);
+                    // this.$set(this.hoverRecordMap, `${row._id}`, false);
                 }
             };
         },