diff --git a/src/components/Cascader/Basic/index.d.ts b/src/components/Cascader/Basic/index.d.ts index e5d248e..06cc768 100644 --- a/src/components/Cascader/Basic/index.d.ts +++ b/src/components/Cascader/Basic/index.d.ts @@ -11,8 +11,10 @@ export interface BasicCascaderProps extends Omit { idKey?: string; /** 树形数据 children 字段,默认 children */ childrenKey?: string; - /** 决定 onGetNodePaths 是否包含自身节点,默认 true */ + /** @deprecated 已弃用,请使用 getNodePathsIsIncludeOneself */ onGetNodePathsIsIncludeOneself?: boolean; + /** 决定 onGetNodePaths 是否包含自身节点,默认 true */ + getNodePathsIsIncludeOneself?: boolean; /** 获取父级节点 */ onGetNodePaths?: (nodes: Record[]) => void; /** 占位符 */ diff --git a/src/components/Cascader/Basic/index.js b/src/components/Cascader/Basic/index.js index 05303ae..4ad9ba7 100644 --- a/src/components/Cascader/Basic/index.js +++ b/src/components/Cascader/Basic/index.js @@ -10,7 +10,8 @@ function BasicCascader(props) { onGetData, onChange, onGetNodePaths, - onGetNodePathsIsIncludeOneself = true, + onGetNodePathsIsIncludeOneself, + getNodePathsIsIncludeOneself = true, placeholder = "", data = [], nameKey = "name", @@ -20,6 +21,14 @@ 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 @@ -34,7 +43,7 @@ function BasicCascader(props) { const getNodePaths = (selectedOptions) => { let nodePaths = selectedOptions; - if (!onGetNodePathsIsIncludeOneself && selectedOptions) { + if (!finalGetNodePathsIsIncludeOneself && 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 f43a033..913596a 100644 --- a/src/components/LeftTree/Basic/index.d.ts +++ b/src/components/LeftTree/Basic/index.d.ts @@ -11,8 +11,10 @@ export interface BasicLeftTreeProps extends Omit { idKey?: string; /** 树形数据 children 字段,默认 children */ childrenKey?: string; - /** 决定 onGetNodePaths 是否包含自身节点,默认 true */ + /** @deprecated 已弃用,请使用 getNodePathsIsIncludeOneself */ onGetNodePathsIsIncludeOneself?: boolean; + /** 决定 onGetNodePaths 是否包含自身节点,默认 true */ + getNodePathsIsIncludeOneself?: boolean; /** 获取父级节点 */ onGetNodePaths?: () => Record[]; /** 获取数据 */ diff --git a/src/components/LeftTree/Basic/index.js b/src/components/LeftTree/Basic/index.js index 50f7640..6d16e3f 100644 --- a/src/components/LeftTree/Basic/index.js +++ b/src/components/LeftTree/Basic/index.js @@ -12,7 +12,8 @@ const BasicLeftTree = (props) => { onGetData, onSelect, onGetNodePaths, - onGetNodePathsIsIncludeOneself = true, + onGetNodePathsIsIncludeOneself, + getNodePathsIsIncludeOneself = true, expandedKeys: externalExpandedKeys, treeData = [], nameKey = "name", @@ -21,6 +22,14 @@ 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); @@ -81,7 +90,7 @@ const BasicLeftTree = (props) => { targetId: selectedNodeId, idKey, childrenKey, - isIncludeOneself: onGetNodePathsIsIncludeOneself, + isIncludeOneself: finalGetNodePathsIsIncludeOneself, }); onGetNodePaths?.(parentNodes); } diff --git a/src/components/SelectTree/Basic/index.d.ts b/src/components/SelectTree/Basic/index.d.ts index fa57d03..0fc1105 100644 --- a/src/components/SelectTree/Basic/index.d.ts +++ b/src/components/SelectTree/Basic/index.d.ts @@ -11,8 +11,10 @@ export interface BasicSelectTreeProps extends Omit[]) => void; /** 占位符 */ diff --git a/src/components/SelectTree/Basic/index.js b/src/components/SelectTree/Basic/index.js index ed9bbf1..fd61986 100644 --- a/src/components/SelectTree/Basic/index.js +++ b/src/components/SelectTree/Basic/index.js @@ -11,7 +11,8 @@ function BasicSelectTree(props) { onChange, onGetLabel, onGetNodePaths, - onGetNodePathsIsIncludeOneself = true, + onGetNodePathsIsIncludeOneself, + getNodePathsIsIncludeOneself = true, placeholder = "", treeData = [], nameKey = "name", @@ -22,6 +23,14 @@ function BasicSelectTree(props) { ...restProps } = props; + // 如果使用了已弃用的参数给出警告 + if (onGetNodePathsIsIncludeOneself !== undefined) { + console.warn("【BasicSelectTree】 onGetNodePathsIsIncludeOneself 已弃用,请使用 getNodePathsIsIncludeOneself"); + } + + // 向后兼容,如果传入了旧参数,使用旧参数 + const finalGetNodePathsIsIncludeOneself = onGetNodePathsIsIncludeOneself !== undefined ? onGetNodePathsIsIncludeOneself : getNodePathsIsIncludeOneself; + const processedTreeData = useMemo(() => { // 根据 level 处理树数据 let result = level @@ -55,7 +64,7 @@ function BasicSelectTree(props) { targetId, idKey, childrenKey, - isIncludeOneself: onGetNodePathsIsIncludeOneself, + isIncludeOneself: finalGetNodePathsIsIncludeOneself, }); parentNodes.push(...currentParentNodes); } @@ -72,7 +81,7 @@ function BasicSelectTree(props) { targetId, idKey, childrenKey, - isIncludeOneself: onGetNodePathsIsIncludeOneself, + isIncludeOneself: finalGetNodePathsIsIncludeOneself, }); onGetNodePaths?.(parentNodes); onGetLabel?.(parentNodes[parentNodes.length - 1][nameKey]);