n20-common-lib 2.6.83 → 2.6.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.83",
+  "version": "2.6.84",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/TablePro/index.vue

@@ -7,7 +7,12 @@
       :data="data"
       :height="height"
       :class="{ 'cell-default-set--': cellDefault }"
-      :checkbox-config="{ checkField: 'checked', checkMethod: forbidSelect }"
+      :checkbox-config="{
+        checkField: 'checked',
+        checkMethod: forbidSelect,
+        ...$attrs['checkbox-config'],
+        ...attrs.checkboxConfig
+      }"
       show-header-overflow
       show-overflow
       :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig, ...$attrs['row-config'] }"
@@ -266,7 +271,8 @@ export default {
     // row当前单次勾选的哪一行数据 包含checked字段
     handleSelectionChange(row = '') {
       const val = this.$refs.vxeTable.getCheckboxRecords()
-      this.$emit('selection-change-method', val, row)
+      const val1 = this.$refs.vxeTable.getCheckboxReserveRecords()
+      this.$emit('selection-change-method', [...val, ...val1], row)
     },
     sizeUp(size) {
       this.sizeC = size

package/src/utils/axios.js

@@ -99,7 +99,7 @@ function errorFn(status, msg, noMsg, isErr, res) {
       if (navigator.userAgent.includes('NSTC-WebEntry')) {
         localStorage.clear()
         sessionStorage.clear()
-        window.top.webQuit()
+        // window.top.webQuit()
       } else {
         auth.removeToken()
       }