szld-libs 0.4.38 → 0.4.40

package/es/utils/method.js

@@ -160,18 +160,21 @@ const handleSubmitForm = (originalData, allValues) => {
   }
   if (isAutoFill) {
     (_a = updatedData == null ? void 0 : updatedData.attr_list) == null ? void 0 : _a.forEach((v) => {
-      var _a2, _b, _c, _d, _e, _f;
+      var _a2, _b, _c, _d, _e, _f, _g;
       const attrvalue = (v == null ? void 0 : v.attrvalue) || "";
       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"]) && !attrvalue) {
         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" && !attrvalue) {
+        if (((_d = v == null ? void 0 : v.json) == null ? void 0 : _d["auto-generate-type"]) === "currenttimestamp") {
+          v.attrvalue = dayjs().unix().toString();
+        }
+        if (((_e = v == null ? void 0 : v.json) == null ? void 0 : _e["auto-generate-type"]) === "guid" && !attrvalue) {
           v.attrvalue = onlyNumber || guid || "";
         }
       }
-      if (((_e = v == null ? void 0 : v.json) == null ? void 0 : _e["default"]) && !attrvalue) {
-        v.attrvalue = (_f = v == null ? void 0 : v.json) == null ? void 0 : _f["default"];
+      if (((_f = v == null ? void 0 : v.json) == null ? void 0 : _f["default"]) && !attrvalue) {
+        v.attrvalue = (_g = v == null ? void 0 : v.json) == null ? void 0 : _g["default"];
       }
     });
   }

package/es/utils/szxkFunc.d.ts

@@ -69,3 +69,4 @@ export declare const handleSetTableRowColor: (record: any, index: number | undef
 export declare const handleFormatMobileDate: (values: Record<string, any>, format?: string) => Record<string, any>;
 export declare const handleNonUniversalHeader: (nonUniversalHeader: Record<string, string>, data: Record<string, any>) => Record<string, any>;
 export declare const handleGetControlPanelConfig: (sourceNumber: string | number, commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>) => Promise<any>;
+export declare const isJson: (str: string) => boolean;

package/es/utils/szxkFunc.js

@@ -98,6 +98,14 @@ const handleGetControlPanelConfig = async (sourceNumber, commonRequest) => {
   } catch (error) {
   }
 };
+const isJson = (str) => {
+  try {
+    JSON.parse(str);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
 export {
   handleCallSupportCode,
   handleFormatMobileDate,
@@ -107,5 +115,6 @@ export {
   handleGetList,
   handleNonUniversalHeader,
   handleObjDetailToSignleAttrList,
-  handleSetTableRowColor
+  handleSetTableRowColor,
+  isJson
 };

package/lib/components/DynamicForm/func.js

@@ -36,7 +36,7 @@ const handleGetPlaceholder = (itemWithJson, langId) => {
   return defaultMessage;
 };
 const handleSetFormItemInitialValue = (itemWithJson) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const inputType = (_a = itemWithJson.json) == null ? void 0 : _a.input;
   let initialValue = itemWithJson.attrvalue || ((_b = itemWithJson.json) == null ? void 0 : _b.default);
   if (inputType === "label" && initialValue) {
@@ -83,6 +83,9 @@ const handleSetFormItemInitialValue = (itemWithJson) => {
   if (inputType === "time-picker" && !initialValue && ((_e = itemWithJson.json) == null ? void 0 : _e["auto-generate"]) && ((_f = itemWithJson.json) == null ? void 0 : _f["auto-generate-type"]) === "currenttime") {
     initialValue = dayjs().format("YYYY-MM-DD HH:mm:ss:ss");
   }
+  if (inputType === "time-picker" && !initialValue && ((_g = itemWithJson.json) == null ? void 0 : _g["auto-generate"]) && ((_h = itemWithJson.json) == null ? void 0 : _h["auto-generate-type"]) === "currenttimestamp") {
+    initialValue = dayjs().unix().toString();
+  }
   if (itemWithJson.attrtype === 1) {
     initialValue = handleGetSingleAttrListObj(itemWithJson.children || []);
   }

package/lib/components/DynamicForm/useDynamicForm.js

@@ -334,7 +334,7 @@ function useDynamicForm(props) {
             antd.Form.Item,
             {
               label: (_d = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _d["combination-name"],
-              required: (_e = itemWithJson.json) == null ? void 0 : _e.must,
+              required: ((_e = itemWithJson.json) == null ? void 0 : _e.must) && !hidden,
               children: /* @__PURE__ */ jsxRuntime.jsx(antd.Space.Compact, { children: combinations.map((item, index) => {
                 var _a2, _b2, _c2, _d2, _e2;
                 let initValue = func.handleSetFormItemInitialValue(item);
@@ -360,7 +360,7 @@ function useDynamicForm(props) {
                     noStyle: true,
                     initialValue: initValue,
                     rules: [
-                      ...((_c2 = item.json) == null ? void 0 : _c2.must) ? [
+                      ...((_c2 = item.json) == null ? void 0 : _c2.must) && !hidden ? [
                         {
                           required: true,
                           message: message2 || `${placeholder}${item.attrname}`
@@ -401,7 +401,7 @@ function useDynamicForm(props) {
             initialValue,
             hidden,
             rules: [
-              ...((_f = itemWithJson.json) == null ? void 0 : _f.must) ? [
+              ...((_f = itemWithJson.json) == null ? void 0 : _f.must) && !hidden ? [
                 {
                   required: true,
                   message: `${placeholder}${itemWithJson.attrname}`

package/lib/components/DynamicFormMobile/func.js

@@ -36,7 +36,7 @@ const handleGetPlaceholder = (itemWithJson, langId) => {
   return defaultMessage;
 };
 const handleSetFormItemInitialValue = (itemWithJson) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const inputType = (_a = itemWithJson.json) == null ? void 0 : _a.input;
   let initialValue = itemWithJson.attrvalue || ((_b = itemWithJson.json) == null ? void 0 : _b.default) || "";
   if (inputType === "label" && initialValue) {
@@ -82,6 +82,9 @@ const handleSetFormItemInitialValue = (itemWithJson) => {
   if (inputType === "time-picker" && !initialValue && ((_e = itemWithJson.json) == null ? void 0 : _e["auto-generate"]) && ((_f = itemWithJson.json) == null ? void 0 : _f["auto-generate-type"]) === "currenttime") {
     initialValue = dayjs().format("YYYY-MM-DD HH:mm:ss:ss");
   }
+  if (inputType === "time-picker" && !initialValue && ((_g = itemWithJson.json) == null ? void 0 : _g["auto-generate"]) && ((_h = itemWithJson.json) == null ? void 0 : _h["auto-generate-type"]) === "currenttimestamp") {
+    initialValue = dayjs().unix().toString();
+  }
   if (itemWithJson.attrtype === 1) {
     initialValue = handleGetSingleAttrListObj(itemWithJson.children || []);
   }

package/lib/components/DynamicFormMobile/myCalendar/index.js

@@ -53,10 +53,12 @@ const StringCompatibleCalendar = (props) => {
       onChange(str);
     }
   };
+  const placeholder = langId === "10001" ? "请选择日期" : "Please select a date";
   return /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(reactVant.Calendar, { type, value: internalValue, onConfirm: handleChange, children: (val, actions) => {
     const valType = typeof val;
+    const delimiter = type === "multiple" ? "," : "~";
     if (valType === "string") {
-      val = val.split("~");
+      val = val.split(delimiter);
       if (val.length === 1) {
         val = [val[0], val[1]];
       }
@@ -67,7 +69,7 @@ const StringCompatibleCalendar = (props) => {
         style: { padding: 0 },
         value: val ? val.map(
           (el) => dayjs(el).format("YYYY-MM-DD")
-        ).join("~") : langId === "10001" ? "请选择日期" : "Please select a date",
+        ).join(delimiter) : placeholder,
         onClick: (e) => {
           actions.open();
         }

package/lib/components/DynamicFormMobile/useDynamicForm.js

@@ -304,14 +304,14 @@ function useDynamicForm(props) {
                   flex: width,
                   pointerEvents: readonly ? "none" : "auto",
                   opacity: readonly ? 0.5 : 1,
-                  display: hidden ? "none" : "block"
+                  display: hidden ? "none" : "flex"
                 },
                 label: index === 0 ? (_b2 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _b2["combination-name"] : /* @__PURE__ */ jsxRuntime.jsx("div", { style: { visibility: "hidden" }, children: (_c2 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _c2["combination-name"] }),
-                required: index === 0 ? (_d2 = item.json) == null ? void 0 : _d2.must : false,
+                required: index === 0 ? ((_d2 = item.json) == null ? void 0 : _d2.must) && !hidden : false,
                 name: formListField ? Array.isArray(formListField.name) ? [...formListField.name, item.attrid] : [formListField.name, item.attrid] : item.attrid,
                 initialValue: initValue,
                 rules: [
-                  ...((_e2 = item.json) == null ? void 0 : _e2.must) ? [
+                  ...((_e2 = item.json) == null ? void 0 : _e2.must) && !hidden ? [
                     {
                       required: true,
                       message: message2 || `${placeholder}${item.attrname}`
@@ -352,10 +352,10 @@ function useDynamicForm(props) {
             style: {
               pointerEvents: readonly ? "none" : "auto",
               opacity: readonly ? 0.5 : 1,
-              display: hidden ? "none" : "block"
+              display: hidden ? "none" : "flex"
             },
             rules: [
-              ...((_e = itemWithJson.json) == null ? void 0 : _e.must) ? [
+              ...((_e = itemWithJson.json) == null ? void 0 : _e.must) && !hidden ? [
                 {
                   required: true,
                   message: `${placeholder}${itemWithJson.attrname}`

package/lib/index.js

@@ -27,10 +27,16 @@ const Demo = () => {
     }, 2e3);
   }, []);
   const onFinish = async (values) => {
+    method.handleSubmitForm(
+      {
+        attr_list: mock.attrList
+      },
+      values
+    );
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { height: "100vh", display: "flex", flexDirection: "column", gap: 20 }, children: [
     /* @__PURE__ */ jsxRuntime.jsx(main.BackHeader, { title: "页头组件", isBack: true }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { style: { padding: "20px" }, children: /* @__PURE__ */ jsxRuntime.jsxs(reactVant.Form, { form, onValuesChange, onFinish, children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { style: { padding: "20px" }, children: /* @__PURE__ */ jsxRuntime.jsxs(reactVant.Form, { form, onValuesChange, layout: "vertical", onFinish, children: [
       /* @__PURE__ */ jsxRuntime.jsx(
         main.DynamicFormMobile,
         {
@@ -48,7 +54,7 @@ const Demo = () => {
           langId
         }
       ),
-      /* @__PURE__ */ jsxRuntime.jsx(reactVant.Form.Item, { name: "submit", style: { marginLeft: "auto" }, children: /* @__PURE__ */ jsxRuntime.jsx(reactVant.Button, { round: true, nativeType: "submit", type: "primary", block: true, children: "提交" }) })
+      /* @__PURE__ */ jsxRuntime.jsx(reactVant.Form.Item, { name: "submit", style: { marginLeft: "auto" } })
     ] }) }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
       "2. 测试循环滚动组件",