szld-libs 0.4.35 → 0.4.37

package/es/components/DynamicForm/mySelect/index.js

@@ -91,6 +91,7 @@ const MySelect = ({
       },
       options,
       style: { ...style },
+      maxTagCount: 1,
       allowClear: true,
       onChange: (val) => {
         if (attrid && (instanceList == null ? void 0 : instanceList.length) > 0 && (item == null ? void 0 : item.inputType) === "instance-url") {

package/es/components/DynamicForm/useDynamicForm.js

@@ -192,7 +192,9 @@ function useDynamicForm(props) {
       parentFormListField,
       isShowLabel = true
     }) => {
+      var _a;
       const formListInitValue = 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];
@@ -204,7 +206,7 @@ function useDynamicForm(props) {
         }
         return [itemWithJson.attrid, field.name];
       };
-      return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
+      return /* @__PURE__ */ jsx(Col, { span: hidden ? 0 : 24 / colNum, children: /* @__PURE__ */ jsx(
         Collapse,
         {
           bordered: false,
@@ -299,10 +301,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__ */ jsx(Fragment$1, {});
       }
-      if (itemWithJson.attrtype === 1) {
+      if (itemWithJson.attrtype === 1 && !hidden) {
         return renderNestedFormList({
           itemWithJson,
           colNum,
@@ -322,12 +325,11 @@ function useDynamicForm(props) {
       }
       if (itemWithJson.attrtype === 0) {
         const initialValue = 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 = handleGetPlaceholder(itemWithJson, langId);
         const { combinations = [] } = itemWithJson.json || {};
         if (combinations == null ? void 0 : combinations.length) {
-          return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
+          return /* @__PURE__ */ jsx(Col, { span: hidden ? 0 : 24 / colNum, children: /* @__PURE__ */ jsx(
             Form.Item,
             {
               label: (_d = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _d["combination-name"],
@@ -390,7 +392,7 @@ function useDynamicForm(props) {
           ) });
         }
         const formItemName = isFormListItem && formListField ? Array.isArray(formListField.name) ? [...formListField.name, itemWithJson.attrid] : [formListField.name, itemWithJson.attrid] : itemWithJson.attrid;
-        return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
+        return /* @__PURE__ */ jsx(Col, { span: hidden ? 0 : 24 / colNum, children: /* @__PURE__ */ jsx(
           Form.Item,
           {
             name: formItemName,
@@ -652,7 +654,7 @@ function useDynamicForm(props) {
           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/es/components/DynamicFormMobile/useDynamicForm.js

@@ -253,12 +253,13 @@ function useDynamicForm(props) {
       formListField,
       isShowLabel = true
     }) => {
-      var _a, _b, _c, _d, _e, _f;
-      if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true || (hideAttrList == null ? void 0 : hideAttrList.includes(itemWithJson.attrid))) {
+      var _a, _b, _c, _d, _e, _f, _g;
+      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__ */ jsx(Fragment$1, {});
       }
-      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,
@@ -278,12 +279,12 @@ function useDynamicForm(props) {
       }
       if (itemWithJson.attrtype === 0) {
         const initialValue = 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 = handleGetPlaceholder(itemWithJson, langId);
         const { combinations = [] } = itemWithJson.json || {};
         if (combinations == null ? void 0 : combinations.length) {
           return /* @__PURE__ */ jsx(Flex, { children: combinations.map((item, index) => {
-            var _a2, _b2, _c2, _d2, _e2, _f2, _g;
+            var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
             let initValue = handleSetFormItemInitialValue(item);
             let width = defaultWidth;
             const mode = item.json.input || "text";
@@ -301,7 +302,8 @@ function useDynamicForm(props) {
                 style: {
                   flex: width,
                   pointerEvents: readonly ? "none" : "auto",
-                  opacity: readonly ? 0.5 : 1
+                  opacity: readonly ? 0.5 : 1,
+                  display: hidden ? "none" : "block"
                 },
                 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,
@@ -317,7 +319,7 @@ function useDynamicForm(props) {
                   ...((_f2 = itemWithJson.json) == null ? void 0 : _f2.regexp) ? [
                     {
                       pattern: new RegExp(itemWithJson.json.regexp.replace(/^\/|\/$/g, "")),
-                      message: ((_g = itemWithJson.json) == null ? void 0 : _g["regexp-message"]) || `${itemWithJson.attrname}格式不正确`
+                      message: ((_g2 = itemWithJson.json) == null ? void 0 : _g2["regexp-message"]) || `${itemWithJson.attrname}格式不正确`
                     }
                   ] : []
                 ],
@@ -348,19 +350,20 @@ function useDynamicForm(props) {
             initialValue,
             style: {
               pointerEvents: readonly ? "none" : "auto",
-              opacity: readonly ? 0.5 : 1
+              opacity: readonly ? 0.5 : 1,
+              display: hidden ? "none" : "block"
             },
             rules: [
-              ...((_d = itemWithJson.json) == null ? void 0 : _d.must) ? [
+              ...((_e = itemWithJson.json) == null ? void 0 : _e.must) ? [
                 {
                   required: true,
                   message: `${placeholder}${itemWithJson.attrname}`
                 }
               ] : [],
-              ...((_e = itemWithJson.json) == null ? void 0 : _e.regexp) ? [
+              ...((_f = itemWithJson.json) == null ? void 0 : _f.regexp) ? [
                 {
                   pattern: new RegExp(itemWithJson.json.regexp.replace(/^\/|\/$/g, "")),
-                  message: ((_f = itemWithJson.json) == null ? void 0 : _f["regexp-message"]) || `${itemWithJson.attrname}格式不正确`
+                  message: ((_g = itemWithJson.json) == null ? void 0 : _g["regexp-message"]) || `${itemWithJson.attrname}格式不正确`
                 }
               ] : []
             ],