cnhis-design-vue 3.1.42-beta.8 → 3.1.42-beta.80

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

@@ -135,6 +135,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         linebarAutoHidden: {
             type: BooleanConstructor;
         };
+        bordered: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
@@ -263,12 +267,17 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             linebarAutoHidden: {
                 type: BooleanConstructor;
             };
+            bordered: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
             onScroll?: ((...args: any[]) => any) | undefined;
             onAnnotationChange?: ((...args: any[]) => any) | undefined;
         }>>;
         emit: (event: "scroll" | "formChange" | "annotationChange", ...args: any[]) => void;
+        cssVars: import("vue").ComputedRef<import("vue").CSSProperties>;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
         formRenderRef: import("vue").Ref<HTMLElement | undefined>;
         formHeight: import("vue").ComputedRef<string>;
@@ -417,39 +426,39 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         exposeEvent: {
             validate(path?: string): Promise<void>;
             getFormValues(needCombineExtendKey?: boolean): any;
-            setFormValues(values: import("../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
+            setFormValues(values: import("../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean, overwrite?: 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;
                 validate: (triggerType?: import("@formily/validator").ValidatorTriggerType | undefined) => any;
                 data: any;
                 loading: boolean;
                 required: boolean;
-                hidden: boolean;
-                visible: boolean;
-                content: any;
-                reset: (options?: import("@formily/core/esm/types").IFieldResetOptions | undefined) => Promise<void>;
-                active: boolean;
-                disabled: boolean;
-                display: import("@formily/core/esm/types").FieldDisplayTypes;
                 value: string;
                 readonly index: string | number;
+                disabled: boolean;
                 onFocus: (...args: any[]) => Promise<void>;
                 onBlur: (...args: any[]) => Promise<void>;
                 onInput: (...args: any[]) => Promise<void>;
+                reset: (options?: import("@formily/core/esm/types").IFieldResetOptions | undefined) => Promise<void>;
+                title: string;
+                editable: boolean;
+                visible: boolean;
                 submit: <T>(onSubmit?: ((values: any) => void | Promise<T>) | undefined) => Promise<T>;
                 validator: import("@formily/core/esm/types").FieldValidator;
                 pattern: import("@formily/core/esm/types").FieldPatternTypes;
-                title: string;
+                content: any;
+                display: import("@formily/core/esm/types").FieldDisplayTypes;
+                hidden: boolean;
                 form: import("@formily/core/esm/models/Form").Form<any>;
                 componentProps: Record<string, any>;
                 decoratorProps: Record<string, any>;
                 description: string;
                 readOnly: boolean;
-                editable: boolean;
                 component: import("@formily/core/esm/types").FieldComponent<any, any>;
                 decorator: import("@formily/core/esm/types").FieldDecorator<any, any>;
                 validating: boolean;
                 submitting: boolean;
+                active: boolean;
                 visited: boolean;
                 selfModified: boolean;
                 modified: boolean;
@@ -536,7 +545,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             };
             readonly disabled: BooleanConstructor;
             readonly displayDirective: {
-                readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
+                readonly type: import("vue").PropType<"if" | "show" | "show:lazy">;
                 readonly default: "if";
             };
             readonly closable: {
@@ -561,7 +570,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             };
             readonly disabled: BooleanConstructor;
             readonly displayDirective: {
-                readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
+                readonly type: import("vue").PropType<"if" | "show" | "show:lazy">;
                 readonly default: "if";
             };
             readonly closable: {
@@ -575,7 +584,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         }>>, {
             readonly disabled: boolean;
             readonly closable: boolean | undefined;
-            readonly displayDirective: "show" | "if" | "show:lazy";
+            readonly displayDirective: "if" | "show" | "show:lazy";
         }>;
         NTabs: any;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange" | "annotationChange")[], "scroll" | "formChange" | "annotationChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -705,6 +714,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         linebarAutoHidden: {
             type: BooleanConstructor;
         };
+        bordered: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
         onScroll?: ((...args: any[]) => any) | undefined;
@@ -720,6 +733,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         consumer: boolean;
         enterToNextWidget: boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void);
         linebarAutoHidden: boolean;
+        bordered: boolean;
     }>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 export default FormRender;

package/es/components/form-render/index.js

@@ -1 +1 @@
-import{COMPONENT_NAMESPACE as e}from"../../shared/global/variable.js";import{safeComponentRegister as s}from"../../shared/utils/index.js";import r from"./src/FormRenderWrapper.vue.js";export{useFieldListAdaptor}from"./src/hooks/useFieldListAdaptor.js";export{useFormRequest}from"./src/hooks/useFormRequest.js";export{useCommonLog}from"./src/hooks/useCommonLog.js";export{useFormField}from"./src/hooks/useFormField.js";export{AsyncQueue,useAsyncQueue}from"./src/hooks/useAsyncQueue.js";export{useFieldVisitor}from"./src/hooks/useFieldVisitor.js";export{useFieldNormalize}from"./src/hooks/useFieldNormalize.js";export{useFormValidator,validateMessageLocale}from"./src/hooks/useFormValidator.js";export{BusinessCollector,useBusinessBinding}from"./src/hooks/useBusinessBinding.js";export{ContextCollector,useChangeContext}from"./src/hooks/useChangeContext.js";export{FormItemDepsCollector,useFormItemDeps}from"./src/hooks/useFormItemDeps.js";export{useAnchor}from"./src/hooks/useAnchor.js";export{useFormContext}from"./src/hooks/useFormContext.js";export{useCommonInjection,useSelectOptionProps}from"./src/hooks/useCommonInjection.js";export{searchContentMatcher,useAutographOptions,useRecommendOptions,useUrlConfigOptions}from"./src/hooks/useFormRenderOptions.js";export{combineExtendKey,createInputSlot,createSlot,createUrlConfigParams,formRenderLog,injectOrProvide,isNestedFieldType,isNestedType,keywordMatcher,mergeDeepProperties,parseNumberFromMaybeString,presetRequestHandler,splitExtendKey,validateMessageParser}from"./src/utils/index.js";export*from"@formily/core";export{businessDateParser,isIdCard,isMobile,parseAge2Birthday,parseAgeFromContext,parseBirthday,parseIdCard,transformDateFormat}from"./src/utils/business.js";export{findNextWidget,queryDecoratorByAddress,queryDecoratorByFieldKey,queryInput}from"./src/utils/dom.js";export{assignClearBindVisited,assignUpdateValue,assignValueBindKey,createLinebarId,createObjSchema,createVisitedSetter,dotEscape,fieldKeyEscape,getParentLinebar,traverseDependKey,traverseSchema}from"./src/utils/schema.js";const o=r;o.install=function(r){s(r,o,e+"FormRender")};export{o as default};
+import{COMPONENT_NAMESPACE as e}from"../../shared/global/variable.js";import{safeComponentRegister as s}from"../../shared/utils/index.js";import r from"./src/FormRenderWrapper.vue.js";export{useFieldListAdaptor}from"./src/hooks/useFieldListAdaptor.js";export{useFormRequest}from"./src/hooks/useFormRequest.js";export{useCommonLog}from"./src/hooks/useCommonLog.js";export{useFormField}from"./src/hooks/useFormField.js";export{useFormAsyncQueue}from"./src/hooks/useFormAsyncQueue.js";export{useFieldVisitor}from"./src/hooks/useFieldVisitor.js";export{useFieldNormalize}from"./src/hooks/useFieldNormalize.js";export{useFormValidator,validateMessageLocale}from"./src/hooks/useFormValidator.js";export{BusinessCollector,useBusinessBinding}from"./src/hooks/useBusinessBinding.js";export{ContextCollector,useChangeContext}from"./src/hooks/useChangeContext.js";export{FormItemDepsCollector,useFormItemDeps}from"./src/hooks/useFormItemDeps.js";export{useAnchor}from"./src/hooks/useAnchor.js";export{useFormContext}from"./src/hooks/useFormContext.js";export{useCommonInjection,useSelectOptionProps}from"./src/hooks/useCommonInjection.js";export{searchContentMatcher,useAutographOptions,useRecommendOptions,useUrlConfigOptions}from"./src/hooks/useFormRenderOptions.js";export{combineExtendKey,createInputSlot,createSlot,createUrlConfigParams,formRenderLog,injectOrProvide,isNestedFieldType,isNestedType,keywordMatcher,mergeDeepProperties,parseNumberFromMaybeString,presetRequestHandler,splitExtendKey,validateMessageParser}from"./src/utils/index.js";export*from"@formily/core";export{businessDateParser,isIdCard,isMobile,parseAge2Birthday,parseAgeFromContext,parseBirthday,parseIdCard,transformDateFormat}from"./src/utils/business.js";export{findNextWidget,queryDecoratorByAddress,queryDecoratorByFieldKey,queryInput}from"./src/utils/dom.js";export{assignClearBindVisited,assignUpdateValue,assignValueBindKey,createLinebarId,createObjSchema,createVisitedSetter,dotEscape,fieldKeyEscape,getParentLinebar,traverseDependKey,traverseSchema}from"./src/utils/schema.js";const o=r;o.install=function(r){s(r,o,e+"FormRender")};export{o as default};

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

@@ -129,6 +129,10 @@ declare const _default: import("vue").DefineComponent<{
     linebarAutoHidden: {
         type: BooleanConstructor;
     };
+    bordered: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -257,12 +261,17 @@ declare const _default: import("vue").DefineComponent<{
         linebarAutoHidden: {
             type: BooleanConstructor;
         };
+        bordered: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
         onScroll?: ((...args: any[]) => any) | undefined;
         onAnnotationChange?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "scroll" | "formChange" | "annotationChange", ...args: any[]) => void;
+    cssVars: import("vue").ComputedRef<import("vue").CSSProperties>;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
     formRenderRef: import("vue").Ref<HTMLElement | undefined>;
     formHeight: import("vue").ComputedRef<string>;
@@ -411,39 +420,39 @@ declare const _default: import("vue").DefineComponent<{
     exposeEvent: {
         validate(path?: string): Promise<void>;
         getFormValues(needCombineExtendKey?: boolean): any;
-        setFormValues(values: AnyObject, needSplitExtendKey?: boolean): void;
+        setFormValues(values: AnyObject, needSplitExtendKey?: boolean, overwrite?: 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;
             validate: (triggerType?: import("@formily/validator").ValidatorTriggerType | undefined) => any;
             data: any;
             loading: boolean;
             required: boolean;
-            hidden: boolean;
-            visible: boolean;
-            content: any;
-            reset: (options?: import("@formily/core").IFieldResetOptions | undefined) => Promise<void>;
-            active: boolean;
-            disabled: boolean;
-            display: import("@formily/core").FieldDisplayTypes;
             value: string;
             readonly index: string | number;
+            disabled: boolean;
             onFocus: (...args: any[]) => Promise<void>;
             onBlur: (...args: any[]) => Promise<void>;
             onInput: (...args: any[]) => Promise<void>;
+            reset: (options?: import("@formily/core").IFieldResetOptions | undefined) => Promise<void>;
+            title: string;
+            editable: boolean;
+            visible: boolean;
             submit: <T>(onSubmit?: ((values: any) => void | Promise<T>) | undefined) => Promise<T>;
             validator: import("@formily/core").FieldValidator;
             pattern: import("@formily/core").FieldPatternTypes;
-            title: string;
+            content: any;
+            display: import("@formily/core").FieldDisplayTypes;
+            hidden: boolean;
             form: import("@formily/core").Form<any>;
             componentProps: Record<string, any>;
             decoratorProps: Record<string, any>;
             description: string;
             readOnly: boolean;
-            editable: boolean;
             component: import("@formily/core").FieldComponent<any, any>;
             decorator: import("@formily/core").FieldDecorator<any, any>;
             validating: boolean;
             submitting: boolean;
+            active: boolean;
             visited: boolean;
             selfModified: boolean;
             modified: boolean;
@@ -530,7 +539,7 @@ declare const _default: import("vue").DefineComponent<{
         };
         readonly disabled: BooleanConstructor;
         readonly displayDirective: {
-            readonly type: PropType<"show" | "if" | "show:lazy">;
+            readonly type: PropType<"if" | "show" | "show:lazy">;
             readonly default: "if";
         };
         readonly closable: {
@@ -555,7 +564,7 @@ declare const _default: import("vue").DefineComponent<{
         };
         readonly disabled: BooleanConstructor;
         readonly displayDirective: {
-            readonly type: PropType<"show" | "if" | "show:lazy">;
+            readonly type: PropType<"if" | "show" | "show:lazy">;
             readonly default: "if";
         };
         readonly closable: {
@@ -569,7 +578,7 @@ declare const _default: import("vue").DefineComponent<{
     }>>, {
         readonly disabled: boolean;
         readonly closable: boolean | undefined;
-        readonly displayDirective: "show" | "if" | "show:lazy";
+        readonly displayDirective: "if" | "show" | "show:lazy";
     }>;
     NTabs: any;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange" | "annotationChange")[], "scroll" | "formChange" | "annotationChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -699,6 +708,10 @@ declare const _default: import("vue").DefineComponent<{
     linebarAutoHidden: {
         type: BooleanConstructor;
     };
+    bordered: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
     onScroll?: ((...args: any[]) => any) | undefined;
@@ -714,5 +727,6 @@ declare const _default: import("vue").DefineComponent<{
     consumer: boolean;
     enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
     linebarAutoHidden: boolean;
+    bordered: boolean;
 }>;
 export default _default;

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

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

@@ -133,6 +133,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         linebarAutoHidden: {
             type: BooleanConstructor;
         };
+        bordered: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
@@ -261,12 +265,17 @@ declare const _default: import("vue").DefineComponent<{}, {
             linebarAutoHidden: {
                 type: BooleanConstructor;
             };
+            bordered: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
             onScroll?: ((...args: any[]) => any) | undefined;
             onAnnotationChange?: ((...args: any[]) => any) | undefined;
         }>>;
         emit: (event: "scroll" | "formChange" | "annotationChange", ...args: any[]) => void;
+        cssVars: import("vue").ComputedRef<import("vue").CSSProperties>;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
         formRenderRef: import("vue").Ref<HTMLElement | undefined>;
         formHeight: import("vue").ComputedRef<string>;
@@ -415,39 +424,39 @@ declare const _default: import("vue").DefineComponent<{}, {
         exposeEvent: {
             validate(path?: string): Promise<void>;
             getFormValues(needCombineExtendKey?: boolean): any;
-            setFormValues(values: import("../../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean): void;
+            setFormValues(values: import("../../../../es/shared/types").AnyObject, needSplitExtendKey?: boolean, overwrite?: 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;
                 validate: (triggerType?: import("@formily/validator").ValidatorTriggerType | undefined) => any;
                 data: any;
                 loading: boolean;
                 required: boolean;
-                hidden: boolean;
-                visible: boolean;
-                content: any;
-                reset: (options?: import("../../../../es/components/form-render").IFieldResetOptions | undefined) => Promise<void>;
-                active: boolean;
-                disabled: boolean;
-                display: import("../../../../es/components/form-render").FieldDisplayTypes;
                 value: string;
                 readonly index: string | number;
+                disabled: boolean;
                 onFocus: (...args: any[]) => Promise<void>;
                 onBlur: (...args: any[]) => Promise<void>;
                 onInput: (...args: any[]) => Promise<void>;
+                reset: (options?: import("../../../../es/components/form-render").IFieldResetOptions | undefined) => Promise<void>;
+                title: string;
+                editable: boolean;
+                visible: boolean;
                 submit: <T>(onSubmit?: ((values: any) => void | Promise<T>) | undefined) => Promise<T>;
                 validator: import("../../../../es/components/form-render").FieldValidator;
                 pattern: import("../../../../es/components/form-render").FieldPatternTypes;
-                title: string;
+                content: any;
+                display: import("../../../../es/components/form-render").FieldDisplayTypes;
+                hidden: boolean;
                 form: import("../../../../es/components/form-render").Form<any>;
                 componentProps: Record<string, any>;
                 decoratorProps: Record<string, any>;
                 description: string;
                 readOnly: boolean;
-                editable: boolean;
                 component: import("../../../../es/components/form-render").FieldComponent<any, any>;
                 decorator: import("../../../../es/components/form-render").FieldDecorator<any, any>;
                 validating: boolean;
                 submitting: boolean;
+                active: boolean;
                 visited: boolean;
                 selfModified: boolean;
                 modified: boolean;
@@ -534,7 +543,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             };
             readonly disabled: BooleanConstructor;
             readonly displayDirective: {
-                readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
+                readonly type: import("vue").PropType<"if" | "show" | "show:lazy">;
                 readonly default: "if";
             };
             readonly closable: {
@@ -559,7 +568,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             };
             readonly disabled: BooleanConstructor;
             readonly displayDirective: {
-                readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
+                readonly type: import("vue").PropType<"if" | "show" | "show:lazy">;
                 readonly default: "if";
             };
             readonly closable: {
@@ -573,7 +582,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>, {
             readonly disabled: boolean;
             readonly closable: boolean | undefined;
-            readonly displayDirective: "show" | "if" | "show:lazy";
+            readonly displayDirective: "if" | "show" | "show:lazy";
         }>;
         NTabs: any;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange" | "annotationChange")[], "scroll" | "formChange" | "annotationChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -703,6 +712,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         linebarAutoHidden: {
             type: BooleanConstructor;
         };
+        bordered: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
         onScroll?: ((...args: any[]) => any) | undefined;
@@ -718,6 +731,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         consumer: boolean;
         enterToNextWidget: boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void);
         linebarAutoHidden: boolean;
+        bordered: boolean;
     }>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

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

@@ -1 +1 @@
-import{defineComponent as e,ref as o,computed as t,watch as r,inject as i,createVNode as n}from"vue";import{isObjectField as a}from"@formily/core";import{RecursionField as m,connect as s}from"@formily/vue";import{AddCircleOutline as l,RemoveCircle as u}from"@vicons/ionicons5";import{isNumber as p,isArray as c,range as d}from"lodash-es";import{NButton as f,NIcon as v}from"naive-ui";import"../../../index.js";import{InjectionBusinessCollector as y}from"../../constants/index.js";import"../../utils/index.js";import{useFormField as x}from"../../hooks/useFormField.js";import{useFieldListAdaptor as h}from"../../hooks/useFieldListAdaptor.js";import{createObjSchema as b}from"../../utils/schema.js";const _=s(e({name:"FormCombination",props:{title:{type:String,default:""},value:{type:Array},maxGroupNum:{type:Number},disabled:{type:Boolean},getProperties:{type:Function,default:()=>[]},onInput:{},onBlur:{},onChange:{}},emits:["update:value"],setup(e){const{field:s,fieldKey:_}=x(),j=o(1),C=t((()=>p(e.maxGroupNum)?e.maxGroupNum<1?0:~~e.maxGroupNum:1/0));function g(){j.value++}r((()=>e.value),(e=>{c(e)&&(j.value=Math.min(Math.max(e.length,1),C.value))}),{immediate:!0});const k=i(y),{schemaAdaptor:F}=h(k);return()=>n("section",{class:"form-render__combination"},[n("header",{class:"form-render__combinationHeader"},[n("div",{class:"form-render__combinationHeaderText"},[e.title]),n(f,{onClick:g,type:"info",text:!0,disabled:j.value>=C.value||e.disabled},{icon:()=>n(v,{component:l},null),default:()=>"新增"})]),d(j.value).map(((o,t)=>n("section",{class:"form-render__combinationContent"},[n(m,{schema:b(F(e.getProperties())),name:t},null),n(f,{text:!0,type:"error",class:"form-render__combinationClose",onClick:()=>async function(e){if(j.value>1)j.value--,await s.value.remove(e);else{const o=s.value.query(`${_.value}.${e}`).take();if(!o||!a(o))return;await o.reset()}}(t)},{icon:()=>n(v,{component:u},null)})])))])}}));export{_ as COMBINATION};
+import{defineComponent as e,ref as o,computed as t,watch as r,inject as i,createVNode as n}from"vue";import{isObjectField as a}from"@formily/core";import{RecursionField as m,connect as l}from"@formily/vue";import{AddCircleOutline as s,RemoveCircle as u}from"@vicons/ionicons5";import{isNumber as c,isArray as p,range as d}from"lodash-es";import{NButton as f,NIcon as v}from"naive-ui";import"../../../index.js";import{InjectionBusinessCollector as y}from"../../constants/index.js";import"../../utils/index.js";import{useFormField as x}from"../../hooks/useFormField.js";import{useFieldListAdaptor as h}from"../../hooks/useFieldListAdaptor.js";import{createObjSchema as b}from"../../utils/schema.js";const _=l(e({name:"FormCombination",props:{title:{type:String,default:""},value:{type:Array},maxGroupNum:{type:Number},disabled:{type:Boolean},getProperties:{type:Function,default:()=>[]},onInput:{},onBlur:{},onChange:{}},emits:["update:value"],setup(e){const{field:l,fieldKey:_}=x(),j=o(1),C=t((()=>c(e.maxGroupNum)?e.maxGroupNum<1?0:~~e.maxGroupNum:1/0));function g(){j.value++}r((()=>e.value),(e=>{p(e)&&(j.value=Math.min(Math.max(e.length,1),C.value))}),{immediate:!0});const k=i(y),{schemaAdaptor:F}=h(k);return()=>n("section",{class:"form-render__combination"},[n("header",{class:"form-render__combinationHeader"},[n("div",{class:"form-render__combinationHeaderText"},[e.title]),n(f,{onClick:g,text:!0,style:{"--n-text-color":"var(--c-primary-color)"},disabled:j.value>=C.value||e.disabled},{icon:()=>n(v,{component:s},null),default:()=>"新增"})]),d(j.value).map(((o,t)=>n("section",{class:"form-render__combinationContent"},[n(m,{schema:b(F(e.getProperties())),name:t},null),n(f,{text:!0,type:"error",class:"form-render__combinationClose",onClick:()=>async function(e){if(j.value>1)j.value--,await l.value.remove(e);else{const o=l.value.query(`${_.value}.${e}`).take();if(!o||!a(o))return;await o.reset()}}(t)},{icon:()=>n(v,{component:u},null)})])))])}}));export{_ as COMBINATION};

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

@@ -28,7 +28,7 @@ export declare const COMPLEX: import("vue").DefineComponent<{
         default: () => {};
     };
 }>>, {
-    display: "flex" | "grid";
     span: number;
+    display: "flex" | "grid";
     wrapperStyle: CSSProperties;
 }>;

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

@@ -11,6 +11,8 @@ export declare const DATE: import("vue").DefineComponent<{
             vali_obj: string;
             max_value: string | number;
             min_value: string | number;
+            min_date: string;
+            max_date: string;
             min_length: string | number;
             max_length: string | number;
             decimal_length: string | number;
@@ -35,6 +37,8 @@ export declare const DATE: import("vue").DefineComponent<{
             vali_obj: string;
             max_value: string | number;
             min_value: string | number;
+            min_date: string;
+            max_date: string;
             min_length: string | number;
             max_length: string | number;
             decimal_length: string | number;

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

@@ -1 +1 @@
-import{defineComponent as e,computed as t,watch as r,createVNode as n,mergeProps as a}from"vue";import{generateTimeFormat as u}from"../../../../../shared/utils/index.js";import{connect as o,mapProps as i}from"@formily/vue";import{isObject as l}from"@vueuse/core";import{format as s}from"date-fns";import{useCommonInjection as m}from"../../hooks/useCommonInjection.js";import"../../utils/index.js";import d from"../../../../date-picker/index.js";import{assignUpdateValue as v,assignClearBindVisited as c}from"../../utils/schema.js";const f=o(e({props:{onChange:{},value:{type:String},validate:{type:Object},valueFormat:{type:String,default:"yyyy-MM-dd"}},emits:["update:value"],setup(e,{emit:o}){const{injectValueValidate:i,injectValueBindKey:v}=m();function c(){var t;return"currTime"===(null==(t=e.validate)?void 0:t.min_date)}function f(){var t;return"currTime"===(null==(t=e.validate)?void 0:t.max_date)}function p(e){return c()&&e<Date.now()-864e5||f()&&e>Date.now()}function D(e){const t=new Date(e),r=new Date,n=new Date(t);return n.setHours(0),n.setMinutes(0),n.setSeconds(0),{isHourDisabled:function(e){return!i()&&(c()&&e<u()||f()&&e>u())},isMinuteDisabled:function(e){if(i())return!1;if(a()===u())return c()&&e<o()||f()&&e>o();return c()&&a()<u()||f()&&a()>u()}};function a(){return t.getHours()}function u(){return r.getHours()}function o(){return r.getMinutes()}function i(){return n>r}}i((()=>e.value));const y=t((()=>{const t={};if(l(e.validate)){const{min_date:r,max_date:n}=e.validate;(r||n)&&(t.isDateDisabled=p,t.isTimeDisabled=D)}return t})),j=t((()=>({valueFormat:e.valueFormat,format:e.valueFormat,timePickerProps:{format:u(e.valueFormat)}})));function g(t){return t?s(new Date(t),e.valueFormat):t}r((()=>e.value),(e=>{e&&g(e)!==e&&o("update:value",g(e))}));const w=t({get:()=>g(e.value),set:e=>{o("update:value",e)}}),x=v(w);return()=>n(d,a({key:x.value},y.value,j.value,{"formatted-value":w.value,"onUpdate:formatted-value":e=>w.value=e}),null)}}),i(v,c));export{f as DATE};
+import{defineComponent as e,computed as t,watch as a,createVNode as r,mergeProps as n}from"vue";import{generateTimeFormat as o}from"../../../../../shared/utils/index.js";import{connect as u,mapProps as i}from"@formily/vue";import{isObject as s}from"@vueuse/core";import{format as l}from"date-fns";import m from"../../../../date-picker/index.js";import{useCommonInjection as d}from"../../hooks/useCommonInjection.js";import"../../utils/index.js";import{assignUpdateValue as v,assignClearBindVisited as c}from"../../utils/schema.js";const f=u(e({props:{onChange:{},value:{type:String},validate:{type:Object},valueFormat:{type:String,default:"yyyy-MM-dd"}},emits:["update:value"],setup(e,{emit:u}){const{injectValueValidate:i,injectValueBindKey:v}=d();function c(){var t;return"currTime"===(null==(t=e.validate)?void 0:t.min_date)}function f(){var t;return"currTime"===(null==(t=e.validate)?void 0:t.max_date)}function p(e){return c()&&e<Date.now()-864e5||f()&&e>Date.now()}function D(e){const t=new Date(e),a=new Date,r=new Date(t);r.setHours(0),r.setMinutes(0),r.setSeconds(0);const n=new Date(t);n.setHours(23),n.setMinutes(59),n.setSeconds(59);const o=r>a,u=n<a,i=t.getHours(),s=a.getHours(),l=a.getMinutes();return{isHourDisabled:function(e){return c()&&!o&&e<s||f()&&!u&&e>s},isMinuteDisabled:function(e){if(i===s)return c()&&!o&&e<l||f()&&!u&&e>l;return c()&&!o&&i<s||f()&&!u&&i>s}}}i((()=>e.value));const y=t((()=>{const t={};if(s(e.validate)){const{min_date:a,max_date:r}=e.validate;(a||r)&&(t.isDateDisabled=p,t.isTimeDisabled=D)}return t})),j=t((()=>({valueFormat:e.valueFormat,format:e.valueFormat,timePickerProps:{format:o(e.valueFormat)}})));function g(t){return t?l(new Date(t),e.valueFormat):t}a((()=>e.value),(e=>{e&&g(e)!==e&&u("update:value",g(e))}));const w=t({get:()=>g(e.value),set:e=>{u("update:value",e)}}),x=v(w);return()=>r(m,n({key:x.value},y.value,j.value,{"formatted-value":w.value,"onUpdate:formatted-value":e=>w.value=e}),null)}}),i(v,c));export{f as DATE};

package/es/components/form-render/src/components/renderer/jsonCombination/index.js

@@ -1 +1 @@
-import{defineComponent as e,ref as o,computed as t,watch as n,onMounted as r,createVNode as i}from"vue";import{isField as l}from"@formily/core";import{Path as a}from"@formily/path";import{AddCircleOutline as u,RemoveCircle as s}from"@vicons/ionicons5";import{isNumber as m,range as c,isArray as p,isEqual as f}from"lodash-es";import{useDeepValidate as v}from"./hooks/useDeepValidate.js";import{formRenderLog as d,mergeDeepProperties as h}from"../../../utils/index.js";import{connect as y,mapProps as g}from"@formily/vue";import{useDebounceFn as b,isObject as N}from"@vueuse/core";import{NButton as _,NIcon as x}from"naive-ui";import C from"../../../FormRender.vue.js";import{assignUpdateValue as j}from"../../../utils/schema.js";const F=y(e({name:"FormJsonCombination",props:{title:{type:String,default:""},value:{type:[String,Array]},maxGroupNum:{type:Number},getProperties:{type:Function,default:()=>[]},onInput:{},onBlur:{},onChange:{}},emits:["update:value"],setup(e,{emit:y}){d("当前COMBINATION控件为json模式,推荐使用非json模式,FieldItem.jsonCombination=false");const g=b((function(){y("update:value",JSON.stringify(j.value))}),300),j=o([]),F=t((()=>j.value.length));function I(o,t=!1){p(o)&&(o.length||o.push({}),o=JSON.stringify(o));const n=function(e){try{if(!e)return null;const o=JSON.parse(e);return Array.isArray(o)?o:null}catch(e){return null}}(o);var r;(r=n)&&!f(r,j.value)&&(n.splice(A.value),n.forEach((function(o,n){if(!N(o))return;j.value[n]=o,t&&h(o,e.getProperties())})),j.value.splice(n.length),j.value.forEach(J))}n((()=>e.value),(e=>I(e))),r((()=>{I(e.value||"[{}]",!0),g()}));const S=o([]);function J(e,o){var t;null==(t=S.value[o])||t.setFieldState("*",(o=>{l(o)&&(o.value=a.getIn(e,o.path))}))}function O(){j.value.push(h({},e.getProperties())),g()}v().bindDeepValidate(S);const A=t((()=>m(e.maxGroupNum)?e.maxGroupNum<1?0:~~e.maxGroupNum:1/0));n(A,(e=>{F.value<=e||(j.value.splice(e),g(),S.value.splice(e))}),{immediate:!0});const G=C;return()=>i("section",{class:"form-render__combination"},[i("header",{class:"form-render__combinationHeader"},[i("div",{class:"form-render__combinationHeaderText"},[e.title]),i(_,{onClick:O,type:"info",text:!0,disabled:F.value>=A.value},{icon:()=>i(x,{component:u},null),default:()=>"新增"})]),c(F.value).map(((o,t)=>i("section",{class:"form-render__combinationContentJson"},[i(G,{ref:e=>function(e,o){S.value[e]=o,J(j.value[e]||{},e)}(t,e),fieldList:e.getProperties(),onFormChange:e=>function(e,{fieldKey:o,value:t}){!j.value[e]&&(j.value[e]={}),a.setIn(j.value[e],o,t),g()}(t,e)},null),i(_,{text:!0,class:"form-render__combinationClose",type:"error",onClick:()=>function(e){j.value.length>1?(j.value.splice(e,1),S.value.splice(e,1)):j.value.splice(e,1,{}),g()}(t)},{icon:()=>i(x,{component:s},null)})])))])}}),g(j));export{F as JSON_COMBINATION};
+import{defineComponent as e,ref as o,computed as t,watch as r,onMounted as n,createVNode as i}from"vue";import{isField as l}from"@formily/core";import{Path as a}from"@formily/path";import{AddCircleOutline as u,RemoveCircle as s}from"@vicons/ionicons5";import{isNumber as m,range as c,isArray as p,isEqual as f}from"lodash-es";import{useDeepValidate as v}from"./hooks/useDeepValidate.js";import{formRenderLog as d,mergeDeepProperties as h}from"../../../utils/index.js";import{connect as y,mapProps as g}from"@formily/vue";import{useDebounceFn as b,isObject as x}from"@vueuse/core";import{NButton as N,NIcon as _}from"naive-ui";import C from"../../../FormRender.vue.js";import{assignUpdateValue as j}from"../../../utils/schema.js";const F=y(e({name:"FormJsonCombination",props:{title:{type:String,default:""},value:{type:[String,Array]},maxGroupNum:{type:Number},getProperties:{type:Function,default:()=>[]},onInput:{},onBlur:{},onChange:{}},emits:["update:value"],setup(e,{emit:y}){d("当前COMBINATION控件为json模式,推荐使用非json模式,FieldItem.jsonCombination=false");const g=b((function(){y("update:value",JSON.stringify(j.value))}),300),j=o([]),F=t((()=>j.value.length));function I(o,t=!1){p(o)&&(o.length||o.push({}),o=JSON.stringify(o));const r=function(e){try{if(!e)return null;const o=JSON.parse(e);return Array.isArray(o)?o:null}catch(e){return null}}(o);var n;(n=r)&&!f(n,j.value)&&(r.splice(A.value),r.forEach((function(o,r){if(!x(o))return;j.value[r]=o,t&&h(o,e.getProperties())})),j.value.splice(r.length),j.value.forEach(J))}r((()=>e.value),(e=>I(e))),n((()=>{I(e.value||"[{}]",!0),g()}));const S=o([]);function J(e,o){var t;null==(t=S.value[o])||t.setFieldState("*",(o=>{l(o)&&(o.value=a.getIn(e,o.path))}))}function O(){j.value.push(h({},e.getProperties())),g()}v().bindDeepValidate(S);const A=t((()=>m(e.maxGroupNum)?e.maxGroupNum<1?0:~~e.maxGroupNum:1/0));r(A,(e=>{F.value<=e||(j.value.splice(e),g(),S.value.splice(e))}),{immediate:!0});const G=C;return()=>i("section",{class:"form-render__combination"},[i("header",{class:"form-render__combinationHeader"},[i("div",{class:"form-render__combinationHeaderText"},[e.title]),i(N,{onClick:O,style:{"--n-text-color":"var(--c-primary-color)"},text:!0,disabled:F.value>=A.value},{icon:()=>i(_,{component:u},null),default:()=>"新增"})]),c(F.value).map(((o,t)=>i("section",{class:"form-render__combinationContentJson"},[i(G,{ref:e=>function(e,o){S.value[e]=o,J(j.value[e]||{},e)}(t,e),fieldList:e.getProperties(),onFormChange:e=>function(e,{fieldKey:o,value:t}){!j.value[e]&&(j.value[e]={}),a.setIn(j.value[e],o,t),g()}(t,e)},null),i(N,{text:!0,class:"form-render__combinationClose",type:"error",onClick:()=>function(e){j.value.length>1?(j.value.splice(e,1),S.value.splice(e,1)):j.value.splice(e,1,{}),g()}(t)},{icon:()=>i(_,{component:s},null)})])))])}}),g(j));export{F as JSON_COMBINATION};

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

@@ -6,6 +6,14 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
+    labelField: {
+        type: StringConstructor;
+        default: string;
+    };
+    valueField: {
+        type: StringConstructor;
+        default: string;
+    };
     autograph: {
         type: StringConstructor;
         required: true;
@@ -46,6 +54,14 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
+    labelField: {
+        type: StringConstructor;
+        default: string;
+    };
+    valueField: {
+        type: StringConstructor;
+        default: string;
+    };
     autograph: {
         type: StringConstructor;
         required: true;
@@ -85,6 +101,8 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     options: AnyObject[];
+    labelField: string;
+    valueField: string;
     lazyRequest: boolean;
     requestCache: boolean;
 }>;

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

@@ -1 +1 @@
-import{defineComponent as e,ref as r,computed as o,inject as t,watch as a,createVNode as n}from"vue";import{useVModel as u}from"@vueuse/core";import{isEqual as i,isString as l,isEmpty as s,isFunction as c,omit as d}from"lodash-es";import"../../../index.js";import{InjectionAsyncQueue as p}from"../../constants/index.js";import{useCommonInjection as m}from"../../hooks/useCommonInjection.js";import{formRenderLog as f}from"../../utils/index.js";import{connect as y,mapProps as v}from"@formily/vue";import h from"../../../../search-cascader/index.js";import k from"../../../../../shared/components/no-data/NoData.vue.js";import{createVisitedSetter as j,assignUpdateValue as _}from"../../utils/schema.js";import{useFormField as w}from"../../hooks/useFormField.js";import{useFormRequest as b}from"../../hooks/useFormRequest.js";const g=y(e({name:"FormSearchCascade",props:{options:{type:Array,default:()=>[]},autograph:{type:String,required:!0},lazyRequest:{type:Boolean,default:!0},requestCache:{type:Boolean,default:!0},wordbook:{type:Object,required:!0},onChange:{},value:{type:[String,Array]}},emits:["update:value"],setup(e,{emit:y}){const v=u(e,"value",y),_=r(!1),g=r([]),{field:K,fieldKey:O}=w(),q=o((()=>{var r,o,t;return null!=(t=null==(o=null==(r=e.wordbook)?void 0:r.render_key)?void 0:o[0])?t:"text"})),F=o((()=>{var r,o;return null!=(o=null==(r=e.wordbook)?void 0:r.value_key)?o:"value"})),S=o((()=>{var r;return(null==(r=e.wordbook)?void 0:r.level_num)||1/0})),x=t(p),{getSearchRequestInfo:C}=b();async function L(r,o){try{if(r&&!r.__keyword&&r.isLeaf)return t(r);if(null==r?void 0:r.__keyword){if(!l(r.id_link))return Promise.reject();const o=r.id_link.split("_").filter((e=>e)),t=await async function(r){if(!C().primaryKeyUrl)return[];try{return await x.addAsync(o(e.wordbook,e.autograph,r,O.value))}catch(e){l(e)&&f(e)}function o(r,o,t,a){const n=C();return{key:a,params:{autograph:o,tableId:r.id,primaryKeyValue:t.join(","),page:1},...n,url:n.primaryKeyUrl,cache:e.requestCache}}}(o);if(!t)return Promise.reject();const{lastOption:a,options:n}=function(e,r){let o=e[0];return{options:r.reduce(((r,a,n)=>{const u=t(e,a);return 0===n?(o=u,[u]):(Object.assign(u,{parent:o,isLeaf:n+1>=S.value}),o.children=[u],o=u,r)}),[]),lastOption:o};function t(e,r){return e.find((e=>e[F.value]===r))}}(t,o);return await L(a),s(a.children)?(v.value=function(e,r){return r.map((r=>e.find((e=>e[F.value]===r))))}(t,o),_.value=!1,Promise.reject()):(g.value=n,a)}{const n=await x.addAsync(function(r,t,a,n,u){const i={autograph:()=>t,wordbookId:"id",wordbookType:"type",fieldKeys:()=>r.search_key?JSON.stringify(r.search_key):void 0,conObj:()=>JSON.stringify(function(e,r,o){return r?e.conObj||[]:o?[{con:"EQ",is_compare_field:!1,field_key:e.level_key,value:o[F.value]}]:e.conObjFirstLevel||[]}(r,o,n)),primaryKey:"primary_key",levelKey:"level_key",keyword:()=>o,page:()=>1},s=Object.entries(i).reduce(((e,[o,t])=>(e[o]=l(t)?r[t]:c(t)?t():void 0,e)),{});return{...C(),params:s,key:u,cache:e.requestCache}}(e.wordbook,e.autograph,K.value,r,O.value));if(r){if(!n.length)return t(r);r.children=n.map((e=>function(e,r,o){return{...e,parent:r,isLeaf:a(r)+1>=o}}(e,r,S.value)))}else g.value=n.map((e=>function(e,r){return e.__keyword=!!r,e.isLeaf=!!r,e}(e,o)))}}catch(e){l(e)&&f(e)}function t(e){return v.value=function(e){const r=[];let o=e;for(;o;)r.unshift(d(o,["parent","isLeaf","__keyword","children"])),o=o.parent;return r}(e),_.value=!1,Promise.reject()}function a(e){let r=1,o=e.parent;for(;o;)r++,o=o.parent;return r}}a((()=>e.wordbook),((r,o)=>{i(r,o)||(g.value=[],r&&(v.value||!e.lazyRequest)&&L())}),{immediate:!0});const{injectValueValidate:V,injectValueWatchFromEmpty:A,injectValueBindKey:I}=m();A(v,L),V(v);const P=I(v);return()=>n(h,{value:v.value,"onUpdate:value":e=>v.value=e,show:_.value,"onUpdate:show":e=>_.value=e,options:g.value,key:P.value,labelKey:q.value,valueKey:F.value,search:L,onFocus:j(K)},{empty:()=>n(k,null,null)})}}),v({dataSource:"options"},_));export{g as LEVEL_SEARCH_CASCADER};
+import{defineComponent as e,ref as r,computed as t,inject as o,watch as a,createVNode as n}from"vue";import{useVModel as u}from"@vueuse/core";import{isEqual as i,isString as l,isEmpty as s,isFunction as c,omit as d}from"lodash-es";import"../../../index.js";import{InjectionAsyncQueue as p}from"../../constants/index.js";import{useCommonInjection as f}from"../../hooks/useCommonInjection.js";import{formRenderLog as m}from"../../utils/index.js";import{connect as y,mapProps as v}from"@formily/vue";import h from"../../../../search-cascader/index.js";import k from"../../../../../shared/components/no-data/NoData.vue.js";import{createVisitedSetter as j,assignUpdateValue as _}from"../../utils/schema.js";import{useFormField as w}from"../../hooks/useFormField.js";import{useFormRequest as b}from"../../hooks/useFormRequest.js";const g=y(e({name:"FormSearchCascade",props:{options:{type:Array,default:()=>[]},labelField:{type:String,default:"text"},valueField:{type:String,default:"value"},autograph:{type:String,required:!0},lazyRequest:{type:Boolean,default:!0},requestCache:{type:Boolean,default:!0},wordbook:{type:Object,required:!0},onChange:{},value:{type:[String,Array]}},emits:["update:value"],setup(e,{emit:y}){const v=u(e,"value",y),_=r(!1),g=r([]),{field:F,fieldKey:K}=w(),O=t((()=>{var r,t,o,a;return null!=(a=null!=(o=null==(t=null==(r=e.wordbook)?void 0:r.render_key)?void 0:t[0])?o:e.labelField)?a:"text"})),q=t((()=>{var r,t,o;return null!=(o=null!=(t=null==(r=e.wordbook)?void 0:r.value_key)?t:e.valueField)?o:"value"})),S=t((()=>{var r;return(null==(r=e.wordbook)?void 0:r.level_num)||1/0})),x=o(p),{getSearchRequestInfo:C}=b();async function L(r,t){try{if(r&&!r.__keyword&&r.isLeaf)return o(r);if(null==r?void 0:r.__keyword){if(!l(r.id_link))return Promise.reject();const t=r.id_link.split("_").filter((e=>e)),o=await async function(r){if(!C().primaryKeyUrl)return[];try{return await x.addAsync(t(e.wordbook,e.autograph,r,K.value))}catch(e){l(e)&&m(e)}function t(r,t,o,a){const n=C();return{key:a,params:{autograph:t,tableId:r.id,primaryKeyValue:o.join(","),page:1},...n,url:n.primaryKeyUrl,cache:e.requestCache}}}(t);if(!o)return Promise.reject();const{lastOption:a,options:n}=function(e,r){let t=e[0];return{options:r.reduce(((r,a,n)=>{const u=o(e,a);return 0===n?(t=u,[u]):(Object.assign(u,{parent:t,isLeaf:n+1>=S.value}),t.children=[u],t=u,r)}),[]),lastOption:t};function o(e,r){return e.find((e=>e[q.value]===r))}}(o,t);return await L(a),s(a.children)?(v.value=function(e,r){return r.map((r=>e.find((e=>e[q.value]===r))))}(o,t),_.value=!1,Promise.reject()):(g.value=n,a)}{const n=await x.addAsync(function(r,o,a,n,u){const i={autograph:()=>o,wordbookId:"id",wordbookType:"type",fieldKeys:()=>r.search_key?JSON.stringify(r.search_key):void 0,conObj:()=>JSON.stringify(function(e,r,t){return r?e.conObj||[]:t?[{con:"EQ",is_compare_field:!1,field_key:e.level_key,value:t[q.value]}]:e.conObjFirstLevel||[]}(r,t,n)),primaryKey:"primary_key",levelKey:"level_key",keyword:()=>t,page:()=>1},s=Object.entries(i).reduce(((e,[t,o])=>(e[t]=l(o)?r[o]:c(o)?o():void 0,e)),{});return{...C(),params:s,key:u,cache:e.requestCache}}(e.wordbook,e.autograph,F.value,r,K.value));if(r){if(!n.length)return o(r);r.children=n.map((e=>function(e,r,t){return{...e,parent:r,isLeaf:a(r)+1>=t}}(e,r,S.value)))}else g.value=n.map((e=>function(e,r){return e.__keyword=!!r,e.isLeaf=!!r,e}(e,t)))}}catch(e){l(e)&&m(e)}function o(e){return v.value=function(e){const r=[];let t=e;for(;t;)r.unshift(d(t,["parent","isLeaf","__keyword","children"])),t=t.parent;return r}(e),_.value=!1,Promise.reject()}function a(e){let r=1,t=e.parent;for(;t;)r++,t=t.parent;return r}}a((()=>e.wordbook),((r,t)=>{i(r,t)||(g.value=[],r&&(v.value||!e.lazyRequest)&&L())}),{immediate:!0});const{injectValueValidate:V,injectValueWatchFromEmpty:A,injectValueBindKey:I}=f();A(v,L),V(v);const P=I(v);return()=>n(h,{value:v.value,"onUpdate:value":e=>v.value=e,show:_.value,"onUpdate:show":e=>_.value=e,options:g.value,key:P.value,labelKey:O.value,valueKey:q.value,search:L,onFocus:j(F)},{empty:()=>n(k,null,null)})}}),v({dataSource:"options"},_));export{g as LEVEL_SEARCH_CASCADER};

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.d.ts

@@ -65,8 +65,8 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
 }>>, {
-    show: boolean;
     disabled: boolean;
+    show: boolean;
     title: string;
 }>;
 export default _default;

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

@@ -65,7 +65,7 @@ export declare const LINEBAR: import("vue").DefineComponent<{
         default: boolean;
     };
 }>>, {
-    show: boolean;
     disabled: boolean;
+    show: boolean;
     title: string;
 }>;