zy-react-library 1.0.27 → 1.0.29

package/components/FormBuilder/FormItemsRenderer.js

@@ -21,13 +21,13 @@ const { RangePicker } = DatePicker;
  * 表单项渲染器组件
  */
 const FormItemsRenderer = ({
-  options,
-  labelCol,
-  span = 12,
-  collapse = false,
-  useAutoGenerateRequired = true,
-  initialValues,
-}) => {
+                             options,
+                             labelCol,
+                             span = 12,
+                             collapse = false,
+                             useAutoGenerateRequired = true,
+                             initialValues,
+                           }) => {
   const form = Form.useFormInstance();
 
   // 获取表单值，优先使用 initialValues
@@ -297,40 +297,39 @@ const FormItemsRenderer = ({
           return (
             option.customizeRender
               ? (renderFormControl(option))
-              : (() => {
-                  // 支持动态计算 hidden
-                  const hidden = typeof option.hidden === "function"
-                    ? option.hidden(getFormValues())
-                    : (option.hidden ?? false);
-
-                  if (hidden)
-                    return null;
-
-                  return (
-                    <Col key={option.name || index} span={itemSpan} style={style}>
-                      <Form.Item
-                        noStyle
-                        shouldUpdate={option.shouldUpdate ?? option?.componentProps?.shouldUpdate}
-                        dependencies={option.dependencies || option?.componentProps?.dependencies}
-                      >
-                        {() => {
-                          return (
-                            <Form.Item
-                              name={option.name}
-                              label={renderLabel(option)}
-                              rules={getRules(option)}
-                              labelCol={itemLabelCol}
-                              wrapperCol={itemWrapperCol}
-                              {...getFormItemProps(option)}
-                            >
-                              {renderFormControl(option)}
-                            </Form.Item>
-                          );
-                        }}
-                      </Form.Item>
-                    </Col>
-                  );
-                })()
+              : (
+                <Form.Item
+                  key={option.name || index}
+                  noStyle
+                  shouldUpdate={option.shouldUpdate ?? option?.componentProps?.shouldUpdate}
+                  dependencies={option.dependencies || option?.componentProps?.dependencies}
+                >
+                  {() => {
+                    // 支持动态计算 hidden
+                    const hidden = typeof option.hidden === "function"
+                      ? option.hidden(getFormValues())
+                      : (option.hidden ?? false);
+
+                    if (hidden)
+                      return null;
+
+                    return (
+                      <Col key={option.name || index} span={itemSpan} style={style}>
+                        <Form.Item
+                          name={option.name}
+                          label={renderLabel(option)}
+                          rules={getRules(option)}
+                          labelCol={itemLabelCol}
+                          wrapperCol={itemWrapperCol}
+                          {...getFormItemProps(option)}
+                        >
+                          {renderFormControl(option)}
+                        </Form.Item>
+                      </Col>
+                    );
+                  }}
+                </Form.Item>
+              )
           );
         }
 
@@ -349,17 +348,17 @@ const FormItemsRenderer = ({
               option.customizeRender
                 ? (renderFormControl(option))
                 : (
-                    <Form.Item
-                      name={option.name}
-                      label={renderLabel(option)}
-                      rules={getRules(option)}
-                      labelCol={itemLabelCol}
-                      wrapperCol={itemWrapperCol}
-                      {...getFormItemProps(option)}
-                    >
-                      {renderFormControl(option)}
-                    </Form.Item>
-                  )
+                  <Form.Item
+                    name={option.name}
+                    label={renderLabel(option)}
+                    rules={getRules(option)}
+                    labelCol={itemLabelCol}
+                    wrapperCol={itemWrapperCol}
+                    {...getFormItemProps(option)}
+                  >
+                    {renderFormControl(option)}
+                  </Form.Item>
+                )
             }
           </Col>
         );

package/hooks/useDownloadBlob/index.js

@@ -10,11 +10,13 @@ export default function useDownloadBlob() {
   const [loading, setLoading] = useState(false);
 
   // 下载Blob流文件
-  const downloadBlob = (url, options = { name: "", type: "", params: {} }) => {
+  const downloadBlob = (url, options) => {
     setLoading(true);
+
     return new Promise((resolve, reject) => {
+      const { name= "", type= "", params= {} } = options
       const finalUrl = (process.env.app.API_HOST || window.__JJB_ENVIRONMENT__.API_HOST) + url;
-      Object.entries(options.params).forEach(([key, value]) => {
+      Object.entries(params).forEach(([key, value]) => {
         finalUrl.searchParams.append(key, value);
       });
       fetch(finalUrl, {
@@ -32,14 +34,14 @@ export default function useDownloadBlob() {
         })
         .then((blob) => {
           const finalBlob = new Blob([blob], {
-            type: options.type || "application/vnd.ms-excel",
+            type: type || "application/vnd.ms-excel",
           });
           const downloadElement = document.createElement("a");
           const href = window.URL.createObjectURL(finalBlob);
           downloadElement.style.display = "none";
           downloadElement.href = href;
           downloadElement.download
-            = options.name || dayjs().format("YYYY-MM-DD HH:mm:ss");
+            = name || dayjs().format("YYYY-MM-DD HH:mm:ss");
           document.body.appendChild(downloadElement);
           downloadElement.click();
           document.body.removeChild(downloadElement);

package/hooks/useImportFile/index.d.ts

@@ -0,0 +1,24 @@
+export interface UploadFile {
+  /** 原始文件对象 */
+  originFileObj?: File;
+  [key: string]: any;
+}
+
+interface UseImportFileOptions {
+  /** 要上传的文件数组 */
+  files: UploadFile[];
+  /** 额外携带的参数对象 */
+  params?: Record<string, any>;
+}
+
+export interface ImportFileOptions {
+  url: string;
+  options: UseImportFileOptions;
+}
+
+export type ImportFileFunction = (url: string, options: UseImportFileOptions) => Promise<any>;
+
+/**
+ * 导入文件
+ */
+export default function useImportFile(): [boolean, ImportFileFunction];

package/hooks/useImportFile/index.js

@@ -0,0 +1,44 @@
+import {request} from "@cqsjjb/jjb-common-lib/http";
+import { useState } from "react";
+
+/**
+ * 导入文件
+ */
+export default function useImportFile() {
+  // loading状态
+  const [loading, setLoading] = useState(false);
+
+  // 导入文件
+  const importFile = (url, options) => {
+    setLoading(true);
+
+    return new Promise((resolve, reject) => {
+      const { files = [], params = {} } = options
+      const formData = new FormData();
+
+      // 将文件添加到formData中
+      files.forEach((f) => {
+        f.originFileObj && formData.append("file", f.originFileObj);
+      });
+
+      // 将额外携带的参数添加到formData中
+      Object.keys(params).forEach((key) => {
+        formData.append(key, params[key]);
+      });
+
+      // 发送请求
+      request(url, "post", formData, { "Content-Type": "multipart/form-data" })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => {
+          reject(err);
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    });
+  };
+
+  return [loading, importFile];
+}

package/package.json

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