cnhis-design-vue 3.1.53-beta.1 → 3.1.53-beta.2

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

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

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

@@ -1,4 +1,4 @@
-import { Func } from '../../../../es/shared/types';
+import { AnyFn } from '../../../../es/shared/types';
 import { FormRenderExpose } from '../../../../es/components/form-render';
 declare const _default: import("vue").DefineComponent<{}, {
     formRenderRef: import("vue").Ref<FormRenderExpose | undefined>;
@@ -122,7 +122,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             }>>;
         };
         requestInstance: {
-            type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+            type: import("vue").PropType<import("../..").FormRequestDefine.RequestInstance>;
         };
         enterToNextWidget: {
             type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
@@ -267,7 +267,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 }>>;
             };
             requestInstance: {
-                type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+                type: import("vue").PropType<import("../..").FormRequestDefine.RequestInstance>;
             };
             enterToNextWidget: {
                 type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
@@ -321,7 +321,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         changeContextCollector: import("../../../../es/components/form-render").ContextCollector;
         formUUID: string;
         anchorBarRef: import("vue").Ref<{
-            syncBarPosition: Func<any[], any>;
+            syncBarPosition: AnyFn<any[], any>;
         } | undefined>;
         currentAnchor: import("vue").WritableComputedRef<string>;
         updateAnchorList: (field: import("@formily/core").GeneralField) => void;
@@ -434,7 +434,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 afterOptionInit(fieldKey: string, options: import("../../../../es/shared/types").AnyObject[], payload?: import("../../../../es/shared/types").AnyObject | undefined): void;
             }>;
             businessFormatter: import("../../../../es/components/form-render").FormBusinessFormatter;
-            requestInstance: import("../../../../es/components/form-render").RequestInstance;
+            requestInstance: import("../..").FormRequestDefine.RequestInstance;
             enterToNextWidget: boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void);
             lowCodeReactions: import("../../../../es/shared/types").FormLowCodeReactions.Config[];
             linebarAutoHidden: boolean;
@@ -842,7 +842,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             }>>;
         };
         requestInstance: {
-            type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+            type: import("vue").PropType<import("../..").FormRequestDefine.RequestInstance>;
         };
         enterToNextWidget: {
             type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;

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

@@ -1,11 +1,11 @@
-import { Func } from '../../../../../../es/shared/types';
+import { AnyFn } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 export declare const INPUT_NUMBER: import("vue").DefineComponent<{
     value: {
         type: (NumberConstructor | StringConstructor)[];
     };
     onChange: {
-        type: PropType<Func<any[], any>>;
+        type: PropType<AnyFn<any[], any>>;
         required: true;
     };
     prefix: {
@@ -19,7 +19,7 @@ export declare const INPUT_NUMBER: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
     };
     onChange: {
-        type: PropType<Func<any[], any>>;
+        type: PropType<AnyFn<any[], any>>;
         required: true;
     };
     prefix: {
@@ -34,7 +34,7 @@ export declare const INPUT_NUMBER_SLASH: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
     };
     onChange: {
-        type: PropType<Func<any[], any>>;
+        type: PropType<AnyFn<any[], any>>;
         required: true;
     };
     prefix: {
@@ -51,7 +51,7 @@ export declare const INPUT_NUMBER_SLASH: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
     };
     onChange: {
-        type: PropType<Func<any[], any>>;
+        type: PropType<AnyFn<any[], any>>;
         required: true;
     };
     prefix: {

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

@@ -1,6 +1,5 @@
 import { AnyObject } from '../../../../../../../es/shared/types';
 import { PropType } from 'vue';
-declare type ValueType = string | AnyObject[];
 export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
     options: {
         type: PropType<AnyObject[]>;
@@ -54,7 +53,7 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
     };
     onChange: {};
     value: {
-        type: PropType<ValueType>;
+        type: PropType<string | AnyObject[]>;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     options: {
@@ -109,7 +108,7 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
     };
     onChange: {};
     value: {
-        type: PropType<ValueType>;
+        type: PropType<string | AnyObject[]>;
     };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -120,4 +119,3 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
     lazyRequest: boolean;
     requestCache: boolean;
 }>;
-export {};

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

@@ -1 +1 @@
-import{defineComponent as e,computed as a,ref as t,inject as r,watch as o,createVNode as l}from"vue";import u from"../../../../../../shared/components/no-data/NoData.vue.js";import{connect as n,mapProps as i}from"@formily/vue";import{isEqual as s,isString as d,isNumber as v,isEmpty as c,isFunction as p}from"lodash-es";import"../../../../index.js";import{createCascaderUtils as y}from"./utils.js";import{InjectionAsyncQueue as m}from"../../../constants/index.js";import{useCommonInjection as h}from"../../../hooks/useCommonInjection.js";import f from"../../../../../search-cascader/index.js";import{formRenderLog as k}from"../../../utils/index.js";import{assignUpdateValue as g}from"../../../utils/schema.js";import{useFormField as j}from"../../../hooks/useFormField.js";import{useFormRequest as w}from"../../../hooks/useFormRequest.js";const b=n(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:n}){const i=a({get:()=>e.value,set(a){s(a,e.value)||n("update:value",a)}}),g=t(!1),b=t([]),{field:K,fieldKey:C}=j(),O=a((()=>{var a,t,r;return null!=(r=null==(t=null==(a=e.wordbook)?void 0:a.show_key)?void 0:t[0])?r:e.labelField})),_=a((()=>{var a,t;return null!=(t=null==(a=e.wordbook)?void 0:a.value_key)?t:e.valueField})),F=a((()=>{var a,t;return null==(t=null==(a=e.wordbook)?void 0:a.render_key)?void 0:t[0]})),S=a((()=>{var a;return(null==(a=e.wordbook)?void 0:a.level_num)||1/0})),q=y(_,O,F),x=r(m),{getSearchRequestInfo:I}=w(),L=t(150),A=t();async function P(a,t,r=!0){var o,l;if(L.value=t&&(null==(o=A.value)?void 0:o.getWidth())||150,q.shouldInitOptionList(i.value,a,t)){const[e,a]=q.transformListToChildren(i.value),t=e[Math.max(0,e.length-2)];if(i.value.length>1){b.value=a;const t=e[Math.max(0,e.length-2)];return await P(t,void 0,!1),t}if(null==(l=b.value)?void 0:l.length)return t}try{return q.isClickNodeCheckbox(a)?u(a):a?a.__keyword?async function(){var t;if(!d(a.id_link))return Promise.reject();const r=q.parseLinkFromString2List(a.id_link);v(S.value)&&S.value!==1/0&&r.splice(S.value);const o=await async function(a){if(!I().primaryKeyUrl)return[];try{return await x.addAsync(t(e.wordbook,e.autograph,a,C.value))}catch(e){d(e)&&k(e)}function t(a,t,r,o){const l=I();return{key:o,params:{autograph:t,tableId:a.id,primaryKeyValue:r.join(","),page:1},...l,url:l.primaryKeyUrl,cache:e.requestCache,payload:{field:K.value,labelKey:O.value,valueKey:_.value}}}}(r);if(!o)return Promise.reject();const{lastOption:l,options:u}=q.generateOptionWithIdList(o,r,S.value);if(u.length<S.value&&(await P(l),c(l.children)))return i.value=q.sortOptionWithIdList(o,r),g.value=!1,Promise.reject();return b.value=u,null==(t=A.value)||t.setCursor(l),l}():async function(){const t=await x.addAsync(n(e.wordbook,e.autograph,K.value,a,C.value));if(!t.length)return r?u(a):Promise.reject();a.children=t.map((e=>q.enrichChildOption(e,a,S.value)))}():async function(){var r;const o=await x.addAsync(n(e.wordbook,e.autograph,K.value,a,C.value));b.value=o.map((e=>q.enrichKeywordOption(e,t))),t&&(null==(r=A.value)||r.setCursor(b.value[0]))}()}catch(e){d(e)&&k(e)}function u(e){return i.value=q.createOptionValue(e),g.value=!1,Promise.reject()}function n(a,r,o,l,u){const n={autograph:()=>r,wordbookId:"id",wordbookType:"type",fieldKeys:()=>a.search_key?JSON.stringify(a.search_key):void 0,conObj:()=>JSON.stringify(q.createConfigObject(a,t,l)),primaryKey:"primary_key",levelKey:"level_key",keyword:()=>t,page:()=>1},i=Object.entries(n).reduce(((e,[t,r])=>(e[t]=d(r)?a[r]:p(r)?r():void 0,e)),{});return{...I(),params:i,key:u,cache:e.requestCache,payload:{field:o,labelKey:O.value,valueKey:_.value}}}}function V(){L.value=150}o((()=>e.wordbook),((a,t)=>{s(a,t)||(b.value=[],a&&(i.value||!e.lazyRequest)&&P())}),{immediate:!0});const{injectValueValidate:N,injectValueBindKey:R}=h();N(i);const U=R(i);return()=>l(f,{ref:A,value:i.value,"onUpdate:value":e=>i.value=e,show:g.value,"onUpdate:show":e=>g.value=e,options:b.value,key:U.value,labelKey:O.value,valueKey:_.value,search:P,onFocus:V,menuWidth:L.value},{empty:()=>l(u,null,null)})}}),i({dataSource:"options"},g));export{b as LEVEL_SEARCH_CASCADER};
+import{defineComponent as e,inject as a,createVNode as o}from"vue";import t from"../../../../../../shared/components/no-data/NoData.vue.js";import"../../../../../../shared/utils/index.js";import"lodash-es";import"naive-ui";import"@vueuse/core";import"date-fns";import"@vue/shared";import{useLevelSearchCascader as r}from"../../../../../../shared/hooks/useLevelSearchCascader.js";import{connect as u,mapProps as s}from"@formily/vue";import"../../../../index.js";import{InjectionAsyncQueue as l}from"../../../constants/index.js";import{useCommonInjection as i}from"../../../hooks/useCommonInjection.js";import n from"../../../../../search-cascader/index.js";import{assignUpdateValue as d}from"../../../utils/schema.js";import{useFormField as m}from"../../../hooks/useFormField.js";const p=u(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:u}){const s=a(l),{field:d,fieldKey:p}=m(),{valueRef:c,labelKey:f,valueKey:v,optionsRef:h,showRef:y,fetchData:j,menuWidth:g,searchCascaderRef:K}=r(e,u,{fieldKey:p,asyncQueue:s,getRequestPayload:()=>({field:d.value})});function S(){g.value=150}const{injectValueValidate:x,injectValueBindKey:C}=i();x(c);const F=C(c);return()=>o(n,{ref:K,value:c.value,"onUpdate:value":e=>c.value=e,show:y.value,"onUpdate:show":e=>y.value=e,options:h.value,key:F.value,labelKey:f.value,valueKey:v.value,search:j,onFocus:S,menuWidth:g.value},{empty:()=>o(t,null,null)})}}),s({dataSource:"options"},d));export{p as LEVEL_SEARCH_CASCADER};

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

@@ -1,4 +1,4 @@
-import { AnyObject, Func } from '../../../../../../es/shared/types';
+import { AnyObject, AnyFn } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 import { UrlConfig } from '../../../../../../es/components/form-render';
 export declare const SEARCH_CASCADER: import("vue").DefineComponent<{
@@ -21,7 +21,7 @@ export declare const SEARCH_CASCADER: import("vue").DefineComponent<{
         default: boolean;
     };
     onFocus: {
-        type: PropType<Func<any[], any>>;
+        type: PropType<AnyFn<any[], any>>;
     };
     filterable: {
         type: BooleanConstructor;
@@ -61,7 +61,7 @@ export declare const SEARCH_CASCADER: import("vue").DefineComponent<{
         default: boolean;
     };
     onFocus: {
-        type: PropType<Func<any[], any>>;
+        type: PropType<AnyFn<any[], any>>;
     };
     filterable: {
         type: BooleanConstructor;

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

@@ -1,6 +1,6 @@
+import { FormRequestDefine } from '../../../../../../es/shared/hooks';
 import { AnyObject, ArrayAble } from '../../../../../../es/shared/types';
 import { RecommendItem } from '../../../../../../es/components/recommend-search/src/types';
-import { RecommendIds } from '../../hooks';
 import { UrlConfig } from '../../types';
 import { PropType } from 'vue';
 export declare const SELECT: import("vue").DefineComponent<{
@@ -81,7 +81,7 @@ export declare const SELECT: import("vue").DefineComponent<{
         type: PropType<RecommendItem[]>;
     };
     getRecommendInfo: {
-        type: PropType<() => RecommendIds>;
+        type: PropType<() => FormRequestDefine.RecommendIds>;
     };
     commonNum: {
         type: NumberConstructor;
@@ -187,7 +187,7 @@ export declare const SELECT: import("vue").DefineComponent<{
         type: PropType<RecommendItem[]>;
     };
     getRecommendInfo: {
-        type: PropType<() => RecommendIds>;
+        type: PropType<() => FormRequestDefine.RecommendIds>;
     };
     commonNum: {
         type: NumberConstructor;

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

@@ -1 +1 @@
-import{defineComponent as e,computed as l,inject as t,useAttrs as a,ref as o,createVNode as u,mergeProps as n,toRaw as r,nextTick as s,createTextVNode as i}from"vue";import{arrayed as p}from"../../../../../shared/utils/index.js";import{HelpCircleSharp as m}from"@vicons/ionicons5";import{promiseTimeout as c}from"@vueuse/shared";import{cloneDeep as d,isArray as v,isString as f,isObject as y,omit as h,xor as g}from"lodash-es";import{useCommonInjection as S,useSelectOptionProps as b}from"../../hooks/useCommonInjection.js";import{useComplexOptions as j,useComplexOptionsSpan as C}from"../../hooks/useComplexOptions.js";import{InjectionChangeContextCollector as w,InjectionFormUUID as k}from"../../constants/index.js";import"../../../index.js";import"@formily/core";import"@formily/path";import"@vue/shared";import"@vueuse/core";import{NSelect as B,NTooltip as F,NIcon as x,NTag as A,NButton as O}from"naive-ui";import"date-fns";import{assignUpdateValue as H,assignClearBindVisited as P,createVisitedSetter as R}from"../../utils/schema.js";import{useFormField as V}from"../../hooks/useFormField.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"../../hooks/useFormValidator.js";import{connect as K,mapProps as L}from"@formily/vue";import"./index.js";import{useUrlConfigOptions as E,useAutographOptions as _,useRecommendOptions as I,searchContentMatcher as N}from"../../hooks/useFormRenderOptions.js";const q=K(e({name:"FormSelect",props:{value:{type:[String,Array,Number]},lazyRequest:{type:Boolean,default:!0},requestCache:{type:Boolean,default:!0},options:{type:Array,default:()=>[]},onChange:{},labelField:{type:String,default:"text"},valueField:{type:String,default:"value"},showField:{type:String},allowCreate:Boolean,shouldSave:Boolean,allowModify:Boolean,showCustomValue:Boolean,cursorPlacement:{type:String,default:"end"},urlConfig:{type:Object},autograph:{type:String},wordbook:{type:Object},recommend:{type:Boolean,default:!1},commonList:{type:Array},recentList:{type:Array},getRecommendInfo:{type:Function},commonNum:{type:Number,default:10},recentNum:{type:Number,default:10},recommendCache:{type:Boolean,default:!1},useLoading:{type:Boolean,default:!0},multiple:{type:Boolean},deletable:{type:Boolean,default:!0},selectAll:{type:Boolean}},emits:["update:value","postRecommend"],setup(e,{slots:H,emit:P}){const K=l({get:()=>e.value,async set(e){P("update:value",e),Y(e)}}),L=l((()=>(e.multiple&&e.allowModify&&console.warn("多选模式下不支持allowModify"),!e.multiple&&e.allowModify))),{labelKey:q,valueKey:M,showKey:z,fetchData:W,searchContent:U,fullOptions:D,filterOptions:T,remoteOptions:$,loading:G}=e.urlConfig?E(e,K):_(e,K),{renderComplexOption:J,hasComplexOption:Q}=j(e,K),{getRecommend:X,postRecommend:Y,sortedOptions:Z}=I(e,T,P,q,M),{field:ee,fieldKey:le}=V();t(w).setContext(le.value,(e=>({currentOption:d(function(e){const l=pe(D.value);return v(e)?function(e){const t=l.reduce(((e,l)=>(e[l[M.value]]=l,e)),{});return e.map((e=>t[e]))}(e):(t=e,l.find((e=>e[M.value]===t)));var t}(e))})));const te=async(e="")=>(U.value=e,Promise.allSettled([W(e),X(e)])),{injectValueValidate:ae,injectValueWatchFromEmpty:oe,injectValueBindKey:ue}=S();oe(K,te),ae(K);const ne=ue(K),{menuProps:re,nodeProps:se}=b();function ie(e){const l=e[q.value];if(!l||!f(l))return"";const t=U.value?N(U.value,l):null,a=t?u("section",null,[t.map(((e,l)=>0!==l&&e?u("span",{style:{color:l%2==0?"var(--n-option-text-color-active)":""}},[e]):null))]):l;return e.desc?u("section",{style:{display:"flex",alignItems:"center",gap:"4px"}},[a,e.desc?u(F,null,{trigger:()=>u(x,{component:m},null),default:()=>e.desc}):null]):a}function pe(l){return e.allowCreate&&U.value&&!l.some((e=>e[q.value]===U.value))?[...l,{[q.value]:U.value,[M.value]:U.value,created:!0,shouldSave:e.shouldSave}]:l}const me=l((()=>pe(L.value?D.value:Z.value))),ce=a(),de=l((()=>{if(e.allowCreate||e.showCustomValue)return K.value;const l=e.multiple&&v(K.value);return D.value.find((e=>l?K.value.includes(e[M.value]):e[M.value]===K.value))?K.value:null})),ve=o(!1);async function fe(e){e&&await te(),ve.value=e}let ye=null;async function he(l,t){K.value=l,ye&&y(t)&&L.value&&(ye.focus(),await s(),ye.value=t[q.value]||"",ye.dispatchEvent(new CustomEvent("input")),"start"===e.cursorPlacement&&ye.setSelectionRange(0,0)),$.value&&t&&p(t).forEach((e=>{if(!y(e))return;const l=e;l.created&&l.shouldSave&&$.value.push(h(r(l),["created","shouldSave"]))}))}const ge=t(k),{getSpan:Se}=C(),be=R(ee,(async l=>{var t,a,o;L.value&&(ye=l.target,ye&&K.value&&(await s(),ye.value=null!=(o=null!=(a=null==(t=D.value.find((e=>e[M.value]===K.value)))?void 0:t[q.value])?a:K.value)?o:"",ye.dispatchEvent(new CustomEvent("input")),"start"===e.cursorPlacement&&(await c(0),ye.setSelectionRange(0,0))))}));function je(e){if(!L.value)return;if(ye=e.target,!ye)return;if(!ye.value)return K.value=null;const l=D.value.find((e=>e[q.value]===ye.value));l?K.value=l[M.value]:(U.value=ye.value,K.value=ye.value)}const Ce=o("");function we({option:l,handleClose:t}){var a;const o=null!=(a=z.value&&l[z.value])?a:l[q.value];return e.multiple?(Ce.value="",e.deletable?u(A,{closable:!0,onClose:e=>{e.stopPropagation(),t()}},{default:()=>u("span",{title:o},[o])}):`${o} ;`):(Ce.value=o,o)}function ke(l){if(!e.multiple)return;const t=l?me.value.map((e=>e[M.value])):[];g(t,e.value).length&&(K.value=t)}function Be(){return[u(O,{quaternary:!0,type:"primary",size:"tiny",onClick:()=>ke(!0)},{default:()=>[i("全选")]}),u(O,{quaternary:!0,type:"primary",size:"tiny",onClick:()=>ke(!1)},{default:()=>[i("清空")]})]}function Fe(l){let t=H;return e.multiple&&e.selectAll&&(t={action:Be,...H}),u(B,n({title:Ce.value,key:ne.value,multiple:e.multiple,remote:!0,filterable:!0,loading:G.value,value:de.value,onUpdateValue:he,"menu-props":re,"node-props":se,labelField:q.value,valueField:M.value,options:me.value,onSearch:te,show:ve.value,"onUpdate:show":fe,onFocus:be,onBlur:je,renderLabel:ie,renderTag:we},l,ce),t)}return()=>{var e,l;if(!Q.value)return Fe();const t=null!=(l=null==(e=ee.value.decoratorProps)?void 0:e.span)?l:6,a=Se(ge,ee.value.address);return u("section",{class:"form-render__selectChildField",style:{"--column":a+t}},[Fe({class:"form-render__selectChildFieldItem",style:{"--form-item-column":t}}),D.value.map((e=>J({option:e,value:K.value,valueKey:M.value,labelKey:q.value,childFieldStrategy:"checked",renderLabel:!1,attrs:{class:"form-render__selectChildFieldItem",style:{"--form-item-column":a}}})))])}}}),L({dataSource:"options"},H,P));export{q as SELECT};
+import{defineComponent as e,computed as l,inject as t,useAttrs as a,ref as o,createVNode as u,mergeProps as n,toRaw as r,nextTick as s,createTextVNode as i}from"vue";import{arrayed as p}from"../../../../../shared/utils/index.js";import{HelpCircleSharp as m}from"@vicons/ionicons5";import{promiseTimeout as c}from"@vueuse/shared";import{cloneDeep as d,isArray as v,isString as f,isObject as y,omit as h,xor as g}from"lodash-es";import{useCommonInjection as S,useSelectOptionProps as b}from"../../hooks/useCommonInjection.js";import{useComplexOptions as j,useComplexOptionsSpan as C}from"../../hooks/useComplexOptions.js";import{InjectionChangeContextCollector as w,InjectionFormUUID as k}from"../../constants/index.js";import"../../../index.js";import"@formily/core";import"@formily/path";import"@vue/shared";import"@vueuse/core";import{NSelect as B,NTooltip as F,NIcon as x,NTag as A,NButton as O}from"naive-ui";import"date-fns";import{assignUpdateValue as H,assignClearBindVisited as P,createVisitedSetter as R}from"../../utils/schema.js";import{useFormField as V}from"../../hooks/useFormField.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"../../hooks/useFormValidator.js";import{connect as K,mapProps as L}from"@formily/vue";import"./index.js";import{useUrlConfigOptions as E,useAutographOptions as _,useRecommendOptions as I,searchContentMatcher as M}from"../../hooks/useFormRenderOptions.js";const N=K(e({name:"FormSelect",props:{value:{type:[String,Array,Number]},lazyRequest:{type:Boolean,default:!0},requestCache:{type:Boolean,default:!0},options:{type:Array,default:()=>[]},onChange:{},labelField:{type:String,default:"text"},valueField:{type:String,default:"value"},showField:{type:String},allowCreate:Boolean,shouldSave:Boolean,allowModify:Boolean,showCustomValue:Boolean,cursorPlacement:{type:String,default:"end"},urlConfig:{type:Object},autograph:{type:String},wordbook:{type:Object},recommend:{type:Boolean,default:!1},commonList:{type:Array},recentList:{type:Array},getRecommendInfo:{type:Function},commonNum:{type:Number,default:10},recentNum:{type:Number,default:10},recommendCache:{type:Boolean,default:!1},useLoading:{type:Boolean,default:!0},multiple:{type:Boolean},deletable:{type:Boolean,default:!0},selectAll:{type:Boolean}},emits:["update:value","postRecommend"],setup(e,{slots:H,emit:P}){const K=l({get:()=>e.value,async set(e){P("update:value",e),Y(e)}}),L=l((()=>(e.multiple&&e.allowModify&&console.warn("多选模式下不支持allowModify"),!e.multiple&&e.allowModify))),{labelKey:N,valueKey:q,showKey:z,fetchData:W,searchContent:U,fullOptions:D,filterOptions:T,remoteOptions:$,loading:G}=e.urlConfig?E(e,K):_(e,K),{renderComplexOption:J,hasComplexOption:Q}=j(e,K),{getRecommend:X,postRecommend:Y,sortedOptions:Z}=I(e,T,P,N,q),{field:ee,fieldKey:le}=V();t(w).setContext(le.value,(e=>({currentOption:d(function(e){const l=pe(D.value);return v(e)?function(e){const t=l.reduce(((e,l)=>(e[l[q.value]]=l,e)),{});return e.map((e=>t[e]))}(e):(t=e,l.find((e=>e[q.value]===t)));var t}(e))})));const te=async(e="")=>(U.value=e,Promise.allSettled([W(e),X(e)])),{injectValueValidate:ae,injectValueWatchFromEmpty:oe,injectValueBindKey:ue}=S();oe(K,te),ae(K);const ne=ue(K),{menuProps:re,nodeProps:se}=b();function ie(e){const l=e[N.value];if(!l||!f(l))return"";const t=U.value?M(U.value,l):null,a=t?u("section",null,[t.map(((e,l)=>0!==l&&e?u("span",{style:{color:l%2==0?"var(--n-option-text-color-active)":""}},[e]):null))]):l;return e.desc?u("section",{style:{display:"flex",alignItems:"center",gap:"4px"}},[a,e.desc?u(F,null,{trigger:()=>u(x,{component:m},null),default:()=>e.desc}):null]):a}function pe(l){return e.allowCreate&&U.value&&!l.some((e=>e[N.value]===U.value))?[...l,{[N.value]:U.value,[q.value]:U.value,created:!0,shouldSave:e.shouldSave}]:l}const me=l((()=>pe(L.value?D.value:Z.value))),ce=a(),de=l((()=>{if(e.allowCreate||e.showCustomValue)return K.value;const l=e.multiple&&v(K.value);return D.value.find((e=>l?K.value.includes(e[q.value]):e[q.value]===K.value))?K.value:null})),ve=o(!1);async function fe(e){e&&await te(),ve.value=e}let ye=null;async function he(l,t){!t||v(t)?K.value=l:t&&(K.value=t[e.allowModify?N.value:q.value]),ye&&y(t)&&L.value&&(ye.focus(),await s(),ye.value=t[N.value]||"",ye.dispatchEvent(new CustomEvent("input")),"start"===e.cursorPlacement&&ye.setSelectionRange(0,0)),$.value&&t&&p(t).forEach((e=>{if(!y(e))return;const l=e;l.created&&l.shouldSave&&$.value.push(h(r(l),["created","shouldSave"]))}))}const ge=t(k),{getSpan:Se}=C(),be=R(ee,(async l=>{var t,a,o;L.value&&(ye=l.target,ye&&K.value&&(await s(),ye.value=null!=(o=null!=(a=null==(t=D.value.find((e=>e[q.value]===K.value)))?void 0:t[N.value])?a:K.value)?o:"",ye.dispatchEvent(new CustomEvent("input")),"start"===e.cursorPlacement&&(await c(0),ye.setSelectionRange(0,0))))}));function je(e){if(L.value&&(ye=e.target,ye)){if(!ye.value)return K.value=null;U.value=ye.value,K.value=ye.value}}const Ce=o("");function we({option:l,handleClose:t}){var a;const o=null!=(a=z.value&&l[z.value])?a:l[N.value];return e.multiple?(Ce.value="",e.deletable?u(A,{closable:!0,onClose:e=>{e.stopPropagation(),t()}},{default:()=>u("span",{title:o},[o])}):`${o} ;`):(Ce.value=o,o)}function ke(l){if(!e.multiple)return;const t=l?me.value.map((e=>e[q.value])):[];g(t,e.value).length&&(K.value=t)}function Be(){return[u(O,{quaternary:!0,type:"primary",size:"tiny",onClick:()=>ke(!0)},{default:()=>[i("全选")]}),u(O,{quaternary:!0,type:"primary",size:"tiny",onClick:()=>ke(!1)},{default:()=>[i("清空")]})]}function Fe(l){let t=H;return e.multiple&&e.selectAll&&(t={action:Be,...H}),u(B,n({title:Ce.value,key:ne.value,multiple:e.multiple,remote:!0,filterable:!0,loading:G.value,value:de.value,onUpdateValue:he,"menu-props":re,"node-props":se,labelField:N.value,valueField:q.value,options:me.value,onSearch:te,show:ve.value,"onUpdate:show":fe,onFocus:be,onBlur:je,renderLabel:ie,renderTag:we},l,ce),t)}return()=>{var e,l;if(!Q.value)return Fe();const t=null!=(l=null==(e=ee.value.decoratorProps)?void 0:e.span)?l:6,a=Se(ge,ee.value.address);return u("section",{class:"form-render__selectChildField",style:{"--column":a+t}},[Fe({class:"form-render__selectChildFieldItem",style:{"--form-item-column":t}}),D.value.map((e=>J({option:e,value:K.value,valueKey:q.value,labelKey:N.value,childFieldStrategy:"checked",renderLabel:!1,attrs:{class:"form-render__selectChildFieldItem",style:{"--form-item-column":a}}})))])}}}),L({dataSource:"options"},H,P));export{N as SELECT};

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

@@ -1,12 +1,13 @@
+import { FormRequestDefine } from '../../../../../es/shared/hooks';
 import { Nullable } from '../../../../../es/shared/types';
 import { GeneralField } from '@formily/core';
 import { AnnotationItem } from '../../../../../es/components/annotation-edit/src/type';
 import { ContextCollector } from '../../../../../es/components/form-render/src/hooks/useChangeContext';
 import { useFormRenderLifeCycle } from '../../../../../es/components/form-render/src/hooks/useFormRenderLifeCycle';
 import { BusinessCollector, FormItemDepsCollector } from '../hooks';
-import { FormAsyncQueue, FormRenderProps } from '../types';
+import { FormRenderProps } from '../types';
 import { Component, InjectionKey, WritableComputedRef } from 'vue';
-export declare const InjectionAsyncQueue: InjectionKey<FormAsyncQueue>;
+export declare const InjectionAsyncQueue: InjectionKey<FormRequestDefine.FormAsyncQueue>;
 export declare const InjectionSchemaField: InjectionKey<Component>;
 export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>;
 export declare const InjectionChangeContextCollector: InjectionKey<ContextCollector>;

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

@@ -1,8 +1,6 @@
 export * from './useFieldListAdaptor';
-export * from './useFormRequest';
 export * from './useCommonLog';
 export * from './useFormField';
-export * from './useFormAsyncQueue';
 export * from './useFieldVisitor';
 export * from './useFieldNormalize';
 export * from './useFormValidator';

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

@@ -1 +1 @@
-export{useFieldListAdaptor}from"./useFieldListAdaptor.js";export{useFormRequest}from"./useFormRequest.js";export{useCommonLog}from"./useCommonLog.js";export{useFormField}from"./useFormField.js";export{useFormAsyncQueue}from"./useFormAsyncQueue.js";export{useFieldVisitor}from"./useFieldVisitor.js";export{useFieldNormalize}from"./useFieldNormalize.js";export{useFormValidator,validateMessageLocale}from"./useFormValidator.js";export{BusinessCollector,useBusinessBinding}from"./useBusinessBinding.js";export{ContextCollector,useChangeContext}from"./useChangeContext.js";export{FormItemDepsCollector,useFormItemDeps}from"./useFormItemDeps.js";export{useAnchor}from"./useAnchor.js";export{useFormContext}from"./useFormContext.js";export{useCommonInjection,useSelectOptionProps}from"./useCommonInjection.js";export{searchContentMatcher,useAutographOptions,useRecommendOptions,useUrlConfigOptions}from"./useFormRenderOptions.js";
+export{useFieldListAdaptor}from"./useFieldListAdaptor.js";export{useCommonLog}from"./useCommonLog.js";export{useFormField}from"./useFormField.js";export{useFieldVisitor}from"./useFieldVisitor.js";export{useFieldNormalize}from"./useFieldNormalize.js";export{useFormValidator,validateMessageLocale}from"./useFormValidator.js";export{BusinessCollector,useBusinessBinding}from"./useBusinessBinding.js";export{ContextCollector,useChangeContext}from"./useChangeContext.js";export{FormItemDepsCollector,useFormItemDeps}from"./useFormItemDeps.js";export{useAnchor}from"./useAnchor.js";export{useFormContext}from"./useFormContext.js";export{useCommonInjection,useSelectOptionProps}from"./useCommonInjection.js";export{searchContentMatcher,useAutographOptions,useRecommendOptions,useUrlConfigOptions}from"./useFormRenderOptions.js";

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

@@ -1,8 +1,8 @@
-import { Func, UndefinedAble } from '../../../../../es/shared/types';
+import { AnyFn, UndefinedAble } from '../../../../../es/shared/types';
 import { Form, GeneralField } from '@formily/core';
 import { Ref } from 'vue';
 import { FormItemDepsCollector, FormRenderProps } from '../../../../../es/components/form-render';
-export declare function useAnchor(props: Readonly<FormRenderProps>, emit: Func, scrollbarRef: Ref<UndefinedAble<HTMLElement>>, collector: FormItemDepsCollector): {
+export declare function useAnchor(props: Readonly<FormRenderProps>, emit: AnyFn, scrollbarRef: Ref<UndefinedAble<HTMLElement>>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
     onScroll: (scrollEvent: Event) => void;
     anchorIdList: Ref<{
@@ -13,6 +13,6 @@ export declare function useAnchor(props: Readonly<FormRenderProps>, emit: Func,
     updateAnchorList: (field: GeneralField) => void;
     scrollTo: (id: string) => Promise<void>;
     anchorBarRef: Ref<{
-        syncBarPosition: Func;
+        syncBarPosition: AnyFn;
     } | undefined>;
 };

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

@@ -1,8 +1,8 @@
-import { Func } from '../../../../../es/shared/types';
+import { AnyFn } from '../../../../../es/shared/types';
 import { WatchSource } from '@vue/runtime-core';
 export declare function useCommonInjection(): {
     injectValueValidate: (traverser: WatchSource) => void;
-    injectValueWatchFromEmpty: (traverser: WatchSource, trigger: Func) => void;
+    injectValueWatchFromEmpty: (traverser: WatchSource, trigger: AnyFn) => void;
     injectValueBindKey: (traverser: WatchSource) => import("vue").Ref<number>;
 };
 export declare function useSelectOptionProps(): {

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

@@ -78,7 +78,7 @@ export declare function useFieldNormalize(): {
             afterOptionInit(fieldKey: string, options: import("../../../../../es/shared/types").AnyObject[], payload?: import("../../../../../es/shared/types").AnyObject | undefined): void;
         }>;
         businessFormatter: import("../types").FormBusinessFormatter;
-        requestInstance: import("./useFormRequest").RequestInstance;
+        requestInstance: import("../../..").FormRequestDefine.RequestInstance;
         enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         lowCodeReactions: import("../../../../../es/shared/types").FormLowCodeReactions.Config[];
         linebarAutoHidden: boolean;
@@ -165,7 +165,7 @@ export declare function useFieldNormalize(): {
             afterOptionInit(fieldKey: string, options: import("../../../../../es/shared/types").AnyObject[], payload?: import("../../../../../es/shared/types").AnyObject | undefined): void;
         }>;
         businessFormatter: import("../types").FormBusinessFormatter;
-        requestInstance: import("./useFormRequest").RequestInstance;
+        requestInstance: import("../../..").FormRequestDefine.RequestInstance;
         enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         lowCodeReactions: import("../../../../../es/shared/types").FormLowCodeReactions.Config[];
         linebarAutoHidden: boolean;

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

@@ -1,8 +1,8 @@
-import { Func } from '../../../../../es/shared/types';
+import { AnyFn } from '../../../../../es/shared/types';
 import { ShallowReactive } from 'vue';
 import { FormRenderProps } from '../../../../../es/components/form-render';
-export declare function useFormContext(props: ShallowReactive<FormRenderProps>, emit: Func): {
-    asyncQueue: import("../../../../shared/hooks").AsyncQueue<import("../../../../../es/components/form-render").FormAsyncQueueItem, any, {
+export declare function useFormContext(props: ShallowReactive<FormRenderProps>, emit: AnyFn): {
+    asyncQueue: import("../../../../../es/shared/hooks").AsyncQueue<import("../../../../../es/shared/hooks").FormRequestDefine.AsyncQueueItem, any, {
         label: string;
         value: unknown;
     }[]>;

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

@@ -1 +1 @@
-import{uuidGenerator as e}from"../../../../shared/utils/index.js";import{createSchemaField as o}from"@formily/vue";import{isObject as t}from"@vue/shared";import{computed as r,provide as n,readonly as s}from"vue";import"../../index.js";import i from"../components/renderer/index.js";import{InjectionAsyncQueue as m,InjectionSchemaField as a,InjectionBusinessCollector as u,InjectionChangeContextCollector as c,InjectionFormItemDepsCollector as p,InjectionFormUUID as l,InjectionAnnotation as f,InjectionFormGlobalProps as d}from"../constants/index.js";import{useFormRenderLifeCycle as j}from"./useFormRenderLifeCycle.js";import{usePresetScope as C}from"./usePresetScope.js";import{presetRequestHandler as y}from"../utils/index.js";import{useFormAsyncQueue as h}from"./useFormAsyncQueue.js";import{useBusinessBinding as x}from"./useBusinessBinding.js";import{useChangeContext as g}from"./useChangeContext.js";import{useFormItemDeps as q}from"./useFormItemDeps.js";function v(v,F){const{callLifeCycle:b}=j(v),R=h(r((()=>v.requestInstance)),r((()=>!!v.uniqueCacheData))).create(v.parallelism,{beforeRequest:(...e)=>b("beforeRequest",e)||e[1],afterRequest:(...e)=>b("afterRequest",e)||y(e[1])});n(m,R);const D=o({components:{...i,...v.components},scope:Object.assign({},C(),v.scope)}).SchemaField;n(a,D);const I=x().create(v.businessFormatter);n(u,I);const S=g().create();n(c,S);const B=q().create();n(p,B);const L=v.uuid||e();return n(l,L),n(f,r({get:()=>v.annotation?s(v.annotation):null,set(e){if(!t(v.annotation)||!t(e))return;const o=v.annotation[e.property];v.annotation[e.property]=e.value,F("annotationChange",{fieldKey:e.property,value:e.value,oldValue:o})}})),n(d,v),{asyncQueue:R,SchemaField:D,businessCollector:I,changeContextCollector:S,formItemDepsCollector:B,formUUID:L}}export{v as useFormContext};
+import{uuidGenerator as e}from"../../../../shared/utils/index.js";import"lodash-es";import"naive-ui";import{computed as o,provide as t,readonly as r}from"vue";import"@vueuse/core";import"date-fns";import{useFormAsyncQueue as s,presetRequestHandler as n}from"../../../../shared/hooks/useFormRequest/index.js";import{createSchemaField as i}from"@formily/vue";import{isObject as a}from"@vue/shared";import"../../index.js";import m from"../components/renderer/index.js";import{InjectionAsyncQueue as u,InjectionSchemaField as c,InjectionBusinessCollector as p,InjectionChangeContextCollector as l,InjectionFormItemDepsCollector as f,InjectionFormUUID as d,InjectionAnnotation as h,InjectionFormGlobalProps as j}from"../constants/index.js";import{useFormRenderLifeCycle as C}from"./useFormRenderLifeCycle.js";import{usePresetScope as v}from"./usePresetScope.js";import{useBusinessBinding as x}from"./useBusinessBinding.js";import{useChangeContext as y}from"./useChangeContext.js";import{useFormItemDeps as q}from"./useFormItemDeps.js";function g(g,F){const{callLifeCycle:R}=C(g),b=s(o((()=>g.requestInstance)),o((()=>!!g.uniqueCacheData))).create(g.parallelism,{beforeRequest:(...e)=>R("beforeRequest",e)||e[1],afterRequest:(...e)=>R("afterRequest",e)||n(e[1])});t(u,b);const D=i({components:{...m,...g.components},scope:Object.assign({},v(),g.scope)}).SchemaField;t(c,D);const I=x().create(g.businessFormatter);t(p,I);const S=y().create();t(l,S);const B=q().create();t(f,B);const L=g.uuid||e();return t(d,L),t(h,o({get:()=>g.annotation?r(g.annotation):null,set(e){if(!a(g.annotation)||!a(e))return;const o=g.annotation[e.property];g.annotation[e.property]=e.value,F("annotationChange",{fieldKey:e.property,value:e.value,oldValue:o})}})),t(j,g),{asyncQueue:b,SchemaField:D,businessCollector:I,changeContextCollector:S,formItemDepsCollector:B,formUUID:L}}export{g as useFormContext};

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

@@ -1,10 +1,10 @@
-import { Func } from '../../../../../es/shared/types';
+import { AnyFn } from '../../../../../es/shared/types';
 import { DependKeyType } from '../../../../../es/components/form-render';
 export declare class FormItemDepsCollector {
     triggerDisabled: boolean;
     private readonly collector;
-    setDeps(key: string, dependKeys: DependKeyType, callback: Func): void;
-    getDeps(dependKey: string): Map<string, Func<any[], any>> | undefined;
+    setDeps(key: string, dependKeys: DependKeyType, callback: AnyFn): void;
+    getDeps(dependKey: string): Map<string, AnyFn<any[], any>> | undefined;
     trigger(dependKey: string, payload?: unknown): void;
 }
 export declare function useFormItemDeps(): {

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

@@ -1,6 +1,7 @@
-import { AnyObject, FormWordbook, Func } from '../../../../../es/shared/types';
+import { FormRequestDefine } from '../../../../../es/shared/hooks';
+import { AnyObject, FormWordbook, AnyFn } from '../../../../../es/shared/types';
 import { Ref } from 'vue';
-import { RecommendIds, UrlConfig } from '../../../../../es/components/form-render';
+import { UrlConfig } from '../../../../../es/components/form-render';
 import { RecommendItem } from '../../../../../es/components/recommend-search/src/types';
 declare type UseOptionHooks = Partial<Record<'onRequestConfigChange' | 'onDepsChange', (payload: {
     fetchData: (content?: string | null, otherParams?: AnyObject) => any;
@@ -12,11 +13,11 @@ export declare function useRecommendOptions(props: {
     recommend: boolean;
     commonList?: RecommendItem[];
     recentList?: RecommendItem[];
-    getRecommendInfo?: () => RecommendIds;
+    getRecommendInfo?: () => FormRequestDefine.RecommendIds;
     recommendCache: boolean;
     commonNum: number;
     recentNum: number;
-}, options: Ref<AnyObject[]>, emit: Func, labelKey: Ref<string>, valueKey: Ref<string>): {
+}, options: Ref<AnyObject[]>, emit: AnyFn, labelKey: Ref<string>, valueKey: Ref<string>): {
     postRecommend: (value: unknown) => Promise<void>;
     getRecommend: (content?: string) => Promise<void>;
     sortedOptions: import("vue").ComputedRef<AnyObject[]>;

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

@@ -1 +1 @@
-import{checkInSetupEnv as e,arrayed as l,jsonParse as n,keywordMatcher as u}from"../../../../shared/utils/index.js";import{useForm as t}from"@formily/vue";import{useMemoize as a}from"@vueuse/core";import{identity as o,uniqBy as r,isEqual as i,isString as v,omit as s,isArray as c,isFunction as m}from"lodash-es";import{computed as f,inject as d,ref as y,watch as p,toRaw as h}from"vue";import"../../index.js";import{InjectionAsyncQueue as g,InjectionFormLifeCycleCaller as w,InjectionFormItemDepsCollector as K}from"../constants/index.js";import{createUrlConfigParams as C,formRenderLog as b}from"../utils/index.js";import{useFormField as k}from"./useFormField.js";import{useFormRequest as R}from"./useFormRequest.js";function F(e,l){const n=y();return f({get:()=>n.value?n.value:e[l],set(e){n.value=e}})}const q=(()=>{const e=a((e=>new RegExp(`(.*)${e.split("").map((e=>`(${function(e){return e.match(/[()\[\]{}$^\/]/)?"\\"+e:e}(e)})`)).join("(.*)")}(.*)`)),{getKey:o});return(l,n)=>n.match(e(l))})();function O(){const e=y();return{searchContent:e,optionSearchFilter:function(l,n,t){if(!e.value)return l;const a=c(t)?t.filter((e=>e&&v(e))):[];return l.filter((l=>function(l,n,t){if(!e.value)return!0;const a=l?l[n]:"";return!!v(a)&&(!!q(e.value,a)||!!u(e.value,l.keyword)||!!t.length&&t.some((n=>v(l[n])&&l[n].includes(e.value))))}(l,n,a)))}}}function j(e,l,u,t,a){const o=F(e,"commonList"),i=F(e,"recentList"),{searchContent:v,optionSearchFilter:c}=O();function y(e){return n(e.itemObj)}const p=f((()=>{var e,l;return null!=(l=null==(e=o.value)?void 0:e.map(y))?l:[]})),h=f((()=>{var e,l;return null!=(l=null==(e=i.value)?void 0:e.map(y))?l:[]})),w=f((()=>{if(!e.recommend||!p.value.length&&!h.value.length)return l.value;const n=r(p.value.concat(h.value),(e=>e[a.value])),u=l.value.filter((e=>n.every((function(l){return l[a.value]!==e[a.value]}))));return[...c(n,t.value),...u]})),{getRecommendRequestInfo:K,getHttpInstance:C}=R();function b(l){const{url:n,getRecommendIds:u}=K(),t=m(u)?u():{},a=m(e.getRecommendInfo)?e.getRecommendInfo():{};return{url:n[l],info:Object.assign({},t,a)}}const{fieldKey:q,field:j}=k(),I=d(g);return{postRecommend:async function(l){if(!e.recommend)return;const n=C();if(!n)return;const{url:t,info:o}=b("post"),r=w.value.find((e=>e[a.value]===l));r&&u("postRecommend",await n.post(t,{...o,keyword:"",itemId:a.value,itemObj:JSON.stringify(r)}))},getRecommend:async function(l){if(!e.recommend)return;if(v.value=l,o.value&&i.value&&e.recommendCache)return;const n=await I.addAsync(function(l,n){const{url:u,info:o}=b("get");return{url:u,method:"get",key:l,cache:n,params:{...o,recNum:Math.max(e.commonNum,e.recentNum),keyword:""},payload:{field:j.value,labelKey:t.value,valueKey:a.value}}}(q.value,e.recommendCache)),{commonly:u,recently:r}=n.reduce(((e,l)=>("commonly"===l.type?e.commonly.push(s(l,["type"])):"recently"===l.type&&e.recently.push(s(l,["type"])),e)),{commonly:[],recently:[]});o.value=u.slice(0,e.commonNum),i.value=r.slice(0,e.recentNum)},sortedOptions:w}}function I(l,n,u){e();const t=d(g),a=d(w),o=f((()=>{var e,n,u;return null!=(u=null!=(n=null==(e=l.urlConfig)?void 0:e.nameKey)?n:l.labelField)?u:"text"})),r=f((()=>{var e,n,u;return null!=(u=null!=(n=null==(e=l.urlConfig)?void 0:e.valueKey)?n:l.valueField)?u:"value"})),s=f((()=>{var e,n;return null!=(n=null==(e=l.urlConfig)?void 0:e.showKey)?n:l.showField})),{searchContent:c,optionSearchFilter:m}=O(),R=y(null),{field:F,fieldKey:q}=k(),j=y(!1),I=async function(e,n){if(c.value=e||"",!l.urlConfig)return R.value=null;try{j.value=!0;const e={field:F.value,labelKey:o.value,valueKey:r.value},u=await t.addAsync(await C({config:{...l.urlConfig,payload:e,params:{...l.urlConfig.params,...n}},cache:l.requestCache,field:F.value}));h(R.value)!==u&&(R.value=u,a("afterOptionInit",[q.value,R.value,e]))}catch(e){v(e)&&b(e)}finally{j.value=!1}},x=f((()=>R.value?m(R.value,o.value):Array.isArray(l.options)?m(l.options,o.value):[])),D=f((()=>R.value||l.options||[])),A=d(K);return p((()=>l.urlConfig),((e,t)=>{if(i(e,t))return;if(R.value=null,!e)return R.value=null;const a={fetchData:I,labelKey:o.value,valueKey:r.value},{onRequestConfigChange:v,onDepsChange:s}=u||{};A.setDeps(q.value,e.dependKey||[],(async()=>{R.value=null,n.value=null,l.lazyRequest||(s?s(a):I())})),!n.value&&l.lazyRequest||(v?v(a):I())}),{immediate:!0}),{labelKey:o,loading:j,showKey:s,valueKey:r,remoteOptions:R,filterOptions:x,fullOptions:D,fetchData:I,searchContent:c}}function x(n,u,a){e();const o=d(g),r=d(w),s=t(),c=f((()=>{var e;const u=l(null==(e=n.wordbook)?void 0:e.show_key)[0];return v(u)?u:null})),m=f((()=>{var e,l,u,t;const a=null==(l=null==(e=n.wordbook)?void 0:e.render_key)?void 0:l[0];return v(a)?a:null!=(t=null!=(u=c.value)?u:n.labelField)?t:"text"})),C=f((()=>{var e,l,u;return null!=(u=null!=(l=null==(e=n.wordbook)?void 0:e.value_key)?l:n.valueField)?u:"value"})),F=f((()=>{var e;return(null==(e=n.wordbook)?void 0:e.search_key)||[]})),q=f((()=>{var e;return null!=(e=c.value)?e:n.showField})),{searchContent:j,optionSearchFilter:I}=O(),x=y(null),{fieldKey:D,field:A}=k(),{getSearchRequestInfo:S}=R(),N=y(!1),_=async function(e,l){if(j.value=e||"",!n.autograph||!n.wordbook)return x.value=null;try{N.value=!0;const e={field:A.value,labelKey:m.value,valueKey:C.value},u=await o.addAsync(function(e,l,u,t,a){var o,r,i;const v={autograph:l,wordbookId:e.id,wordbookType:e.type,fieldKeys:e.search_key,keyword:"",page:1,...a};if(null==(o=e.queryParams)?void 0:o.length){const l=null!=(i=null==(r=s.value)?void 0:r.getFormState().values)?i:{};e.queryParams.forEach((e=>{v[e]=l[e]}))}return{...S(),params:v,key:u,cache:n.requestCache,payload:t}}(n.wordbook,n.autograph,D.value,e,l));h(x.value)!==u&&(x.value=u,r("afterOptionInit",[D.value,x.value,e]))}catch(e){v(e)&&b(e)}finally{N.value=!1}},z=f((()=>x.value?I(x.value,m.value,F.value):Array.isArray(n.options)?I(n.options,m.value):[])),P=f((()=>x.value||n.options||[])),$=d(K);return p((()=>n.wordbook),((e,l)=>{if(i(e,l))return;if(x.value=null,!e)return x.value=null;const t={fetchData:_,labelKey:m.value,valueKey:C.value},{onRequestConfigChange:o,onDepsChange:r}=a||{};$.setDeps(D.value,e.queryParams||[],(async()=>{x.value=null,r?r(t):_()})),!u.value&&n.lazyRequest||(o?o(t):_())}),{immediate:!0}),{labelKey:m,showKey:q,loading:N,remoteOptions:x,valueKey:C,filterOptions:z,fullOptions:P,fetchData:_,searchContent:j}}export{q as searchContentMatcher,x as useAutographOptions,j as useRecommendOptions,I as useUrlConfigOptions};
+import{checkInSetupEnv as e,arrayed as l,jsonParse as n,keywordMatcher as u}from"../../../../shared/utils/index.js";import{identity as t,uniqBy as a,isEqual as o,isString as r,omit as i,isArray as s,isFunction as v}from"lodash-es";import"naive-ui";import{computed as c,inject as m,ref as d,watch as f,toRaw as y}from"vue";import{useMemoize as p}from"@vueuse/core";import"date-fns";import{useFormRequest as h}from"../../../../shared/hooks/useFormRequest/index.js";import{useForm as g}from"@formily/vue";import"../../index.js";import{InjectionAsyncQueue as w,InjectionFormLifeCycleCaller as K,InjectionFormItemDepsCollector as C}from"../constants/index.js";import{createUrlConfigParams as b,formRenderLog as k}from"../utils/index.js";import{useFormField as R}from"./useFormField.js";function F(e,l){const n=d();return c({get:()=>n.value?n.value:e[l],set(e){n.value=e}})}const q=(()=>{const e=p((e=>new RegExp(`(.*)${e.split("").map((e=>`(${function(e){return e.match(/[()\[\]{}$^\/]/)?"\\"+e:e}(e)})`)).join("(.*)")}(.*)`)),{getKey:t});return(l,n)=>n.match(e(l))})();function O(){const e=d();return{searchContent:e,optionSearchFilter:function(l,n,t){if(!e.value)return l;const a=s(t)?t.filter((e=>e&&r(e))):[];return l.filter((l=>function(l,n,t){if(!e.value)return!0;const a=l?l[n]:"";return!!r(a)&&(!!q(e.value,a)||!!u(e.value,l.keyword)||!!t.length&&t.some((n=>r(l[n])&&l[n].includes(e.value))))}(l,n,a)))}}}function j(e,l,u,t,o){const r=F(e,"commonList"),s=F(e,"recentList"),{searchContent:d,optionSearchFilter:f}=O();function y(e){return n(e.itemObj)}const p=c((()=>{var e,l;return null!=(l=null==(e=r.value)?void 0:e.map(y))?l:[]})),g=c((()=>{var e,l;return null!=(l=null==(e=s.value)?void 0:e.map(y))?l:[]})),K=c((()=>{if(!e.recommend||!p.value.length&&!g.value.length)return l.value;const n=a(p.value.concat(g.value),(e=>e[o.value])),u=l.value.filter((e=>n.every((function(l){return l[o.value]!==e[o.value]}))));return[...f(n,t.value),...u]})),{getRecommendRequestInfo:C,getHttpInstance:b}=h();function k(l){const{url:n,getRecommendIds:u}=C(),t=v(u)?u():{},a=v(e.getRecommendInfo)?e.getRecommendInfo():{};return{url:n[l],info:Object.assign({},t,a)}}const{fieldKey:q,field:j}=R(),x=m(w);return{postRecommend:async function(l){if(!e.recommend)return;const n=b();if(!n)return;const{url:t,info:a}=k("post"),r=K.value.find((e=>e[o.value]===l));r&&u("postRecommend",await n.post(t,{...a,keyword:"",itemId:o.value,itemObj:JSON.stringify(r)}))},getRecommend:async function(l){if(!e.recommend)return;if(d.value=l,r.value&&s.value&&e.recommendCache)return;const n=await x.addAsync(function(l,n){const{url:u,info:a}=k("get");return{url:u,method:"get",key:l,cache:n,params:{...a,recNum:Math.max(e.commonNum,e.recentNum),keyword:""},payload:{field:j.value,labelKey:t.value,valueKey:o.value}}}(q.value,e.recommendCache)),{commonly:u,recently:a}=n.reduce(((e,l)=>("commonly"===l.type?e.commonly.push(i(l,["type"])):"recently"===l.type&&e.recently.push(i(l,["type"])),e)),{commonly:[],recently:[]});r.value=u.slice(0,e.commonNum),s.value=a.slice(0,e.recentNum)},sortedOptions:K}}function x(l,n,u){e();const t=m(w),a=m(K),i=c((()=>{var e,n,u;return null!=(u=null!=(n=null==(e=l.urlConfig)?void 0:e.nameKey)?n:l.labelField)?u:"text"})),s=c((()=>{var e,n,u;return null!=(u=null!=(n=null==(e=l.urlConfig)?void 0:e.valueKey)?n:l.valueField)?u:"value"})),v=c((()=>{var e,n;return null!=(n=null==(e=l.urlConfig)?void 0:e.showKey)?n:l.showField})),{searchContent:p,optionSearchFilter:h}=O(),g=d(null),{field:F,fieldKey:q}=R(),j=d(!1),x=async function(e,n){if(p.value=e||"",!l.urlConfig)return g.value=null;try{j.value=!0;const e={field:F.value,labelKey:i.value,valueKey:s.value},u=await t.addAsync(await b({config:{...l.urlConfig,payload:e,params:{...l.urlConfig.params,...n}},cache:l.requestCache,field:F.value}));y(g.value)!==u&&(g.value=u,a("afterOptionInit",[q.value,g.value,e]))}catch(e){r(e)&&k(e)}finally{j.value=!1}},I=c((()=>g.value?h(g.value,i.value):Array.isArray(l.options)?h(l.options,i.value):[])),D=c((()=>g.value||l.options||[])),A=m(C);return f((()=>l.urlConfig),((e,t)=>{if(o(e,t))return;if(g.value=null,!e)return g.value=null;const a={fetchData:x,labelKey:i.value,valueKey:s.value},{onRequestConfigChange:r,onDepsChange:v}=u||{};A.setDeps(q.value,e.dependKey||[],(async()=>{g.value=null,n.value=null,l.lazyRequest||(v?v(a):x())})),!n.value&&l.lazyRequest||(r?r(a):x())}),{immediate:!0}),{labelKey:i,loading:j,showKey:v,valueKey:s,remoteOptions:g,filterOptions:I,fullOptions:D,fetchData:x,searchContent:p}}function I(n,u,t){e();const a=m(w),i=m(K),s=g(),v=c((()=>{var e;const u=l(null==(e=n.wordbook)?void 0:e.show_key)[0];return r(u)?u:null})),p=c((()=>{var e,l,u,t;const a=null==(l=null==(e=n.wordbook)?void 0:e.render_key)?void 0:l[0];return r(a)?a:null!=(t=null!=(u=v.value)?u:n.labelField)?t:"text"})),b=c((()=>{var e,l,u;return null!=(u=null!=(l=null==(e=n.wordbook)?void 0:e.value_key)?l:n.valueField)?u:"value"})),F=c((()=>{var e;return(null==(e=n.wordbook)?void 0:e.search_key)||[]})),q=c((()=>{var e;return null!=(e=v.value)?e:n.showField})),{searchContent:j,optionSearchFilter:x}=O(),I=d(null),{fieldKey:D,field:A}=R(),{getSearchRequestInfo:S}=h(),N=d(!1),_=async function(e,l){if(j.value=e||"",!n.autograph||!n.wordbook)return I.value=null;try{N.value=!0;const e={field:A.value,labelKey:p.value,valueKey:b.value},u=await a.addAsync(function(e,l,u,t,a){var o,r,i;const v={autograph:l,wordbookId:e.id,wordbookType:e.type,fieldKeys:e.search_key,keyword:"",page:1,...a};if(null==(o=e.queryParams)?void 0:o.length){const l=null!=(i=null==(r=s.value)?void 0:r.getFormState().values)?i:{};e.queryParams.forEach((e=>{v[e]=l[e]}))}return{...S(),params:v,key:u,cache:n.requestCache,payload:t}}(n.wordbook,n.autograph,D.value,e,l));y(I.value)!==u&&(I.value=u,i("afterOptionInit",[D.value,I.value,e]))}catch(e){r(e)&&k(e)}finally{N.value=!1}},z=c((()=>I.value?x(I.value,p.value,F.value):Array.isArray(n.options)?x(n.options,p.value):[])),P=c((()=>I.value||n.options||[])),$=m(C);return f((()=>n.wordbook),((e,l)=>{if(o(e,l))return;if(I.value=null,!e)return I.value=null;const a={fetchData:_,labelKey:p.value,valueKey:b.value},{onRequestConfigChange:r,onDepsChange:i}=t||{};$.setDeps(D.value,e.queryParams||[],(async()=>{I.value=null,i?i(a):_()})),!u.value&&n.lazyRequest||(r?r(a):_())}),{immediate:!0}),{labelKey:p,showKey:q,loading:N,remoteOptions:I,valueKey:b,filterOptions:z,fullOptions:P,fetchData:_,searchContent:j}}export{q as searchContentMatcher,I as useAutographOptions,j as useRecommendOptions,x as useUrlConfigOptions};

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

@@ -1,7 +1,8 @@
+import { FormRequestDefine } from '../../../../../es/shared/hooks';
 import { AnyObject, ArrayAble, BindEventSettingItem, FormWordbook } from '../../../../../es/shared/types';
 import { SchemaEffectTypes, SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
-import { DependKeyType, FormCommonState, FormRequestType } from '../../../../../es/components/form-render';
+import { DependKeyType, FormCommonState } from '../../../../../es/components/form-render';
 declare type FieldBusinessType = 'password' | 'id_card' | 'age' | 'age_unit' | 'mobile' | 'telephone' | 'email' | 'sex' | 'birthday' | 'bank_card' | 'website' | 'gestational_weeks' | 'gestational_stage' | 'customer_name';
 declare type HtmlType = 'INPUT' | 'TEXTAREA' | 'SELECT' | 'LINEBAR' | 'LINE_BREAKS' | 'INPUT_NUMBER' | 'REMOTE_SEARCH' | 'DATE' | 'LEVEL_SEARCH_CASCADER' | 'SEARCH_CASCADER' | 'COMBINATION' | 'RADIO' | 'CHECKBOX' | 'SWITCH' | 'SLIDER' | 'COMPLEX' | 'SEARCH' | 'PHONE_TYPE' | 'IDCARD_TYPE' | 'SEARCH_MORE' | 'DIGITAL' | 'CHECKBOX_BLOCK' | 'RADIO_BLOCK' | 'DATE-INPUT' | 'DATETIME-INPUT' | 'SWITCH_COMPONENT' | 'SLIDER_COMPONENT' | 'LEVEL_SEARCH_CASCADE' | 'SEARCH_CASCADE' | ({} & string);
 declare type ValidateType = 'mobile' | 'integer' | 'number' | 'id_card' | 'regular' | string;
@@ -47,7 +48,7 @@ export interface FormRenderer {
 export declare type UrlConfig = {
     url: string;
 } & Partial<{
-    method: FormRequestType;
+    method: FormRequestDefine.RequestType;
     nameKey: string;
     valueKey: string;
     showKey: string;

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

@@ -1,11 +1,10 @@
-import { AsyncQueue } from '../../../../../es/shared/hooks';
+import { FormRequestDefine } from '../../../../../es/shared/hooks';
 import { AnyObject, FormLowCodeReactions, FormOperationalConfig, UndefinedAble } from '../../../../../es/shared/types';
 import { DataField, Field, Form } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Component, FunctionalComponent } from 'vue';
 import { FIELD_BUSINESS_TYPE } from '../../../../../es/components/form-render/src/constants';
 import { FieldItem } from '../types';
-import { RequestInstance } from '../hooks';
 export * from './fieldItem';
 export declare type FormCommonState = '0' | '1';
 export interface FieldVisitorContext {
@@ -15,16 +14,6 @@ export interface FieldVisitorContext {
     insertAfter(f: FieldItem | FieldItem[]): void;
 }
 export declare type FieldVisitor = Record<string, (context: FieldVisitorContext) => void>;
-export declare type FormRequestType = 'post' | 'get' | 'patch' | 'delete' | 'put';
-export interface FormAsyncQueueItem {
-    key: any;
-    cache?: boolean;
-    url: string;
-    method?: FormRequestType;
-    params?: AnyObject;
-    payload?: AnyObject;
-}
-export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObject[]>;
 export declare type AgeContext = Record<'age' | 'day' | 'month' | 'year' | 'hours', number>;
 export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & AgeContext;
 export declare type FormRenderExpose = {
@@ -141,7 +130,7 @@ export declare type FormRenderProps = Partial<{
     uuid: string;
     lifeCycle: FormRenderLifeCycle;
     businessFormatter: FormBusinessFormatter;
-    requestInstance: RequestInstance;
+    requestInstance: FormRequestDefine.RequestInstance;
     enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
     lowCodeReactions: FormLowCodeReactions.Config[];
     linebarAutoHidden: boolean;

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

@@ -13,7 +13,6 @@ export declare function createSlot(renderer: unknown, props: AnyObject, defaultR
     default(): any;
 };
 export declare function createInputSlot(props: AnyObject, defaultRenderer?: (v: unknown) => unknown[]): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;
-export declare function presetRequestHandler(res: unknown): AnyObject[];
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;
 export declare function combineExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
 export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
@@ -28,7 +27,7 @@ export declare function createUrlConfigParams({ config, field, cache }: {
     key: string;
     cache: boolean | undefined;
     url: string;
-    method?: import("../../../../../es/components/form-render").FormRequestType | undefined;
+    method?: import("../../..").FormRequestDefine.RequestType | undefined;
     nameKey?: string | undefined;
     valueKey?: string | undefined;
     showKey?: string | undefined;

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

@@ -1 +1 @@
-import{inject as e,provide as t,computed as n,createVNode as r,Fragment as o}from"vue";import{arrayed as c}from"../../../../shared/utils/index.js";import{isGeneralField as i,isField as s}from"@formily/core";import{Path as u}from"@formily/path";import{HelpCircleSharp as f}from"@vicons/ionicons5";import{isObject as a}from"@vue/shared";import{useMemoize as l}from"@vueuse/core";import{isString as p,isFunction as m,omit as d}from"lodash-es";import{NTooltip as h,NIcon as y}from"naive-ui";import"../../index.js";import{NESTED_FORM_ITEM_TYPE as x}from"../constants/index.js";import"date-fns";import{traverseDependKey as g}from"./schema.js";export{assignClearBindVisited,assignUpdateValue,assignValueBindKey,createLinebarId,createObjSchema,createVisitedSetter,dotEscape,fieldKeyEscape,getParentLinebar,traverseDependKey,traverseSchema}from"./schema.js";function v(e){console.warn(`[FormRender]: ${e}`)}function j(e,t,n=["children","properties","suffixConfig"],r="val_key",o="default_val"){return function e(t,r){r.forEach((r=>{a(r)&&(null!=s(r)&&null==t[i(r)]&&u.setIn(t,i(r),s(r)),n.forEach((n=>{r[n]&&(t[i(r)]||(t[i(r)]={}),e(t[i(r)],c(r[n])))})))}))}(e,t),e;function i(e){return e[r]}function s(e){return e[o]}}function S(n,r){let o=e(n,null);return o||(o=r(),t(n,o)),o}function E(e){return p(e)?+e:e}function b(e,t,n){if(a(e)&&!m(e)){const n={};return Object.entries(e).forEach((([e,r])=>{m(r)&&(n[e]=()=>r(t))})),n}return{default:()=>m(e)?e(t):n?n(e):[e]}}function K(e,t){return n((()=>{const n={};return e.prefix&&(n.prefix=()=>r(o,null,[b(e.prefix,e,t).default()])),e.suffix&&(n.suffix=()=>r(o,null,[b(e.suffix,e,t).default()])),n}))}function w(e){if(!a(e))throw e;return t=e,Reflect.has(t,"map")&&Reflect.has(t,"result")?function(e){const{result:t,map:n}=e;if("SUCCESS"!==t)throw e;return n.rows}(e):function(e){return Reflect.has(e,"result")&&Reflect.has(e,"obj")}(e)?function(e){const{obj:t,result:n}=e;if("SUCCESS"!==n||!a(t))throw e;return Object.entries(t).reduce(((e,[t,n])=>(n.forEach((n=>e.push({...n,type:t}))),e)),[])}(e):function(e){return Reflect.has(e,"data")&&Reflect.has(e,"success")}(e)?function(e){const{data:t,success:n}=e;if(!n)throw e;return t}(e):[];var t}function R(e,t){return p(e)&&e?e.replace(/\$\{([^}]*)}/g,(function(e,n){const r=n.split("||");for(const e of r){const n=t[e.trim()];if(n)return n}return""})):""}function O(e){return e.reduce(((e,t)=>(p(t.extendKey)&&t.extendKey&&e.push(t),V(t)&&e.push(...O(t.children||[])),e)),[])}function k(e,t){const n=O(e);if(!n.length)return t;const r={},o=new Map;return Object.entries(t).forEach((([e,c])=>{const i=n.find((t=>t.val_key===e));if(!i)return r[e]=c;const{val_key:s,extendKey:u}=i,f=o.get(u)||{};o.set(u,f),f[s]=t[s]})),[...o.entries()].forEach((([e,t])=>{r[e]=JSON.stringify(t)})),r}function C(e,t){const n=O(e);if(!n.length)return t;const r=l((e=>{try{return a(t[e])?t[e]:JSON.parse(t[e])||{}}catch(e){return{}}})),o=d(t,n.map((e=>e.extendKey)));return n.forEach((({val_key:e,extendKey:t})=>{Reflect.has(o,e)||(o[e]=r(t)[e])})),o}function _(e){return e&&x.includes(e)}function V(e){return _(i(e)?e.componentType:e.html_type)}async function I({config:e,field:t,cache:n}){const r={},o=t.props.name.toString();try{g(e.dependKey||[],((e,n,o)=>{const c=t.query(e).take();if(!s(c)||o&&null==c.value)throw`缺少必须的参数=>${e}`;r[n]=c.value}))}catch(e){return Promise.reject(e)}return{...e,params:Object.assign({},e.params,r),key:o,cache:n}}function U(e,t){return r("section",{style:{display:"flex",alignItems:"center",gap:"4px"}},[e,t.desc?r(h,null,{trigger:()=>r(y,{component:f},null),default:()=>t.desc}):null])}export{k as combineExtendKey,K as createInputSlot,b as createSlot,I as createUrlConfigParams,v as formRenderLog,S as injectOrProvide,V as isNestedFieldType,_ as isNestedType,j as mergeDeepProperties,E as parseNumberFromMaybeString,w as presetRequestHandler,U as renderDescOption,C as splitExtendKey,R as validateMessageParser};
+import{inject as e,provide as n,computed as t,createVNode as r,Fragment as o}from"vue";import{arrayed as i}from"../../../../shared/utils/index.js";import{isGeneralField as c,isField as u}from"@formily/core";import{Path as s}from"@formily/path";import{HelpCircleSharp as f}from"@vicons/ionicons5";import{isObject as a}from"@vue/shared";import{useMemoize as l}from"@vueuse/core";import{isString as p,isFunction as m,omit as d}from"lodash-es";import{NTooltip as h,NIcon as y}from"naive-ui";import"../../index.js";import{NESTED_FORM_ITEM_TYPE as x}from"../constants/index.js";import"date-fns";import{traverseDependKey as g}from"./schema.js";export{assignClearBindVisited,assignUpdateValue,assignValueBindKey,createLinebarId,createObjSchema,createVisitedSetter,dotEscape,fieldKeyEscape,getParentLinebar,traverseDependKey,traverseSchema}from"./schema.js";function v(e){console.warn(`[FormRender]: ${e}`)}function j(e,n,t=["children","properties","suffixConfig"],r="val_key",o="default_val"){return function e(n,r){r.forEach((r=>{a(r)&&(null!=u(r)&&null==n[c(r)]&&s.setIn(n,c(r),u(r)),t.forEach((t=>{r[t]&&(n[c(r)]||(n[c(r)]={}),e(n[c(r)],i(r[t])))})))}))}(e,n),e;function c(e){return e[r]}function u(e){return e[o]}}function K(t,r){let o=e(t,null);return o||(o=r(),n(t,o)),o}function E(e){return p(e)?+e:e}function b(e,n,t){if(a(e)&&!m(e)){const t={};return Object.entries(e).forEach((([e,r])=>{m(r)&&(t[e]=()=>r(n))})),t}return{default:()=>m(e)?e(n):t?t(e):[e]}}function k(e,n){return t((()=>{const t={};return e.prefix&&(t.prefix=()=>r(o,null,[b(e.prefix,e,n).default()])),e.suffix&&(t.suffix=()=>r(o,null,[b(e.suffix,e,n).default()])),t}))}function O(e,n){return p(e)&&e?e.replace(/\$\{([^}]*)}/g,(function(e,t){const r=t.split("||");for(const e of r){const t=n[e.trim()];if(t)return t}return""})):""}function S(e){return e.reduce(((e,n)=>(p(n.extendKey)&&n.extendKey&&e.push(n),I(n)&&e.push(...S(n.children||[])),e)),[])}function _(e,n){const t=S(e);if(!t.length)return n;const r={},o=new Map;return Object.entries(n).forEach((([e,i])=>{const c=t.find((n=>n.val_key===e));if(!c)return r[e]=i;const{val_key:u,extendKey:s}=c,f=o.get(s)||{};o.set(s,f),f[u]=n[u]})),[...o.entries()].forEach((([e,n])=>{r[e]=JSON.stringify(n)})),r}function V(e,n){const t=S(e);if(!t.length)return n;const r=l((e=>{try{return a(n[e])?n[e]:JSON.parse(n[e])||{}}catch(e){return{}}})),o=d(n,t.map((e=>e.extendKey)));return t.forEach((({val_key:e,extendKey:n})=>{Reflect.has(o,e)||(o[e]=r(n)[e])})),o}function w(e){return e&&x.includes(e)}function I(e){return w(c(e)?e.componentType:e.html_type)}async function $({config:e,field:n,cache:t}){const r={},o=n.props.name.toString();try{g(e.dependKey||[],((e,t,o)=>{const i=n.query(e).take();if(!u(i)||o&&null==i.value)throw`缺少必须的参数=>${e}`;r[t]=i.value}))}catch(e){return Promise.reject(e)}return{...e,params:Object.assign({},e.params,r),key:o,cache:t}}function B(e,n){return r("section",{style:{display:"flex",alignItems:"center",gap:"4px"}},[e,n.desc?r(h,null,{trigger:()=>r(y,{component:f},null),default:()=>n.desc}):null])}export{_ as combineExtendKey,k as createInputSlot,b as createSlot,$ as createUrlConfigParams,v as formRenderLog,K as injectOrProvide,I as isNestedFieldType,w as isNestedType,j as mergeDeepProperties,E as parseNumberFromMaybeString,B as renderDescOption,V as splitExtendKey,O as validateMessageParser};