优化useDownloadBlob和FormItemsRenderer

components/FormBuilder/FormItemsRenderer.d.ts

@@ -15,12 +15,6 @@ export type FormItemRenderType
  * 选项项数据类型
  */
 export interface OptionItem {
-  /** 值字段 */
-  value?: any;
-  /** 标签字段 */
-  label?: string;
-  /** 字典ID */
-  dictionariesId?: any;
   /** ID字段 */
   id?: any;
   /** 名称字段 */
@@ -32,9 +26,9 @@ export interface OptionItem {
  * 字段键配置
  */
 export interface itemsFieldConfig {
-  /** 值字段的键名，默认为 'value' */
+  /** 值字段的键名，默认为 'id' */
   valueKey?: string;
-  /** 标签字段的键名，默认为 'label' */
+  /** 标签字段的键名，默认为 'name' */
   labelKey?: string;
 }
 

components/FormBuilder/FormItemsRenderer.js

@@ -75,8 +75,8 @@ const FormItemsRenderer = ({
   // 获取items里的value和label字段key
   const getItemsFieldKey = (option) => {
     return {
-      valueKey: option?.itemsField?.valueKey || "value",
+      valueKey: option?.itemsField?.valueKey || "id",
-      labelKey: option?.itemsField?.labelKey || "label",
+      labelKey: option?.itemsField?.labelKey || "name",
     };
   };
 
@@ -144,8 +144,8 @@ const FormItemsRenderer = ({
         return (
           <Select placeholder={placeholder} {...componentProps}>
             {(option.items || []).map((item) => {
-              const value = item[itemsFieldKey.valueKey] ?? item.dictionariesId ?? item.id;
+              const value = item[itemsFieldKey.valueKey];
-              const label = item[itemsFieldKey.labelKey] ?? item.name;
+              const label = item[itemsFieldKey.labelKey];
               return (
                 <Select.Option key={value} value={value}>
                   {label}
@@ -159,8 +159,8 @@ const FormItemsRenderer = ({
         return (
           <Radio.Group {...componentProps}>
             {(option.items || []).map((item) => {
-              const value = item[itemsFieldKey.valueKey] ?? item.dictionariesId ?? item.id;
+              const value = item[itemsFieldKey.valueKey];
-              const label = item[itemsFieldKey.labelKey] ?? item.name;
+              const label = item[itemsFieldKey.labelKey];
               return (
                 <Radio key={value} value={value}>
                   {label}
@@ -174,8 +174,8 @@ const FormItemsRenderer = ({
         return (
           <Checkbox.Group {...componentProps}>
             {(option.items || []).map((item) => {
-              const value = item[itemsFieldKey.valueKey] ?? item.dictionariesId ?? item.id;
+              const value = item[itemsFieldKey.valueKey];
-              const label = item[itemsFieldKey.labelKey] ?? item.name;
+              const label = item[itemsFieldKey.labelKey];
               return (
                 <Checkbox key={value} value={value}>
                   {label}

hooks/useDownloadBlob/index.d.ts

@@ -7,10 +7,14 @@ interface UseDownloadBlobOptions {
   params?: Record<string, any>;
 }
 
+export interface downloadBlobOptions {
+  url: string;
+  options?: UseDownloadBlobOptions;
+}
+
+export type DeleteFileFunction = (options: downloadBlobOptions) => Promise<any>;
+
 /**
  * 下载Blob流文件
  */
-export default function useDownloadBlob(
+export default function useDownloadBlob(): [boolean, DeleteFileFunction];
-  url: string,
-  options?: UseDownloadBlobOptions
-): Promise<any>;

hooks/useDownloadBlob/index.js

@@ -1,14 +1,18 @@
 import { message } from "antd";
 import dayjs from "dayjs";
+import { useState } from "react";
 import { getFileUrl } from "../../utils/index.js";
 
 /**
  * 下载Blob流文件
  */
-export default function useDownloadBlob(
+export default function useDownloadBlob() {
-  url,
+  // loading状态
-  options = { name: "", type: "", params: {} },
+  const [loading, setLoading] = useState(false);
-) {
+
+  // 下载Blob流文件
+  const downloadBlob = (url, options = { name: "", type: "", params: {} }) => {
+    setLoading(true);
     const fileUrl = getFileUrl();
     return new Promise((resolve, reject) => {
       const finalUrl = !url.includes(fileUrl) ? fileUrl + url : url;
@@ -47,6 +51,12 @@ export default function useDownloadBlob(
         .catch((err) => {
           message.error("导出失败");
           reject(err);
+        })
+        .finally(() => {
+          setLoading(false);
         });
     });
+  };
+
+  return [loading, downloadBlob];
 }