zy-react-library 1.0.54 → 1.0.56

package/components/Cascader/Basic/index.js

@@ -33,7 +33,7 @@ function BasicCascader(props) {
     if (!onGetNodePathsIsIncludeOneself && selectedOptions) {
       nodePaths = selectedOptions.slice(0, -1);
     }
-    return nodePaths;
+    return nodePaths || [];
   };
 
   const handleChange = (value, selectedOptions) => {

package/components/Select/Basic/index.d.ts

@@ -13,6 +13,8 @@ export interface BasicSelectProps extends SelectProps {
   idKey?: string;
   /** 占位符 */
   placeholder?: string;
+  /** 获取 label */
+  onGetLabel?: (label: string) => void;
 }
 
 /**

package/components/Select/Basic/index.js

@@ -1,32 +1,41 @@
-import { Select } from "antd";
-
-/**
- * 基础下拉组件（不建议直接使用此组件，二次继承使用）
- */
-function BasicSelect(props) {
-  const {
-    placeholder = "",
-    data = [],
-    nameKey = "name",
-    idKey = "id",
-    ...restProps
-  } = props;
-
-  return (
-    <Select placeholder={`请选择${placeholder}`} showSearch allowClear {...restProps}>
-      {data.map((item) => {
-        const value = item[idKey];
-        const label = item[nameKey];
-        return (
-          <Select.Option key={value} value={value}>
-            {label}
-          </Select.Option>
-        );
-      })}
-    </Select>
-  );
-}
-
-BasicSelect.displayName = "BasicSelect";
-
-export default BasicSelect;
+import { Select } from "antd";
+import { getLabelName } from "../../../utils";
+
+/**
+ * 基础下拉组件（不建议直接使用此组件，二次继承使用）
+ */
+function BasicSelect(props) {
+  const {
+    onGetLabel,
+    placeholder = "",
+    data = [],
+    nameKey = "name",
+    idKey = "id",
+    ...restProps
+  } = props;
+
+  const handleChange = (event) => {
+    if (event)
+      onGetLabel?.(getLabelName({ list: data, status: event, idKey, nameKey }));
+    else
+      onGetLabel?.("");
+  };
+
+  return (
+    <Select placeholder={`请选择${placeholder}`} showSearch allowClear onChange={handleChange} {...restProps}>
+      {data.map((item) => {
+        const value = item[idKey];
+        const label = item[nameKey];
+        return (
+          <Select.Option key={value} value={value}>
+            {label}
+          </Select.Option>
+        );
+      })}
+    </Select>
+  );
+}
+
+BasicSelect.displayName = "BasicSelect";
+
+export default BasicSelect;

package/components/SelectTree/Basic/index.d.ts

@@ -19,6 +19,8 @@ export interface BasicSelectTreeProps extends TreeSelectProps {
   placeholder?: string;
   /** 控制只能选择到第几级 */
   level?: number;
+  /** 获取 label */
+  onGetLabel?: (label: string) => void;
 }
 
 /**
@@ -26,4 +28,4 @@ export interface BasicSelectTreeProps extends TreeSelectProps {
  */
 declare const BasicSelectTree: FC<BasicSelectTreeProps>;
 
-export default BasicSelectTree;
+export default BasicSelectTree;

package/components/SelectTree/Basic/index.js

@@ -6,7 +6,8 @@ import { getTreeNodePaths, processTreeDataByLevel } from "../../../utils";
  */
 function BasicSelectTree(props) {
   const {
-    onSelect,
+    onChange,
+    onGetLabel,
     onGetNodePaths,
     onGetNodePathsIsIncludeOneself = true,
     placeholder = "",
@@ -28,8 +29,8 @@ function BasicSelectTree(props) {
     })
     : treeData;
 
-  const handleSelect = (value, node, extra) => {
-    if (value.length > 0) {
+  const handleChange = (value, label, extra) => {
+    if (value) {
       const parentNodes = getTreeNodePaths({
         data: treeData,
         targetId: value,
@@ -38,8 +39,13 @@ function BasicSelectTree(props) {
         isIncludeOneself: onGetNodePathsIsIncludeOneself,
       });
       onGetNodePaths?.(parentNodes);
+      onGetLabel?.(parentNodes[parentNodes.length - 1][nameKey]);
     }
-    onSelect?.(value, node, extra);
+    else {
+      onGetNodePaths?.([]);
+      onGetLabel?.("");
+    }
+    onChange?.(value, label, extra);
   };
 
   return (
@@ -50,7 +56,7 @@ function BasicSelectTree(props) {
         popup: { root: { maxHeight: 400, overflow: "auto" } },
       }}
       placeholder={`请选择${placeholder}`}
-      onSelect={handleSelect}
+      onChange={handleChange}
       allowClear
       treeData={processedTreeData}
       fieldNames={{ label: nameKey, value: idKey, children: childrenKey }}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.54",
+  "version": "1.0.56",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",