szld-libs 0.2.69 → 0.2.71

package/es/utils/method.d.ts

@@ -11,7 +11,21 @@ export declare const handleSubmitForm: (originalData: any, allValues: any) => {
     updatedData: any;
     uploadedFiles: any[];
 };
-export declare const handleAttrList: (attrList: any[]) => any[];
+/**
+ * 处理基础属性数组
+ */
+export declare const handleBaseAttrList: (attrList: any[], extraAttrs?: {
+    [key: string]: any;
+} | undefined) => any[];
+/**
+ * 处理属性列表，合并组合属性
+ * @param attrList 属性列表
+ * @param extraAttrs 额外属性
+ * @returns
+ */
+export declare const handleAttrList: (attrList: any[], extraAttrs?: {
+    [key: string]: any;
+} | undefined) => any[];
 export declare const handleFormConfig: ({ number, key, sourceNumber, guidInterfaceName, SelPCParamInterfaceName, servicerAttrListInterfaceName, accepterAttrListInterfaceName, defaultAttrListInterfaceName, commonRequest, guidParams, pcParam, attrReqKey, attrListExtraParams, }: {
     number: string | number;
     key: string;
@@ -46,3 +60,9 @@ export declare const handleFormConfig: ({ number, key, sourceNumber, guidInterfa
  * @returns
  */
 export declare const handleOperationFile: (params: any, data: any, commonRequestWidthParams: any) => Promise<any>;
+/**
+ * 命名转换为驼峰命名
+ * @param str 烤肉串命名
+ * @returns 驼峰命名
+ */
+export declare function handleKebabToCamel(str: string): string;

package/es/utils/method.js

@@ -29,83 +29,112 @@ function isBase64(str) {
 const handleSubmitForm = (originalData, allValues) => {
   let updatedData = _.cloneDeep(originalData);
   let uploadedFiles = [];
-  const processAttrList = (attrList) => {
-    var _a, _b, _c;
-    const attrMap = new Map(attrList.map((item, index) => [item.attrid, index]));
+  const processAttrList = (attrList, item) => {
+    var _a;
     try {
-      for (const [fieldName, formValue] of Object.entries(allValues)) {
-        const index = attrMap.get(fieldName);
-        if (index === void 0)
-          continue;
-        const attrItem = attrList[index];
-        const inputType = (_a = attrItem.json) == null ? void 0 : _a.input;
-        const format = (_b = attrItem.json) == null ? void 0 : _b["format"];
-        if (!formValue && formValue !== 0) {
-          attrItem.attrvalue = "";
-          continue;
-        }
-        switch (inputType) {
-          case "image":
-          case "file":
-          case "video":
-          case "audio":
-            const parsedValue = typeof formValue === "string" ? JSON.parse(formValue) : formValue;
-            if (!Array.isArray(parsedValue)) {
-              attrItem.attrvalue = JSON.stringify([]);
-              return;
-            }
-            const existingFiles = parsedValue.filter((file) => file.FileId);
-            const uploadedFileList = parsedValue.filter((file) => {
-              var _a2;
-              return file.status === "done" && ((_a2 = file.response) == null ? void 0 : _a2.data);
-            }).map((file) => file.response.data);
-            const allFiles = [...existingFiles, ...uploadedFileList];
-            uploadedFiles = [...uploadedFiles, ...uploadedFileList];
-            attrItem.attrvalue = JSON.stringify(allFiles);
-            break;
-          case "cascader":
-            if (Array.isArray(formValue) && formValue.length > 0) {
-              const delimiter = ((_c = attrItem.json) == null ? void 0 : _c["cascader-delimiter"]) || "/";
-              attrItem.attrvalue = formValue.join(delimiter);
-            } else {
-              attrItem.attrvalue = "";
-            }
-            break;
-          case "checkbox":
-          case "mult-select":
-            if (Array.isArray(formValue) && formValue.length > 0) {
-              attrItem.attrvalue = formValue.join(",");
-            } else {
-              attrItem.attrvalue = formValue;
-            }
-            break;
-          case "date-picker":
-            if (formValue) {
-              attrItem.attrvalue = dayjs(formValue).format(format || "YYYY-MM-DD");
-            } else {
-              attrItem.attrvalue = "";
-            }
-            break;
-          case "time-picker":
-            if (formValue) {
-              attrItem.attrvalue = dayjs(formValue).format(format || "YYYY-MM-DD HH:mm:ss");
-            } else {
-              attrItem.attrvalue = "";
+      if ((_a = item == null ? void 0 : item.json) == null ? void 0 : _a["properties-multiple"]) {
+        const attrValue = allValues[item.attrid];
+        if (Array.isArray(attrValue)) {
+          const childrenObj = {};
+          attrValue.forEach((item2, index) => {
+            var _a2;
+            childrenObj[index] = _.cloneDeep(attrList);
+            for (const [fieldName, formValue] of Object.entries(item2)) {
+              const attrItem = (_a2 = childrenObj[index]) == null ? void 0 : _a2.find((item3) => item3.attrid === fieldName);
+              handleDealValue(attrItem, formValue);
             }
-            break;
-          default:
-            attrItem.attrvalue = formValue;
-            break;
+          });
+          item.children = childrenObj;
         }
-      }
-      attrList.forEach((item) => {
-        if (item.children && Array.isArray(item.children) && item.children.length > 0) {
-          processAttrList(item.children);
+      } else {
+        const attrMap = new Map(attrList.map((item2, index) => [item2.attrid, index]));
+        for (const [fieldName, formValue] of Object.entries(allValues)) {
+          const index = attrMap.get(fieldName);
+          if (index === void 0)
+            continue;
+          const attrItem = attrList[index];
+          if (!formValue && formValue !== 0) {
+            attrItem.attrvalue = "";
+            continue;
+          }
+          handleDealValue(attrItem, formValue);
         }
-      });
+        attrList.forEach((item2) => {
+          if (item2.children && Array.isArray(item2.children) && item2.children.length > 0) {
+            processAttrList(item2.children, item2);
+          }
+        });
+      }
     } catch (error) {
     }
   };
+  const handleDealValue = (attrItem, formValue) => {
+    var _a, _b, _c, _d;
+    const inputType = (_a = attrItem.json) == null ? void 0 : _a.input;
+    const format = (_b = attrItem.json) == null ? void 0 : _b["format"];
+    switch (inputType) {
+      case "image":
+      case "file":
+      case "video":
+      case "audio":
+        const parsedValue = typeof formValue === "string" ? JSON.parse(formValue) : formValue;
+        if (!Array.isArray(parsedValue)) {
+          attrItem.attrvalue = JSON.stringify([]);
+          return;
+        }
+        const existingFiles = parsedValue.filter((file) => file.FileId);
+        const uploadedFileList = parsedValue.filter((file) => {
+          var _a2;
+          return file.status === "done" && ((_a2 = file.response) == null ? void 0 : _a2.data);
+        }).map((file) => file.response.data);
+        const allFiles = [...existingFiles, ...uploadedFileList];
+        uploadedFiles = [...uploadedFiles, ...uploadedFileList];
+        attrItem.attrvalue = JSON.stringify(allFiles);
+        break;
+      case "cascader":
+        if (Array.isArray(formValue) && formValue.length > 0) {
+          const delimiter = ((_c = attrItem.json) == null ? void 0 : _c["cascader-delimiter"]) || "/";
+          attrItem.attrvalue = formValue.join(delimiter);
+        } else {
+          attrItem.attrvalue = "";
+        }
+        break;
+      case "range-picker":
+        if (Array.isArray(formValue) && formValue.length > 0) {
+          attrItem.attrvalue = formValue.join("~");
+        } else {
+          attrItem.attrvalue = "";
+        }
+        break;
+      case "checkbox":
+      case "mult-select":
+        if (Array.isArray(formValue) && formValue.length > 0) {
+          attrItem.attrvalue = formValue.join(",");
+        } else {
+          attrItem.attrvalue = formValue;
+        }
+        break;
+      case "date-picker":
+        if (formValue) {
+          attrItem.attrvalue = dayjs(formValue).format(format || "YYYY-MM-DD");
+        } else {
+          attrItem.attrvalue = "";
+        }
+        break;
+      case "time-picker":
+        if (formValue) {
+          attrItem.attrvalue = dayjs(formValue).format(format || "YYYY-MM-DD HH:mm:ss");
+        } else {
+          attrItem.attrvalue = "";
+        }
+        break;
+      default:
+        if (!((_d = attrItem == null ? void 0 : attrItem.json) == null ? void 0 : _d["properties-multiple"])) {
+          attrItem.attrvalue = formValue;
+        }
+        break;
+    }
+  };
   if (updatedData.attr_list && Array.isArray(updatedData.attr_list)) {
     processAttrList(updatedData.attr_list);
   }
@@ -114,19 +143,76 @@ const handleSubmitForm = (originalData, allValues) => {
     uploadedFiles
   };
 };
-const handleAttrList = (attrList) => {
-  return attrList.map((item) => {
-    if (!item.json && item.info) {
-      try {
-        const json = item.info_base64 === 1 ? getJson(base64ToString(item.info)) : getJson(item.info);
-        item.json = json;
-      } catch (error) {
-        item.json = {};
-      }
+const processChildren = (items, extraAttrs) => {
+  return items.map((item) => {
+    const processedItem = processItem(item, extraAttrs);
+    if (processedItem.children && Array.isArray(processedItem.children)) {
+      processedItem.children = processChildren(processedItem.children);
     }
-    return item;
+    return processedItem;
   });
 };
+const processItem = (item, extraAttrs) => {
+  if (!item.json && item.info) {
+    try {
+      const infoStr = item.info_base64 === 1 ? base64ToString(item.info) : item.info;
+      const json = getJson(infoStr);
+      return { ...item, json, ...extraAttrs };
+    } catch (error) {
+      return { ...item, json: {}, ...extraAttrs };
+    }
+  }
+  return { ...item, ...extraAttrs };
+};
+const handleBaseAttrList = (attrList, extraAttrs) => {
+  return processChildren(attrList, extraAttrs);
+};
+const handleAttrList = (attrList, extraAttrs) => {
+  const parsedAttrList = processChildren(attrList, extraAttrs);
+  const combinationGroups = parsedAttrList.filter((item) => {
+    var _a;
+    return (_a = item.json) == null ? void 0 : _a.combination;
+  }).reduce((groups, item) => {
+    const combinationId = item.json["combination-id"];
+    if (!combinationId)
+      return groups;
+    if (!groups[combinationId]) {
+      groups[combinationId] = [];
+    }
+    groups[combinationId].push(item);
+    return groups;
+  }, {});
+  const excludeAttrIds = /* @__PURE__ */ new Set();
+  Object.values(combinationGroups).forEach((group) => {
+    if ((group == null ? void 0 : group.length) === 0)
+      return;
+    group.slice(1).forEach((item) => excludeAttrIds.add(item.attrid));
+  });
+  const filterAndCombine = (items) => {
+    return items.filter((item) => !excludeAttrIds.has(item.attrid)).map((item) => {
+      var _a;
+      const combinationId = (_a = item.json) == null ? void 0 : _a["combination-id"];
+      if (combinationId && combinationGroups[combinationId]) {
+        const processedItem = {
+          ...item,
+          json: {
+            ...item.json,
+            combinations: combinationGroups[combinationId]
+          }
+        };
+        if (processedItem.children && Array.isArray(processedItem.children)) {
+          processedItem.children = filterAndCombine(processedItem.children);
+        }
+        return processedItem;
+      }
+      if (item.children && Array.isArray(item.children)) {
+        item.children = filterAndCombine(item.children);
+      }
+      return item;
+    });
+  };
+  return filterAndCombine(parsedAttrList);
+};
 const handleFormConfig = async ({
   number,
   key,
@@ -200,11 +286,18 @@ const handleOperationFile = async (params, data, commonRequestWidthParams) => {
   const response = await commonRequestWidthParams(params, data);
   return response;
 };
+function handleKebabToCamel(str) {
+  return str.replace(/-([a-z])/g, function(match, letter) {
+    return letter.toUpperCase();
+  });
+}
 export {
   base64ToString,
   getJson,
   handleAttrList,
+  handleBaseAttrList,
   handleFormConfig,
+  handleKebabToCamel,
   handleOperationFile,
   handleSubmitForm,
   isBase64

package/lib/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/lib/components/DynamicForm/index.js

@@ -7,6 +7,7 @@ const DynamicForm = react.forwardRef((props, ref) => {
   const {
     formConfig,
     setFormConfig,
+    setAttrList,
     form,
     readonly = false,
     relatedid,
@@ -25,7 +26,11 @@ const DynamicForm = react.forwardRef((props, ref) => {
     relatedidKey = "relatedid",
     actionUrlKey = "action-url",
     actionUrlExtraParams = {},
-    CustomModalComponent
+    CustomModalComponent,
+    hideAttrList = [],
+    formShowType = "form",
+    headerWidth,
+    formListItemWidth
   } = props;
   const delFileListRef = react.useRef([]);
   const updateDelFileList = (file) => {
@@ -36,6 +41,7 @@ const DynamicForm = react.forwardRef((props, ref) => {
     uploadAction,
     commonRequest,
     setFormConfig,
+    setAttrList,
     updateDelFileList,
     formConfig,
     interfaceTypeChildren,
@@ -44,14 +50,53 @@ const DynamicForm = react.forwardRef((props, ref) => {
     relatedidKey,
     actionUrlKey,
     actionUrlExtraParams,
-    CustomModalComponent
+    CustomModalComponent,
+    hideAttrList
   });
   react.useImperativeHandle(ref, () => ({
     getDelFileList: () => {
       return delFileListRef.current;
     }
   }));
-  return /* @__PURE__ */ jsxRuntime.jsx(antd.Row, { gutter: colSpace, children: formConfig.map((item, index) => /* @__PURE__ */ jsxRuntime.jsx(react.Fragment, { children: handleRenderItem({
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: formShowType === "table" ? /* @__PURE__ */ jsxRuntime.jsx(antd.Form.List, { name: "customFormList", initialValue: [{}], children: (fields, { add, remove }) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "custom-form-list", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(antd.Flex, { align: "center", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(antd.Flex, { className: "custom-form-list-header", align: "center", children: formConfig == null ? void 0 : formConfig.map((child, index) => {
+        return /* @__PURE__ */ jsxRuntime.jsxs(antd.Flex, { style: { width: (headerWidth == null ? void 0 : headerWidth[index]) || defaultWidth }, align: "center", children: [
+          index !== 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "line" }),
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "custom-form-list-header-item", children: child.attrname })
+        ] }, index);
+      }) }),
+      /* @__PURE__ */ jsxRuntime.jsx("a", { className: "custom-form-list-add-btn", onClick: () => add(), children: "新增" })
+    ] }),
+    fields.map((field) => /* @__PURE__ */ jsxRuntime.jsxs(antd.Flex, { align: "center", className: "custom-form-list-item-container", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(antd.Flex, { className: "custom-form-list-item", align: "center", children: formConfig == null ? void 0 : formConfig.map((child, index) => {
+        return /* @__PURE__ */ jsxRuntime.jsx(
+          antd.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__ */ jsxRuntime.jsx("a", { className: "custom-form-list-del-btn", onClick: () => remove(field.key), children: "删除" })
+    ] }, field.key))
+  ] }) }) : /* @__PURE__ */ jsxRuntime.jsx(antd.Row, { gutter: colSpace, children: formConfig.map((item, index) => /* @__PURE__ */ jsxRuntime.jsx(react.Fragment, { children: handleRenderItem({
     item,
     readonly,
     colNum,
@@ -61,6 +106,6 @@ const DynamicForm = react.forwardRef((props, ref) => {
     defaultWidth,
     formItemStyle,
     radioAlign
-  }) }, item.attrid || `form-item-${index}`)) });
+  }) }, item.attrid || `form-item-${index}`)) }) });
 });
 module.exports = DynamicForm;

package/lib/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;