cnhis-design-vue 3.1.41-beta.4 → 3.1.41-beta.5

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

@@ -581,7 +581,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 clearSpan: (uuid: string) => void;
                 exposeEvent: {
                     validate(path?: string): Promise<void>;
-                    getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                    getFormValues(needCombineExtendKey?: boolean): any;
                     setFormValues(values: import("../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                     setFieldState(path: string, handler: (field: Partial<Pick<import("@formily/core").Field<any, any, any, any>, import("@formily/core").NonFunctionPropertyNames<{
                         match: (pattern: import("@formily/path").Pattern) => boolean;
@@ -3151,7 +3151,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 clearSpan: (uuid: string) => void;
                 exposeEvent: {
                     validate(path?: string): Promise<void>;
-                    getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                    getFormValues(needCombineExtendKey?: boolean): any;
                     setFormValues(values: import("../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                     setFieldState(path: string, handler: (field: Partial<Pick<import("@formily/core").Field<any, any, any, any>, import("@formily/core").NonFunctionPropertyNames<{
                         match: (pattern: import("@formily/path").Pattern) => boolean;

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

@@ -582,7 +582,7 @@ declare const _default: import("vue").DefineComponent<{
                 clearSpan: (uuid: string) => void;
                 exposeEvent: {
                     validate(path?: string): Promise<void>;
-                    getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                    getFormValues(needCombineExtendKey?: boolean): any;
                     setFormValues(values: import("../../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                     setFieldState(path: string, handler: (field: Partial<Pick<import("@formily/core").Field<any, any, any, any>, import("@formily/core").NonFunctionPropertyNames<{
                         match: (pattern: import("@formily/path").Pattern) => boolean;
@@ -3152,7 +3152,7 @@ declare const _default: import("vue").DefineComponent<{
                 clearSpan: (uuid: string) => void;
                 exposeEvent: {
                     validate(path?: string): Promise<void>;
-                    getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                    getFormValues(needCombineExtendKey?: boolean): any;
                     setFormValues(values: import("../../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                     setFieldState(path: string, handler: (field: Partial<Pick<import("@formily/core").Field<any, any, any, any>, import("@formily/core").NonFunctionPropertyNames<{
                         match: (pattern: import("@formily/path").Pattern) => boolean;

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

@@ -429,7 +429,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             clearSpan: (uuid: string) => void;
             exposeEvent: {
                 validate(path?: string): Promise<void>;
-                getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                getFormValues(needCombineExtendKey?: boolean): any;
                 setFormValues(values: import("../../../../shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                 setFieldState(path: string, handler: (field: Partial<Pick<import("../../../../../es/components/form-render").Field<any, any, any, any>, import("../../../../../es/components/form-render").NonFunctionPropertyNames<{
                     match: (pattern: import("@formily/path").Pattern) => boolean;

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

@@ -2154,7 +2154,7 @@ declare const _default: import("vue").DefineComponent<{
             clearSpan: (uuid: string) => void;
             exposeEvent: {
                 validate(path?: string): Promise<void>;
-                getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                getFormValues(needCombineExtendKey?: boolean): any;
                 setFormValues(values: import("../../../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                 setFieldState(path: string, handler: (field: Partial<Pick<import("../../../../../es/components/form-render").Field<any, any, any, any>, import("../../../../../es/components/form-render").NonFunctionPropertyNames<{
                     match: (pattern: import("@formily/path").Pattern) => boolean;

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

@@ -416,7 +416,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         clearSpan: (uuid: string) => void;
         exposeEvent: {
             validate(path?: string): Promise<void>;
-            getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+            getFormValues(needCombineExtendKey?: boolean): any;
             setFormValues(values: import("../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
             setFieldState(path: string, handler: (field: Partial<Pick<import("@formily/core/esm/models/Field").Field<any, any, any, any>, import("@formily/core/esm/types").NonFunctionPropertyNames<{
                 match: (pattern: import("@formily/path").Pattern) => boolean;

package/es/components/form-render/src/FormRender.vue.d.ts

@@ -410,7 +410,7 @@ declare const _default: import("vue").DefineComponent<{
     clearSpan: (uuid: string) => void;
     exposeEvent: {
         validate(path?: string): Promise<void>;
-        getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+        getFormValues(needCombineExtendKey?: boolean): any;
         setFormValues(values: AnyObject, needSplitExtendKey?: boolean): void;
         setFieldState(path: string, handler: (field: Partial<Pick<import("@formily/core").Field<any, any, any, any>, import("@formily/core").NonFunctionPropertyNames<{
             match: (pattern: import("@formily/path").Pattern) => boolean;

package/es/components/form-render/src/FormRender.vue.js

@@ -1 +1 @@
-import{defineComponent as e,ref as o,computed as t,provide as r,onMounted as s,onUnmounted as a,openBlock as i,createBlock as l,unref as n,withCtx as m,createElementBlock as p,createVNode as u,isRef as d,Fragment as c,renderList as f,createCommentVNode as h,createElementVNode as y,normalizeStyle as j,withKeys as v,withModifiers as g,toDisplayString as b}from"vue";import{createForm as k,onFieldValueChange as F,onFieldMount as x,onFieldUnmount as C,onFieldReact as H,onFormMount as S}from"@formily/core";import{FormProvider as A,FormConsumer as R}from"@formily/vue";import{isNumber as _,cloneDeep as L}from"lodash-es";import{NForm as O,NTabs as w,NTabPane as B,NConfigProvider as V}from"naive-ui";import{InjectionFormGraph as I}from"./constants/index.js";import{useAutoHidden as N}from"./hooks/useAutoHidden.js";import{useComplexOptionsSpan as D}from"./hooks/useComplexOptions.js";import{useFormDomEvent as q,useFormExposeEvent as U}from"./hooks/useFormEvent.js";import{useFormGraph as W}from"./hooks/useFormGraph.js";import{useFormRenderLifeCycle as G}from"./hooks/useFormRenderLifeCycle.js";import{useLowCodeReactions as K}from"./hooks/useLowCodeReactions.js";import{useNuiThemeOverrides as M}from"./hooks/useNuiThemeOverrides.js";import"./utils/index.js";import{useFieldListAdaptor as T}from"./hooks/useFieldListAdaptor.js";import"../../../shared/utils/index.js";import"../index.js";import{useFieldVisitor as E}from"./hooks/useFieldVisitor.js";import"../../../shared/utils/tapable/SyncHook.js";import"../../../shared/utils/tapable/SyncBailHook.js";import"../../../shared/utils/tapable/SyncWaterfallHook.js";import"../../../shared/utils/tapable/SyncLoopHook.js";import"../../../shared/utils/tapable/AsyncParallelHook.js";import"../../../shared/utils/tapable/AsyncParallelBailHook.js";import"../../../shared/utils/tapable/AsyncSeriesHook.js";import"../../../shared/utils/tapable/AsyncSeriesBailHook.js";import"../../../shared/utils/tapable/AsyncSeriesLoopHook.js";import"../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js";import{validateMessageLocale as P}from"./hooks/useFormValidator.js";import"@vueuse/core";import"date-fns";import{useAnchor as J}from"./hooks/useAnchor.js";import{useFormContext as z}from"./hooks/useFormContext.js";import"./hooks/useFormRenderOptions.js";import Q from"../../../_virtual/plugin-vue_export-helper.js";import{createObjSchema as X}from"./utils/schema.js";const Y={key:0,style:{height:"54px"}},Z={style:{"white-space":"pre"}};var $=Q(e({__name:"FormRender",props:{fieldList:{type:Array},initialData:{type:Object,default:()=>({})},fieldVisitor:{type:Object},column:{type:Number,default:24},maxHeight:{type:[Number,String],default:""},anchor:{type:Boolean,default:!1},parallelism:{type:Number,default:3},businessFormatter:{type:Function},schema:{type:Object},components:{type:Object,default:()=>({})},scope:{type:Object,default:()=>({})},annotation:{type:Object},consumer:{type:Boolean,default:!1},uuid:{type:String},lifeCycle:{type:Object},requestInstance:{type:Object},enterToNextWidget:{type:[Boolean,Function],default:!0},lowCodeReactions:{type:Array},linebarAutoHidden:{type:Boolean}},emits:["formChange","annotationChange","scroll"],setup(e,{expose:Q,emit:$}){const ee=e,{nuiThemeOverrides:oe}=M();P();const te=o(),re=t((()=>_(ee.maxHeight)?ee.maxHeight+"px":ee.maxHeight)),{SchemaField:se,businessCollector:ae,formItemDepsCollector:ie,changeContextCollector:le,formUUID:ne}=z(ee,$),{anchorBarRef:me,currentAnchor:pe,generateAnchorList:ue,updateAnchorList:de,anchorIdList:ce,onScroll:fe}=J(ee,$,te,ie);G(ee).callLifeCycle("onSetup");const{trigger:he}=N(),{observeFormGraph:ye,setGraph:je,removeGraph:ve}=W();r(I,ye);const ge=k({initialValues:ee.initialData,effects(e){F("*",(o=>{const t=o.props.name.toString();ae.trigger(e,t),ie.trigger(t),$("formChange",{fieldInstance:o,fieldKey:t,fieldName:o.title,value:o.value,context:le.getContext(t,o.value)}),be(t,o.value)})),x("*",je),C("*",ve),ee.linebarAutoHidden&&(H("*",he),S((e=>e.query("*").forEach(he)))),ee.anchor&&(H("*",de),S(ue))}}),{lowCodeReactionsHandler:be,triggerAllReactionsHandler:ke}=K(t((()=>ee.lowCodeReactions)),ge);s(ke);const{schemaAdaptor:Fe}=T(ae);let xe=ee.fieldList||[];const Ce=t((()=>ee.schema?ee.schema:ee.fieldList?(xe=E().traverse(L(ee.fieldList),ee.fieldVisitor),X(Fe(xe))):X({}))),{onKeydown:He}=q({formModel:ge,formRenderRef:te,props:ee}),{clearSpan:Se}=D();a((()=>Se(ne)));const Ae=U({formModel:ge,formRenderRef:te,formItemDepsCollector:ie,getFieldList:()=>xe,formUUID:ne});return Q({formModel:ge,validate:(e="*")=>Ae.validate(e),getFormValues:(e=!0,o=!0)=>Ae.getFormValues(e,o),setFormValues:(e,o=!0)=>Ae.setFormValues(e,o),setFieldState(e,o){Ae.setFieldState(e,o)},resetFields(e="*"){Ae.resetFields(e)},queryWidget:async e=>Ae.queryWidget(e),async reload(){console.error("reload function is abstract,it should be overwrite!")}}),(o,t)=>(i(),l(n(O),{class:"form-render","require-mark-placement":"left"},{default:m((()=>[e.anchor?(i(),p("section",Y,[u(n(w),{value:n(pe),"onUpdate:value":t[0]||(t[0]=e=>d(pe)?pe.value=e:null),type:"line",ref_key:"anchorBarRef",ref:me},{default:m((()=>[(i(!0),p(c,null,f(n(ce),(e=>(i(),l(n(B),{name:e.name,tab:e.title,key:e.name},null,8,["name","tab"])))),128))])),_:1},8,["value"])])):h("v-if",!0),u(n(V),{"theme-overrides":n(oe)},{default:m((()=>[y("section",{class:"form-render__wrapper",style:j({"--column":e.column,"--form-height":n(re)}),ref_key:"formRenderRef",ref:te,onScroll:t[1]||(t[1]=(...e)=>n(fe)&&n(fe)(...e)),onKeydownCapture:t[2]||(t[2]=v(g(((...e)=>n(He)&&n(He)(...e)),["prevent"]),["enter"]))},[u(n(A),{form:n(ge)},{default:m((()=>[u(n(se),{schema:n(Ce)},null,8,["schema"]),e.consumer?(i(),l(n(R),{key:0},{default:m((({form:e})=>[y("div",Z,b(JSON.stringify(e.values,null,2)),1)])),_:1})):h("v-if",!0)])),_:1},8,["form"])],36)])),_:1},8,["theme-overrides"])])),_:1}))}}),[["__file","FormRender.vue"]]);export{$ as default};
+import{defineComponent as e,ref as o,computed as t,provide as r,onMounted as s,onUnmounted as a,openBlock as i,createBlock as l,unref as n,withCtx as m,createElementBlock as p,createVNode as u,isRef as d,Fragment as c,renderList as f,createCommentVNode as h,createElementVNode as y,normalizeStyle as j,withKeys as v,withModifiers as g,toDisplayString as b}from"vue";import{createForm as k,onFieldValueChange as F,onFieldMount as x,onFieldUnmount as C,onFieldReact as H,onFormMount as S}from"@formily/core";import{FormProvider as A,FormConsumer as R}from"@formily/vue";import{isNumber as _,cloneDeep as L}from"lodash-es";import{NForm as O,NTabs as w,NTabPane as B,NConfigProvider as V}from"naive-ui";import{InjectionFormGraph as I}from"./constants/index.js";import{useAutoHidden as N}from"./hooks/useAutoHidden.js";import{useComplexOptionsSpan as D}from"./hooks/useComplexOptions.js";import{useFormDomEvent as q,useFormExposeEvent as U}from"./hooks/useFormEvent.js";import{useFormGraph as W}from"./hooks/useFormGraph.js";import{useFormRenderLifeCycle as G}from"./hooks/useFormRenderLifeCycle.js";import{useLowCodeReactions as K}from"./hooks/useLowCodeReactions.js";import{useNuiThemeOverrides as M}from"./hooks/useNuiThemeOverrides.js";import"./utils/index.js";import{useFieldListAdaptor as T}from"./hooks/useFieldListAdaptor.js";import"../../../shared/utils/index.js";import"../index.js";import{useFieldVisitor as E}from"./hooks/useFieldVisitor.js";import"../../../shared/utils/tapable/SyncHook.js";import"../../../shared/utils/tapable/SyncBailHook.js";import"../../../shared/utils/tapable/SyncWaterfallHook.js";import"../../../shared/utils/tapable/SyncLoopHook.js";import"../../../shared/utils/tapable/AsyncParallelHook.js";import"../../../shared/utils/tapable/AsyncParallelBailHook.js";import"../../../shared/utils/tapable/AsyncSeriesHook.js";import"../../../shared/utils/tapable/AsyncSeriesBailHook.js";import"../../../shared/utils/tapable/AsyncSeriesLoopHook.js";import"../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js";import{validateMessageLocale as P}from"./hooks/useFormValidator.js";import"@vueuse/core";import"date-fns";import{useAnchor as J}from"./hooks/useAnchor.js";import{useFormContext as z}from"./hooks/useFormContext.js";import"./hooks/useFormRenderOptions.js";import Q from"../../../_virtual/plugin-vue_export-helper.js";import{createObjSchema as X}from"./utils/schema.js";const Y={key:0,style:{height:"54px"}},Z={style:{"white-space":"pre"}};var $=Q(e({__name:"FormRender",props:{fieldList:{type:Array},initialData:{type:Object,default:()=>({})},fieldVisitor:{type:Object},column:{type:Number,default:24},maxHeight:{type:[Number,String],default:""},anchor:{type:Boolean,default:!1},parallelism:{type:Number,default:3},businessFormatter:{type:Function},schema:{type:Object},components:{type:Object,default:()=>({})},scope:{type:Object,default:()=>({})},annotation:{type:Object},consumer:{type:Boolean,default:!1},uuid:{type:String},lifeCycle:{type:Object},requestInstance:{type:Object},enterToNextWidget:{type:[Boolean,Function],default:!0},lowCodeReactions:{type:Array},linebarAutoHidden:{type:Boolean}},emits:["formChange","annotationChange","scroll"],setup(e,{expose:Q,emit:$}){const ee=e,{nuiThemeOverrides:oe}=M();P();const te=o(),re=t((()=>_(ee.maxHeight)?ee.maxHeight+"px":ee.maxHeight)),{SchemaField:se,businessCollector:ae,formItemDepsCollector:ie,changeContextCollector:le,formUUID:ne}=z(ee,$),{anchorBarRef:me,currentAnchor:pe,generateAnchorList:ue,updateAnchorList:de,anchorIdList:ce,onScroll:fe}=J(ee,$,te,ie);G(ee).callLifeCycle("onSetup");const{trigger:he}=N(),{observeFormGraph:ye,setGraph:je,removeGraph:ve}=W();r(I,ye);const ge=k({initialValues:ee.initialData,effects(e){F("*",(o=>{const t=o.props.name.toString();ae.trigger(e,t),ie.trigger(t),$("formChange",{fieldInstance:o,fieldKey:t,fieldName:o.title,value:o.value,context:le.getContext(t,o.value)}),be(t,o.value)})),x("*",je),C("*",ve),ee.linebarAutoHidden&&(H("*",he),S((e=>e.query("*").forEach(he)))),ee.anchor&&(H("*",de),S(ue))}}),{lowCodeReactionsHandler:be,triggerAllReactionsHandler:ke}=K(t((()=>ee.lowCodeReactions)),ge);s(ke);const{schemaAdaptor:Fe}=T(ae);let xe=ee.fieldList||[];const Ce=t((()=>ee.schema?ee.schema:ee.fieldList?(xe=E().traverse(L(ee.fieldList),ee.fieldVisitor),X(Fe(xe))):X({}))),{onKeydown:He}=q({formModel:ge,formRenderRef:te,props:ee}),{clearSpan:Se}=D();a((()=>Se(ne)));const Ae=U({formModel:ge,formRenderRef:te,formItemDepsCollector:ie,getFieldList:()=>xe,formUUID:ne});return Q({formModel:ge,validate:(e="*")=>Ae.validate(e),getFormValues:(e=!0)=>Ae.getFormValues(e),setFormValues:(e,o=!0)=>Ae.setFormValues(e,o),setFieldState(e,o){Ae.setFieldState(e,o)},resetFields(e="*"){Ae.resetFields(e)},queryWidget:async e=>Ae.queryWidget(e),async reload(){console.error("reload function is abstract,it should be overwrite!")}}),(o,t)=>(i(),l(n(O),{class:"form-render","require-mark-placement":"left"},{default:m((()=>[e.anchor?(i(),p("section",Y,[u(n(w),{value:n(pe),"onUpdate:value":t[0]||(t[0]=e=>d(pe)?pe.value=e:null),type:"line",ref_key:"anchorBarRef",ref:me},{default:m((()=>[(i(!0),p(c,null,f(n(ce),(e=>(i(),l(n(B),{name:e.name,tab:e.title,key:e.name},null,8,["name","tab"])))),128))])),_:1},8,["value"])])):h("v-if",!0),u(n(V),{"theme-overrides":n(oe)},{default:m((()=>[y("section",{class:"form-render__wrapper",style:j({"--column":e.column,"--form-height":n(re)}),ref_key:"formRenderRef",ref:te,onScroll:t[1]||(t[1]=(...e)=>n(fe)&&n(fe)(...e)),onKeydownCapture:t[2]||(t[2]=v(g(((...e)=>n(He)&&n(He)(...e)),["prevent"]),["enter"]))},[u(n(A),{form:n(ge)},{default:m((()=>[u(n(se),{schema:n(Ce)},null,8,["schema"]),e.consumer?(i(),l(n(R),{key:0},{default:m((({form:e})=>[y("div",Z,b(JSON.stringify(e.values,null,2)),1)])),_:1})):h("v-if",!0)])),_:1},8,["form"])],36)])),_:1},8,["theme-overrides"])])),_:1}))}}),[["__file","FormRender.vue"]]);export{$ as default};

package/es/components/form-render/src/FormRenderWrapper.vue.d.ts

@@ -413,7 +413,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         clearSpan: (uuid: string) => void;
         exposeEvent: {
             validate(path?: string): Promise<void>;
-            getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+            getFormValues(needCombineExtendKey?: boolean): any;
             setFormValues(values: import("../../../shared/types").AnyObject, needSplitExtendKey?: boolean): void;
             setFieldState(path: string, handler: (field: Partial<Pick<import("../../../../es/components/form-render").Field<any, any, any, any>, import("../../../../es/components/form-render").NonFunctionPropertyNames<{
                 match: (pattern: import("@formily/path").Pattern) => boolean;

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

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

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

@@ -1 +1 @@
-import{defineComponent as e,createVNode as o,isVNode as t}from"vue";import{connect as a,mapProps as l}from"@formily/vue";import{NSpace as r,NRadio as u,NRadioGroup as i,NCheckbox as n,NCheckboxGroup as p}from"naive-ui";import"../../../index.js";import{useComplexOptions as s}from"../../hooks/useComplexOptions.js";import"../../utils/index.js";import{useAutographOptions as m}from"../../hooks/useFormRenderOptions.js";import{useCommonInjection as v}from"../../hooks/useCommonInjection.js";import{assignUpdateValue as c,createVisitedSetter as d}from"../../utils/schema.js";import{useFormField as f}from"../../hooks/useFormField.js";function y(a,l,u){return e({name:a,props:{value:{type:[String,Number,Object,Array]},options:{type:Array,default:()=>[]},autograph:{type:String},lazyRequest:{type:Boolean,default:!1},requestCache:{type:Boolean,default:!0},wordbook:{type:Object},vertical:{type:Boolean,default:!1},onChange:{}},emits:["update:value"],setup(e,{emit:a}){const{field:i}=f(),{renderComplexOption:n,checkValueRef:p,valueRef:c}=s(e,a),{labelKey:y,valueKey:j,options:b}=m(e,c),{injectValueBindKey:h,injectValueValidate:k}=v();k(c);const C=h(c);return()=>o(l,{key:C.value,value:c.value,"onUpdate:value":e=>c.value=e,onClick:d(i)},{default:()=>[o(r,{vertical:e.vertical,"vertical-space":e.vertical},{default:()=>{var e;return[null==(e=b.value)?void 0:e.map((e=>{let a;return o(u,{key:e[j.value],value:e[j.value],disabled:e.disabled},"function"==typeof(l=a=n({value:p.value,option:e,valueKey:j.value,labelKey:y.value}))||"[object Object]"===Object.prototype.toString.call(l)&&!t(l)?a:{default:()=>[a]});var l}))]}})]})}})}const j=a(y("FormRadio",i,u),l({dataSource:"options"},c)),b=a(y("FormCheckbox",p,n),l({dataSource:"options"},c));export{b as CHECKBOX,j as RADIO};
+import{defineComponent as e,createVNode as o,isVNode as t}from"vue";import{connect as a,mapProps as r}from"@formily/vue";import{NSpace as l,NRadio as u,NRadioGroup as i,NCheckbox as n,NCheckboxGroup as p}from"naive-ui";import"../../../index.js";import{useComplexOptions as s}from"../../hooks/useComplexOptions.js";import"../../utils/index.js";import{useAutographOptions as m}from"../../hooks/useFormRenderOptions.js";import{useCommonInjection as v}from"../../hooks/useCommonInjection.js";import{assignUpdateValue as c,createVisitedSetter as d}from"../../utils/schema.js";import{useFormField as f}from"../../hooks/useFormField.js";function y(a,r,u){return e({name:a,props:{value:{type:[String,Number,Object,Array]},options:{type:Array,default:()=>[]},autograph:{type:String},lazyRequest:{type:Boolean,default:!1},requestCache:{type:Boolean,default:!0},wordbook:{type:Object},vertical:{type:Boolean,default:!1},onChange:{}},emits:["update:value"],setup(e,{emit:a}){const{field:i}=f(),{renderComplexOption:n,valueRef:p}=s(e,a),{labelKey:c,valueKey:y,options:j}=m(e,p),{injectValueBindKey:b,injectValueValidate:h}=v();h(p);const k=b(p);return()=>o(r,{key:k.value,value:p.value,"onUpdate:value":e=>p.value=e,onClick:d(i)},{default:()=>[o(l,{vertical:e.vertical,"vertical-space":e.vertical},{default:()=>{var e;return[null==(e=j.value)?void 0:e.map((e=>{let a;return o(u,{key:e[y.value],value:e[y.value],disabled:e.disabled},"function"==typeof(r=a=n({value:p.value,option:e,valueKey:y.value,labelKey:c.value}))||"[object Object]"===Object.prototype.toString.call(r)&&!t(r)?a:{default:()=>[a]});var r}))]}})]})}})}const j=a(y("FormRadio",i,u),r({dataSource:"options"},c)),b=a(y("FormCheckbox",p,n),r({dataSource:"options"},c));export{b as CHECKBOX,j as RADIO};

package/es/components/form-render/src/hooks/useComplexOptions.d.ts

@@ -1,8 +1,8 @@
 import { AnyObject, Func } from '../../../../../es/shared/types';
 import { Path } from '@formily/path';
-import { FieldItem, FormOptionItem } from '../../../../../es/components/form-render';
+import { FormOptionItem } from '../../../../../es/components/form-render';
 declare function setSpan(uuid: string, address: Path | string, span?: number): void;
-declare function getSpan(uuid: string, address: Path | string): number;
+declare function getSpan(uuid: string, address: Path | string, withSelf?: boolean): number;
 declare function deleteSpan(uuid: string, address: Path | string): void;
 declare function clearSpan(uuid: string): void;
 export declare function useComplexOptions(props: {
@@ -17,7 +17,6 @@ export declare function useComplexOptions(props: {
     }) => any[];
     valueRef: import("vue").WritableComputedRef<unknown>;
     hasComplexOption: import("vue").ComputedRef<boolean>;
-    checkValueRef: import("vue").Ref<any>;
 };
 export declare function useComplexOptionsSpan(): {
     getSpan: typeof getSpan;
@@ -25,7 +24,4 @@ export declare function useComplexOptionsSpan(): {
     deleteSpan: typeof deleteSpan;
     clearSpan: typeof clearSpan;
 };
-export declare function useComplexOptionsKey(): {
-    combineComplexOptionKey: (fieldList: FieldItem[], values: AnyObject) => AnyObject;
-};
 export {};

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

@@ -1 +1 @@
-import{reactive as e,defineComponent as t,inject as n,computed as l,watch as r,onUnmounted as u,onMounted as a,createVNode as o,withModifiers as i,ref as s}from"vue";import{checkInSetupEnv as c,jsonParse as p}from"../../../../shared/utils/index.js";import{RecursionField as d}from"@formily/vue";import{sumBy as v,property as m,noop as f,isObject as h,isArray as y,isString as b,cloneDeep as g,isNumber as x}from"lodash-es";import"../../index.js";import{InjectionFormUUID as j,InjectionBusinessCollector as F}from"../constants/index.js";import{useFormField as O}from"./useFormField.js";import{useFieldListAdaptor as S}from"./useFieldListAdaptor.js";import{createObjSchema as k}from"../utils/schema.js";const C=e(new Map);function K(e,t,n=0){C.set(e,C.get(e)||{});C.get(e)[t+""]=n}function w(e,t){const n=C.get(e);return n?Object.entries(n).reduce(((e,[n,l])=>n===t+""||n.startsWith(`${t}.`)?e+l:e),0):0}function A(e,t){const n=C.get(e);n&&Reflect.deleteProperty(n,t+"")}function R(e){C.delete(e)}const $=t({props:{fields:{type:Array,default:()=>[]},name:{type:String,required:!0}},setup(e){const t=n(j),{field:s}=O(),c=n(F),{schemaAdaptor:p}=S(c);function h(e){return Object.assign(e,{"x-decorator-props":{...e["x-decorator-props"],labelPlacement:"left",showFeedback:!1,showLabel:!!e.title},"x-component-props":{...e["x-component-props"],size:"small"}})}const y=l((()=>{const t=p(e.fields);return Object.values(t).forEach(h),k(t)})),b=l((()=>v(Object.values(y.value.properties||[]),m("x-decorator-props.span")))),g=l((()=>`${s.value.address.toString()}.${e.name}`));function x(){return s.value.form.query(g.value).take()}return r(b,(e=>{K(t,g.value,e)}),{immediate:!0}),u((()=>{const e=x();e&&(e.display="none"),A(t,g.value)})),a((()=>{const e=x();e&&(e.display="visible")})),()=>o("section",{onClick:i(f,["stop"]),class:"form-render__labelField",style:{"--column":w(t,g.value)}},[o(d,{name:e.name,schema:y.value},null)])}});function _(e){return e.some((e=>y(e.childrenFields)&&e.childrenFields.length))}function q(e,t){c();const{fieldKey:n}=O(),u=l((()=>_(e.options)));const a=s(),i=l({get(){return t=u.value?a.value:e.value,x(t)?t+"":t;var t},set(l){if(!u.value)return t("update:value",l);h(e.value)&&(e.value[n.value]=l,a.value=l)}});function d(e,t,n="value"){if(y(e)?e.includes(t[n]):e===t[n])return y(t.childrenFields)&&t.childrenFields.length}return r(a,(()=>{u.value&&h(e.value)&&(e.value[n.value]=a.value)})),r([()=>e.value,u],(([e,l])=>{if(l){if(y(e))return a.value=e,t("update:value",{[n.value]:e});if(b(e)){if(e.startsWith("{")){const l=g(p(e));return a.value=l[n.value],t("update:value",l)}return a.value=e,t("update:value",{[n.value]:e})}h(e)?a.value=e[n.value]:(a.value=void 0,t("update:value",{}))}}),{immediate:!0}),{renderComplexOption:function({value:e,option:t,valueKey:n="value",labelKey:l="label"}){return[t[l],u.value&&d(e,t,n)?o($,{fields:t.childrenFields,name:t[n]},null):null]},valueRef:i,hasComplexOption:u,checkValueRef:a}}function L(){return{getSpan:w,setSpan:K,deleteSpan:A,clearSpan:R}}function P(){return{combineComplexOptionKey:function(e,t){const n=e.reduce(((e,t)=>(e[t.val_key]=t,e)),{});return Object.entries(t).reduce(((e,[t,l])=>{const r=n[t];return r&&y(r.option)&&_(r.option)?e[t]=JSON.stringify(l):e[t]=l,e}),{})}}}export{q as useComplexOptions,P as useComplexOptionsKey,L as useComplexOptionsSpan};
+import{reactive as e,defineComponent as t,inject as r,provide as n,computed as o,watch as l,onUnmounted as a,onMounted as s,createVNode as i,withModifiers as u}from"vue";import{checkInSetupEnv as c}from"../../../../shared/utils/index.js";import{useField as p,useForm as d,RecursionField as m}from"@formily/vue";import{noop as f,isArray as v,isNumber as h}from"lodash-es";import"../../index.js";import{InjectionFormUUID as b,InjectionBusinessCollector as y}from"../constants/index.js";import{useFieldListAdaptor as j}from"./useFieldListAdaptor.js";import{createObjSchema as x}from"../utils/schema.js";const g=e(new Map);function F(e,t,r=0){g.set(e,g.get(e)||{});g.get(e)[t+""]=r}function O(e,t,r=!0){const n=g.get(e);return n?Object.entries(n).reduce(((e,[n,o])=>r&&n===`${t}`||n.startsWith(`${t}.`)?e+o:e),0):0}function $(e,t){const r=g.get(e);r&&Reflect.deleteProperty(r,t+"")}function E(e){g.delete(e)}const P=t({props:{fieldItems:{type:Array,default:()=>[]},name:{type:String,required:!0}},setup(e){const t=r(b),c=r(y),v=p(),h=r(t+"_virtualParent",""),g=`${h?h+".":""}${v.value.address}`;function E(e){return`${g}.${e}`}n(t+"_virtualParent",g);const{schemaAdaptor:P}=j(c);function S(e){return Object.assign(e,{"x-decorator-props":{...e["x-decorator-props"],labelPlacement:"left",showFeedback:!1,showLabel:!!e.title},"x-component-props":{...e["x-component-props"],size:"small"}})}const _=o((()=>{const t=P(e.fieldItems);return Object.values(t).forEach(S),x(t)}));l(_,(()=>{return e=_.value,void Object.values(e.properties||{}).forEach((e=>{var r;F(t,E(e.name),null==(r=null==e?void 0:e["x-decorator-props"])?void 0:r.span)}));var e}),{immediate:!0});const k=d();function I(){return e.fieldItems.map((e=>k.value.query(e.val_key).take()))}return a((()=>{var e;I().forEach((e=>{e&&(e.display="none")})),e=_.value,Object.values(e.properties||{}).forEach((e=>{$(t,E(e.name))}))})),s((()=>{I().forEach((e=>{e&&(e.display="visible")}))})),()=>{return i("section",{onClick:u(f,["stop"]),class:"form-render__labelField",style:{"--column":(e=_.value,Object.values(e.properties||{}).reduce(((e,r)=>e+O(t,E(r.name))),0))}},[i(m,{basePath:".",schema:_.value},null)]);var e}}});function S(e,t){c();const r=o((()=>e.options.some((e=>v(e.childrenFields)&&e.childrenFields.length))));function n(e,t,r="value"){if(v(e)?e.includes(t[r]):e===t[r])return v(t.childrenFields)&&t.childrenFields.length}return{renderComplexOption:function({value:e,option:t,valueKey:o="value",labelKey:l="label"}){return[t[l],r.value&&n(e,t,o)?i(P,{fieldItems:t.childrenFields,name:t[o]},null):null]},valueRef:o({get(){return t=e.value,h(t)?t+"":t;var t},set(e){t("update:value",e)}}),hasComplexOption:r}}function _(){return{getSpan:O,setSpan:F,deleteSpan:$,clearSpan:E}}export{S as useComplexOptions,_ as useComplexOptionsSpan};

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 d(d){const{createValidatorSchema:u}=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=u(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,allowCreate:"1"===e.free_entry,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,is_show:"1",hide_title:"1",suffixConfig:void 0}].concat(t.map((e=>({...e,hide_title:"1",is_show:"1"})))),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)},"x-decorator-props":{...r["x-decorator-props"],showFeedback:!1,suffixFields:n.map((e=>e.val_key))},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&&d.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{d 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 d(d){const{createValidatorSchema:u}=l(),x=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=u(e);return r&&(n["x-validator"]=r),"0"===e.is_null&&(n.required=!0),n},f=e=>{const o=x(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,allowCreate:"1"===e.free_entry||!!o["x-component-props"].allowCreate,maxTagCount:r(e.multi_select_value),...n(e,["lazyRequest","requestCache"])}),t&&(o.type="array"),o},_=e=>{const o=x(e);return Object.assign(o["x-component-props"],{options:e.option,vertical:e.__vertical}),m(o,e),o},h=e=>{const t=x(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=x(e);return Object.assign(o["x-component-props"],{...n(e,["prefix","suffix"])}),o}],["INPUT_NUMBER",e=>{const o=x(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",f],["REMOTE_SEARCH",f],["DATE",e=>{const o=x(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=x(e);return Object.assign(o["x-component-props"],{...n(e,["wordbook","lazyRequest","autograph"])}),o}],["SEARCH_CASCADER",e=>{var o;const t=x(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=x(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=x(e);return Object.assign(o["x-component-props"],{openDescription:e.open,closeDescription:e.close}),o}],["SLIDER",e=>{const o=x(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=x(e);Array.isArray(e.properties)&&i("COMPLEX控件的properties属性已经废弃, 请使用children作为替代, 在之后的版本中properties属性将不再支持");const t=Array.isArray(e.properties||e.children)?O(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,is_show:"1",hide_title:"1",suffixConfig:void 0}].concat(t.map((e=>({...e,hide_title:"1",is_show:"1"})))),r=x(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)},"x-decorator-props":{...r["x-decorator-props"],showFeedback:!1,suffixFields:n.map((e=>e.val_key))},properties:O(n)}),r},{FieldNormalizeWaterfallHook:C}=s();function O(o){let n=null;return o.reduce(((e,o,s)=>{var a;const p=null==(a=(o=C.call(t(o))).validate)?void 0:a.obj_type;return p&&d.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:O}}export{d as useFieldListAdaptor};

package/es/components/form-render/src/hooks/useFormEvent.d.ts

@@ -10,7 +10,7 @@ export declare function useFormExposeEvent({ formModel, formRenderRef, formUUID,
     formItemDepsCollector: FormItemDepsCollector;
 }): {
     validate(path?: string): Promise<void>;
-    getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+    getFormValues(needCombineExtendKey?: boolean): any;
     setFormValues(values: AnyObject, needSplitExtendKey?: boolean): void;
     setFieldState(path: string, handler: (field: IFieldState) => void): void;
     resetFields(path?: string): Promise<void>;

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 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};
+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 a}from"vue";import"../../index.js";import{FormItemLineBarDepKeyPrepend as m,NESTED_FORM_ITEM_TYPE as l}from"../constants/index.js";import{queryDecorator as u,queryInput as f,findNextWidget as d}from"../utils/dom.js";import{validateMessageParser as c,combineExtendKey as p,splitExtendKey as g}from"../utils/index.js";import{getParentLinebar as v}from"../utils/schema.js";function y({formModel:t,formRenderRef:s,formUUID:l,getFieldList:d,formItemDepsCollector:y}){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(a)),o=!0)})),!o&&t.push(a(r)),t}function a(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)?c(null!=(r=t.fieldItem.defined_error_msg)?r:e,t.fieldItem):e}(e,r.get("decoratorProps")))),a=u(e.path,s.value,l);return{...e,messages:i,title:o,decoratorElement:a,...f(e.decoratorElement)}}},getFormValues(e=!0){let r=t.getFormState().values;return e&&(r=p(d(),r)),r},setFormValues(e,n=!0){n&&(e=g(d(),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=u(e,t,l);if(o)return i(o);const n=v(e,r);return n?(y.trigger(m+n,!0),await a(),i(u(e,t,l))):i();function i(e){return{decoratorElement:e,...f(e)}}}(e,s.value,d()):null}}function h({props:e,formRenderRef:r,formModel:o}){return{onKeydown:function n(i){var a;if(!e.enterToNextWidget||!r.value)return;const m=t(i.target,(e=>e.classList.contains("form-render__formItem")));if(!m)return;const u=`.form-render__formItem${l.map((e=>`:not([widget-type=${e}])`)).join("")}`,f=Array.from(r.value.querySelectorAll(u)),c=f.findIndex((e=>e.id===m.id));if(!~c)return;const{widget:p,field:g}=d(f,c,i.target);if(!p)return;const v=g&&o.query(g).take();v&&s(e.enterToNextWidget)&&(e.enterToNextWidget(null==(a=v.decoratorProps)?void 0:a.fieldItem)?null==p||p.focus():n({target:p}))}}}export{h as useFormDomEvent,y as useFormExposeEvent};

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

@@ -1 +1 @@
-import{arrayed as e}from"../../../../shared/utils/index.js";import{once as a,isString as r}from"lodash-es";import"../utils/index.js";import{isFunction as s}from"@vueuse/core";import{registerValidateLocale as i}from"@formily/core";import{isIdCard as l}from"../utils/business.js";function t(){const a=new Map([["mobile",({validate:e})=>({format:"phone",message:null==e?void 0:e.message})],["integer",({validate:e})=>({format:"integer",message:null==e?void 0:e.message})],["number",({validate:e})=>({format:"number",message:null==e?void 0:e.message})],["id_card",({validate:e})=>({validator(a){var s;if(null!=a)return r(a)&&l(a)?void 0:null!=(s=null==e?void 0:e.message)?s:"该字段不是合法的身份证格式"}})],["regular",({validate:e,regular_expression:a,regular_error_tip:r})=>({pattern:a||(null==e?void 0:e.regular_expression)||"",message:r||(null==e?void 0:e.regular_error_tip)||(null==e?void 0:e.message)||"格式错误"})]]),i={triggerType:"onBlur"};return{createValidatorSchema:function(r){const l=[],{validate:{vali_obj:t,max_length:o,min_length:n,message:m,max_value:u,min_value:g,decimal_length:d}={},validator:v}=r;if(v&&e(v).forEach((e=>{s(e)&&l.push({validator:a=>e(a,r)})})),o&&l.push({max:o,message:m}),n&&l.push({min:n,message:m}),u&&l.push({maximum:u,message:m}),g&&l.push({minimum:g,message:m}),null!=d&&l.push(((e,a)=>{const r=null!=a?a:`小数位数最多${e}位`;return{validator(a){var s;return(null==(s=String(a).split(".")[1])?void 0:s.length)>e?r:""}}})(+d,m)),t){const e=a.get(t)||(({validate:e})=>({format:t,message:null==e?void 0:e.message}));l.push(Object.assign({},i,e(r)))}return l}}}const o=a((()=>{i({"zh-CN":{required:"${alias}为必填"}})}));export{t as useFormValidator,o as validateMessageLocale};
+import{arrayed as e}from"../../../../shared/utils/index.js";import{once as a,isString as r}from"lodash-es";import"../utils/index.js";import{isFunction as s}from"@vueuse/core";import{registerValidateLocale as i}from"@formily/core";import{isIdCard as l}from"../utils/business.js";function t(){const a=new Map([["mobile",({validate:e})=>({format:"phone",message:null==e?void 0:e.message})],["integer",({validate:e})=>({format:"integer",message:null==e?void 0:e.message})],["number",({validate:e})=>({format:"number",message:null==e?void 0:e.message})],["id_card",({validate:e})=>({validator(a){var s;if(null!=a&&""!==a)return r(a)&&l(a)?void 0:null!=(s=null==e?void 0:e.message)?s:"该字段不是合法的身份证格式"}})],["regular",({validate:e,regular_expression:a,regular_error_tip:r})=>({pattern:a||(null==e?void 0:e.regular_expression)||"",message:r||(null==e?void 0:e.regular_error_tip)||(null==e?void 0:e.message)||"格式错误"})]]),i={triggerType:"onBlur"};return{createValidatorSchema:function(r){const l=[],{validate:{vali_obj:t,max_length:o,min_length:n,message:m,max_value:u,min_value:g,decimal_length:d}={},validator:v}=r;if(v&&e(v).forEach((e=>{s(e)&&l.push({validator:a=>e(a,r)})})),o&&l.push({max:o,message:m}),n&&l.push({min:n,message:m}),u&&l.push({maximum:u,message:m}),g&&l.push({minimum:g,message:m}),null!=d&&l.push(((e,a)=>{const r=null!=a?a:`小数位数最多${e}位`;return{validator(a){var s;return(null==(s=String(a).split(".")[1])?void 0:s.length)>e?r:""}}})(+d,m)),t){const e=a.get(t)||(({validate:e})=>({format:t,message:null==e?void 0:e.message}));l.push(Object.assign({},i,e(r)))}return l}}}const o=a((()=>{i({"zh-CN":{required:"${alias}为必填"}})}));export{t as useFormValidator,o as validateMessageLocale};

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

@@ -28,7 +28,7 @@ export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & AgeCo
 export declare type FormRenderExpose = {
     formModel: Form;
     validate(path?: string): Promise<unknown>;
-    getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): AnyObject;
+    getFormValues(needCombineExtendKey?: boolean): AnyObject;
     setFormValues(values: AnyObject, needSplitExtendKey?: boolean): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
     resetFields(path?: string): void;

package/es/components/shortcut-setter/index.d.ts

@@ -2132,7 +2132,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             clearSpan: (uuid: string) => void;
             exposeEvent: {
                 validate(path?: string): Promise<void>;
-                getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                getFormValues(needCombineExtendKey?: boolean): any;
                 setFormValues(values: import("../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                 setFieldState(path: string, handler: (field: Partial<Pick<import("@formily/core").Field<any, any, any, any>, import("@formily/core").NonFunctionPropertyNames<{
                     match: (pattern: import("@formily/path").Pattern) => boolean;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -2134,7 +2134,7 @@ declare const _default: import("vue").DefineComponent<{
             clearSpan: (uuid: string) => void;
             exposeEvent: {
                 validate(path?: string): Promise<void>;
-                getFormValues(needCombineExtendKey?: boolean, needCombineOptionKey?: boolean): any;
+                getFormValues(needCombineExtendKey?: boolean): any;
                 setFormValues(values: import("../../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
                 setFieldState(path: string, handler: (field: Partial<Pick<import("../../../../es/components/form-render").Field<any, any, any, any>, import("../../../../es/components/form-render").NonFunctionPropertyNames<{
                     match: (pattern: import("@formily/path").Pattern) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.41-beta.4",
+	"version": "3.1.41-beta.5",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "3babf9efc7209fcd6709ef4cb17523bd14554067"
+	"gitHead": "5bf654a31b4e5d7bd9554908d1b2d6df40f1c549"
 }