cnhis-design-vue 3.1.53-beta.2 → 3.1.53-hotfix.0

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

@@ -1,13 +1,12 @@
-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 { FormRenderProps } from '../types';
+import { FormAsyncQueue, FormRenderProps } from '../types';
 import { Component, InjectionKey, WritableComputedRef } from 'vue';
-export declare const InjectionAsyncQueue: InjectionKey<FormRequestDefine.FormAsyncQueue>;
+export declare const InjectionAsyncQueue: InjectionKey<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,6 +1,8 @@
 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{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";
+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";

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

@@ -1,8 +1,8 @@
-import { AnyFn, UndefinedAble } from '../../../../../es/shared/types';
+import { Func, 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: AnyFn, scrollbarRef: Ref<UndefinedAble<HTMLElement>>, collector: FormItemDepsCollector): {
+export declare function useAnchor(props: Readonly<FormRenderProps>, emit: Func, 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: AnyFn,
     updateAnchorList: (field: GeneralField) => void;
     scrollTo: (id: string) => Promise<void>;
     anchorBarRef: Ref<{
-        syncBarPosition: AnyFn;
+        syncBarPosition: Func;
     } | undefined>;
 };

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

@@ -1,8 +1,8 @@
-import { AnyFn } from '../../../../../es/shared/types';
+import { Func } from '../../../../../es/shared/types';
 import { WatchSource } from '@vue/runtime-core';
 export declare function useCommonInjection(): {
     injectValueValidate: (traverser: WatchSource) => void;
-    injectValueWatchFromEmpty: (traverser: WatchSource, trigger: AnyFn) => void;
+    injectValueWatchFromEmpty: (traverser: WatchSource, trigger: Func) => 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("../../..").FormRequestDefine.RequestInstance;
+        requestInstance: import("./useFormRequest").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("../../..").FormRequestDefine.RequestInstance;
+        requestInstance: import("./useFormRequest").RequestInstance;
         enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         lowCodeReactions: import("../../../../../es/shared/types").FormLowCodeReactions.Config[];
         linebarAutoHidden: boolean;

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

@@ -0,0 +1,16 @@
+import { AsyncQueue } from '../../../../../es/shared/hooks';
+import { AnyObject, UndefinedAble } from '../../../../../es/shared/types';
+import { ComputedRef } from 'vue';
+import { FormAsyncQueueItem } from '../types';
+import { RequestInstance } from '../../../../../es/components/form-render';
+declare type ProcessorOption = Partial<{
+    afterRequest(key: string, res?: unknown, payload?: AnyObject): AnyObject[];
+    beforeRequest(key: string, params?: unknown, payload?: AnyObject): UndefinedAble<AnyObject> | void;
+}>;
+export declare function useFormAsyncQueue(requestInstance: ComputedRef<UndefinedAble<RequestInstance>>, uniqueData: ComputedRef<boolean>): {
+    create: (parallelism?: number, option?: ProcessorOption) => AsyncQueue<FormAsyncQueueItem, any, {
+        label: string;
+        value: unknown;
+    }[]>;
+};
+export {};

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

@@ -0,0 +1 @@
+import{uuidGenerator as e}from"../../../../shared/utils/index.js";import{isFunction as r}from"lodash-es";import"naive-ui";import{unref as t}from"vue";import"@vueuse/core";import"date-fns";import{AsyncQueue as o}from"../../../../shared/hooks/useAsyncQueue.js";import"../../index.js";import{useCommonLog as s}from"./useCommonLog.js";import{useFormRequest as a}from"./useFormRequest.js";function n(n,u){const{getHttpInstance:i}=a();return{create:function(a=3,m){return new o({name:"FormRenderAsyncQueue",uniqueData:u.value,parallelism:a,async processor({key:e,method:o="post",cache:a,params:u,url:p,payload:c},f,l){var d,y;const h=null!=(d=t(n))?d:i();if(!h)return s().invalidHttpInstanceLog(),f(),void l();try{m&&r(m.beforeRequest)&&(u=null!=(y=m.beforeRequest(e,u,c))?y:{});let t=await h[o](p,u);m&&r(m.afterRequest)&&(t=m.afterRequest(e,t,c)),f(void 0,Array.isArray(t)?t:[]),!a&&l()}catch(e){f(new Error(`Request error => ${e}`)),l()}},getKey:({url:r,method:t="post",cache:o,params:s})=>o?r+t+JSON.stringify(s||{}):e()})}}}export{n as useFormAsyncQueue};

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

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

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

@@ -1,10 +1,10 @@
-import { AnyFn } from '../../../../../es/shared/types';
+import { Func } 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: AnyFn): void;
-    getDeps(dependKey: string): Map<string, AnyFn<any[], any>> | undefined;
+    setDeps(key: string, dependKeys: DependKeyType, callback: Func): void;
+    getDeps(dependKey: string): Map<string, Func<any[], any>> | undefined;
     trigger(dependKey: string, payload?: unknown): void;
 }
 export declare function useFormItemDeps(): {

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

@@ -1,7 +1,6 @@
-import { FormRequestDefine } from '../../../../../es/shared/hooks';
-import { AnyObject, FormWordbook, AnyFn } from '../../../../../es/shared/types';
+import { AnyObject, Func } from '../../../../../es/shared/types';
 import { Ref } from 'vue';
-import { UrlConfig } from '../../../../../es/components/form-render';
+import { FormWordbook, RecommendIds, 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;
@@ -13,11 +12,11 @@ export declare function useRecommendOptions(props: {
     recommend: boolean;
     commonList?: RecommendItem[];
     recentList?: RecommendItem[];
-    getRecommendInfo?: () => FormRequestDefine.RecommendIds;
+    getRecommendInfo?: () => RecommendIds;
     recommendCache: boolean;
     commonNum: number;
     recentNum: number;
-}, options: Ref<AnyObject[]>, emit: AnyFn, labelKey: Ref<string>, valueKey: Ref<string>): {
+}, options: Ref<AnyObject[]>, emit: Func, 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{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};
+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};

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

@@ -0,0 +1,26 @@
+import { Func, Nullable } from '../../../../../es/shared/types';
+import { FormRequestType } from '../../../../../es/components/form-render';
+export declare type RequestInstance = Record<string, Func>;
+declare type SearchRequestInfo = {
+    method: FormRequestType;
+    url: string;
+    primaryKeyUrl?: string;
+};
+export declare type RecommendIds = Partial<Record<'businessId' | 'componentId' | 'deptId' | 'userId', string>>;
+declare type RecommendRequestInfo = {
+    getRecommendIds(): RecommendIds;
+    url: Record<'get' | 'post' | 'delete', string>;
+};
+export declare function useFormRequest(): {
+    getHttpInstance: () => Nullable<RequestInstance>;
+    registGlobHttpInstance: (instance: RequestInstance) => void;
+    registGlobRecommendInfo: (info: Partial<RecommendRequestInfo>) => void;
+    registGlobSearchInfo: (info: SearchRequestInfo) => void;
+    getSearchRequestInfo: () => {
+        method: FormRequestType;
+        url: string;
+        primaryKeyUrl?: string | undefined;
+    };
+    getRecommendRequestInfo: () => RecommendRequestInfo;
+};
+export {};

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

@@ -0,0 +1 @@
+import{cloneDeep as e}from"lodash-es";let t=null;const n={method:"post",url:"",primaryKeyUrl:""},o={url:{get:"/fdp-api/fdp/aiRec/search",post:"/fdp-api/fdp/aiRec/sendBehaviorData",delete:"/fdp-api/fdp/aiRec/delete"},getRecommendIds:()=>({})};function r(){return{getHttpInstance:function(){return t},registGlobHttpInstance:function(e){t=e},registGlobRecommendInfo:function(e){Object.assign(o,e)},registGlobSearchInfo:function(e){Object.assign(n,e)},getSearchRequestInfo:function(){return{...n}},getRecommendRequestInfo:function(){return e(o)}}}export{r as useFormRequest};

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

@@ -1,8 +1,7 @@
-import { FormRequestDefine } from '../../../../../es/shared/hooks';
-import { AnyObject, ArrayAble, BindEventSettingItem, FormWordbook } from '../../../../../es/shared/types';
+import { AnyObject, ArrayAble, BindEventSettingItem } from '../../../../../es/shared/types';
 import { SchemaEffectTypes, SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
-import { DependKeyType, FormCommonState } from '../../../../../es/components/form-render';
+import { DependKeyType, FormCommonState, FormRequestType } 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;
@@ -48,7 +47,7 @@ export interface FormRenderer {
 export declare type UrlConfig = {
     url: string;
 } & Partial<{
-    method: FormRequestDefine.RequestType;
+    method: FormRequestType;
     nameKey: string;
     valueKey: string;
     showKey: string;
@@ -75,6 +74,29 @@ interface ReactionType {
     };
     [key: string]: any;
 }
+export declare type FormWordbook = Partial<{
+    level_num: number;
+    id: string;
+    name: string;
+    render_key: string[];
+    search_key: string[];
+    value_key: string;
+    queryParams: string[];
+    primary_key: string;
+    type: string;
+    level_key: string;
+    link_key: string;
+    link_key_split: string;
+    show_key: string[] | string;
+    conObj: AnyObject[];
+    conObjFirstLevel: AnyObject[];
+    setting: Partial<{
+        cascading: {
+            'form.name': string;
+            value: string;
+        }[];
+    }>;
+}>;
 export declare type CombinationItemDeletableFn = (itemData: AnyObject, index: number) => boolean;
 export declare type FieldItem = {
     val_key: string;

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

@@ -1,10 +1,11 @@
-import { FormRequestDefine } from '../../../../../es/shared/hooks';
+import { AsyncQueue } 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 {
@@ -14,6 +15,16 @@ 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 = {
@@ -130,7 +141,7 @@ export declare type FormRenderProps = Partial<{
     uuid: string;
     lifeCycle: FormRenderLifeCycle;
     businessFormatter: FormBusinessFormatter;
-    requestInstance: FormRequestDefine.RequestInstance;
+    requestInstance: RequestInstance;
     enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
     lowCodeReactions: FormLowCodeReactions.Config[];
     linebarAutoHidden: boolean;

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

@@ -13,6 +13,7 @@ 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;
@@ -27,7 +28,7 @@ export declare function createUrlConfigParams({ config, field, cache }: {
     key: string;
     cache: boolean | undefined;
     url: string;
-    method?: import("../../..").FormRequestDefine.RequestType | undefined;
+    method?: import("../../../../../es/components/form-render").FormRequestType | 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 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};
+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};

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

@@ -1,4 +1,4 @@
-import { AnyObject, AnyFn } from '../../../../../es/shared/types';
+import { AnyObject, Func } from '../../../../../es/shared/types';
 import { GeneralField } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Ref } from 'vue';
@@ -21,4 +21,4 @@ export declare function assignClearBindVisited(props: AnyObject, field: GeneralF
     [x: string]: any;
 };
 export declare function createObjSchema(properties: Record<string, ISchema>): ISchema;
-export declare function createVisitedSetter(field: Ref<GeneralField>, callback?: AnyFn): (...args: unknown[]) => any;
+export declare function createVisitedSetter(field: Ref<GeneralField>, callback?: Func): (...args: unknown[]) => any;

package/es/components/guide/src/renderer.js

@@ -1 +1 @@
-import{defineComponent as e,provide as t,createVNode as r}from"vue";import{useTheme as s}from"../../../shared/hooks/useTheme.js";import"@vueuse/core";import"date-fns";import{isFunction as n,range as i}from"lodash-es";import"@vue/shared";import{widthAppend as o}from"../../../shared/utils/index.js";import{NSpace as u,NButton as l}from"naive-ui";const d=e({props:{config:{type:Object,required:!0,default:()=>({})},index:{type:Number,required:!0},length:{type:Number,required:!0}},emits:["cancel","next","toNext"],setup(e,{emit:t,slots:d}){const p=s();function a(e,{skippable:s=!0,skipText:o="跳过",nextText:d="下一步",endText:p="结束引导"},a,c){var f;return r("footer",{class:"guide__stepFooter"},[null!=(f=n(e)?e():null)?f:r(u,{justify:"end",wrapItem:!1},{default:()=>[m(),s?r(l,{ghost:!0,bordered:!1,class:"guide__stepSkipBtn",textColor:"#c5c5c5",onClick:()=>t("cancel")},{default:()=>o}):null,r(l,{type:"primary",class:"guide__stepNextBtn",onClick:()=>t("next")},{default:()=>a===c-1?p:d})]})]);function m(){return r(u,{justify:"start",style:"flex:1"},{default:function(){return i(c).map((e=>r(l,{class:"guide__stepToBtn",bordered:!1,onClick:()=>t("toNext",e)},{default:()=>r("i",{class:["guide__stepToBtnContent",{guide__stepActiveBtn:e===a}]},null)})))}})}}return()=>{const{minWidth:t=240,maxWidth:s=300,pointer:i=!0}=e.config;return r("section",{class:"guide__stepContentWrapper",style:{minWidth:o(t),maxWidth:o(s),...p.value}},[i?r("div",{class:"guide__stepPointerWrapper"},[r("div",{class:"guide__stepPointer"},null),r("div",{class:"guide__stepPointerLine"},null)]):null,(l=d.header,r("header",{class:"guide__stepHeader"},[n(l)?l():null])),(u=d.body,r("section",{class:"guide__stepBody"},[n(u)?u():null])),a(d.footer,e.config,e.index,e.length)]);var u,l}}});function p(s){return s?e({setup(e,{attrs:n,slots:i}){const o=[];let u=(null==s?void 0:s.parent)&&Reflect.get(s.parent,"provides");for(;u;)Object.entries(u).forEach((([e,r])=>{o.includes(e)||(o.push(e),t(e,r))})),u=Object.getPrototypeOf(u);return()=>r(d,n,i)}}):d}export{p as createGuideStep};
+import{defineComponent as e,provide as t,createVNode as r}from"vue";import{useTheme as s}from"../../../shared/hooks/useTheme.js";import"@vueuse/core";import"date-fns";import{isFunction as n,range as i}from"lodash-es";import{widthAppend as o}from"../../../shared/utils/index.js";import{NSpace as l,NButton as u}from"naive-ui";const d=e({props:{config:{type:Object,required:!0,default:()=>({})},index:{type:Number,required:!0},length:{type:Number,required:!0}},emits:["cancel","next","toNext"],setup(e,{emit:t,slots:d}){const p=s();function a(e,{skippable:s=!0,skipText:o="跳过",nextText:d="下一步",endText:p="结束引导"},a,c){var f;return r("footer",{class:"guide__stepFooter"},[null!=(f=n(e)?e():null)?f:r(l,{justify:"end",wrapItem:!1},{default:()=>[m(),s?r(u,{ghost:!0,bordered:!1,class:"guide__stepSkipBtn",textColor:"#c5c5c5",onClick:()=>t("cancel")},{default:()=>o}):null,r(u,{type:"primary",class:"guide__stepNextBtn",onClick:()=>t("next")},{default:()=>a===c-1?p:d})]})]);function m(){return r(l,{justify:"start",style:"flex:1"},{default:function(){return i(c).map((e=>r(u,{class:"guide__stepToBtn",bordered:!1,onClick:()=>t("toNext",e)},{default:()=>r("i",{class:["guide__stepToBtnContent",{guide__stepActiveBtn:e===a}]},null)})))}})}}return()=>{const{minWidth:t=240,maxWidth:s=300,pointer:i=!0}=e.config;return r("section",{class:"guide__stepContentWrapper",style:{minWidth:o(t),maxWidth:o(s),...p.value}},[i?r("div",{class:"guide__stepPointerWrapper"},[r("div",{class:"guide__stepPointer"},null),r("div",{class:"guide__stepPointerLine"},null)]):null,(u=d.header,r("header",{class:"guide__stepHeader"},[n(u)?u():null])),(l=d.body,r("section",{class:"guide__stepBody"},[n(l)?l():null])),a(d.footer,e.config,e.index,e.length)]);var l,u}}});function p(s){return s?e({setup(e,{attrs:n,slots:i}){const o=[];let l=(null==s?void 0:s.parent)&&Reflect.get(s.parent,"provides");for(;l;)Object.entries(l).forEach((([e,r])=>{o.includes(e)||(o.push(e),t(e,r))})),l=Object.getPrototypeOf(l);return()=>r(d,n,i)}}):d}export{p as createGuideStep};

package/es/components/iho-table/index.d.ts

@@ -19,17 +19,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
     annotation: {
         type: import("vue").PropType<Record<string, import("../annotation-edit/src/type").AnnotationItem>>;
     };
-    requestInstance: {
-        type: import("vue").PropType<import("..").FormRequestDefine.RequestInstance>;
-    };
-    uniqueCacheData: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    parallelism: {
-        type: NumberConstructor;
-        default: number;
-    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         tableConfig: {
@@ -47,17 +36,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         annotation: {
             type: import("vue").PropType<Record<string, import("../annotation-edit/src/type").AnnotationItem>>;
         };
-        requestInstance: {
-            type: import("vue").PropType<import("..").FormRequestDefine.RequestInstance>;
-        };
-        uniqueCacheData: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        parallelism: {
-            type: NumberConstructor;
-            default: number;
-        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
         onCopy?: ((...args: any[]) => any) | undefined;
@@ -132,10 +110,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
     }>;
     eventListener: import("./src/hooks/tapHooks/useEventHooks").IhoTableEventListener;
     emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "rowDrag" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd" | "pageChange", ...args: any[]) => void;
-    asyncQueue: import("..").AsyncQueue<import("..").FormRequestDefine.AsyncQueueItem, any, {
-        label: string;
-        value: unknown;
-    }[]>;
     hooks: Readonly<{
         configHooks: import("../../../es/components/iho-table/src/types").AbstractConfigHooks;
         fieldHooks: import("../../../es/components/iho-table/src/types").AbstractFieldHooks;
@@ -4687,17 +4661,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
     annotation: {
         type: import("vue").PropType<Record<string, import("../annotation-edit/src/type").AnnotationItem>>;
     };
-    requestInstance: {
-        type: import("vue").PropType<import("..").FormRequestDefine.RequestInstance>;
-    };
-    uniqueCacheData: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    parallelism: {
-        type: NumberConstructor;
-        default: number;
-    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
     onCopy?: ((...args: any[]) => any) | undefined;
@@ -4766,8 +4729,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
     onRowDrag?: ((...args: any[]) => any) | undefined;
 }, {
     fieldList: import("../../../es/components/iho-table/src/types").LowCodeTableFieldItem[];
-    parallelism: number;
-    uniqueCacheData: boolean;
     tableConfig: import("../../../es/components/iho-table/src/types").IhoTableConfig;
     tableData: import("../../../es/shared/types").AnyObject[];
 }>>;

package/es/components/iho-table/src/IhoTable.vue.d.ts

@@ -1,4 +1,3 @@
-import { FormRequestDefine } from '../../../../es/shared/hooks';
 import { AnyObject } from '../../../../es/shared/types';
 import { PropType } from 'vue';
 import { VxeTableInstance } from 'vxe-table';
@@ -20,17 +19,6 @@ declare const _default: import("vue").DefineComponent<{
     annotation: {
         type: PropType<Record<string, AnnotationItem>>;
     };
-    requestInstance: {
-        type: PropType<FormRequestDefine.RequestInstance>;
-    };
-    uniqueCacheData: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    parallelism: {
-        type: NumberConstructor;
-        default: number;
-    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         tableConfig: {
@@ -48,17 +36,6 @@ declare const _default: import("vue").DefineComponent<{
         annotation: {
             type: PropType<Record<string, AnnotationItem>>;
         };
-        requestInstance: {
-            type: PropType<FormRequestDefine.RequestInstance>;
-        };
-        uniqueCacheData: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        parallelism: {
-            type: NumberConstructor;
-            default: number;
-        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
         onCopy?: ((...args: any[]) => any) | undefined;
@@ -133,10 +110,6 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     eventListener: import("../../../../es/components/iho-table/src/hooks/tapHooks/useEventHooks").IhoTableEventListener;
     emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "rowDrag" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd" | "pageChange", ...args: any[]) => void;
-    asyncQueue: import("../../../../es/shared/hooks").AsyncQueue<FormRequestDefine.AsyncQueueItem, any, {
-        label: string;
-        value: unknown;
-    }[]>;
     hooks: Readonly<{
         configHooks: import("../../../../es/components/iho-table/src/types").AbstractConfigHooks;
         fieldHooks: import("../../../../es/components/iho-table/src/types").AbstractFieldHooks;
@@ -4688,17 +4661,6 @@ declare const _default: import("vue").DefineComponent<{
     annotation: {
         type: PropType<Record<string, AnnotationItem>>;
     };
-    requestInstance: {
-        type: PropType<FormRequestDefine.RequestInstance>;
-    };
-    uniqueCacheData: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    parallelism: {
-        type: NumberConstructor;
-        default: number;
-    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
     onCopy?: ((...args: any[]) => any) | undefined;
@@ -4767,8 +4729,6 @@ declare const _default: import("vue").DefineComponent<{
     onRowDrag?: ((...args: any[]) => any) | undefined;
 }, {
     fieldList: LowCodeTableFieldItem[];
-    parallelism: number;
-    uniqueCacheData: boolean;
     tableConfig: IhoTableConfig;
     tableData: AnyObject[];
 }>;