n20-common-lib 2.22.2 → 2.22.4

package/package.json

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

package/src/components/AdvancedFilter/index.vue

@@ -334,7 +334,7 @@ export default {
         }
       })
       this.$refs.advanced_popover.showPopper = false
-      this.$emit('check')
+      this.$emit('check', saveCheckArr)
     },
     check(keys) {
       this.checkList = keys

package/src/components/TablePro/index.vue

@@ -42,7 +42,8 @@
         iconNone: 'n20-icon-xiala-moren',
         iconMatch: 'n20-icon-xiala-moren'
       }"
-      v-bind="Object.assign({ size: size }, $attrs, sizeBind)"
+      :merge-cells="mergeCells"
+      v-bind="Object.assign({ size: size }, $attrs, sizeBind, $attrs.small)"
       v-on="$listeners"
       @sort-change="(val) => customSortMethod(val)"
       @filter-change="filterChange"
@@ -77,16 +78,26 @@
         >
           <template #header="{ $table, checked, indeterminate, disabled }">
             <span class="custom-checkbox" @click.stop="toggleAll($table, disabled)">
-              <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" :disabled="disabled" />
-              <el-checkbox v-else-if="checked" :key="key" :value="checked" :disabled="disabled" />
-              <el-checkbox v-else :key="key" :value="checked" :disabled="disabled" />
+              <el-checkbox
+                v-if="indeterminate"
+                :key="key + '-header-indeterminate'"
+                :indeterminate="indeterminate"
+                :disabled="disabled"
+              />
+              <el-checkbox v-else-if="checked" :key="key + '-header-checked'" :value="checked" :disabled="disabled" />
+              <el-checkbox v-else :key="key + '-header-unchecked'" :value="checked" :disabled="disabled" />
             </span>
           </template>
           <template #checkbox="{ $table, row, checked, indeterminate, disabled }">
             <span class="custom-checkbox" @click.stop="toggleChecked($table, row, disabled)">
-              <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" :disabled="disabled" />
-              <el-checkbox v-else-if="checked" :key="key" :value="checked" :disabled="disabled" />
-              <el-checkbox v-else :key="key" :value="checked" :disabled="disabled" />
+              <el-checkbox
+                v-if="indeterminate"
+                :key="key + '-row-indeterminate'"
+                :indeterminate="indeterminate"
+                :disabled="disabled"
+              />
+              <el-checkbox v-else-if="checked" :key="key + '-row-checked'" :value="checked" :disabled="disabled" />
+              <el-checkbox v-else :key="key + '-row-unchecked'" :value="checked" :disabled="disabled" />
             </span>
           </template>
         </vxe-column>
@@ -109,7 +120,7 @@
         </vxe-colgroup>
         <vxe-column
           v-else
-          :key="'vxe-table-' + i"
+          :key="'vxe-table-column' + i"
           :class-name="`${item.wrap && `vxe-table-custom-wrap`} ${item.bold && `font-w600`}`"
           :formatter="item.formatter ? item.formatter : 'formatName'"
           :filters="item.filters"
@@ -210,6 +221,16 @@ export default {
     isAutoWidth: {
       type: Boolean,
       default: true
+    },
+    // 合并单元格配置，格式: [{ row: 0, col: 0, rowspan: 2, colspan: 0 }]
+    mergeCells: {
+      type: Array,
+      default: () => []
+    },
+    // 全选时是否排除被合并的行（从属行）
+    excludeMergedRows: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -250,14 +271,53 @@ export default {
   },
   mounted() {},
   methods: {
-    // 全选
+    // 全选/反选
     toggleAllSelection() {
-      if (this.$refs.vxeTable) {
-        this.$refs.vxeTable.setAllCheckboxRow(true)
-        // 得手动触发
-        this.handleSelectionChange()
+      if (!this.$refs.vxeTable) return
+      const allData = this.data || []
+      // 获取合并行索引集合
+      const mergedIndexes =
+        this.excludeMergedRows && this.mergeCells && this.mergeCells.length > 0 ? this.getMergedRowIndexes() : new Set()
+      // 筛选出可选择的行（排除合并从属行 + 排除禁止选择的行）
+      const selectableRows = allData.filter((row, index) => {
+        if (mergedIndexes.has(index)) return false
+        if (typeof this.forbidSelect === 'function' && this.forbidSelect({ row }) === true) return false
+        return true
+      })
+      // 判断当前可选行是否已全部选中
+      const checkedRows = this.$refs.vxeTable.getCheckboxRecords(false)
+      const checkedSet = new Set(checkedRows)
+      const isAllChecked = selectableRows.length > 0 && selectableRows.every((row) => checkedSet.has(row))
+      if (isAllChecked) {
+        // 已全选，则取消可选行的选中状态
+        selectableRows.forEach((row) => {
+          this.$refs.vxeTable.setCheckboxRow(row, false)
+        })
+      } else {
+        // 未全选，则选中所有可选行
+        selectableRows.forEach((row) => {
+          this.$refs.vxeTable.setCheckboxRow(row, true)
+        })
+      }
+      // 得手动触发
+      this.handleSelectionChange()
+    },
+    // 获取被合并的从属行索引集合
+    getMergedRowIndexes() {
+      const mergedIndexes = new Set()
+      if (this.mergeCells && this.mergeCells.length > 0) {
+        this.mergeCells.forEach((cell) => {
+          if (cell.rowspan > 1) {
+            // 从 row+1 到 row+rowspan-1 都是被合并的从属行
+            for (let i = 1; i < cell.rowspan; i++) {
+              mergedIndexes.add(cell.row + i)
+            }
+          }
+        })
       }
+      return mergedIndexes
     },
+
     // 清空选择
     clearSelection() {
       if (this.$refs.vxeTable) {
@@ -276,7 +336,35 @@ export default {
       if (disabled) {
         return false
       }
-      $table.toggleAllCheckboxRow()
+      // 如果配置了排除合并行，则手动处理非合并行的选中状态
+      if (this.excludeMergedRows && this.mergeCells && this.mergeCells.length > 0) {
+        const mergedIndexes = this.getMergedRowIndexes()
+        const allData = this.data || []
+        // 筛选出可选择的行（排除合并从属行 + 排除禁止选择的行）
+        const selectableRows = allData.filter((row, index) => {
+          if (mergedIndexes.has(index)) return false
+          if (typeof this.forbidSelect === 'function' && this.forbidSelect({ row }) === true) return false
+          return true
+        })
+        // 判断当前可选行是否已全部选中
+        const checkedRows = $table.getCheckboxRecords(false)
+        const checkedSet = new Set(checkedRows)
+        const isAllChecked = selectableRows.length > 0 && selectableRows.every((row) => checkedSet.has(row))
+        if (isAllChecked) {
+          // 已全选，则取消可选行的选中状态
+          selectableRows.forEach((row) => {
+            $table.setCheckboxRow(row, false)
+          })
+        } else {
+          // 未全选，则选中所有可选行
+          selectableRows.forEach((row) => {
+            $table.setCheckboxRow(row, true)
+          })
+        }
+      } else {
+        // 默认行为：全选/取消全选所有行
+        $table.toggleAllCheckboxRow()
+      }
       this.key++
       this.handleSelectionChange()
     },