zy-react-library 1.0.160 → 1.0.162

package/components/FormBuilder/FormBuilder.js

@@ -1,4 +1,4 @@
-import { Button, Col, Form, Row, Space, Spin, message } from "antd";
+import { Button, Col, Form, message, Row, Space, Spin } from "antd";
 import FormItemsRenderer from "./FormItemsRenderer";
 
 /**

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -77,6 +77,8 @@ export interface FormOption {
   required?: boolean | ((formValues: FormValues) => boolean);
   /** 验证规则 */
   rules?: Rule | Rule[];
+  /** 是否使用字符验证限制 */
+  useConstraints?: boolean;
   /** 占位符文本，默认会根据传入的 render 类型自动判断（请选择、请输入）和 label 组合 */
   placeholder?: ReactNode;
   /** 提示信息，传入将在 label 右侧生成图标展示 tooltip */

package/components/FormBuilder/FormItemsRenderer.js

@@ -147,17 +147,17 @@ const FormItemsRenderer = ({
     const render = option.render || FORM_ITEM_RENDER_ENUM.INPUT;
     switch (render) {
       case FORM_ITEM_RENDER_ENUM.INPUT:
-        rules.push({ max: 50, message: "最多输入50字符" });
+        option.useConstraints !== false && rules.push({ max: 50, message: "最多输入50字符" });
         break;
 
       case FORM_ITEM_RENDER_ENUM.TEXTAREA:
-        rules.push({ max: 500, message: "最多输入500字符" });
+        option.useConstraints !== false && rules.push({ max: 500, message: "最多输入500字符" });
         break;
 
       case FORM_ITEM_RENDER_ENUM.INPUT_NUMBER:
       case FORM_ITEM_RENDER_ENUM.NUMBER:
-        rules.push({ pattern: /^(\d+)(\.\d{1,2})?$/, message: "请输入正确的数字，最多保留两位小数" });
-        rules.push({
+        option.useConstraints !== false && rules.push({ pattern: /^(\d+)(\.\d{1,2})?$/, message: "请输入正确的数字，最多保留两位小数" });
+        option.useConstraints !== false && rules.push({
           validator: (_, value) => {
             if (value && Math.abs(Number.parseFloat(value)) > 999999999) {
               return Promise.reject("输入数值超出安全范围");
@@ -235,7 +235,7 @@ const FormItemsRenderer = ({
     const itemsFieldKey = getItemsFieldKey(option);
     /** @type {string | Function} */
     const render = option.render || FORM_ITEM_RENDER_ENUM.INPUT;
-    const placeholder = option.placeholder || `请${render === FORM_ITEM_RENDER_ENUM.SELECT || render === FORM_ITEM_RENDER_ENUM.RADIO || render === FORM_ITEM_RENDER_ENUM.CHECKBOX ? "选择" : "输入"}${option.label}`;
+    const placeholder = option.placeholder || `请${[FORM_ITEM_RENDER_ENUM.INPUT, FORM_ITEM_RENDER_ENUM.TEXTAREA, FORM_ITEM_RENDER_ENUM.INPUT_NUMBER, FORM_ITEM_RENDER_ENUM.NUMBER].includes(render) ? "输入" : "选择"}${option.label}`;
 
     switch (render) {
       case FORM_ITEM_RENDER_ENUM.INPUT:

package/components/HiddenInfo/gwj/index.js

@@ -2,17 +2,28 @@ import { request } from "@cqsjjb/jjb-common-lib/http";
 import { Button, Descriptions, Divider, Space, Spin } from "antd";
 import dayjs from "dayjs";
 import { useEffect, useState } from "react";
-import { HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "../../../enum/hidden/gwj";
-import { UPLOAD_FILE_TYPE_ENUM } from "../../../enum/uploadFile/gwj";
-import useDownloadFile from "../../../hooks/useDownloadFile";
-import useGetFile from "../../../hooks/useGetFile";
-import useGetUrlQuery from "../../../hooks/useGetUrlQuery";
-import { getFileName, getFileSuffix, getLabelName } from "../../../utils";
-import HeaderBack from "../../HeaderBack";
-import VideoIcon from "../../Icon/VideoIcon";
-import PreviewImg from "../../PreviewImg";
-import PreviewPdf from "../../PreviewPdf";
-import Video from "../../Video";
+import HeaderBack from "zy-react-library/components/HeaderBack";
+import VideoIcon from "zy-react-library/components/Icon/VideoIcon";
+import PreviewImg from "zy-react-library/components/PreviewImg";
+import PreviewPdf from "zy-react-library/components/PreviewPdf";
+import Video from "zy-react-library/components/Video";
+// import { HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "../../../enum/hidden/gwj";
+// import { UPLOAD_FILE_TYPE_ENUM } from "../../../enum/uploadFile/gwj";
+// import useDownloadFile from "../../../hooks/useDownloadFile";
+// import useGetFile from "../../../hooks/useGetFile";
+// import useGetUrlQuery from "../../../hooks/useGetUrlQuery";
+// import { getFileName, getFileSuffix, getLabelName } from "../../../utils";
+// import HeaderBack from "../../HeaderBack";
+// import VideoIcon from "../../Icon/VideoIcon";
+// import PreviewImg from "../../PreviewImg";
+// import PreviewPdf from "../../PreviewPdf";
+// import Video from "../../Video";
+import { HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj";
+import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
+import useDownloadFile from "zy-react-library/hooks/useDownloadFile";
+import useGetFile from "zy-react-library/hooks/useGetFile";
+import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
+import { getFileName, getFileSuffix, getLabelName } from "zy-react-library/utils";
 
 /**
  * 隐患查看组件（港务局版本）
@@ -72,7 +83,7 @@ function HiddenInfo(props) {
         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: info.hiddenRectifyUserCO[i].hiddenSchemeId,
+            eqForeignKey: info.hiddenRectifyUserCO[i].hiddenSchemeCO.hiddenSchemeId,
           });
           setRectificationPlanImageFiles(prevState => [...prevState, rectificationPlanImageFiles]);
         }
@@ -145,7 +156,7 @@ function HiddenInfo(props) {
               },
               { label: "隐患位置描述", children: info.positionDesc },
               { label: "隐患发现人", children: info.creatorName },
-              { label: "隐患发现时间", children: dayjs(info.hiddenFindTime).format("YYYY-MM-DD hh:mm:ss") },
+              { label: "隐患发现时间", children: dayjs(info.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") },
               {
                 label: "整改类型",
                 children: getLabelName({
@@ -156,7 +167,7 @@ function HiddenInfo(props) {
               {
                 label: "是否相关方",
                 children: getLabelName({
-                  list: [{ bianma: "1", name: "是" }, { bianma: "2", name: "否" }],
+                  list: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }],
                   status: info.isRelated,
                 }),
               },
@@ -389,8 +400,8 @@ function HiddenInfo(props) {
                         { label: "整改人", children: item.userName },
                         { label: "整改时间", children: item.rectificationTime },
                         { label: "整改描述", children: item.descr },
-                        { label: "投入资金", children: item.investmentFunds },
-                        { label: "临时安全措施", children: info.tempSafeMeasure },
+                        ...(item.investmentFunds ? [{ label: "投入资金", children: `${item.investmentFunds}元` }] : []),
+                        ...(info.tempSafeMeasure ? [{ label: "临时安全措施", children: info.tempSafeMeasure }] : []),
                         { label: "整改后图片", children: <PreviewImg files={afterRectificationImageFiles[index]} /> },
                         { label: "整改方案", children: item.isRectificationScheme === 0 ? "无" : "有" },
                         ...((item.isRectificationScheme === 1 && item.hiddenSchemeCO && Object.keys(item.hiddenSchemeCO).length > 0)
@@ -431,10 +442,10 @@ function HiddenInfo(props) {
                                   { label: "验收部门", children: item.deptName },
                                   { label: "验收人", children: item.userName },
                                   { label: "验收时间", children: item.rectificationTime },
-                                  { label: "验收打回意见", children: item.repulseCause },
+                                  ...(item.repulseCause ? [{ label: "验收打回意见", children: item.repulseCause }] : []),
                                   { label: "是否合格", children: "合格" },
-                                  { label: "验收描述", children: item.descr },
-                                  { label: "验收图片", children: <PreviewImg files={acceptImageFiles[index]} /> },
+                                  ...(item.descr ? [{ label: "验收描述", children: item.descr }] : []),
+                                  ...((acceptImageFiles[index] && acceptImageFiles[index].length > 0) ? [{ label: "验收图片", children: <PreviewImg files={acceptImageFiles[index]} /> }] : []),
                                 ]}
                               />
                             ))

package/components/Map/MapSelector.js

@@ -36,7 +36,7 @@ const MapSelector = (props) => {
   // 初始化地图
   const initMap = async () => {
     if (!window.BMapGL) {
-      await dynamicLoadJs("https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr");
+      await dynamicLoadJs("https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr&callback=initialize");
     }
 
     setLoading(true);

package/components/Video/AliPlayer.js

@@ -1,160 +1,160 @@
-import { useDocumentVisibility } from "ahooks";
-import { uniqueId } from "lodash-es";
-import { forwardRef, useEffect, useImperativeHandle, useRef } from "react";
-import { dynamicLoadCss, dynamicLoadJs } from "../../utils";
-
-/**
- * 视频播放组件
- */
-const AliPlayer = forwardRef(({
-  source = "",
-  vid = "",
-  playAuth = "",
-  cover = "",
-  width = "100%",
-  height = "600px",
-  autoplay = true,
-  showProgress = true,
-  isLive = false,
-  playTime = 0,
-  onEnded,
-  onTimeupdate,
-}, ref) => {
-  const playerRef = useRef(null);
-  const containerRef = useRef(null);
-  const visibility = useDocumentVisibility();
-  const className = useRef(uniqueId("_")).current;
-
-  useImperativeHandle(ref, () => ({
-    play: () => {
-      playerRef.current && playerRef.current.play();
-    },
-    pause: () => {
-      playerRef.current && playerRef.current.pause();
-    },
-  }));
-
-  const onDisposeAliPlayer = () => {
-    if (!playerRef.current)
-      return;
-    playerRef.current.dispose();
-    playerRef.current = null;
-  };
-
-  const onCreateAliPlayer = async () => {
-    if (!containerRef.current)
-      return;
-    if (!window.Aliplayer) {
-      await dynamicLoadJs("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js");
-      await dynamicLoadCss("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css");
-    }
-
-    onDisposeAliPlayer();
-
-    const skinLayout = [
-      { name: "bigPlayButton", align: "blabs", x: 30, y: 80 },
-      { name: "H5Loading", align: "cc" },
-      { name: "errorDisplay", align: "tlabs", x: 0, y: 0 },
-      { name: "infoDisplay" },
-      { name: "tooltip", align: "blabs", x: 0, y: 56 },
-      { name: "thumbnail" },
-      {
-        name: "controlBar",
-        align: "blabs",
-        x: 0,
-        y: 0,
-        children: [
-          { name: "playButton", align: "tl", x: 15, y: 12 },
-          { name: "timeDisplay", align: "tl", x: 10, y: 7 },
-          { name: "fullScreenButton", align: "tr", x: 10, y: 12 },
-          { name: "setting", align: "tr", x: 15, y: 12 },
-          { name: "volume", align: "tr", x: 5, y: 10 },
-        ],
-      },
-    ];
-
-    if (showProgress) {
-      skinLayout[skinLayout.length - 1].children.unshift({
-        name: "progress",
-        align: "blabs",
-        x: 0,
-        y: 44,
-      });
-    }
-
-    playerRef.current = new window.Aliplayer(
-      {
-        id: className,
-        ...(source
-          ? { source }
-          : {
-              vid,
-              playauth: playAuth,
-              qualitySort: "asc",
-              format: "m3u8",
-              encryptType: 1,
-              mediaType: "video",
-              isLive: true,
-              rePlay: false,
-              playsinline: true,
-              controlBarVisibility: "hover",
-            }),
-        cover,
-        width,
-        height,
-        autoplay,
-        isLive,
-        useH5Prism: true,
-        skinLayout,
-      },
-      (player) => {
-        if (autoplay) {
-          player.play();
-        }
-
-        player.on("ended", () => {
-          onEnded && onEnded();
-        });
-
-        player.on("timeupdate", () => {
-          onTimeupdate && onTimeupdate(player.getCurrentTime());
-        });
-
-        if (playTime > 0) {
-          player.seek(playTime);
-        }
-      },
-    );
-  };
-
-  useEffect(() => {
-    if (source || (vid && playAuth)) {
-      onCreateAliPlayer();
-    }
-
-    return () => {
-      onDisposeAliPlayer();
-    };
-  }, [source, vid, playAuth]);
-
-  useEffect(() => {
-    if (visibility === "hidden") {
-      playerRef.current && playerRef.current.pause();
-    }
-    else {
-      playerRef.current && playerRef.current.play();
-    }
-  }, [visibility]);
-
-  return (
-    <div
-      ref={containerRef}
-      id={className}
-      style={{ width, height }}
-    />
-  );
-});
-
-AliPlayer.displayName = "AliPlayer";
-
-export default AliPlayer;
+import { useDocumentVisibility } from "ahooks";
+import { uniqueId } from "lodash-es";
+import { forwardRef, useEffect, useImperativeHandle, useRef } from "react";
+import { dynamicLoadCss, dynamicLoadJs } from "../../utils";
+
+/**
+ * 视频播放组件
+ */
+const AliPlayer = forwardRef(({
+  source = "",
+  vid = "",
+  playAuth = "",
+  cover = "",
+  width = "100%",
+  height = "600px",
+  autoplay = true,
+  showProgress = true,
+  isLive = false,
+  playTime = 0,
+  onEnded,
+  onTimeupdate,
+}, ref) => {
+  const playerRef = useRef(null);
+  const containerRef = useRef(null);
+  const visibility = useDocumentVisibility();
+  const className = useRef(uniqueId("_")).current;
+
+  useImperativeHandle(ref, () => ({
+    play: () => {
+      playerRef.current && playerRef.current.play();
+    },
+    pause: () => {
+      playerRef.current && playerRef.current.pause();
+    },
+  }));
+
+  const onDisposeAliPlayer = () => {
+    if (!playerRef.current)
+      return;
+    playerRef.current.dispose();
+    playerRef.current = null;
+  };
+
+  const onCreateAliPlayer = async () => {
+    if (!containerRef.current)
+      return;
+    if (!window.Aliplayer) {
+      await dynamicLoadJs("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js");
+      await dynamicLoadCss("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css");
+    }
+
+    onDisposeAliPlayer();
+
+    const skinLayout = [
+      { name: "bigPlayButton", align: "blabs", x: 30, y: 80 },
+      { name: "H5Loading", align: "cc" },
+      { name: "errorDisplay", align: "tlabs", x: 0, y: 0 },
+      { name: "infoDisplay" },
+      { name: "tooltip", align: "blabs", x: 0, y: 56 },
+      { name: "thumbnail" },
+      {
+        name: "controlBar",
+        align: "blabs",
+        x: 0,
+        y: 0,
+        children: [
+          { name: "playButton", align: "tl", x: 15, y: 12 },
+          { name: "timeDisplay", align: "tl", x: 10, y: 7 },
+          { name: "fullScreenButton", align: "tr", x: 10, y: 12 },
+          { name: "setting", align: "tr", x: 15, y: 12 },
+          { name: "volume", align: "tr", x: 5, y: 10 },
+        ],
+      },
+    ];
+
+    if (showProgress) {
+      skinLayout[skinLayout.length - 1].children.unshift({
+        name: "progress",
+        align: "blabs",
+        x: 0,
+        y: 44,
+      });
+    }
+
+    playerRef.current = new window.Aliplayer(
+      {
+        id: className,
+        ...(source
+          ? { source }
+          : {
+              vid,
+              playauth: playAuth,
+              qualitySort: "asc",
+              format: "m3u8",
+              encryptType: 1,
+              mediaType: "video",
+              isLive: true,
+              rePlay: false,
+              playsinline: true,
+              controlBarVisibility: "hover",
+            }),
+        cover,
+        width,
+        height,
+        autoplay,
+        isLive,
+        useH5Prism: true,
+        skinLayout,
+      },
+      (player) => {
+        if (autoplay) {
+          player.play();
+        }
+
+        player.on("ended", () => {
+          onEnded && onEnded();
+        });
+
+        player.on("timeupdate", () => {
+          onTimeupdate && onTimeupdate(player.getCurrentTime());
+        });
+
+        if (playTime > 0) {
+          player.seek(playTime);
+        }
+      },
+    );
+  };
+
+  useEffect(() => {
+    if (source || (vid && playAuth)) {
+      onCreateAliPlayer();
+    }
+
+    return () => {
+      onDisposeAliPlayer();
+    };
+  }, [source, vid, playAuth]);
+
+  useEffect(() => {
+    if (visibility === "hidden") {
+      playerRef.current && playerRef.current.pause();
+    }
+    else {
+      playerRef.current && playerRef.current.play();
+    }
+  }, [visibility]);
+
+  return (
+    <div
+      ref={containerRef}
+      id={className}
+      style={{ width, height }}
+    />
+  );
+});
+
+AliPlayer.displayName = "AliPlayer";
+
+export default AliPlayer;

package/enum/hidden/gwj/index.js

@@ -27,5 +27,5 @@ export const HIDDEN_STATE_ENUM = [
 // 隐患整改类型
 export const HIDDEN_RECTIFICATION_TYPE_ENUM = [
   { bianma: 1, name: "立即整改" },
-  { bianma: 2, name: "延期整改" },
+  { bianma: 2, name: "限期整改" },
 ];

package/package.json

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

package/utils/index.js

@@ -530,7 +530,7 @@ export const validatorEndTime = (timeStart, message = "结束时间不能早于
 export const validatorTimeGTCurrentDay = (message = "需要大于当前时间") => {
   return {
     validator: (_, value) => {
-      if (value && value <= dayjs().format("YYYY-MM-DD hh:mm:ss")) {
+      if (value && value <= dayjs().format("YYYY-MM-DD HH:mm:ss")) {
         return Promise.reject(message);
       }
       else {