From 585b03329bc4d9081d2df9065f943487c6d49a1c Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Tue, 23 Jun 2026 13:50:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(types):=20=E7=A7=BB=E9=99=A4=E5=B7=B2?= =?UTF-8?q?=E5=BC=83=E7=94=A8=E7=9A=84=20onGetNodePathsIsIncludeOneself=20?= =?UTF-8?q?=E5=92=8C=20callback=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 Cascader、LeftTree、SelectTree 组件中已弃用的 onGetNodePathsIsIncludeOneself 类型定义 - 删除 useTable hook 中已弃用的 callback 类型定义 - 组件实现中移除对 onGetNodePathsIsIncludeOneself 参数的支持和警告提示 - 统一使用 getNodePathsIsIncludeOneself 参数代替已废弃参数 - 移除 useTable hook 中对 callback 参数的警告和调用，建议使用 onSuccess --- src/components/Cascader/Basic/index.d.ts | 2 -- src/components/Cascader/Basic/index.js | 11 +---------- src/components/LeftTree/Basic/index.d.ts | 2 -- src/components/LeftTree/Basic/index.js | 11 +---------- src/components/SelectTree/Basic/index.d.ts | 2 -- src/components/SelectTree/Basic/index.js | 13 ++----------- src/hooks/useTable/index.d.ts | 2 -- src/hooks/useTable/index.js | 7 ------- 8 files changed, 4 insertions(+), 46 deletions(-) diff --git a/src/components/Cascader/Basic/index.d.ts b/src/components/Cascader/Basic/index.d.ts index 09a89f5..f4714d0 100644 --- a/src/components/Cascader/Basic/index.d.ts +++ b/src/components/Cascader/Basic/index.d.ts @@ -11,8 +11,6 @@ export interface BasicCascaderProps extends Omit { idKey?: string; /** 树形数据 children 字段，默认 children */ childrenKey?: string; - /** @deprecated 已弃用，请使用 getNodePathsIsIncludeOneself */ - onGetNodePathsIsIncludeOneself?: boolean; /** 决定 onGetNodePaths 是否包含自身节点，默认 true */ getNodePathsIsIncludeOneself?: boolean; /** 获取父级节点 */ diff --git a/src/components/Cascader/Basic/index.js b/src/components/Cascader/Basic/index.js index a2d15b7..cf3af40 100644 --- a/src/components/Cascader/Basic/index.js +++ b/src/components/Cascader/Basic/index.js @@ -10,7 +10,6 @@ function BasicCascader(props) { onGetData, onChange, onGetNodePaths, - onGetNodePathsIsIncludeOneself, getNodePathsIsIncludeOneself = true, placeholder = "", data = [], @@ -21,14 +20,6 @@ function BasicCascader(props) { ...restProps } = props; - // 如果使用了已弃用的参数给出警告 - if (onGetNodePathsIsIncludeOneself !== undefined) { - console.warn("【BasicCascader】 onGetNodePathsIsIncludeOneself 参数已弃用，请使用 getNodePathsIsIncludeOneself 参数"); - } - - // 向后兼容，如果传入了旧参数，使用旧参数 - const finalGetNodePathsIsIncludeOneself = onGetNodePathsIsIncludeOneself !== undefined ? onGetNodePathsIsIncludeOneself : getNodePathsIsIncludeOneself; - // 根据 level 处理树数据 const processedData = useMemo(() => { return level @@ -43,7 +34,7 @@ function BasicCascader(props) { const getNodePaths = (selectedOptions) => { let nodePaths = selectedOptions; - if (!finalGetNodePathsIsIncludeOneself && selectedOptions) { + if (!getNodePathsIsIncludeOneself && selectedOptions) { nodePaths = selectedOptions.slice(0, -1); } return nodePaths || []; diff --git a/src/components/LeftTree/Basic/index.d.ts b/src/components/LeftTree/Basic/index.d.ts index aec431b..707f1ac 100644 --- a/src/components/LeftTree/Basic/index.d.ts +++ b/src/components/LeftTree/Basic/index.d.ts @@ -11,8 +11,6 @@ export interface BasicLeftTreeProps extends Omit { idKey?: string; /** 树形数据 children 字段，默认 children */ childrenKey?: string; - /** @deprecated 已弃用，请使用 getNodePathsIsIncludeOneself */ - onGetNodePathsIsIncludeOneself?: boolean; /** 决定 onGetNodePaths 是否包含自身节点，默认 true */ getNodePathsIsIncludeOneself?: boolean; /** 获取父级节点 */ diff --git a/src/components/LeftTree/Basic/index.js b/src/components/LeftTree/Basic/index.js index 2b53f5a..ce19afc 100644 --- a/src/components/LeftTree/Basic/index.js +++ b/src/components/LeftTree/Basic/index.js @@ -12,7 +12,6 @@ const BasicLeftTree = (props) => { onGetData, onSelect, onGetNodePaths, - onGetNodePathsIsIncludeOneself, getNodePathsIsIncludeOneself = true, expandedKeys: externalExpandedKeys, treeData = [], @@ -22,14 +21,6 @@ const BasicLeftTree = (props) => { ...restProps } = props; - // 如果使用了已弃用的参数给出警告 - if (onGetNodePathsIsIncludeOneself !== undefined) { - console.warn("【BasicLeftTree】 onGetNodePathsIsIncludeOneself 参数已弃用，请使用 getNodePathsIsIncludeOneself 参数"); - } - - // 向后兼容，如果传入了旧参数，使用旧参数 - const finalGetNodePathsIsIncludeOneself = onGetNodePathsIsIncludeOneself !== undefined ? onGetNodePathsIsIncludeOneself : getNodePathsIsIncludeOneself; - const [expandedKeys, setExpandedKeys] = useState([]); const [searchValue, setSearchValue] = useState(""); const [autoExpandParent, setAutoExpandParent] = useState(true); @@ -90,7 +81,7 @@ const BasicLeftTree = (props) => { targetId: selectedNodeId, idKey, childrenKey, - isIncludeOneself: finalGetNodePathsIsIncludeOneself, + isIncludeOneself: getNodePathsIsIncludeOneself, }); onGetNodePaths?.(parentNodes); } diff --git a/src/components/SelectTree/Basic/index.d.ts b/src/components/SelectTree/Basic/index.d.ts index e5c8848..787a7fa 100644 --- a/src/components/SelectTree/Basic/index.d.ts +++ b/src/components/SelectTree/Basic/index.d.ts @@ -11,8 +11,6 @@ export interface BasicSelectTreeProps extends Omit { // 根据 level 处理树数据 let result = level @@ -64,7 +55,7 @@ function BasicSelectTree(props) { targetId, idKey, childrenKey, - isIncludeOneself: finalGetNodePathsIsIncludeOneself, + isIncludeOneself: getNodePathsIsIncludeOneself, }); parentNodes.push(...currentParentNodes); } @@ -81,7 +72,7 @@ function BasicSelectTree(props) { targetId, idKey, childrenKey, - isIncludeOneself: finalGetNodePathsIsIncludeOneself, + isIncludeOneself: getNodePathsIsIncludeOneself, }); onGetNodePaths?.(parentNodes); onGetLabel?.(parentNodes[parentNodes.length - 1][nameKey]); diff --git a/src/hooks/useTable/index.d.ts b/src/hooks/useTable/index.d.ts index 360cada..0054ba8 100644 --- a/src/hooks/useTable/index.d.ts +++ b/src/hooks/useTable/index.d.ts @@ -18,8 +18,6 @@ export interface UseTableOptions ext params?: Record | (() => Record); /** 表单数据转换函数，在每次请求之前调用，接收当前搜索的表单项，要求返回一个对象 */ transform?: (formData: FormValues) => FormValues; - /** @deprecated 已弃用，请使用 onSuccess */ - callback?: (list: any[], data: any) => void; /** 表单实例（通过 Form.useForm() 创建） */ form?: FormInstance; } diff --git a/src/hooks/useTable/index.js b/src/hooks/useTable/index.js index 54c0448..686639b 100644 --- a/src/hooks/useTable/index.js +++ b/src/hooks/useTable/index.js @@ -96,13 +96,6 @@ function useTable(service, options) { }, ); - if (restOptions.callback !== undefined) { - console.warn("【useTable】 callback 参数已弃用，请使用 onSuccess 参数"); - } - - // 执行回调函数 - restOptions.callback && restOptions.callback(res?.data?.list || [], res?.data || {}); - // 返回结果 return { ...res,