szld-libs 0.2.69 → 0.2.71

package/es/components/DynamicForm/index.d.ts

@@ -1,5 +1,4 @@
 import dayjs from 'dayjs';
-import { AxiosResponse } from 'axios';
 
 export interface IformConfigItem {
   xh: number;
@@ -19,6 +18,11 @@ export interface IformConfigItem {
 }
 
 export interface Ijson {
+  'properties-width'?: number; // 属性集表单宽度
+  'properties-multiple'?: boolean; // 是否支持可增减的表单列表
+  propertiesID: string;
+  'combination-name'?: string; // 组合表单名称
+  combinations: any; // 组合表单配置
   input: InputType;
   length?: number;
   'label-value'?: string; //代表属性固定取值，并且不可在实例化时修改
@@ -70,6 +74,8 @@ export type InputType =
   | 'week-picker'
   | 'month-picker'
   | 'quarter-picker'
+  | 'range-picker'
+  | 'multiple-date-picker'
   | 'year-picker'
   | 'second-picker'
   | 'image'
@@ -101,32 +107,3 @@ export interface Iselect {
   label: string;
   value: string | number;
 }
-
-export interface DynamicFormProps {
-  formConfig: IformConfigItem[]; // 表单配置项
-  form: FormInstance; // 表单实例
-  readonly?: boolean; // 是否只读，默认false
-  relatedid?: string; // GuId实例id
-  colNum?: number; // 新增：列数，默认1列
-  colSpace?: [number, number]; // 新增：列间距，默认[15,15]
-  instructionShowMode?: 'icon' | 'flex'; // icon 图标展示，flex 文字展示
-  formItemStyle?: IformItemStyle[]; // 新增：表单项样式，默认[]
-  radioAlign?: 'horizontal' | 'vertical'; // 'horizontal': 横向展示(默认), 'vertical': 垂直展示
-  defaultWidth?: number; // 新增：默认宽度，默认358px
-  commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>; // 用于请求url类型的数据
-  uploadAction: (PageName?: string | undefined) => string; // 用于上传文件地址
-  commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>; // 用于请求字典类型的数据
-  ref?: React.Ref<{ getDelFileList: () => any[] }>; // 新增：用于获取删除文件列表的ref
-  setFormConfig?: (config: IformConfigItem[]) => void; // 新增：用于设置表单配置项的函数
-  interfaceTypeChildren?: string; // 新增：接口类型子项，默认YLLRDetailAttrlist
-  interfaceTypeDict?: string; // 新增：接口类型字典，默认YLZDDictList
-  interfaceTypeSysDict?: string; // 新增：接口系统类型字典，默认YLZDSysConfigList
-  relatedidKey?: string; // 新增：关联id键名，默认relatedid
-  actionUrlKey?: string; // 新增：配置第三方接口参数取action-url的键名，默认action-url
-  actionUrlExtraParams?: object; // 新增：配置第三方接口参数取action-url的额外参数，默认{}
-  CustomModalComponent?: React.FC<ICustomModal>;
-}
-// 定义DynamicForm的Ref类型（包含暴露的方法）
-export interface DynamicFormRef {
-  getDelFileList: () => UploadFile<any>[];
-}

package/es/components/DynamicForm/index.js

@@ -1,11 +1,12 @@
-import { jsx } from "react/jsx-runtime";
-import { forwardRef, useRef, useImperativeHandle, Fragment } from "react";
-import { Row } from "antd";
+import { jsx, Fragment, jsxs } from "react/jsx-runtime";
+import { forwardRef, useRef, useImperativeHandle, Fragment as Fragment$1 } from "react";
+import { Form, Flex, Row } from "antd";
 import useDynamicForm from "./useDynamicForm";
 const DynamicForm = forwardRef((props, ref) => {
   const {
     formConfig,
     setFormConfig,
+    setAttrList,
     form,
     readonly = false,
     relatedid,
@@ -24,7 +25,11 @@ const DynamicForm = forwardRef((props, ref) => {
     relatedidKey = "relatedid",
     actionUrlKey = "action-url",
     actionUrlExtraParams = {},
-    CustomModalComponent
+    CustomModalComponent,
+    hideAttrList = [],
+    formShowType = "form",
+    headerWidth,
+    formListItemWidth
   } = props;
   const delFileListRef = useRef([]);
   const updateDelFileList = (file) => {
@@ -35,6 +40,7 @@ const DynamicForm = forwardRef((props, ref) => {
     uploadAction,
     commonRequest,
     setFormConfig,
+    setAttrList,
     updateDelFileList,
     formConfig,
     interfaceTypeChildren,
@@ -43,14 +49,53 @@ const DynamicForm = forwardRef((props, ref) => {
     relatedidKey,
     actionUrlKey,
     actionUrlExtraParams,
-    CustomModalComponent
+    CustomModalComponent,
+    hideAttrList
   });
   useImperativeHandle(ref, () => ({
     getDelFileList: () => {
       return delFileListRef.current;
     }
   }));
-  return /* @__PURE__ */ jsx(Row, { gutter: colSpace, children: formConfig.map((item, index) => /* @__PURE__ */ jsx(Fragment, { children: handleRenderItem({
+  return /* @__PURE__ */ jsx(Fragment, { children: formShowType === "table" ? /* @__PURE__ */ jsx(Form.List, { name: "customFormList", initialValue: [{}], children: (fields, { add, remove }) => /* @__PURE__ */ jsxs("div", { className: "custom-form-list", children: [
+    /* @__PURE__ */ jsxs(Flex, { align: "center", children: [
+      /* @__PURE__ */ jsx(Flex, { className: "custom-form-list-header", align: "center", children: formConfig == null ? void 0 : formConfig.map((child, index) => {
+        return /* @__PURE__ */ jsxs(Flex, { style: { width: (headerWidth == null ? void 0 : headerWidth[index]) || defaultWidth }, align: "center", children: [
+          index !== 0 && /* @__PURE__ */ jsx("div", { className: "line" }),
+          /* @__PURE__ */ jsx("div", { className: "custom-form-list-header-item", children: child.attrname })
+        ] }, index);
+      }) }),
+      /* @__PURE__ */ jsx("a", { className: "custom-form-list-add-btn", onClick: () => add(), children: "新增" })
+    ] }),
+    fields.map((field) => /* @__PURE__ */ jsxs(Flex, { align: "center", className: "custom-form-list-item-container", children: [
+      /* @__PURE__ */ jsx(Flex, { className: "custom-form-list-item", align: "center", children: formConfig == null ? void 0 : formConfig.map((child, index) => {
+        return /* @__PURE__ */ jsx(
+          Flex,
+          {
+            align: "center",
+            className: "custom-form-list-item-content",
+            justify: "center",
+            style: { width: (headerWidth == null ? void 0 : headerWidth[index]) || defaultWidth },
+            children: handleRenderItem({
+              item: child,
+              readonly,
+              colNum,
+              instructionShowMode,
+              relatedid,
+              form,
+              defaultWidth: (formListItemWidth == null ? void 0 : formListItemWidth[index]) || defaultWidth,
+              formItemStyle,
+              isFormListItem: true,
+              formListField: field,
+              isShowLabel: false
+            })
+          },
+          child.attrid || `child-${index}`
+        );
+      }) }),
+      /* @__PURE__ */ jsx("a", { className: "custom-form-list-del-btn", onClick: () => remove(field.key), children: "删除" })
+    ] }, field.key))
+  ] }) }) : /* @__PURE__ */ jsx(Row, { gutter: colSpace, children: formConfig.map((item, index) => /* @__PURE__ */ jsx(Fragment$1, { children: handleRenderItem({
     item,
     readonly,
     colNum,
@@ -60,7 +105,7 @@ const DynamicForm = forwardRef((props, ref) => {
     defaultWidth,
     formItemStyle,
     radioAlign
-  }) }, item.attrid || `form-item-${index}`)) });
+  }) }, item.attrid || `form-item-${index}`)) }) });
 });
 export {
   DynamicForm as default

package/es/components/DynamicForm/useDynamicForm.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { IformConfigItem, IformItemStyle } from './index.d';
 import { AxiosResponse } from 'axios';
-import { FormInstance, UploadFile } from 'antd';
+import { FormInstance, FormListFieldData, UploadFile } from 'antd';
 interface IDynamicFormProps {
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
@@ -16,9 +16,11 @@ interface IDynamicFormProps {
     actionUrlKey: string;
     actionUrlExtraParams: object;
     CustomModalComponent?: React.FC<ICustomModal>;
+    setAttrList?: (config: IformConfigItem[]) => void;
+    hideAttrList?: string[];
 }
 declare function useDynamicForm(props: IDynamicFormProps): {
-    handleRenderItem: ({ item, readonly, colNum, instructionShowMode, relatedid, form, defaultWidth, formItemStyle, radioAlign, }: {
+    handleRenderItem: ({ item, readonly, colNum, instructionShowMode, relatedid, form, defaultWidth, formItemStyle, radioAlign, isFormListItem, formListField, isShowLabel, }: {
         item: IformConfigItem;
         readonly: boolean;
         colNum: number;
@@ -28,6 +30,10 @@ declare function useDynamicForm(props: IDynamicFormProps): {
         defaultWidth?: number | undefined;
         formItemStyle: IformItemStyle[] | undefined;
         radioAlign?: "horizontal" | "vertical" | undefined;
+        isFormListItem?: boolean | undefined;
+        formListField?: FormListFieldData | undefined;
+        isShowLabel?: boolean | undefined;
     }) => import("react/jsx-runtime").JSX.Element | null;
+    handleSetFormItemInitialValue: (itemWithJson: IformConfigItem) => any;
 };
 export default useDynamicForm;

package/es/components/DynamicForm/useDynamicForm.js

@@ -1,7 +1,7 @@
 import { jsx, Fragment, jsxs } from "react/jsx-runtime";
-import { MinusSquareOutlined, PlusSquareOutlined, InfoCircleOutlined } from "@ant-design/icons";
+import { MinusSquareOutlined, PlusSquareOutlined, CloseOutlined, InfoCircleOutlined } from "@ant-design/icons";
 import { useRef, useEffect, useCallback, Fragment as Fragment$1 } from "react";
-import { getJson, base64ToString } from "../../utils/method";
+import { handleAttrList, getJson, base64ToString } from "../../utils/method";
 import isoWeek from "dayjs/plugin/isoWeek";
 import SelectModel from "./selectModel";
 import MyCheckbox from "./myCheckbox";
@@ -12,7 +12,7 @@ import MySelect from "./mySelect";
 import MyUpload from "./myUpload";
 import MyRadio from "./myRadio";
 import _ from "lodash";
-import { App, Col, Collapse, Form, Input, DatePicker, InputNumber, Flex, Tooltip } from "antd";
+import { App, Col, Collapse, Form, Card, Flex, Button, Space, Input, DatePicker, InputNumber, Tooltip } from "antd";
 dayjs.extend(isoWeek);
 function useDynamicForm(props) {
   const {
@@ -28,7 +28,9 @@ function useDynamicForm(props) {
     relatedidKey,
     actionUrlKey,
     actionUrlExtraParams,
-    CustomModalComponent
+    CustomModalComponent,
+    setAttrList,
+    hideAttrList = []
   } = props;
   const formConfigRef = useRef([]);
   const { message } = App.useApp();
@@ -118,17 +120,24 @@ function useDynamicForm(props) {
             value: value ? dayjs(value, format || "HH:mm:ss") : null
           });
           break;
+        case "range-picker":
+          baseProps.getValueFromEvent = (date) => date == null ? void 0 : date.map((d) => d == null ? void 0 : d.format(format || "YYYY-MM-DD"));
+          baseProps.getValueProps = (value) => ({
+            value: (value == null ? void 0 : value.map((v) => dayjs(v))) || null
+          });
+          break;
       }
       return baseProps;
     },
     [handleNormFile]
   );
   const handleSetFormItemInitialValue = useCallback((itemWithJson) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const inputType = (_a = itemWithJson.json) == null ? void 0 : _a.input;
-    let initialValue = itemWithJson.attrvalue ?? ((_b = itemWithJson.json) == null ? void 0 : _b.default);
+    const isFormList = (_b = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _b["properties-multiple"];
+    let initialValue = itemWithJson.attrvalue ?? ((_c = itemWithJson.json) == null ? void 0 : _c.default);
     if (inputType === "label" && initialValue) {
-      initialValue = ((_c = itemWithJson.json) == null ? void 0 : _c["label-value"]) ?? initialValue ?? "-";
+      initialValue = ((_d = itemWithJson.json) == null ? void 0 : _d["label-value"]) ?? initialValue ?? "-";
     }
     if ((inputType === "date-picker" || inputType === "time-picker") && initialValue) {
       try {
@@ -138,8 +147,16 @@ function useDynamicForm(props) {
         initialValue = void 0;
       }
     }
+    if (inputType === "range-picker" && initialValue) {
+      try {
+        initialValue = initialValue == null ? void 0 : initialValue.split("~");
+        initialValue = initialValue.map((v) => dayjs(v));
+      } catch (error) {
+        initialValue = void 0;
+      }
+    }
     if (inputType === "cascader" && initialValue && typeof initialValue === "string") {
-      const delimiter = (_d = itemWithJson.json) == null ? void 0 : _d["cascader-delimiter"];
+      const delimiter = (_e = itemWithJson.json) == null ? void 0 : _e["cascader-delimiter"];
       if (delimiter) {
         initialValue = initialValue.split(delimiter).filter(Boolean);
       }
@@ -160,6 +177,19 @@ function useDynamicForm(props) {
         initialValue = [];
       }
     }
+    if (isFormList && itemWithJson.attrtype === 1) {
+      const children = itemWithJson.children || [];
+      if (Array.isArray(children)) {
+        initialValue = [
+          Object.assign(
+            {},
+            ...children == null ? void 0 : children.map((child) => ({
+              [child.attrid]: handleSetFormItemInitialValue(child)
+            }))
+          )
+        ];
+      }
+    }
     return initialValue || null;
   }, []);
   const handleCollapseIcon = useCallback(
@@ -192,10 +222,18 @@ function useDynamicForm(props) {
       formItemStyle,
       relatedid,
       form,
-      defaultWidth = 358
+      defaultWidth = 358,
+      isFormListItem = false,
+      formListField,
+      isShowLabel = true
     }) => {
-      var _a, _b;
-      if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true) {
+      var _a, _b, _c, _d, _e;
+      const isFormList = (_a = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a["properties-multiple"];
+      let formListInitValue = [];
+      if (isFormList) {
+        formListInitValue = handleSetFormItemInitialValue(itemWithJson);
+      }
+      if (((_b = itemWithJson.json) == null ? void 0 : _b.hide) === true || (hideAttrList == null ? void 0 : hideAttrList.includes(itemWithJson.attrid))) {
         return /* @__PURE__ */ jsx(Fragment, {});
       }
       if (itemWithJson.attrtype === 1) {
@@ -206,23 +244,25 @@ function useDynamicForm(props) {
             style: { backgroundColor: "transparent" },
             expandIcon: ({ isActive }) => handleCollapseIcon({ isActive }),
             onChange: async (key) => {
-              var _a2;
+              var _a2, _b2;
               try {
                 const { children = [] } = itemWithJson;
-                if (key && (key == null ? void 0 : key.length) && setFormConfig && formConfigRef.current && interfaceTypeChildren && !(children == null ? void 0 : children.length)) {
+                if (key && (key == null ? void 0 : key.length) && formConfigRef.current && interfaceTypeChildren && !(children == null ? void 0 : children.length)) {
                   const res = await commonRequest(interfaceTypeChildren, {
                     instanceid: relatedid,
-                    asid: itemWithJson.asid,
-                    tname: itemWithJson.tname
+                    asid: (_a2 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a2.propertiesID,
+                    tname: itemWithJson.attrvalue
                   });
                   if ((res == null ? void 0 : res.ReturnValue) === 1) {
-                    const arr = ((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.list) || [];
+                    const list = ((_b2 = res == null ? void 0 : res.data) == null ? void 0 : _b2.list) || [];
+                    const arr = handleAttrList(list, { instanceid: relatedid, tname: itemWithJson.tname });
                     const _formConfig = _.cloneDeep(formConfigRef.current);
                     const _item = _formConfig.find((item) => item.attrid === itemWithJson.attrid);
                     if (_item) {
                       _item.children = [...arr];
                     }
-                    setFormConfig(_formConfig);
+                    setFormConfig == null ? void 0 : setFormConfig(_formConfig);
+                    setAttrList == null ? void 0 : setAttrList(_formConfig);
                   }
                 }
               } catch (error) {
@@ -232,7 +272,52 @@ function useDynamicForm(props) {
               {
                 key: itemWithJson.attrid,
                 label: itemWithJson.attrname,
-                children: /* @__PURE__ */ jsx("div", { children: (itemWithJson.children || []).map((child, index) => {
+                styles: {
+                  header: {
+                    paddingLeft: 0
+                  }
+                },
+                children: isFormList ? /* @__PURE__ */ jsx(Form.List, { name: itemWithJson.attrid, initialValue: formListInitValue, children: (fields, { add, remove }) => {
+                  var _a2;
+                  return /* @__PURE__ */ jsxs("div", { style: { display: "flex", rowGap: 16, flexDirection: "column" }, children: [
+                    fields.map((field) => {
+                      var _a3;
+                      return /* @__PURE__ */ jsx(
+                        Card,
+                        {
+                          style: { width: ((_a3 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a3["properties-width"]) || defaultWidth + 100 },
+                          size: "small",
+                          title: `${itemWithJson.attrname} ${field.name + 1}`,
+                          extra: /* @__PURE__ */ jsx(
+                            CloseOutlined,
+                            {
+                              onClick: () => {
+                                remove(field.name);
+                              }
+                            }
+                          ),
+                          children: (itemWithJson.children || []).map((child, index) => {
+                            return /* @__PURE__ */ jsx(Fragment$1, { children: handleRenderItem({
+                              item: child,
+                              readonly,
+                              colNum,
+                              instructionShowMode,
+                              relatedid,
+                              form,
+                              defaultWidth,
+                              formItemStyle,
+                              isFormListItem: true,
+                              formListField: field,
+                              isShowLabel: true
+                            }) }, child.attrid || `child-${index}`);
+                          })
+                        },
+                        field.key
+                      );
+                    }),
+                    /* @__PURE__ */ jsx(Flex, { style: { width: ((_a2 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a2["properties-width"]) || defaultWidth + 100 }, children: /* @__PURE__ */ jsx(Button, { type: "dashed", onClick: () => add(), block: true, children: "+ 新增" }) })
+                  ] });
+                } }) : /* @__PURE__ */ jsx("div", { children: (itemWithJson.children || []).map((child, index) => {
                   return /* @__PURE__ */ jsx(Fragment$1, { children: handleRenderItem({
                     item: child,
                     readonly,
@@ -264,6 +349,8 @@ function useDynamicForm(props) {
           "mult-select",
           "modal-select",
           "date-picker",
+          "range-picker",
+          "multiple-date-picker",
           "time-picker",
           "week-picker",
           "month-picker",
@@ -276,14 +363,92 @@ function useDynamicForm(props) {
         if (["image", "file", "video", "audio"].includes(input)) {
           placeholder = "请上传";
         }
+        const { combinations = [] } = itemWithJson.json || {};
+        if (combinations == null ? void 0 : combinations.length) {
+          return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(Form.Item, { label: (_c = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _c["combination-name"], children: /* @__PURE__ */ jsx(Space.Compact, { children: combinations.map((item, index) => {
+            var _a2, _b2;
+            let initValue = handleSetFormItemInitialValue(item);
+            let width = defaultWidth;
+            const customWidth = {};
+            const mode = item.json.input || "text";
+            const itemStyle = formItemStyle == null ? void 0 : formItemStyle.find((v) => v.type === mode);
+            if (itemStyle) {
+              const { width: width2 } = (itemStyle == null ? void 0 : itemStyle.style) || {};
+              if (width2) {
+                customWidth["width"] = width2;
+              }
+            }
+            const widthRatio = (_a2 = item == null ? void 0 : item.json) == null ? void 0 : _a2["combination-width-ratio"];
+            if (widthRatio) {
+              width = defaultWidth * widthRatio;
+            }
+            return /* @__PURE__ */ jsx(
+              Form.Item,
+              {
+                name: item.attrid,
+                noStyle: true,
+                initialValue: initValue,
+                rules: [
+                  ...((_b2 = item.json) == null ? void 0 : _b2.must) ? [
+                    {
+                      required: true,
+                      message: `${placeholder}${item.attrname}`
+                    }
+                  ] : []
+                ],
+                ...handleSetFormItemProps(item),
+                children: handleRenderItemInputMode({
+                  item,
+                  readonly,
+                  formItemStyle,
+                  radioAlign,
+                  relatedid,
+                  form,
+                  defaultWidth: width,
+                  customWidth
+                })
+              },
+              index
+            );
+          }) }) }, `${itemWithJson.attrid}+1`) });
+        }
+        if (isFormListItem && formListField) {
+          return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
+            Form.Item,
+            {
+              name: [formListField == null ? void 0 : formListField.name, itemWithJson.attrid],
+              label: isShowLabel && handleDealInstruction(itemWithJson, instructionShowMode) || null,
+              initialValue,
+              rules: [
+                ...((_d = itemWithJson.json) == null ? void 0 : _d.must) ? [
+                  {
+                    required: true,
+                    message: `${placeholder}${itemWithJson.attrname}`
+                  }
+                ] : []
+              ],
+              ...handleSetFormItemProps(itemWithJson),
+              children: handleRenderItemInputMode({
+                item: itemWithJson,
+                readonly,
+                formItemStyle,
+                radioAlign,
+                relatedid,
+                form,
+                defaultWidth
+              })
+            },
+            itemWithJson.attrid
+          ) });
+        }
         return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
           Form.Item,
           {
             name: itemWithJson.attrid,
-            label: handleDealInstruction(itemWithJson, instructionShowMode),
+            label: isShowLabel && handleDealInstruction(itemWithJson, instructionShowMode) || null,
             initialValue,
             rules: [
-              ...((_b = itemWithJson.json) == null ? void 0 : _b.must) ? [
+              ...((_e = itemWithJson.json) == null ? void 0 : _e.must) ? [
                 {
                   required: true,
                   message: `${placeholder}${itemWithJson.attrname}`
@@ -339,7 +504,8 @@ function useDynamicForm(props) {
     radioAlign = "horizontal",
     relatedid,
     form,
-    defaultWidth = 358
+    defaultWidth = 358,
+    customWidth = {}
   }) => {
     var _a, _b;
     const mode = item.json.input || "text";
@@ -355,7 +521,7 @@ function useDynamicForm(props) {
           {
             disabled: true,
             value: ((_a = item.json) == null ? void 0 : _a["label-value"]) || item.attrvalue || ((_b = item.json) == null ? void 0 : _b.default) || "-",
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style }
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
           }
         );
       case "text":
@@ -366,7 +532,7 @@ function useDynamicForm(props) {
             ...params,
             disabled: readonly,
             allowClear: true,
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style }
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
           }
         );
       case "textarea":
@@ -378,7 +544,7 @@ function useDynamicForm(props) {
             rows: 5,
             ...params,
             disabled: readonly,
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style }
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
           }
         );
       case "number":
@@ -389,7 +555,7 @@ function useDynamicForm(props) {
             placeholder: "请输入",
             ...params,
             disabled: readonly,
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style }
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
           }
         );
       case "select":
@@ -400,7 +566,7 @@ function useDynamicForm(props) {
             handleUrlOptions,
             item: item.json,
             readonly,
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style },
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth },
             commonRequestWidthParams,
             commonRequest,
             value: formatValue,
@@ -419,7 +585,7 @@ function useDynamicForm(props) {
         return /* @__PURE__ */ jsx(
           SelectModel,
           {
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style },
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth },
             item: item.json,
             value: item.attrvalue || item.json.default || "",
             commonRequestWidthParams,
@@ -455,10 +621,18 @@ function useDynamicForm(props) {
             picker: pickerObj[mode] || "date",
             disabled: readonly,
             placement: "bottomLeft",
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style }
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
           }
         );
       }
+      case "range-picker":
+        return /* @__PURE__ */ jsx(
+          DatePicker.RangePicker,
+          {
+            disabled: readonly,
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
+          }
+        );
       case "radio":
         return /* @__PURE__ */ jsx(
           MyRadio,
@@ -526,7 +700,7 @@ function useDynamicForm(props) {
             commonRequest,
             item: item.json,
             value: item.attrvalue,
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style },
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth },
             interfaceTypeDict,
             interfaceTypeSysDict,
             actionUrlKey,
@@ -546,7 +720,16 @@ function useDynamicForm(props) {
           }
         );
       default:
-        return /* @__PURE__ */ jsx(Input, { placeholder: "请输入", ...params, showCount: true, disabled: readonly, style: { ...itemStyle == null ? void 0 : itemStyle.style } });
+        return /* @__PURE__ */ jsx(
+          Input,
+          {
+            placeholder: "请输入",
+            ...params,
+            showCount: true,
+            disabled: readonly,
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
+          }
+        );
     }
   };
   const handleRenderItem = ({
@@ -558,40 +741,41 @@ function useDynamicForm(props) {
     form,
     defaultWidth = 358,
     formItemStyle,
-    radioAlign = "horizontal"
+    radioAlign = "horizontal",
+    isFormListItem = false,
+    formListField,
+    isShowLabel = true
   }) => {
     var _a;
     const json = item.info_base64 === 1 ? getJson(base64ToString(item.info)) : getJson(item.info);
-    const itemWithJson = { ...item, json };
+    const itemWithJson = {
+      ...item,
+      json: {
+        ...item == null ? void 0 : item.json,
+        ...json
+      }
+    };
     if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true) {
       return null;
     }
-    return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-      handleRenderFunc({
-        itemWithJson,
-        readonly,
-        colNum,
-        instructionShowMode,
-        relatedid,
-        form,
-        defaultWidth,
-        formItemStyle,
-        radioAlign
-      }),
-      /* @__PURE__ */ jsx(
-        Form.Item,
-        {
-          name: itemWithJson.attrid + "_objs",
-          style: { display: "none" },
-          initialValue: itemWithJson,
-          children: /* @__PURE__ */ jsx(Input, { type: "hidden" })
-        },
-        itemWithJson.attrid + "_objs"
-      )
-    ] }, itemWithJson.attrid);
+    return /* @__PURE__ */ jsx(Fragment$1, { children: handleRenderFunc({
+      itemWithJson,
+      readonly,
+      colNum,
+      instructionShowMode,
+      relatedid,
+      form,
+      defaultWidth,
+      formItemStyle,
+      radioAlign,
+      isFormListItem,
+      formListField,
+      isShowLabel
+    }) }, itemWithJson.attrid);
   };
   return {
-    handleRenderItem
+    handleRenderItem,
+    handleSetFormItemInitialValue
   };
 }
 export {