zy-react-library 1.0.66 → 1.0.68

package/components/HiddenInfo/gwj/index.d.ts

@@ -14,6 +14,8 @@ export interface HiddenInfoProps {
   hiddenIdKey?: string;
   /** 是否显示头部的返回，默认 true */
   isShowHeaderBack?: boolean;
+  /** 获取数据 */
+  onGetData?: (data: Record<string, any>) => void;
 }
 
 /**

package/components/HiddenInfo/gwj/index.js

@@ -22,6 +22,7 @@ function HiddenInfo(props) {
     hiddenId = "",
     hiddenIdKey = "hiddenId",
     isShowHeaderBack = true,
+    onGetData,
   } = props;
 
   const [info, setInfo] = useState({
@@ -47,6 +48,7 @@ function HiddenInfo(props) {
     request(`/hidden/hidden/${id || query[idKey]}`, "get").then((res) => {
       setInfo(res.data);
       setLoading(false);
+      onGetData?.(res.data);
     });
     const hiddenImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["3"], eqForeignKey: hiddenId || query[hiddenIdKey] });
     setHiddenImageFiles(hiddenImageFiles);

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

@@ -15,6 +15,8 @@ export interface BasicSelectProps extends SelectProps {
   placeholder?: string;
   /** 获取 label */
   onGetLabel?: (label: string | string[]) => void;
+  /** 获取选中的项 */
+  onGetOption?: (option: Record<string, any> | Record<string, any>[]) => void;
   /** 获取数据 */
   onGetData?: (data: Record<string, any>[]) => void;
 }

package/components/Select/Basic/index.js

@@ -1,6 +1,5 @@
 import { Select } from "antd";
 import { useEffect } from "react";
-import { getLabelName } from "../../../utils";
 
 /**
  * 基础下拉组件（不建议直接使用此组件，二次继承使用）
@@ -10,6 +9,7 @@ function BasicSelect(props) {
     onGetData,
     onChange,
     onGetLabel,
+    onGetOption,
     placeholder = "",
     data = [],
     nameKey = "name",
@@ -20,21 +20,33 @@ function BasicSelect(props) {
   const handleChange = (event, option) => {
     if (Array.isArray(event)) {
       if (event.length > 0) {
-        const name = [];
+        const findItems = [];
+        const names = [];
         event.forEach((item) => {
-          name.push(getLabelName({ list: data, status: item, idKey, nameKey }));
+          const findItem = data.find(dataItem => dataItem[idKey] === item);
+          if (findItem) {
+            findItems.push(findItem);
+            names.push(findItem[nameKey]);
+          }
         });
-        onGetLabel?.(name);
+        onGetLabel?.(names);
+        onGetOption?.(findItems);
       }
       else {
         onGetLabel?.([]);
+        onGetOption?.([]);
       }
     }
     else {
-      if (event)
-        onGetLabel?.(getLabelName({ list: data, status: event, idKey, nameKey }));
-      else
+      if (event) {
+        const findItem = data.find(item => item[idKey] === event);
+        onGetLabel?.(findItem[nameKey]);
+        onGetOption?.(findItem);
+      }
+      else {
         onGetLabel?.("");
+        onGetOption?.({});
+      }
     }
     onChange?.(event, option);
   };

package/package.json

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