zy-react-library 1.0.152 → 1.0.155

package/components/FormBuilder/FormItemsRenderer.js

@@ -481,14 +481,16 @@ const FormItemsRenderer = ({
                               required={getRequired(listOption.required)}
                               {...getFormItemProps(listOption)}
                             >
-                              <div style={{ display: "flex", gap: 10, alignItems: "center" }}>
-                                <Form.Item
-                                  noStyle
-                                  rules={getRules(listOption)}
-                                  name={listOption.name}
-                                >
-                                  {renderFormControl(listOption)}
-                                </Form.Item>
+                              <div style={{ display: "flex", gap: 10, alignItems: "center", justifyContent: "space-between" }}>
+                                <div>
+                                  <Form.Item
+                                    noStyle
+                                    rules={getRules(listOption)}
+                                    name={listOption.name}
+                                  >
+                                    {renderFormControl(listOption)}
+                                  </Form.Item>
+                                </div>
                                 {
                                   // 只有当不是第一行时才显示删除按钮
                                   fieldIndex >= 1

package/components/HiddenInfo/gwj/index.js

@@ -63,19 +63,18 @@ function HiddenInfo(props) {
     setHiddenVideoFiles(hiddenVideoFiles);
 
     if (info.hiddenRectifyUserCO && info.hiddenRectifyUserCO.length > 0) {
-      const afterRectificationImageFiles = await getFile({
-        eqType: UPLOAD_FILE_TYPE_ENUM["4"],
-        eqForeignKey: hiddenId || query[hiddenIdKey],
-      });
-      setAfterRectificationImageFiles(afterRectificationImageFiles);
-
       for (let i = 0; i < info.hiddenRectifyUserCO.length; i++) {
-        if ((info.hiddenRectifyUserCO[i].isRectificationScheme === 1 && info.hiddenRectifyUserCO[i].hiddenSchemeCO && Object.keys(info.hiddenRectifyUserCO[i].hiddenSchemeCO).length > 0)) {
+        const afterRectificationImageFiles = await getFile({
+          eqType: UPLOAD_FILE_TYPE_ENUM["4"],
+          eqForeignKey: info.hiddenRectifyUserCO[i].hiddenUserId,
+        });
+        setAfterRectificationImageFiles(prevState => [...prevState, afterRectificationImageFiles]);
+        if (info.hiddenRectifyUserCO[i].isRectificationScheme === 1 && info.hiddenRectifyUserCO[i].hiddenSchemeCO && Object.keys(info.hiddenRectifyUserCO[i].hiddenSchemeCO).length > 0) {
           const rectificationPlanImageFiles = await getFile({
             eqType: UPLOAD_FILE_TYPE_ENUM["8"],
-            eqForeignKey: hiddenId || query[hiddenIdKey],
+            eqForeignKey: info.hiddenRectifyUserCO[i].hiddenSchemeId,
           });
-          setRectificationPlanImageFiles(prevState => [...prevState, ...rectificationPlanImageFiles]);
+          setRectificationPlanImageFiles(prevState => [...prevState, rectificationPlanImageFiles]);
         }
       }
     }
@@ -86,7 +85,7 @@ function HiddenInfo(props) {
           eqType: UPLOAD_FILE_TYPE_ENUM["5"],
           eqForeignKey: hiddenId || query[hiddenIdKey],
         });
-        setAcceptImageFiles(prevState => [...prevState, ...acceptImageFiles]);
+        setAcceptImageFiles(prevState => [...prevState, acceptImageFiles]);
       }
     }
 
@@ -392,7 +391,7 @@ function HiddenInfo(props) {
                         { label: "整改描述", children: item.descr },
                         { label: "投入资金", children: item.investmentFunds },
                         { label: "临时安全措施", children: info.tempSafeMeasure },
-                        { label: "整改后图片", children: <PreviewImg files={afterRectificationImageFiles} /> },
+                        { label: "整改后图片", children: <PreviewImg files={afterRectificationImageFiles[index]} /> },
                         { label: "整改方案", children: item.isRectificationScheme === 0 ? "无" : "有" },
                         ...((item.isRectificationScheme === 1 && item.hiddenSchemeCO && Object.keys(item.hiddenSchemeCO).length > 0)
                           ? [

package/components/Map/MapSelector.js

@@ -19,6 +19,7 @@ const MapSelector = (props) => {
 
   const mapContainerRef = useRef(null);
   const mapInstanceRef = useRef(null);
+  const local = useRef(null);
   const [loading, setLoading] = useState(false);
   const [currentLongitude, setCurrentLongitude] = useState(longitude || "");
   const [currentLatitude, setCurrentLatitude] = useState(latitude || "");
@@ -86,10 +87,18 @@ const MapSelector = (props) => {
   // 搜索功能
   const handleLocalSearch = () => {
     if (localSearch && mapInstanceRef.current) {
-      const local = new window.BMapGL.LocalSearch(mapInstanceRef.current, {
+      local.current = new window.BMapGL.LocalSearch(mapInstanceRef.current, {
         renderOptions: { map: mapInstanceRef.current },
       });
-      local.search(localSearch);
+      local.current.search(localSearch);
+    }
+  };
+
+  // 清空
+  const handleLocalClear = () => {
+    setLocalSearch("");
+    if (mapInstanceRef.current) {
+      local.current.search("");
     }
   };
 
@@ -191,10 +200,13 @@ const MapSelector = (props) => {
                 </Form.Item>
               </Col>
               <Col span={12}>
-                <Form.Item label=" " colon={false}>
+                <Form.Item label=" " colon={false} style={{ textAlign: "right" }}>
                   <Button type="primary" onClick={handleLocalSearch}>
                     搜索
                   </Button>
+                  <Button onClick={handleLocalClear} style={{ marginLeft: 8 }}>
+                    重置
+                  </Button>
                 </Form.Item>
               </Col>
             </Row>

package/components/PreviewImg/index.js

@@ -16,7 +16,7 @@ const PreviewImg = (props) => {
           <Image
             key={item[fileUrlKey] || item}
             src={item[fileUrlKey] ? fileUrl + item[fileUrlKey] : fileUrl + item}
-            style={{ marginLeft: index > 0 ? 10 : 0 }}
+            wrapperStyle={{ marginLeft: index > 0 ? 10 : 0 }}
             width={100}
             height={100}
             alt=""

package/components/Select/Personnel/Gwj/index.d.ts

@@ -27,6 +27,8 @@ export interface PersonnelSelectProps extends Omit<BasicSelectProps, "data" | "p
   isNeedPostId?: boolean;
   /** 是否需要部门id，默认 true */
   isNeedDepartmentId?: boolean;
+  /** 返回值是否存在主账号 */
+  noMain?: 1 | "";
 }
 
 /**

package/components/Select/Personnel/Gwj/index.js

@@ -12,6 +12,7 @@ function PersonnelSelect(props) {
     isNeedCorpInfoId = false,
     isNeedDepartmentId = true,
     isNeedPostId = false,
+    noMain = "",
     ...restProps
   } = props;
 
@@ -27,13 +28,13 @@ function PersonnelSelect(props) {
     if (isNeedPostId && !params.postId)
       return;
 
-    const { data } = await request("/basicInfo/user/listAll", "get", params);
+    const { data } = await request("/basicInfo/user/listAll", "get", { ...params, noMain });
     setData(data);
   };
 
   useEffect(() => {
     getData();
-  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId]);
+  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId, noMain]);
 
   return (
     <BasicSelect data={data} placeholder={placeholder} {...restProps} />

package/components/SelectTree/Basic/index.js

@@ -25,11 +25,11 @@ function BasicSelectTree(props) {
   // 根据 level 处理树数据
   let processedTreeData = level
     ? processTreeDataByLevel({
-      data: treeData,
-      level,
-      childrenKey,
-      currentLevel: 1,
-    })
+        data: treeData,
+        level,
+        childrenKey,
+        currentLevel: 1,
+      })
     : treeData;
 
   // 根据 onlyLastLevel 处理树数据
@@ -40,22 +40,25 @@ function BasicSelectTree(props) {
       if (getDataType(value) === "Array") {
         const parentNodes = [];
         for (let i = 0; i < value.length; i++) {
+          const targetId = (restProps.labelInValue || restProps.treeCheckStrictly) ? value[i].value : value[i];
           const currentParentNodes = getTreeNodePaths({
             data: treeData,
-            targetId: value[i],
+            targetId,
             idKey,
             childrenKey,
             isIncludeOneself: onGetNodePathsIsIncludeOneself,
           });
           parentNodes.push(...currentParentNodes);
         }
-        onGetNodePaths?.(arrayObjectDeduplication(parentNodes, idKey));
-        onGetLabel?.(label);
+        const deduplicationParentNodes = arrayObjectDeduplication(parentNodes, idKey);
+        onGetNodePaths?.(deduplicationParentNodes);
+        onGetLabel?.((restProps.labelInValue || restProps.treeCheckStrictly) ? value.map(item => item.label) : label);
       }
       else {
+        const targetId = (restProps.labelInValue || restProps.treeCheckStrictly) ? value.value : value;
         const parentNodes = getTreeNodePaths({
           data: treeData,
-          targetId: value,
+          targetId,
           idKey,
           childrenKey,
           isIncludeOneself: onGetNodePathsIsIncludeOneself,
@@ -68,7 +71,7 @@ function BasicSelectTree(props) {
       onGetNodePaths?.([]);
       onGetLabel?.("");
     }
-    onChange?.(value, label, extra);
+    onChange?.((restProps.labelInValue || restProps.treeCheckStrictly) ? value.map(item => item.value) : value, label, extra);
   };
 
   useEffect(() => {
@@ -88,6 +91,7 @@ function BasicSelectTree(props) {
       treeData={processedTreeData}
       fieldNames={{ label: nameKey, value: idKey, children: childrenKey }}
       treeNodeFilterProp={nameKey}
+      showCheckedStrategy={TreeSelect.SHOW_ALL}
       {...restProps}
     />
   );

package/enum/uploadFile/gwj/index.js

@@ -85,6 +85,7 @@ export const UPLOAD_FILE_TYPE_ENUM = {
   153: 153, // regulations_resource_library - 安全生产操作规程资源库
   154: 154, // responsibility_based_resource_library - 安全生产责任制资源库
   155: 155, // institutional_resource_library - 安全生产管理制度资源库
+  156: 156, // security_management_agreement - 相关方-安全管理协议
 };
 
 /**
@@ -171,4 +172,5 @@ export const UPLOAD_FILE_PATH_ENUM = {
   153: "regulations_resource_library",
   154: "responsibility_based_resource_library",
   155: "institutional_resource_library",
+  156: "security_management_agreement",
 };

package/package.json

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

package/utils/index.d.ts

@@ -329,14 +329,14 @@ export function processTreeDataForOnlyLastLevel(
 /**
  * 验证结束时间是否大于开始时间
  */
-export function validatorEndTime(timeStart: string): {
+export function validatorEndTime(timeStart: string, message: string): {
   validator: (_: any, value: any) => Promise<void | string>;
 };
 
 /**
  * 验证时间是否大于等于当前时间
  */
-export function validatorTimeGTCurrentDay(): {
+export function validatorTimeGTCurrentDay(message: string): {
   validator: (_: any, value: any) => Promise<void | string>;
 };
 

package/utils/index.js

@@ -511,11 +511,11 @@ export const processTreeDataForOnlyLastLevel = (options) => {
 /**
  * 验证结束时间是否大于开始时间
  */
-export const validatorEndTime = (timeStart) => {
+export const validatorEndTime = (timeStart, message = "结束时间不能早于开始时间") => {
   return {
     validator: (_, value) => {
       if (value && timeStart && value < timeStart) {
-        return Promise.reject("结束时间不能早于开始时间");
+        return Promise.reject(message);
       }
       else {
         return Promise.resolve();
@@ -527,11 +527,11 @@ export const validatorEndTime = (timeStart) => {
 /**
  * 验证时间是否大于等于当前时间
  */
-export const validatorTimeGTCurrentDay = () => {
+export const validatorTimeGTCurrentDay = (message = "需要大于当前时间") => {
   return {
     validator: (_, value) => {
       if (value && value <= dayjs().format("YYYY-MM-DD hh:mm:ss")) {
-        return Promise.reject("需要大于当前时间");
+        return Promise.reject(message);
       }
       else {
         return Promise.resolve();