szld-libs 0.3.1 → 0.3.2

package/es/index.js

@@ -22,7 +22,6 @@ const Demo = () => {
     /* @__PURE__ */ jsx(
       DynamicFormMobile,
       {
-        interfaceTypeChildren: "YLFWLRDetailAttrlist",
         formConfig: handleAttrList(attrList),
         readonly: false,
         relatedid: "guid",

package/es/utils/method.d.ts

@@ -13,7 +13,9 @@ export declare function isBase64(str: string): boolean;
 export declare const handleSubmitForm: (originalData: {
     attr_list: any[];
     isMobile?: boolean;
-}, allValues: any, isListToObj?: boolean) => {
+    guid?: string;
+    isListToObj?: boolean;
+}, allValues: any) => {
     updatedData: any;
     uploadedFiles: any[];
 };

package/es/utils/method.js

@@ -27,32 +27,36 @@ function isBase64(str) {
   const base64Regex = /^[A-Za-z0-9+/]+(?:=?=?)$/;
   return base64Regex.test(str);
 }
-const handleSubmitForm = (originalData, allValues, isListToObj) => {
+const handleSubmitForm = (originalData, allValues) => {
+  var _a;
   let updatedData = _.cloneDeep(originalData);
-  const { isMobile = false } = originalData;
+  const { attr_list = [] } = updatedData;
+  const { isMobile = false, guid, isListToObj = false } = originalData;
   let uploadedFiles = [];
-  const processAttrList = (attrList) => {
+  const processAttrList = (attrList, values) => {
     try {
       const attrMap = new Map(attrList.map((item, index) => [item.attrid, index]));
-      for (const [fieldName, formValue] of Object.entries(allValues)) {
+      for (const [fieldName, formValue] of Object.entries(values)) {
         const index = attrMap.get(fieldName);
-        if (index === void 0)
+        if (index === void 0) {
           continue;
-        const attrItem = attrList[index];
+        }
+        let attrItem = attrList[index];
         if (!formValue && formValue !== 0) {
           attrItem.attrvalue = "";
           continue;
         }
-        handleDealValue(attrItem, formValue, isMobile);
+        attrItem = handleDealValue(attrItem, formValue, isMobile);
       }
       attrList.forEach((item) => {
         if (item.children && Array.isArray(item.children) && item.children.length > 0 && !Array.isArray(item.children[0])) {
-          processAttrList(item.children);
+          processAttrList(item.children, values[item.attrid]);
         }
         if (item.children && Array.isArray(item.children) && item.children.length > 0 && Array.isArray(item.children[0])) {
-          item.children.forEach((v) => {
-            if (v.children && Array.isArray(v.children)) {
-              processAttrList(v.children);
+          item.children.forEach((v, i) => {
+            var _a2;
+            if (v && Array.isArray(v)) {
+              processAttrList(v, (_a2 = values == null ? void 0 : values[item.attrid]) == null ? void 0 : _a2[i]);
             }
           });
         }
@@ -61,8 +65,8 @@ const handleSubmitForm = (originalData, allValues, isListToObj) => {
     }
   };
   const handleDealValue = (attrItem, formValue, isMobile2) => {
-    var _a, _b, _c, _d;
-    const inputType = (_a = attrItem.json) == null ? void 0 : _a.input;
+    var _a2, _b, _c, _d;
+    const inputType = (_a2 = attrItem.json) == null ? void 0 : _a2.input;
     const format = (_b = attrItem.json) == null ? void 0 : _b["format"];
     switch (inputType) {
       case "image":
@@ -76,8 +80,8 @@ const handleSubmitForm = (originalData, allValues, isListToObj) => {
         }
         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);
+          var _a3;
+          return file.status === "done" && ((_a3 = file.response) == null ? void 0 : _a3.data);
         }).map((file) => file.response.data);
         const allFiles = [...existingFiles, ...uploadedFileList];
         uploadedFiles = [...uploadedFiles, ...uploadedFileList];
@@ -149,10 +153,25 @@ const handleSubmitForm = (originalData, allValues, isListToObj) => {
         }
         break;
     }
+    return attrItem;
   };
   if (updatedData.attr_list && Array.isArray(updatedData.attr_list)) {
-    processAttrList(updatedData.attr_list);
+    processAttrList(attr_list, allValues);
   }
+  (_a = updatedData == null ? void 0 : updatedData.attr_list) == null ? void 0 : _a.forEach((v) => {
+    var _a2, _b, _c, _d, _e, _f;
+    if (((_a2 = v == null ? void 0 : v.json) == null ? void 0 : _a2["auto-generate"]) && ((_b = v == null ? void 0 : v.json) == null ? void 0 : _b["auto-generate-type"])) {
+      if (((_c = v == null ? void 0 : v.json) == null ? void 0 : _c["auto-generate-type"]) === "currenttime") {
+        v.attrvalue = dayjs().format("YYYY-MM-DD HH:mm:ss");
+      }
+      if (((_d = v == null ? void 0 : v.json) == null ? void 0 : _d["auto-generate-type"]) === "guid") {
+        v.attrvalue = guid || "";
+      }
+    }
+    if ((_e = v == null ? void 0 : v.json) == null ? void 0 : _e["default"]) {
+      v.attrvalue = (_f = v == null ? void 0 : v.json) == null ? void 0 : _f["default"];
+    }
+  });
   return {
     updatedData: isListToObj ? handleAttrListToObj(updatedData.attr_list || []) : updatedData,
     uploadedFiles
@@ -330,12 +349,8 @@ const handleAttrListToObj = (attrList) => {
           data_list: [processLevel(item.children)]
         };
       } else if (item.attrtype === 1 && item.children.length > 0 && Array.isArray(item.children)) {
-        let { attrvalue = [], children = [] } = item || {};
-        attrvalue = Array.isArray(attrvalue) ? attrvalue : [attrvalue];
-        if (Array.isArray(attrvalue) && (attrvalue == null ? void 0 : attrvalue.length)) {
-          item.children = attrvalue.map((v) => {
-            return handleObjDetailToSignleAttrList((children == null ? void 0 : children[0]) || [], v);
-          });
+        const { children = [] } = item || {};
+        if ((children == null ? void 0 : children.length) && Array.isArray(children == null ? void 0 : children[0])) {
           result[key] = {
             asid: ((_e = (_d = (_c = item.children) == null ? void 0 : _c[0]) == null ? void 0 : _d[0]) == null ? void 0 : _e.asid) || "",
             data_list: item.children.map((child) => {
@@ -488,12 +503,6 @@ const handleSelectOptions = async ({
   }
   return options;
 };
-const handleObjDetailToSignleAttrList = (attrList, detail) => {
-  return attrList.map((item) => ({
-    ...item,
-    attrvalue: detail[item.attrid] || ""
-  }));
-};
 export {
   base64ToString,
   getJson,

package/lib/index.js

@@ -23,7 +23,6 @@ const Demo = () => {
     /* @__PURE__ */ jsxRuntime.jsx(
       main.DynamicFormMobile,
       {
-        interfaceTypeChildren: "YLFWLRDetailAttrlist",
         formConfig: method.handleAttrList(mock.attrList),
         readonly: false,
         relatedid: "guid",

package/lib/utils/method.d.ts

@@ -13,7 +13,9 @@ export declare function isBase64(str: string): boolean;
 export declare const handleSubmitForm: (originalData: {
     attr_list: any[];
     isMobile?: boolean;
-}, allValues: any, isListToObj?: boolean) => {
+    guid?: string;
+    isListToObj?: boolean;
+}, allValues: any) => {
     updatedData: any;
     uploadedFiles: any[];
 };

package/lib/utils/method.js

@@ -29,32 +29,36 @@ function isBase64(str) {
   const base64Regex = /^[A-Za-z0-9+/]+(?:=?=?)$/;
   return base64Regex.test(str);
 }
-const handleSubmitForm = (originalData, allValues, isListToObj) => {
+const handleSubmitForm = (originalData, allValues) => {
+  var _a;
   let updatedData = _.cloneDeep(originalData);
-  const { isMobile = false } = originalData;
+  const { attr_list = [] } = updatedData;
+  const { isMobile = false, guid, isListToObj = false } = originalData;
   let uploadedFiles = [];
-  const processAttrList = (attrList) => {
+  const processAttrList = (attrList, values) => {
     try {
       const attrMap = new Map(attrList.map((item, index) => [item.attrid, index]));
-      for (const [fieldName, formValue] of Object.entries(allValues)) {
+      for (const [fieldName, formValue] of Object.entries(values)) {
         const index = attrMap.get(fieldName);
-        if (index === void 0)
+        if (index === void 0) {
           continue;
-        const attrItem = attrList[index];
+        }
+        let attrItem = attrList[index];
         if (!formValue && formValue !== 0) {
           attrItem.attrvalue = "";
           continue;
         }
-        handleDealValue(attrItem, formValue, isMobile);
+        attrItem = handleDealValue(attrItem, formValue, isMobile);
       }
       attrList.forEach((item) => {
         if (item.children && Array.isArray(item.children) && item.children.length > 0 && !Array.isArray(item.children[0])) {
-          processAttrList(item.children);
+          processAttrList(item.children, values[item.attrid]);
         }
         if (item.children && Array.isArray(item.children) && item.children.length > 0 && Array.isArray(item.children[0])) {
-          item.children.forEach((v) => {
-            if (v.children && Array.isArray(v.children)) {
-              processAttrList(v.children);
+          item.children.forEach((v, i) => {
+            var _a2;
+            if (v && Array.isArray(v)) {
+              processAttrList(v, (_a2 = values == null ? void 0 : values[item.attrid]) == null ? void 0 : _a2[i]);
             }
           });
         }
@@ -63,8 +67,8 @@ const handleSubmitForm = (originalData, allValues, isListToObj) => {
     }
   };
   const handleDealValue = (attrItem, formValue, isMobile2) => {
-    var _a, _b, _c, _d;
-    const inputType = (_a = attrItem.json) == null ? void 0 : _a.input;
+    var _a2, _b, _c, _d;
+    const inputType = (_a2 = attrItem.json) == null ? void 0 : _a2.input;
     const format = (_b = attrItem.json) == null ? void 0 : _b["format"];
     switch (inputType) {
       case "image":
@@ -78,8 +82,8 @@ const handleSubmitForm = (originalData, allValues, isListToObj) => {
         }
         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);
+          var _a3;
+          return file.status === "done" && ((_a3 = file.response) == null ? void 0 : _a3.data);
         }).map((file) => file.response.data);
         const allFiles = [...existingFiles, ...uploadedFileList];
         uploadedFiles = [...uploadedFiles, ...uploadedFileList];
@@ -151,10 +155,25 @@ const handleSubmitForm = (originalData, allValues, isListToObj) => {
         }
         break;
     }
+    return attrItem;
   };
   if (updatedData.attr_list && Array.isArray(updatedData.attr_list)) {
-    processAttrList(updatedData.attr_list);
+    processAttrList(attr_list, allValues);
   }
+  (_a = updatedData == null ? void 0 : updatedData.attr_list) == null ? void 0 : _a.forEach((v) => {
+    var _a2, _b, _c, _d, _e, _f;
+    if (((_a2 = v == null ? void 0 : v.json) == null ? void 0 : _a2["auto-generate"]) && ((_b = v == null ? void 0 : v.json) == null ? void 0 : _b["auto-generate-type"])) {
+      if (((_c = v == null ? void 0 : v.json) == null ? void 0 : _c["auto-generate-type"]) === "currenttime") {
+        v.attrvalue = dayjs().format("YYYY-MM-DD HH:mm:ss");
+      }
+      if (((_d = v == null ? void 0 : v.json) == null ? void 0 : _d["auto-generate-type"]) === "guid") {
+        v.attrvalue = guid || "";
+      }
+    }
+    if ((_e = v == null ? void 0 : v.json) == null ? void 0 : _e["default"]) {
+      v.attrvalue = (_f = v == null ? void 0 : v.json) == null ? void 0 : _f["default"];
+    }
+  });
   return {
     updatedData: isListToObj ? handleAttrListToObj(updatedData.attr_list || []) : updatedData,
     uploadedFiles
@@ -332,12 +351,8 @@ const handleAttrListToObj = (attrList) => {
           data_list: [processLevel(item.children)]
         };
       } else if (item.attrtype === 1 && item.children.length > 0 && Array.isArray(item.children)) {
-        let { attrvalue = [], children = [] } = item || {};
-        attrvalue = Array.isArray(attrvalue) ? attrvalue : [attrvalue];
-        if (Array.isArray(attrvalue) && (attrvalue == null ? void 0 : attrvalue.length)) {
-          item.children = attrvalue.map((v) => {
-            return handleObjDetailToSignleAttrList((children == null ? void 0 : children[0]) || [], v);
-          });
+        const { children = [] } = item || {};
+        if ((children == null ? void 0 : children.length) && Array.isArray(children == null ? void 0 : children[0])) {
           result[key] = {
             asid: ((_e = (_d = (_c = item.children) == null ? void 0 : _c[0]) == null ? void 0 : _d[0]) == null ? void 0 : _e.asid) || "",
             data_list: item.children.map((child) => {
@@ -490,12 +505,6 @@ const handleSelectOptions = async ({
   }
   return options;
 };
-const handleObjDetailToSignleAttrList = (attrList, detail) => {
-  return attrList.map((item) => ({
-    ...item,
-    attrvalue: detail[item.attrid] || ""
-  }));
-};
 exports.base64ToString = base64ToString;
 exports.getJson = getJson;
 exports.handleAttrList = handleAttrList;

package/package.json

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