n20-common-lib 2.4.14 → 2.4.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/TablePro/index.vue +27 -17
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.4.14",
3
+ "version": "2.4.16",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/TablePro/index.vue CHANGED
@@ -3,7 +3,6 @@
3
3
  <vxe-table
4
4
  ref="vxeTable"
5
5
  :key="colsKey"
6
- row-key
7
6
  :align="'center'"
8
7
  :data="data"
9
8
  :height="height"
@@ -12,8 +11,8 @@
12
11
  v-bind="Object.assign({ size: size }, $attrs, sizeBind)"
13
12
  show-overflow
14
13
  show-header-overflow
15
- :row-config="{ isHover: true, useKey: false }"
16
- :column-config="{ resizable: false, useKey: true }"
14
+ :row-config="{ isHover: true, useKey: true }"
15
+ :column-config="{ resizable: true, useKey: true }"
17
16
  :sort-config="{
18
17
  multiple: false,
19
18
  remote: true,
@@ -40,20 +39,20 @@
40
39
  width="50"
41
40
  fixed="left"
42
41
  >
43
- <!-- <template #header="{ $table, checked, indeterminate }">
44
- <span class="custom-checkbox" @click.stop="toggleAll($table)">
45
- <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" />
46
- <el-checkbox v-else-if="checked" :key="key" :value="checked" />
47
- <el-checkbox v-else :key="key" :value="checked" />
42
+ <template #header="{ $table, checked, indeterminate, disabled }">
43
+ <span class="custom-checkbox" @click.stop="toggleAll($table, disabled)">
44
+ <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" :disabled="disabled" />
45
+ <el-checkbox v-else-if="checked" :key="key" :value="checked" :disabled="disabled" />
46
+ <el-checkbox v-else :key="key" :value="checked" :disabled="disabled" />
48
47
  </span>
49
48
  </template>
50
- <template #checkbox="{ $table, row, checked, indeterminate }">
51
- <span class="custom-checkbox" @click.stop="toggleChecked($table, row)">
52
- <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" />
53
- <el-checkbox v-else-if="checked" :key="key" :value="checked" />
54
- <el-checkbox v-else :key="key" :value="checked" />
49
+ <template #checkbox="{ $table, row, checked, indeterminate, disabled }">
50
+ <span class="custom-checkbox" @click.stop="toggleChecked($table, row, disabled)">
51
+ <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" :disabled="disabled" />
52
+ <el-checkbox v-else-if="checked" :key="key" :value="checked" :disabled="disabled" />
53
+ <el-checkbox v-else :key="key" :value="checked" :disabled="disabled" />
55
54
  </span>
56
- </template> -->
55
+ </template>
57
56
  </vxe-column>
58
57
  <vxe-column
59
58
  v-else
@@ -130,16 +129,27 @@ export default {
130
129
  },
131
130
  size(val) {
132
131
  this.sizeC = val
132
+ },
133
+ data() {
134
+ // 翻页清除选中
135
+ this.$refs.vxeTable.clearCheckboxRow()
136
+ this.$emit('selection-change-method', [])
133
137
  }
134
138
  },
135
139
  mounted() {},
136
140
  methods: {
137
- toggleAll($table) {
141
+ toggleAll($table, disabled) {
142
+ if (disabled) {
143
+ return false
144
+ }
138
145
  $table.toggleAllCheckboxRow()
139
146
  this.key++
140
147
  this.handleSelectionChange()
141
148
  },
142
- toggleChecked($table, row) {
149
+ toggleChecked($table, row, disabled) {
150
+ if (disabled) {
151
+ return false
152
+ }
143
153
  $table.toggleCheckboxRow(row)
144
154
  this.key++
145
155
  this.handleSelectionChange()
@@ -148,7 +158,7 @@ export default {
148
158
  const orders = sortList.map((item) => {
149
159
  return {
150
160
  column: item.field,
151
- asc: item.order === 'desc'
161
+ asc: item.order === 'asc'
152
162
  }
153
163
  })
154
164
  this.$emit('sort-change-method', orders)