szld-libs 0.4.41 → 0.4.43

package/lib/components/DynamicForm/index.d.ts

@@ -18,6 +18,7 @@ export interface IformConfigItem {
 }
 
 export interface Ijson {
+  extraDescObj?: Record<string, any>;
   hidden?: boolean; // 是否隐藏属性
   'auto-generate'?: boolean; // 是否自动生成时间
   'auto-generate-type'?: string; // 自动生成时间类型

package/lib/components/DynamicForm/useDynamicForm.js

@@ -301,7 +301,7 @@ function useDynamicForm(props) {
       formListField,
       isShowLabel = true
     }) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
       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, {});
@@ -335,6 +335,17 @@ function useDynamicForm(props) {
             {
               label: (_d = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _d["combination-name"],
               required: ((_e = itemWithJson.json) == null ? void 0 : _e.must) && !hidden,
+              extra: /* @__PURE__ */ jsxRuntime.jsx(
+                "span",
+                {
+                  style: {
+                    marginTop: ((_g = (_f = itemWithJson.json) == null ? void 0 : _f.extraDescObj) == null ? void 0 : _g.info) ? 10 : 0,
+                    display: "inline-block",
+                    color: (_i = (_h = itemWithJson.json) == null ? void 0 : _h.extraDescObj) == null ? void 0 : _i.color
+                  },
+                  children: (_k = (_j = itemWithJson.json) == null ? void 0 : _j.extraDescObj) == null ? void 0 : _k.info
+                }
+              ),
               children: /* @__PURE__ */ jsxRuntime.jsx(antd.Space.Compact, { children: combinations.map((item, index) => {
                 var _a2, _b2, _c2, _d2, _e2;
                 let initValue = func.handleSetFormItemInitialValue(item);
@@ -400,17 +411,28 @@ function useDynamicForm(props) {
             label: isShowLabel && handleDealInstruction(itemWithJson, instructionShowMode) || null,
             initialValue,
             hidden,
+            extra: /* @__PURE__ */ jsxRuntime.jsx(
+              "span",
+              {
+                style: {
+                  marginTop: ((_m = (_l = itemWithJson.json) == null ? void 0 : _l.extraDescObj) == null ? void 0 : _m.info) ? 10 : 0,
+                  display: "inline-block",
+                  color: (_o = (_n = itemWithJson.json) == null ? void 0 : _n.extraDescObj) == null ? void 0 : _o.color
+                },
+                children: (_q = (_p = itemWithJson.json) == null ? void 0 : _p.extraDescObj) == null ? void 0 : _q.info
+              }
+            ),
             rules: [
-              ...((_f = itemWithJson.json) == null ? void 0 : _f.must) && !hidden ? [
+              ...((_r = itemWithJson.json) == null ? void 0 : _r.must) && !hidden ? [
                 {
                   required: true,
                   message: `${placeholder}${itemWithJson.attrname}`
                 }
               ] : [],
-              ...((_g = itemWithJson.json) == null ? void 0 : _g.regexp) ? [
+              ...((_s = itemWithJson.json) == null ? void 0 : _s.regexp) ? [
                 {
                   pattern: new RegExp(itemWithJson.json.regexp.replace(/^\/|\/$/g, "")),
-                  message: ((_h = itemWithJson.json) == null ? void 0 : _h["regexp-message"]) || `${itemWithJson.attrname}${langId === "10001" ? "格式不正确" : "Format is incorrect"}`
+                  message: ((_t = itemWithJson.json) == null ? void 0 : _t["regexp-message"]) || `${itemWithJson.attrname}${langId === "10001" ? "格式不正确" : "Format is incorrect"}`
                 }
               ] : []
             ],

package/lib/components/DynamicFormMobile/useDynamicForm.js

@@ -254,7 +254,7 @@ function useDynamicForm(props) {
       formListField,
       isShowLabel = true
     }) => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
       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, {});
@@ -285,7 +285,7 @@ function useDynamicForm(props) {
         const { combinations = [] } = itemWithJson.json || {};
         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;
+            var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
             let initValue = func.handleSetFormItemInitialValue(item);
             let width = defaultWidth;
             const mode = item.json.input || "text";
@@ -324,6 +324,17 @@ function useDynamicForm(props) {
                     }
                   ] : []
                 ],
+                intro: /* @__PURE__ */ jsxRuntime.jsx(
+                  "span",
+                  {
+                    style: {
+                      marginTop: ((_i2 = (_h2 = itemWithJson.json) == null ? void 0 : _h2.extraDescObj) == null ? void 0 : _i2.info) ? 10 : 0,
+                      display: "inline-block",
+                      color: (_k2 = (_j2 = itemWithJson.json) == null ? void 0 : _j2.extraDescObj) == null ? void 0 : _k2.color
+                    },
+                    children: (_m2 = (_l2 = itemWithJson.json) == null ? void 0 : _l2.extraDescObj) == null ? void 0 : _m2.info
+                  }
+                ),
                 ...handleSetFormItemProps(item),
                 children: handleRenderItemInputMode({
                   item,
@@ -369,6 +380,17 @@ function useDynamicForm(props) {
               ] : []
             ],
             ...handleSetFormItemProps(itemWithJson),
+            intro: /* @__PURE__ */ jsxRuntime.jsx(
+              "span",
+              {
+                style: {
+                  marginTop: ((_i = (_h = itemWithJson.json) == null ? void 0 : _h.extraDescObj) == null ? void 0 : _i.info) ? 10 : 0,
+                  display: "inline-block",
+                  color: (_k = (_j = itemWithJson.json) == null ? void 0 : _j.extraDescObj) == null ? void 0 : _k.color
+                },
+                children: (_m = (_l = itemWithJson.json) == null ? void 0 : _l.extraDescObj) == null ? void 0 : _m.info
+              }
+            ),
             children: handleRenderItemInputMode({
               item: itemWithJson,
               readonly,