szld-libs 0.2.70 → 0.2.72

package/lib/utils/method.js

@@ -31,83 +31,119 @@ 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 "multiple-date-picker":
+        if (Array.isArray(formValue) && formValue.length > 0) {
+          attrItem.attrvalue = formValue.join(",");
+        } else {
+          attrItem.attrvalue = formValue;
+        }
+        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);
   }
@@ -116,19 +152,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,
@@ -202,10 +295,17 @@ 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();
+  });
+}
 exports.base64ToString = base64ToString;
 exports.getJson = getJson;
 exports.handleAttrList = handleAttrList;
+exports.handleBaseAttrList = handleBaseAttrList;
 exports.handleFormConfig = handleFormConfig;
+exports.handleKebabToCamel = handleKebabToCamel;
 exports.handleOperationFile = handleOperationFile;
 exports.handleSubmitForm = handleSubmitForm;
 exports.isBase64 = isBase64;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "szld-libs",
   "private": false,
-  "version": "0.2.70",
+  "version": "0.2.72",
   "type": "module",
   "scripts": {
     "dev": "vite",