szld-libs 0.4.38 → 0.4.40

package/es/components/DynamicForm/func.js

@@ -34,7 +34,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) {
@@ -81,6 +81,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/es/components/DynamicForm/useDynamicForm.js

@@ -333,7 +333,7 @@ function useDynamicForm(props) {
             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__ */ jsx(Space.Compact, { children: combinations.map((item, index) => {
                 var _a2, _b2, _c2, _d2, _e2;
                 let initValue = handleSetFormItemInitialValue(item);
@@ -359,7 +359,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}`
@@ -400,7 +400,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/es/components/DynamicFormMobile/func.js

@@ -34,7 +34,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) {
@@ -80,6 +80,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/es/components/DynamicFormMobile/myCalendar/index.js

@@ -52,10 +52,12 @@ const StringCompatibleCalendar = (props) => {
       onChange(str);
     }
   };
+  const placeholder = langId === "10001" ? "请选择日期" : "Please select a date";
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(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]];
       }
@@ -66,7 +68,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/es/components/DynamicFormMobile/useDynamicForm.js

@@ -303,14 +303,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__ */ 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}`
@@ -351,10 +351,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/es/index.js

@@ -1,10 +1,10 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { commonRequestWidthParams, uploadFormAction, commonRequest } from "./services";
-import { handleAttrList } from "./utils/method";
+import { handleAttrList, handleSubmitForm } from "./utils/method";
 import { BackHeader, DynamicFormMobile } from "./main";
 import { BrowserRouter } from "react-router-dom";
 import { ConfigProvider, App } from "antd";
-import { Form, Button } from "react-vant";
+import { Form } from "react-vant";
 import { useRef, useState, useEffect } from "react";
 import ReactDOM from "react-dom/client";
 import zhCN from "antd/es/locale/zh_CN";
@@ -26,10 +26,16 @@ const Demo = () => {
     }, 2e3);
   }, []);
   const onFinish = async (values) => {
+    handleSubmitForm(
+      {
+        attr_list: attrList
+      },
+      values
+    );
   };
   return /* @__PURE__ */ jsxs("div", { style: { height: "100vh", display: "flex", flexDirection: "column", gap: 20 }, children: [
     /* @__PURE__ */ jsx(BackHeader, { title: "页头组件", isBack: true }),
-    /* @__PURE__ */ jsx("div", { style: { padding: "20px" }, children: /* @__PURE__ */ jsxs(Form, { form, onValuesChange, onFinish, children: [
+    /* @__PURE__ */ jsx("div", { style: { padding: "20px" }, children: /* @__PURE__ */ jsxs(Form, { form, onValuesChange, layout: "vertical", onFinish, children: [
       /* @__PURE__ */ jsx(
         DynamicFormMobile,
         {
@@ -47,7 +53,7 @@ const Demo = () => {
           langId
         }
       ),
-      /* @__PURE__ */ jsx(Form.Item, { name: "submit", style: { marginLeft: "auto" }, children: /* @__PURE__ */ jsx(Button, { round: true, nativeType: "submit", type: "primary", block: true, children: "提交" }) })
+      /* @__PURE__ */ jsx(Form.Item, { name: "submit", style: { marginLeft: "auto" } })
     ] }) }),
     /* @__PURE__ */ jsxs("div", { children: [
       "2. 测试循环滚动组件",