cnhis-design-vue 3.1.41-beta.0 → 3.1.41-beta.1

package/es/components/form-config/index.d.ts

@@ -1056,6 +1056,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
                 } | undefined;
                 regular_error_tip?: string | undefined;
+                message?: string | undefined;
             } | undefined;
             option?: {
                 text: string;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -1057,6 +1057,7 @@ declare const _default: import("vue").DefineComponent<{
                     [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
                 } | undefined;
                 regular_error_tip?: string | undefined;
+                message?: string | undefined;
             } | undefined;
             option?: {
                 text: string;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -64,6 +64,7 @@ declare const _default: import("vue").DefineComponent<{
                 [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
             } | undefined;
             regular_error_tip?: string | undefined;
+            message?: string | undefined;
         } | undefined;
         option?: {
             text: string;

package/es/components/form-render/src/components/renderer/date.d.ts

@@ -16,6 +16,7 @@ export declare const DATE: import("vue").DefineComponent<{
             decimal_length: string | number;
             regular_expression: string | RegExp;
             regular_error_tip: string;
+            message: string;
         }>>;
     };
     valueFormat: {
@@ -39,6 +40,7 @@ export declare const DATE: import("vue").DefineComponent<{
             decimal_length: string | number;
             regular_expression: string | RegExp;
             regular_error_tip: string;
+            message: string;
         }>>;
     };
     valueFormat: {

package/es/components/form-render/src/components/renderer/formItem.js

@@ -1 +1 @@
-import{defineComponent as e,inject as r,computed as o,createVNode as t,mergeProps as l}from"vue";import{arrayed as n,widthAppend as i}from"../../../../../shared/utils/index.js";import{isVoidField as m}from"@formily/core";import{connect as s,mapProps as a}from"@formily/vue";import{isString as u,isArray as f}from"lodash-es";import{NFormItem as d}from"naive-ui";import p from"../../../../annotation-edit/index.js";import"../../../index.js";import v from"../tooltipMessage.vue.js";import{InjectionAnnotation as c,InjectionFormUUID as _}from"../../constants/index.js";import{useComplexOptionsSpan as g}from"../../hooks/useComplexOptions.js";import{dotEscape as y}from"../../utils/schema.js";import{useFormField as b}from"../../hooks/useFormField.js";import{validateMessageParser as j}from"../../utils/index.js";const x=s(e({props:{label:String,propertyKey:String,remark:String,span:{type:Number,default:6},annotation:{},fieldItem:{}},setup(e,{slots:n}){const m=r(c),s=o({get(){var r,o;return null!=(o=null==(r=m.value)?void 0:r[e.propertyKey])?o:""},set(r){m.value={property:e.propertyKey,value:r}}});const a=o((()=>m.value&&!1!==e.annotation)),u=o((()=>e.label&&" "!==e.label)),{field:f,fieldKey:j}=b(),x=r(_),I=o((()=>y(`${x}-${j.value}`))),h=o((()=>{let r=0;return a.value&&(r+=18),e.remark&&(r+=18),r}));function k(){return u.value?t("section",{class:"form-render__formItemLabel"},[t("span",{class:"form-render__formItemLabel--text",style:{marginRight:i(h.value)}},[e.label]),h.value?t("section",{class:"form-render__formItemLabel--operation"},[e.remark?t("div",{class:"form-render__formItemLabel--tooltip"},[t(v,{message:e.remark},null)]):null,a.value?t(p,{class:"form-render__formItemLabel--annotation",modelValue:s.value,"onUpdate:modelValue":e=>s.value=e},null):null]):null]):null}const{getSpan:L}=g();return()=>t(d,l({class:"form-render__formItem",style:{"--form-item-column":L(x,f.value.address)+e.span}},{id:I.value,"widget-type":f.value.componentType,"form-field":j.value}),{...n,label:k})}}),a({title:"label"},((e,r)=>{const o=m(r)?void 0:n(r.selfErrors).length?function(e,r){if(!u(r.defined_error_msg)||!r.defined_error_msg)return e.map((e=>j(e,r))).join(",");return j(r.defined_error_msg,r)}(n(r.selfErrors),e.fieldItem):void 0,t=m(r)?function(e){return!!(e&&f(e.suffixConfig)&&e.suffixConfig.length)&&"0"==`${e.is_null}`}(e.fieldItem):r.required;return{...e,fieldItem:void 0,required:t,feedback:o,"validation-status":o?"error":void 0}})));export{x as FORM_ITEM};
+import{defineComponent as e,inject as r,computed as o,createVNode as t,mergeProps as l}from"vue";import{arrayed as n,widthAppend as i}from"../../../../../shared/utils/index.js";import{isVoidField as m}from"@formily/core";import{connect as s,mapProps as a}from"@formily/vue";import{isString as f,isArray as u}from"lodash-es";import{NFormItem as d}from"naive-ui";import p from"../../../../annotation-edit/index.js";import"../../../index.js";import v from"../tooltipMessage.vue.js";import{InjectionAnnotation as c,InjectionFormUUID as g}from"../../constants/index.js";import{useComplexOptionsSpan as _}from"../../hooks/useComplexOptions.js";import{dotEscape as y}from"../../utils/schema.js";import{useFormField as b}from"../../hooks/useFormField.js";import{validateMessageParser as x}from"../../utils/index.js";const j=s(e({props:{label:String,propertyKey:String,remark:String,span:{type:Number,default:6},annotation:{},fieldItem:{}},setup(e,{slots:n}){const m=r(c),s=o({get(){var r,o;return null!=(o=null==(r=m.value)?void 0:r[e.propertyKey])?o:""},set(r){m.value={property:e.propertyKey,value:r}}});const a=o((()=>m.value&&!1!==e.annotation)),f=o((()=>e.label&&" "!==e.label)),{field:u,fieldKey:x}=b(),j=r(g),I=o((()=>y(`${j}-${x.value}`))),k=o((()=>{let r=0;return a.value&&(r+=18),e.remark&&(r+=18),r}));function h(){return f.value?t("section",{class:"form-render__formItemLabel"},[t("span",{class:"form-render__formItemLabel--text",style:{marginRight:i(k.value)}},[e.label]),k.value?t("section",{class:"form-render__formItemLabel--operation"},[e.remark?t("div",{class:"form-render__formItemLabel--tooltip"},[t(v,{message:e.remark},null)]):null,a.value?t(p,{class:"form-render__formItemLabel--annotation",modelValue:s.value,"onUpdate:modelValue":e=>s.value=e},null):null]):null]):null}const{getSpan:L}=_();return()=>t(d,l({class:"form-render__formItem",style:{"--form-item-column":L(j,u.value.address)+e.span}},{id:I.value,"widget-type":u.value.componentType,"form-field":x.value}),{...n,label:h})}}),a({title:"label"},((e,r)=>{const o=m(r)?void 0:n(r.selfErrors).length?function(e,r){if(!f(r.defined_error_msg)||!r.defined_error_msg)return e.map((e=>x(e,r))).join(",");return x(r.defined_error_msg,r)}(n(r.selfErrors),e.fieldItem):void 0,t=m(r)?function(e,r){return!!(r&&u(r.suffixConfig)&&r.suffixConfig.length)&&[r,...r.suffixConfig].some((r=>{const o=e.form.query(r.val_key).take();if(o)return Reflect.get(o,"required")}))}(r,e.fieldItem):r.required;return{...e,fieldItem:void 0,required:t,feedback:o,"validation-status":o?"error":void 0}})));export{j as FORM_ITEM};

package/es/components/form-render/src/hooks/useFieldListAdaptor.js

@@ -1 +1 @@
-import{arrayed as e,deepOmit as o}from"../../../../shared/utils/index.js";import{cloneDeep as t,pick as n}from"lodash-es";import"../../index.js";import{parseNumberFromMaybeString as r,formRenderLog as i}from"../utils/index.js";import{useFieldNormalize as s}from"./useFieldNormalize.js";import{fieldKeyEscape as a,createLinebarId as p}from"../utils/schema.js";import{useFormValidator as l}from"./useFormValidator.js";import{transformDateFormat as c}from"../utils/business.js";function m(e,o){Object.assign(e["x-component-props"],{...n(o,["wordbook","autograph"])})}function u(u){const{createValidatorSchema:d}=l(),f=e=>{var t;const n={name:e.val_key,type:null!=(t=e.fieldType)?t:"string",title:e.alias||e.name,"x-component":e.html_type,default:e.default_val,"x-component-props":{placeholder:e.placeholder,clearable:"0"===e.is_empty,...e.componentProps||{}},"x-content":e.slots,"x-display":"0"===e.is_show?"hidden":"visible","x-pattern":"0"===e.is_edit?"disabled":"editable"};e.reactions&&(n["x-reactions"]=e.reactions),e.noDecorator||Object.assign(n,{"x-decorator":"FORM_ITEM","x-decorator-props":{fieldItem:o(e,["reactions"]),span:2*(e.elem_width||3),showLabel:"1"!==e.hide_title,remark:e.remark,propertyKey:e.val_key,annotation:e.annotation,...e.decoratorProps||{}}});const r=d(e);return r&&(n["x-validator"]=r),"0"===e.is_null&&(n.required=!0),n},x=e=>{const o=f(e);e.urlConfig?function(e,o){Object.assign(e["x-component-props"],{...n(o,["urlConfig"])})}(o,e):e.autograph&&m(o,e);const t="0"===e.multi_select;return Object.assign(o["x-component-props"],{multiple:t,options:e.option,maxTagCount:r(e.multi_select_value),...n(e,["lazyRequest","requestCache"])}),t&&(o.type="array"),o},_=e=>{const o=f(e);return Object.assign(o["x-component-props"],{options:e.option,vertical:e.__vertical}),m(o,e),o},h=e=>{const t=f(e);return Object.assign(t["x-component-props"],{fieldItem:o(e,["reactions"])}),t},g=e=>({name:e.val_key,type:"void",title:e.alias||e.name,"x-component":"LINEBAR","x-display":"visible","x-component-props":{disabled:"1"===e.is_not_fold,id:p(e.val_key),show:"0"!==e.is_show,remark:e.remark}}),y=new Map([["LINEBAR",g],["LINE_BREAKS",e=>({name:e.val_key,type:"void",title:e.alias||e.name,"x-component":"LINE_BREAKS","x-display":"0"===e.is_show?"hidden":"visible"})],["INPUT",e=>{const o=f(e);return Object.assign(o["x-component-props"],{...n(e,["prefix","suffix"])}),o}],["INPUT_NUMBER",e=>{const o=f(e),{decimal_length:t,validate:n}=e;return Object.assign(o["x-component-props"],{precision:t||(null==n?void 0:n.decimal_length),prefix:e.prefix,suffix:e.suffix}),o}],["SELECT",x],["REMOTE_SEARCH",x],["DATE",e=>{const o=f(e);return Object.assign(o["x-component-props"],{valueFormat:e.date_format,type:c(e.date_format),validate:e.validate}),o}],["LEVEL_SEARCH_CASCADER",e=>{const o=f(e);return Object.assign(o["x-component-props"],{...n(e,["wordbook","lazyRequest","autograph"])}),o}],["SEARCH_CASCADER",e=>{var o;const t=f(e);return Object.assign(t["x-component-props"],{urlConfig:e.urlConfig,depth:null==(o=e.wordbook)?void 0:o.level_num,options:e.option}),t}],["COMBINATION",e=>{const o=f(e);return o.type="array",!1!==e.jsonCombination&&(o["x-component"]="JSON_COMBINATION"),Object.assign(o["x-decorator-props"],{showLabel:!1,showFeedback:!1}),Object.assign(o["x-component-props"],{title:e.alias||e.name,maxGroupNum:e.maxGroupNum,getProperties:()=>e.children||[]}),o}],["RADIO",_],["CHECKBOX",_],["SWITCH",e=>{const o=f(e);return Object.assign(o["x-component-props"],{openDescription:e.open,closeDescription:e.close}),o}],["SLIDER",e=>{const o=f(e);return Object.assign(o["x-component-props"],{step:r(e.step_length),max:r(e.max_length),min:r(e.min_length),option:e.option}),o}],["COMPLEX",e=>{const o=f(e);Array.isArray(e.properties)&&i("COMPLEX控件的properties属性已经废弃, 请使用children作为替代, 在之后的版本中properties属性将不再支持");const t=Array.isArray(e.properties||e.children)?C(e.properties||e.children):{};return o.type=e.fieldType||"void",o.properties=t,Object.assign(o["x-decorator-props"],{showFeedback:!1}),Object.assign(o["x-component-props"],n(e,["wrapperStyle","display"])),o}]]),b=e=>{if(e.suffixConfig)return v(e);return(y.get(e.html_type)||h)(e)},v=o=>{if(!o.suffixConfig)return b(o);const t=e(o.suffixConfig),n=[{...o,hide_title:"1",suffixConfig:void 0}].concat(t.map((e=>({...e,hide_title:"1",is_show:o.is_show})))),r=f(o);return Object.assign(r,{type:"void",name:a(n),title:o.alias||o.name,"x-component":"INPUT_GROUP","x-component-props":{span:2*(o.elem_width||3)},properties:C(n)}),r},{FieldNormalizeWaterfallHook:O}=s();function C(o){let n=null;return o.reduce(((e,o,s)=>{var a;const p=null==(a=(o=O.call(t(o))).validate)?void 0:a.obj_type;return p&&u.collect(p,t(o)),"LINEBAR"===o.html_type?(e[i(o)]=r(g(o),s),n=e[i(o)].properties={}):n?n[i(o)]=r(b(o),s):(n=null,e[i(o)]=r(b(o),s)),e}),{});function r(e,o){return e["x-index"]=o,e}function i(o){return o.suffixConfig?a([o,...e(o.suffixConfig)]):o.val_key}}return{schemaAdaptor:C}}export{u as useFieldListAdaptor};
+import{arrayed as e,deepOmit as o}from"../../../../shared/utils/index.js";import{cloneDeep as t,pick as n}from"lodash-es";import"../../index.js";import{parseNumberFromMaybeString as r,formRenderLog as i}from"../utils/index.js";import{useFieldNormalize as s}from"./useFieldNormalize.js";import{fieldKeyEscape as a,createLinebarId as p}from"../utils/schema.js";import{useFormValidator as l}from"./useFormValidator.js";import{transformDateFormat as c}from"../utils/business.js";function m(e,o){Object.assign(e["x-component-props"],{...n(o,["wordbook","autograph"])})}function u(u){const{createValidatorSchema:d}=l(),f=e=>{var t;const n={name:e.val_key,type:null!=(t=e.fieldType)?t:"string",title:e.alias||e.name,"x-component":e.html_type,default:e.default_val,"x-component-props":{placeholder:e.placeholder,clearable:"0"===e.is_empty,...e.componentProps||{}},"x-content":e.slots,"x-display":"0"===e.is_show?"hidden":"visible","x-pattern":"0"===e.is_edit?"disabled":"editable"};e.reactions&&(n["x-reactions"]=e.reactions),e.noDecorator||Object.assign(n,{"x-decorator":"FORM_ITEM","x-decorator-props":{fieldItem:o(e,["reactions"]),span:2*(e.elem_width||3),showLabel:"1"!==e.hide_title,remark:e.remark,propertyKey:e.val_key,annotation:e.annotation,...e.decoratorProps||{}}});const r=d(e);return r&&(n["x-validator"]=r),"0"===e.is_null&&(n.required=!0),n},x=e=>{const o=f(e);e.urlConfig?function(e,o){Object.assign(e["x-component-props"],{...n(o,["urlConfig"])})}(o,e):e.autograph&&m(o,e);const t="0"===e.multi_select;return Object.assign(o["x-component-props"],{multiple:t,options:e.option,maxTagCount:r(e.multi_select_value),...n(e,["lazyRequest","requestCache"])}),t&&(o.type="array"),o},_=e=>{const o=f(e);return Object.assign(o["x-component-props"],{options:e.option,vertical:e.__vertical}),m(o,e),o},h=e=>{const t=f(e);return Object.assign(t["x-component-props"],{fieldItem:o(e,["reactions"])}),t},g=e=>({name:e.val_key,type:"void",title:e.alias||e.name,"x-component":"LINEBAR","x-display":"visible","x-component-props":{disabled:"1"===e.is_not_fold,id:p(e.val_key),show:"0"!==e.is_show,remark:e.remark}}),y=new Map([["LINEBAR",g],["LINE_BREAKS",e=>({name:e.val_key,type:"void",title:e.alias||e.name,"x-component":"LINE_BREAKS","x-display":"0"===e.is_show?"hidden":"visible"})],["INPUT",e=>{const o=f(e);return Object.assign(o["x-component-props"],{...n(e,["prefix","suffix"])}),o}],["INPUT_NUMBER",e=>{const o=f(e),{decimal_length:t,validate:n}=e;return Object.assign(o["x-component-props"],{precision:null!=t?t:null==n?void 0:n.decimal_length,prefix:e.prefix,suffix:e.suffix}),o}],["SELECT",x],["REMOTE_SEARCH",x],["DATE",e=>{const o=f(e);return Object.assign(o["x-component-props"],{valueFormat:e.date_format,type:c(e.date_format),validate:e.validate}),o}],["LEVEL_SEARCH_CASCADER",e=>{const o=f(e);return Object.assign(o["x-component-props"],{...n(e,["wordbook","lazyRequest","autograph"])}),o}],["SEARCH_CASCADER",e=>{var o;const t=f(e);return Object.assign(t["x-component-props"],{urlConfig:e.urlConfig,depth:null==(o=e.wordbook)?void 0:o.level_num,options:e.option}),t}],["COMBINATION",e=>{const o=f(e);return o.type="array",!1!==e.jsonCombination&&(o["x-component"]="JSON_COMBINATION"),Object.assign(o["x-decorator-props"],{showLabel:!1,showFeedback:!1}),Object.assign(o["x-component-props"],{title:e.alias||e.name,maxGroupNum:e.maxGroupNum,getProperties:()=>e.children||[]}),o}],["RADIO",_],["CHECKBOX",_],["SWITCH",e=>{const o=f(e);return Object.assign(o["x-component-props"],{openDescription:e.open,closeDescription:e.close}),o}],["SLIDER",e=>{const o=f(e);return Object.assign(o["x-component-props"],{step:r(e.step_length),max:r(e.max_length),min:r(e.min_length),option:e.option}),o}],["COMPLEX",e=>{const o=f(e);Array.isArray(e.properties)&&i("COMPLEX控件的properties属性已经废弃, 请使用children作为替代, 在之后的版本中properties属性将不再支持");const t=Array.isArray(e.properties||e.children)?C(e.properties||e.children):{};return o.type=e.fieldType||"void",o.properties=t,Object.assign(o["x-decorator-props"],{showFeedback:!1}),Object.assign(o["x-component-props"],n(e,["wrapperStyle","display"])),o}]]),b=e=>{if(e.suffixConfig)return v(e);return(y.get(e.html_type)||h)(e)},v=o=>{if(!o.suffixConfig)return b(o);const t=e(o.suffixConfig),n=[{...o,hide_title:"1",suffixConfig:void 0}].concat(t.map((e=>({...e,hide_title:"1",is_show:o.is_show})))),r=f(o);return Object.assign(r,{type:"void",name:a(n),title:o.alias||o.name,"x-component":"INPUT_GROUP","x-component-props":{span:2*(o.elem_width||3)},properties:C(n)}),r},{FieldNormalizeWaterfallHook:O}=s();function C(o){let n=null;return o.reduce(((e,o,s)=>{var a;const p=null==(a=(o=O.call(t(o))).validate)?void 0:a.obj_type;return p&&u.collect(p,t(o)),"LINEBAR"===o.html_type?(e[i(o)]=r(g(o),s),n=e[i(o)].properties={}):n?n[i(o)]=r(b(o),s):(n=null,e[i(o)]=r(b(o),s)),e}),{});function r(e,o){return e["x-index"]=o,e}function i(o){return o.suffixConfig?a([o,...e(o.suffixConfig)]):o.val_key}}return{schemaAdaptor:C}}export{u as useFieldListAdaptor};

package/es/components/form-render/src/hooks/useFormEvent.js

@@ -1 +1 @@
-import{arrayed as e,findAncestor as t}from"../../../../shared/utils/index.js";import{isField as r}from"@formily/core";import{Path as o}from"@formily/path";import{isObject as n}from"@vue/shared";import{isArray as i,isFunction as s}from"lodash-es";import{nextTick as m}from"vue";import"../../index.js";import{FormItemLineBarDepKeyPrepend as a,NESTED_FORM_ITEM_TYPE as u}from"../constants/index.js";import{useComplexOptionsKey as l}from"./useComplexOptions.js";import{queryDecorator as f,queryInput as d,findNextWidget as c}from"../utils/dom.js";import{validateMessageParser as p,combineExtendKey as g,splitExtendKey as v}from"../utils/index.js";import{getParentLinebar as y}from"../utils/schema.js";function h({formModel:t,formRenderRef:s,formUUID:u,getFieldList:c,formItemDepsCollector:h}){const{combineComplexOptionKey:x}=l();return{validate(r="*"){return t.validate(r).catch((e=>Promise.reject(Array.isArray(e)?e.reduce(o,[]):e)));function o(t,r){if(!n(r))return t;let o=!1;return i(r.messages)&&r.messages.forEach((r=>{n(r)&&(t.push(...e(r).map(m)),o=!0)})),!o&&t.push(m(r)),t}function m(e){if(e.decoratorElement)return e;const r=t.query(e.path),o=r.get("title"),n=e.messages.map((e=>function(e,t){return t&&t.fieldItem?p(e,t.fieldItem):e}(e,r.get("decoratorProps")))),i=f(e.path,s.value,u);return{...e,messages:n,title:o,decoratorElement:i,...d(e.decoratorElement)}}},getFormValues(e=!0,r=!0){let o=t.getFormState().values;return e&&(o=g(c(),o)),r&&(o=x(c(),o)),o},setFormValues(e,n=!0){n&&(e=v(c(),e)),t.setFieldState("*",(t=>{r(t)&&(t.value=o.getIn(e,t.path))}))},setFieldState(e,r){t.setFieldState(e,r)},resetFields:(e="*")=>t.reset(e),queryWidget:async e=>s.value?await async function(e,t,r){if(!s.value)return i();const o=f(e,t,u);if(o)return i(o);const n=y(e,r);return n?(h.trigger(a+n,!0),await m(),i(f(e,t,u))):i();function i(e){return{decoratorElement:e,...d(e)}}}(e,s.value,c()):null}}function x({props:e,formRenderRef:r,formModel:o}){return{onKeydown:function n(i){var m;if(!e.enterToNextWidget||!r.value)return;const a=t(i.target,(e=>e.classList.contains("form-render__formItem")));if(!a)return;const l=`.form-render__formItem${u.map((e=>`:not([widget-type=${e}])`)).join("")}`,f=Array.from(r.value.querySelectorAll(l)),d=f.findIndex((e=>e.id===a.id));if(!~d)return;const{widget:p,field:g}=c(f,d,i.target);if(!p)return;const v=g&&o.query(g).take();v&&s(e.enterToNextWidget)&&(e.enterToNextWidget(null==(m=v.decoratorProps)?void 0:m.fieldItem)?null==p||p.focus():n({target:p}))}}}export{x as useFormDomEvent,h as useFormExposeEvent};
+import{arrayed as e,findAncestor as t}from"../../../../shared/utils/index.js";import{isField as r}from"@formily/core";import{Path as o}from"@formily/path";import{isObject as n}from"@vue/shared";import{isArray as i,isFunction as s}from"lodash-es";import{nextTick as m}from"vue";import"../../index.js";import{FormItemLineBarDepKeyPrepend as a,NESTED_FORM_ITEM_TYPE as l}from"../constants/index.js";import{useComplexOptionsKey as u}from"./useComplexOptions.js";import{queryDecorator as f,queryInput as d,findNextWidget as c}from"../utils/dom.js";import{validateMessageParser as p,combineExtendKey as g,splitExtendKey as v}from"../utils/index.js";import{getParentLinebar as y}from"../utils/schema.js";function h({formModel:t,formRenderRef:s,formUUID:l,getFieldList:c,formItemDepsCollector:h}){const{combineComplexOptionKey:x}=u();return{validate(r="*"){return t.validate(r).catch((e=>Promise.reject(Array.isArray(e)?e.reduce(o,[]):e)));function o(t,r){if(!n(r))return t;let o=!1;return i(r.messages)&&r.messages.forEach((r=>{n(r)&&(t.push(...e(r).map(m)),o=!0)})),!o&&t.push(m(r)),t}function m(e){if(e.decoratorElement)return e;const r=t.query(e.path),o=r.get("title"),i=e.messages.map((e=>function(e,t){var r;return t&&n(t.fieldItem)?p(null!=(r=t.fieldItem.defined_error_msg)?r:e,t.fieldItem):e}(e,r.get("decoratorProps")))),m=f(e.path,s.value,l);return{...e,messages:i,title:o,decoratorElement:m,...d(e.decoratorElement)}}},getFormValues(e=!0,r=!0){let o=t.getFormState().values;return e&&(o=g(c(),o)),r&&(o=x(c(),o)),o},setFormValues(e,n=!0){n&&(e=v(c(),e)),t.setFieldState("*",(t=>{r(t)&&(t.value=o.getIn(e,t.path))}))},setFieldState(e,r){t.setFieldState(e,r)},resetFields:(e="*")=>t.reset(e),queryWidget:async e=>s.value?await async function(e,t,r){if(!s.value)return i();const o=f(e,t,l);if(o)return i(o);const n=y(e,r);return n?(h.trigger(a+n,!0),await m(),i(f(e,t,l))):i();function i(e){return{decoratorElement:e,...d(e)}}}(e,s.value,c()):null}}function x({props:e,formRenderRef:r,formModel:o}){return{onKeydown:function n(i){var m;if(!e.enterToNextWidget||!r.value)return;const a=t(i.target,(e=>e.classList.contains("form-render__formItem")));if(!a)return;const u=`.form-render__formItem${l.map((e=>`:not([widget-type=${e}])`)).join("")}`,f=Array.from(r.value.querySelectorAll(u)),d=f.findIndex((e=>e.id===a.id));if(!~d)return;const{widget:p,field:g}=c(f,d,i.target);if(!p)return;const v=g&&o.query(g).take();v&&s(e.enterToNextWidget)&&(e.enterToNextWidget(null==(m=v.decoratorProps)?void 0:m.fieldItem)?null==p||p.focus():n({target:p}))}}}export{x as useFormDomEvent,h as useFormExposeEvent};

package/es/components/form-render/src/types/fieldItem.d.ts

@@ -5,6 +5,7 @@ import { DependKeyType, FormCommonState, FormRequestType } from '../../../../../
 export * from '@formily/core';
 declare type FieldBusinessType = 'password' | 'id_card' | 'age' | 'age_unit' | 'mobile' | 'telephone' | 'email' | 'sex' | 'birthday' | 'bank_card' | 'website' | 'gestational_weeks' | 'gestational_stage' | 'customer_name';
 declare type HtmlType = 'INPUT' | 'SELECT' | 'LINEBAR' | 'LINE_BREAKS' | 'INPUT_NUMBER' | 'REMOTE_SEARCH' | 'DATE' | 'LEVEL_SEARCH_CASCADER' | 'SEARCH_CASCADER' | 'COMBINATION' | 'RADIO' | 'CHECKBOX' | 'SWITCH' | 'SLIDER' | 'COMPLEX' | 'SEARCH' | 'PHONE_TYPE' | 'IDCARD_TYPE' | 'SEARCH_MORE' | 'DIGITAL' | 'CHECKBOX_BLOCK' | 'RADIO_BLOCK' | 'DATE-INPUT' | 'DATETIME-INPUT' | 'SWITCH_COMPONENT' | 'SLIDER_COMPONENT' | 'LEVEL_SEARCH_CASCADE' | 'SEARCH_CASCADE' | ({} & string);
+declare type ValidateType = 'mobile' | 'integer' | 'number' | 'id_card' | 'regular' | string;
 export declare type ValidateItem = Partial<{
     /**
      * 业务类型
@@ -13,7 +14,7 @@ export declare type ValidateItem = Partial<{
     /**
      * 校验类型
      */
-    vali_obj: string;
+    vali_obj: ValidateType;
     max_value: string | number;
     min_value: string | number;
     min_length: string | number;
@@ -21,6 +22,7 @@ export declare type ValidateItem = Partial<{
     decimal_length: string | number;
     regular_expression: RegExp | string;
     regular_error_tip: string;
+    message: string;
     [key: string]: any;
 }>;
 export interface FormOptionItem {