From 7d26ed0e19bf952e7c037b21bfd687759b46e851 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 25 六月 2024 19:21:33 +0800
Subject: [PATCH] 菜单更新
---
src/components/Table/src/hooks/useCustomRow.ts | 53 +++++++++++++++++++----------------------------------
1 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/src/components/Table/src/hooks/useCustomRow.ts b/src/components/Table/src/hooks/useCustomRow.ts
index 1a5aac8..0d49e6e 100644
--- a/src/components/Table/src/hooks/useCustomRow.ts
+++ b/src/components/Table/src/hooks/useCustomRow.ts
@@ -1,32 +1,16 @@
import type { ComputedRef } from 'vue';
import type { BasicTableProps } from '../types/table';
import { unref } from 'vue';
-import { ROW_KEY } from '../const';
-import { isString, isFunction } from '/@/utils/is';
+import type { Key } from 'ant-design-vue/lib/table/interface';
+
+import { parseRowKeyValue } from '../helper';
interface Options {
- setSelectedRowKeys: (keys: string[]) => void;
- getSelectRowKeys: () => string[];
+ setSelectedRowKeys: (keyValues: Key[]) => void;
+ getSelectRowKeys: () => Key[];
clearSelectedRowKeys: () => void;
emit: EmitType;
getAutoCreateKey: ComputedRef<boolean | undefined>;
-}
-
-function getKey(
- record: Recordable,
- rowKey: string | ((record: Record<string, any>) => string) | undefined,
- autoCreateKey?: boolean,
-) {
- if (!rowKey || autoCreateKey) {
- return record[ROW_KEY];
- }
- if (isString(rowKey)) {
- return record[rowKey];
- }
- if (isFunction(rowKey)) {
- return record[rowKey(record)];
- }
- return null;
}
export function useCustomRow(
@@ -40,37 +24,38 @@
function handleClick() {
const { rowSelection, rowKey, clickToRowSelect } = unref(propsRef);
if (!rowSelection || !clickToRowSelect) return;
- const keys = getSelectRowKeys() || [];
- const key = getKey(record, rowKey, unref(getAutoCreateKey));
- if (!key) return;
+ const keyValues = getSelectRowKeys() || [];
+ const keyValue = parseRowKeyValue(rowKey, record, unref(getAutoCreateKey));
+ if (!keyValue) return;
const isCheckbox = rowSelection.type === 'checkbox';
if (isCheckbox) {
// 鎵惧埌tr
- const tr: HTMLElement = (e as MouseEvent)
+ const tr = (e as MouseEvent)
.composedPath?.()
- .find((dom: HTMLElement) => dom.tagName === 'TR') as HTMLElement;
+ .find((dom) => (dom as HTMLElement).tagName === 'TR') as HTMLElement;
if (!tr) return;
// 鎵惧埌Checkbox锛屾鏌ユ槸鍚︿负disabled
const checkBox = tr.querySelector('input[type=checkbox]');
if (!checkBox || checkBox.hasAttribute('disabled')) return;
- if (!keys.includes(key)) {
- setSelectedRowKeys([...keys, key]);
+ if (!keyValues.includes(keyValue)) {
+ keyValues.push(keyValue);
+ setSelectedRowKeys(keyValues);
return;
}
- const keyIndex = keys.findIndex((item) => item === key);
- keys.splice(keyIndex, 1);
- setSelectedRowKeys(keys);
+ const keyIndex = keyValues.findIndex((item) => item === keyValue);
+ keyValues.splice(keyIndex, 1);
+ setSelectedRowKeys(keyValues);
return;
}
const isRadio = rowSelection.type === 'radio';
if (isRadio) {
- if (!keys.includes(key)) {
- if (keys.length) {
+ if (!keyValues.includes(keyValue)) {
+ if (keyValues.length) {
clearSelectedRowKeys();
}
- setSelectedRowKeys([key]);
+ setSelectedRowKeys([keyValue]);
return;
}
clearSelectedRowKeys();
--
Gitblit v1.9.3