zy-react-library 1.0.176 → 1.0.178

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -61,7 +61,7 @@ export interface FormListUniqueProps {
   /** 删除按钮的文本，默认 '删除' */
   removeButtonText?: string;
   /** 表单配置项 */
-  options: (operations: FormListOperations) => FormOption[];
+  options: (field: FormListFieldData, operations: FormListOperations) => FormOption[];
   /** 点击新增按钮时的默认值 */
   addDefaultValue?: FormValues;
   /** 点击新增按钮时插入的索引位置 */

package/components/FormBuilder/FormItemsRenderer.js

@@ -225,7 +225,7 @@ const FormItemsRenderer = ({
   // 获取 listOptions
   const getListOptions = (listOptions, field, fieldIndex, add, remove, move) => {
     return typeof listOptions === "function"
-      ? listOptions(field, fieldIndex, add, remove, move)
+      ? listOptions(field, { field, fieldIndex, add, remove, move })
       : (listOptions ?? []);
   };
 

package/components/HiddenInfo/gwj/index.js

@@ -161,6 +161,7 @@ function HiddenInfo(props) {
                   status: info.isRelated,
                 }),
               },
+              ...(info.isRelated === 1 ? [{ label:'相关方项目',children:info.projectName }] : []),
               { label: "隐患图片", children: <PreviewImg files={hiddenImageFiles} /> },
               ...(hiddenVideoFiles.length > 0
                 ? [{
@@ -184,7 +185,7 @@ function HiddenInfo(props) {
                   column={1}
                   styles={{ label: { width: 200 } }}
                   items={[
-                    { label: "整改部门", children: info.hiddenUserPresetsCO.rectifyDeptName },
+                    { label: `整改${info.isRelated === 1 ? "单位" : "部门"}`, children: info.hiddenUserPresetsCO.rectifyDeptName },
                     { label: "整改人", children: info.hiddenUserPresetsCO.rectifyUserName },
                     ...(info.rectificationType === 2
                       ? [
@@ -220,8 +221,8 @@ function HiddenInfo(props) {
                         ...(item.hiddenLevelName ? [{ label: "隐患级别", children: item.hiddenLevelName }] : []),
                         ...(item.userName ? [{ label: "隐患确认人", children: item.userName }] : []),
                         ...(item.rectificationTime ? [{ label: "隐患确认时间", children: item.rectificationTime }] : []),
-                        ...(item.rectifyDeptName ? [{ label: "整改负责人部门", children: item.rectifyDeptName }] : []),
-                        ...(item.rectifyUserName ? [{ label: "整改负责人", children: item.rectifyUserName }] : []),
+                        ...(item.rectifyDeptName ? [{ label: `整改${info.isRelated === 1 ? "单位" : "部门"}`, children: item.rectifyDeptName }] : []),
+                        ...(item.rectifyUserName ? [{ label: "整改人", children: item.rectifyUserName }] : []),
                         ...(item.rectificationDeadline ? [{ label: "整改完成期限", children: item.rectificationDeadline }] : []),
                         ...(item.checkDeptName ? [{ label: "验收部门", children: item.checkDeptName }] : []),
                         ...(item.checkUserName ? [{ label: "验收人", children: item.checkUserName }] : []),
@@ -386,7 +387,7 @@ function HiddenInfo(props) {
                       column={1}
                       styles={{ label: { width: 200 } }}
                       items={[
-                        ...(item.deptName ? [{ label: "整改部门", children: item.deptName }] : []),
+                        ...(item.deptName ? [{ label: `整改${info.isRelated === 1 ? "单位" : "部门"}`, children: item.deptName }] : []),
                         ...(item.userName ? [{ label: "整改人", children: item.userName }] : []),
                         ...(item.rectificationTime ? [{ label: "整改时间", children: item.rectificationTime }] : []),
                         ...(item.descr ? [{ label: "整改描述", children: item.descr }] : []),

package/components/Pdf/index.js

@@ -53,7 +53,7 @@ function Pdf(props) {
   const renderPdfContent = () => (
     <>
       {loading && (
-        <div style={{ display: "flex", justifyContent: "center", alignItems: "center", height: "80vh" }}>
+        <div style={{ display: "flex", justifyContent: "center", alignItems: "center", height: "72vh" }}>
           <Spin size="large" />
         </div>
       )}
@@ -110,7 +110,7 @@ function Pdf(props) {
           >
             关闭
           </Button>,
-          <Button
+          !loading && <Button
             key="fullScreen"
             onClick={() => {
               isFullscreen ? exitFullscreen() : enterFullscreen();

package/package.json

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