szld-libs 0.4.36 → 0.4.37

package/lib/components/DynamicForm/useDynamicForm.js

@@ -193,7 +193,9 @@ function useDynamicForm(props) {
       parentFormListField,
       isShowLabel = true
     }) => {
+      var _a;
       const formListInitValue = func.handleSetFormItemInitialValue(itemWithJson);
+      const hidden = (_a = itemWithJson.json) == null ? void 0 : _a.hidden;
       let children = itemWithJson.children || [];
       if (Array.isArray(children == null ? void 0 : children[0]) && children.length) {
         children = children[0];
@@ -205,7 +207,7 @@ function useDynamicForm(props) {
         }
         return [itemWithJson.attrid, field.name];
       };
-      return /* @__PURE__ */ jsxRuntime.jsx(antd.Col, { span: 24 / colNum, children: /* @__PURE__ */ jsxRuntime.jsx(
+      return /* @__PURE__ */ jsxRuntime.jsx(antd.Col, { span: hidden ? 0 : 24 / colNum, children: /* @__PURE__ */ jsxRuntime.jsx(
         antd.Collapse,
         {
           bordered: false,
@@ -300,10 +302,11 @@ function useDynamicForm(props) {
       isShowLabel = true
     }) => {
       var _a, _b, _c, _d, _e, _f, _g, _h;
-      if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true) {
+      const hidden = (_a = itemWithJson.json) == null ? void 0 : _a.hidden;
+      if (((_b = itemWithJson.json) == null ? void 0 : _b.hide) === true) {
         return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {});
       }
-      if (itemWithJson.attrtype === 1) {
+      if (itemWithJson.attrtype === 1 && !hidden) {
         return renderNestedFormList({
           itemWithJson,
           colNum,
@@ -323,12 +326,11 @@ function useDynamicForm(props) {
       }
       if (itemWithJson.attrtype === 0) {
         const initialValue = func.handleSetFormItemInitialValue(itemWithJson);
-        const message2 = (_b = itemWithJson.json) == null ? void 0 : _b["default-prompt"];
-        const hidden = (_c = itemWithJson.json) == null ? void 0 : _c.hidden;
+        const message2 = (_c = itemWithJson.json) == null ? void 0 : _c["default-prompt"];
         const placeholder = func.handleGetPlaceholder(itemWithJson, langId);
         const { combinations = [] } = itemWithJson.json || {};
         if (combinations == null ? void 0 : combinations.length) {
-          return /* @__PURE__ */ jsxRuntime.jsx(antd.Col, { span: 24 / colNum, children: /* @__PURE__ */ jsxRuntime.jsx(
+          return /* @__PURE__ */ jsxRuntime.jsx(antd.Col, { span: hidden ? 0 : 24 / colNum, children: /* @__PURE__ */ jsxRuntime.jsx(
             antd.Form.Item,
             {
               label: (_d = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _d["combination-name"],
@@ -391,7 +393,7 @@ function useDynamicForm(props) {
           ) });
         }
         const formItemName = isFormListItem && formListField ? Array.isArray(formListField.name) ? [...formListField.name, itemWithJson.attrid] : [formListField.name, itemWithJson.attrid] : itemWithJson.attrid;
-        return /* @__PURE__ */ jsxRuntime.jsx(antd.Col, { span: 24 / colNum, children: /* @__PURE__ */ jsxRuntime.jsx(
+        return /* @__PURE__ */ jsxRuntime.jsx(antd.Col, { span: hidden ? 0 : 24 / colNum, children: /* @__PURE__ */ jsxRuntime.jsx(
           antd.Form.Item,
           {
             name: formItemName,
@@ -653,7 +655,7 @@ function useDynamicForm(props) {
           antd.DatePicker,
           {
             multiple: true,
-            maxTagCount: ((_p = item == null ? void 0 : item.json) == null ? void 0 : _p["max-tag-count"]) || 2,
+            maxTagCount: ((_p = item == null ? void 0 : item.json) == null ? void 0 : _p["max-tag-count"]) || 1,
             disabled: readonly || ((_q = item.json) == null ? void 0 : _q.readonly) || false,
             style: { width, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth }
           }

package/lib/components/DynamicFormMobile/useDynamicForm.js

@@ -255,11 +255,12 @@ function useDynamicForm(props) {
       isShowLabel = true
     }) => {
       var _a, _b, _c, _d, _e, _f, _g;
-      if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true || (hideAttrList == null ? void 0 : hideAttrList.includes(itemWithJson.attrid))) {
+      const hidden = (_a = itemWithJson.json) == null ? void 0 : _a.hidden;
+      if (((_b = itemWithJson.json) == null ? void 0 : _b.hide) === true || (hideAttrList == null ? void 0 : hideAttrList.includes(itemWithJson.attrid))) {
         return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {});
       }
-      readonly = ((_b = itemWithJson.json) == null ? void 0 : _b.readonly) || readonly || false;
-      if (itemWithJson.attrtype === 1) {
+      readonly = ((_c = itemWithJson.json) == null ? void 0 : _c.readonly) || readonly || false;
+      if (itemWithJson.attrtype === 1 && !hidden) {
         return renderNestedFormList({
           itemWithJson,
           colNum,
@@ -279,10 +280,9 @@ function useDynamicForm(props) {
       }
       if (itemWithJson.attrtype === 0) {
         const initialValue = func.handleSetFormItemInitialValue(itemWithJson);
-        const message2 = (_c = itemWithJson.json) == null ? void 0 : _c["default-prompt"];
+        const message2 = (_d = itemWithJson.json) == null ? void 0 : _d["default-prompt"];
         const placeholder = func.handleGetPlaceholder(itemWithJson, langId);
         const { combinations = [] } = itemWithJson.json || {};
-        const hidden = (_d = itemWithJson.json) == null ? void 0 : _d.hidden;
         if (combinations == null ? void 0 : combinations.length) {
           return /* @__PURE__ */ jsxRuntime.jsx(antd.Flex, { children: combinations.map((item, index) => {
             var _a2, _b2, _c2, _d2, _e2, _f2, _g2;