bri-components 1.4.75 → 1.4.76

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.75",
+    "version": "1.4.76",
     "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/mixins/tableBaseMixin.js

@@ -485,10 +485,15 @@ export default {
         //  全部数据 或 筛选时符合条件的数据 -当前页的
         curPageShowListData () {
             return this.pagePropsObj.page >= 1
-                ? this.showListData.slice(
-                    (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
-                    this.pagePropsObj.page * this.pagePropsObj.pagesize
-                )
+                ? (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
+                    )
                 : [];
         },
         // 全部数据 或 筛选时符合条件的数据 -总数
@@ -512,11 +517,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 +612,13 @@ export default {
                 //     clickHighlight: true,
                 //     stripe: true // 斑马纹
                 // },
+                ...(
+                    this.selfPropsObj.checkboxOption
+                        ? {
+                            checkboxOption: this.selfPropsObj.checkboxOption
+                        }
+                        : {}
+                ),
                 maxHeight: this.contentHeight,
                 // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
                 columnHiddenOption: {
@@ -854,8 +871,8 @@ export default {
             }
         },
         // 列表选择项改变
-        changeSelect (list) {
-            this.$emit("changeSelect", list);
+        changeSelect (...params) {
+            this.$emit("changeSelect", params[0].map(item => item._id), ...params);
         },
         // 切换正倒序
         changeSort () {