cnhis-design-vue 3.1.15-beta.4 → 3.1.15-beta.7

package/es/packages/field-set/style/index.css

@@ -56,15 +56,6 @@
   height: 52px;
   line-height: 52px;
 }
-.c-field-set .set-show .alias-style {
-  outline: none;
-  border-radius: 4px 4px 4px 4px;
-  border: solid 1px #d5d5d5;
-  height: 32px;
-  text-indent: 16px;
-  color: #38454f;
-  width: 100%;
-}
 .c-field-set .set-show .is-sort-style {
   outline: none;
   border-radius: 4px 4px 4px 4px;

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

@@ -109,6 +109,13 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     uuid: {
         type: StringConstructor;
     };
+    lifeCycle: {
+        type: import("vue").PropType<Partial<{
+            onSetup(): void;
+            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+            afterRequest(fieldKey: string, payload?: import("../../../es/src/types").AnyObject[] | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject[]>;
+        }>>;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -217,6 +224,13 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         uuid: {
             type: StringConstructor;
         };
+        lifeCycle: {
+            type: import("vue").PropType<Partial<{
+                onSetup(): void;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                afterRequest(fieldKey: string, payload?: import("../../../es/src/types").AnyObject[] | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject[]>;
+            }>>;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
@@ -226,10 +240,11 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     businessCollector: import("./src/hooks").BusinessCollector;
     formItemDepsCollector: import("./src/hooks").FormItemDepsCollector;
     changeContextCollector: import("./src/hooks").ContextCollector;
-    formUUID: any;
+    formUUID: string;
     formModel: import("@formily/core").Form<{
         [x: string]: any;
     }>;
+    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
     schemaAdaptor: (fieldList: import("./src/types").FieldItem[]) => Record<string, import("@formily/json-schema").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
@@ -345,7 +360,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         "x-compile-omitted"?: string[] | undefined;
     }>>;
     currentAnchor: import("vue").WritableComputedRef<string>;
-    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
     generateAnchorList: (schema: import("@formily/json-schema").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
@@ -407,7 +421,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         name: string;
         title: string;
     }[]>;
-    formHeight: import("vue").ComputedRef<any>;
+    formHeight: import("vue").ComputedRef<string | undefined>;
     onScroll: () => void;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("./src/types").FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;
@@ -1712,6 +1726,13 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     uuid: {
         type: StringConstructor;
     };
+    lifeCycle: {
+        type: import("vue").PropType<Partial<{
+            onSetup(): void;
+            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+            afterRequest(fieldKey: string, payload?: import("../../../es/src/types").AnyObject[] | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject[]>;
+        }>>;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
 }, {

package/es/packages/form-render/src/FormRender.js

@@ -1,9 +1,10 @@
-import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
+import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { cloneDeep, isArray, isObject } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
+import { useFormRenderLifeCycle } from '../../../packages/form-render/src/hooks/useFormRenderLifeCycle';
 import { arrayed, queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
 import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
@@ -37,7 +38,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     scope: { type: Object, default: () => ({}) },
     annotation: { type: Object },
     consumer: { type: Boolean, default: false },
-    uuid: { type: String }
+    uuid: { type: String },
+    lifeCycle: { type: Object }
   },
   emits: [
     "formChange"
@@ -45,6 +47,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose, emit }) {
     const props = __props;
     const { nuiThemeOverrides } = useNuiThemeOverrides();
+    useFormRenderLifeCycle(props).callLifeCycle("onSetup");
     const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props);
     const formModel = createForm({
       initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
@@ -63,6 +66,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     });
+    const scrollbarRef = ref();
     const { schemaAdaptor } = useFieldListAdaptor(businessCollector, formUUID);
     const parsedSchema = computed(() => {
       if (props.schema) {
@@ -74,7 +78,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return { type: "object", properties: {} };
     });
-    const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(props, formItemDepsCollector);
+    const { currentAnchor, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(props, scrollbarRef, formItemDepsCollector);
     watch(parsedSchema, generateAnchorList, { immediate: true });
     async function queryWidget(key, wrapperElement, fieldList) {
       if (!scrollbarRef.value)
@@ -98,16 +102,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);
         });
         function errInfoNormalize(result, error) {
-          let childMessageNum = 0;
+          let hasChildMessage = false;
           if (isArray(error.messages)) {
             error.messages.forEach((message) => {
               if (!isObject(message))
                 return;
               result.push(...arrayed(message).map(bindInfo));
-              childMessageNum++;
+              hasChildMessage = true;
             });
           }
-          !childMessageNum && result.push(bindInfo(error));
+          !hasChildMessage && result.push(bindInfo(error));
           return result;
         }
         function bindInfo(info) {

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

@@ -109,6 +109,13 @@ declare const _default: import("vue").DefineComponent<{
     uuid: {
         type: StringConstructor;
     };
+    lifeCycle: {
+        type: PropType<Partial<{
+            onSetup(): void;
+            beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject>;
+            afterRequest(fieldKey: string, payload?: AnyObject[] | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject[]>;
+        }>>;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -217,6 +224,13 @@ declare const _default: import("vue").DefineComponent<{
         uuid: {
             type: StringConstructor;
         };
+        lifeCycle: {
+            type: PropType<Partial<{
+                onSetup(): void;
+                beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject>;
+                afterRequest(fieldKey: string, payload?: AnyObject[] | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject[]>;
+            }>>;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
@@ -226,10 +240,11 @@ declare const _default: import("vue").DefineComponent<{
     businessCollector: import("./hooks").BusinessCollector;
     formItemDepsCollector: import("./hooks").FormItemDepsCollector;
     changeContextCollector: import("./hooks").ContextCollector;
-    formUUID: any;
+    formUUID: string;
     formModel: import("@formily/core").Form<{
         [x: string]: any;
     }>;
+    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
     schemaAdaptor: (fieldList: FieldItem[]) => Record<string, import("@formily/vue").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
@@ -345,7 +360,6 @@ declare const _default: import("vue").DefineComponent<{
         "x-compile-omitted"?: string[] | undefined;
     }>>;
     currentAnchor: import("vue").WritableComputedRef<string>;
-    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
     generateAnchorList: (schema: import("@formily/vue").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
@@ -407,7 +421,7 @@ declare const _default: import("vue").DefineComponent<{
         name: string;
         title: string;
     }[]>;
-    formHeight: import("vue").ComputedRef<any>;
+    formHeight: import("vue").ComputedRef<string | undefined>;
     onScroll: () => void;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;
@@ -1712,6 +1726,13 @@ declare const _default: import("vue").DefineComponent<{
     uuid: {
         type: StringConstructor;
     };
+    lifeCycle: {
+        type: PropType<Partial<{
+            onSetup(): void;
+            beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject>;
+            afterRequest(fieldKey: string, payload?: AnyObject[] | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject[]>;
+        }>>;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
 }, {

package/es/packages/form-render/src/components/renderer/combination/hooks/useDeepValidate.d.ts

@@ -0,0 +1,5 @@
+import { Ref } from 'vue';
+import { FormRenderExpose } from '../../../../../../../../es/packages/form-render';
+export declare function useDeepValidate(): {
+    bindDeepValidate: (formRenderRefs: Ref<FormRenderExpose[]>) => void;
+};

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

@@ -0,0 +1,32 @@
+import { isField } from '@formily/core';
+import { flatten } from 'lodash-es';
+import { onMounted } from 'vue';
+import { useFormField } from '../../../../../../../packages/form-render';
+import { arrayed } from '../../../../../../../packages/form-render/src/utils';
+
+function useDeepValidate() {
+  function bindDeepValidate(formRenderRefs) {
+    const { field } = useFormField();
+    onMounted(() => {
+      if (!isField(field.value))
+        return;
+      const tempValidator = field.value.validator;
+      field.value.validator = [
+        {
+          async validator() {
+            return Promise.allSettled(formRenderRefs.value.map((formRenderRef) => formRenderRef.validate())).then((resultList) => {
+              const rejected = resultList.filter((res) => res.status === "rejected");
+              if (!rejected.length)
+                return "";
+              return flatten(rejected.map((res) => res.reason));
+            });
+          }
+        },
+        ...tempValidator ? arrayed(tempValidator) : []
+      ];
+    });
+  }
+  return { bindDeepValidate };
+}
+
+export { useDeepValidate };

package/es/packages/form-render/src/components/renderer/{combination.d.ts → combination/index.d.ts}

@@ -1,4 +1,4 @@
-import { FieldItem } from '../../types';
+import { FieldItem } from '../../../../../../../es/packages/form-render';
 import { PropType } from 'vue';
 export declare const COMBINATION: import("vue").DefineComponent<{
     title: {
@@ -15,6 +15,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
         type: PropType<() => FieldItem[]>;
         default: () => never[];
     };
+    onInput: {};
+    onBlur: {};
+    onChange: {};
 }, () => 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<{
     title: {
         type: StringConstructor;
@@ -30,6 +33,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
         type: PropType<() => FieldItem[]>;
         default: () => never[];
     };
+    onInput: {};
+    onBlur: {};
+    onChange: {};
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {

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

@@ -0,0 +1,157 @@
+import { defineComponent, ref, computed, watch, onMounted, createVNode, createTextVNode } from 'vue';
+import { isField } from '@formily/core';
+import { Path } from '@formily/path';
+import { isNumber, isEqual } from 'lodash-es';
+import { useDeepValidate } from '../../../../../../packages/form-render/src/components/renderer/combination/hooks/useDeepValidate';
+import { assignUpdateValue, mergeDeepProperties, formRenderLog } from '../../../utils/index.js';
+import { connect, mapProps } from '@formily/vue';
+import { useDebounceFn, isObject } from '@vueuse/core';
+import { NButton } from 'naive-ui';
+import FormRender from '../../../FormRender.js';
+
+const script = defineComponent({
+  name: "FormCombination",
+  props: {
+    title: {
+      type: String,
+      default: ""
+    },
+    value: {
+      type: String
+    },
+    maxGroupNum: {
+      type: Number
+    },
+    getProperties: {
+      type: Function,
+      default: () => []
+    },
+    onInput: {},
+    onBlur: {},
+    onChange: {}
+  },
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const emitChange = useDebounceFn(function emitChange2() {
+      emit("update:value", JSON.stringify(combinationData.value));
+    }, 300);
+    const combinationData = ref([{}]);
+    const currentGroupNum = computed(() => combinationData.value.length);
+    function setCombinationData(data, withInitialData = false) {
+      const parsedData = getParsedData(data);
+      if (!needLoad(parsedData))
+        return;
+      parsedData.splice(maxGroupNum.value);
+      parsedData.forEach(setCombinationData2);
+      combinationData.value.splice(parsedData.length);
+      combinationData.value.forEach(setFormRenderData);
+      function needLoad(_data) {
+        return !!_data && !isEqual(_data, combinationData.value);
+      }
+      function setCombinationData2(v, idx) {
+        if (!isObject(v))
+          return;
+        combinationData.value[idx] = v;
+        withInitialData && mergeDeepProperties(v, props.getProperties());
+      }
+      function getParsedData(data2) {
+        try {
+          if (!data2)
+            return null;
+          const result = JSON.parse(data2);
+          if (!Array.isArray(result))
+            return null;
+          return result;
+        } catch (e) {
+          formRenderLog(`invalid JSON value ${data2} in COMBINATION => ${props.title}`, "warn");
+          return null;
+        }
+      }
+    }
+    watch(() => props.value, (value) => setCombinationData(value));
+    onMounted(() => {
+      setCombinationData(props.value || "[{}]", true);
+      emitChange();
+    });
+    const formRenderRefs = ref([]);
+    useDeepValidate().bindDeepValidate(formRenderRefs);
+    function setFormRenderData(item, idx) {
+      var _a;
+      (_a = formRenderRefs.value[idx]) == null ? void 0 : _a.setFieldState("*", (state) => {
+        if (!isField(state))
+          return;
+        state.value = Path.getIn(item, state.path);
+      });
+    }
+    function setFormRenderRef(idx, _ref) {
+      formRenderRefs.value[idx] = _ref;
+      setFormRenderData(combinationData.value[idx] || {}, idx);
+    }
+    function addGroup() {
+      combinationData.value.push(mergeDeepProperties({}, props.getProperties()));
+      emitChange();
+    }
+    function removeGroup(idx) {
+      combinationData.value.splice(idx, 1);
+      formRenderRefs.value.splice(idx, 1);
+      emitChange();
+    }
+    const maxGroupNum = computed(() => {
+      if (!isNumber(props.maxGroupNum))
+        return Infinity;
+      if (props.maxGroupNum < 1)
+        return 0;
+      return ~~props.maxGroupNum;
+    });
+    watch(maxGroupNum, (value) => {
+      if (currentGroupNum.value <= value)
+        return;
+      combinationData.value.splice(value);
+      emitChange();
+      formRenderRefs.value.splice(value);
+    }, {
+      immediate: true
+    });
+    function onChange(idx, {
+      fieldKey,
+      value
+    }) {
+      !combinationData.value[idx] && (combinationData.value[idx] = {});
+      Path.setIn(combinationData.value[idx], fieldKey, value);
+      emitChange();
+    }
+    const FormRenderComponent = FormRender;
+    return () => {
+      return createVNode("section", {
+        "class": "form-render__combination"
+      }, [createVNode("header", {
+        "class": "form-render__combinationHeader"
+      }, [createVNode("div", {
+        "class": "form-render__combinationHeaderText"
+      }, [props.title]), createVNode(NButton, {
+        "onClick": addGroup,
+        "type": "info",
+        "text": true,
+        "disabled": currentGroupNum.value >= maxGroupNum.value
+      }, {
+        default: () => [createTextVNode("\u65B0\u589E")]
+      })]), Array.from({
+        length: currentGroupNum.value
+      }).map((_, idx) => createVNode("section", {
+        "class": "form-render__combinationContent"
+      }, [createVNode(FormRenderComponent, {
+        "ref": (_ref) => setFormRenderRef(idx, _ref),
+        "fieldList": props.getProperties(),
+        "onFormChange": (payload) => onChange(idx, payload)
+      }, null), idx === 0 ? null : createVNode("i", {
+        "class": "form-render__combinationClose",
+        "onClick": () => removeGroup(idx)
+      }, ["-"])]))]);
+    };
+  }
+});
+const COMBINATION = connect(script, mapProps(assignUpdateValue));
+
+export { COMBINATION };

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

@@ -7,7 +7,7 @@ export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup.js';
 export { DATE } from './date.js';
 export { SEARCH_CASCADE } from './cascader.js';
-export { COMBINATION } from './combination.js';
+export { COMBINATION } from './combination/index.js';
 export { CHECKBOX } from './checkbox.js';
 export { SWITCH } from './switch.js';
 export { RADIO } from './radio.js';

package/es/packages/form-render/src/components/renderer/radio.js

@@ -1,5 +1,6 @@
 import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
+import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import { assignUpdateValue } from '../../utils/index.js';
 
@@ -23,7 +24,9 @@ const script = defineComponent({
     emit
   }) {
     function dangerousTypeTransform(value) {
-      return value + "";
+      if (isNumber(value))
+        return value + "";
+      return value;
     }
     const valueRef = computed({
       get() {

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

@@ -13,6 +13,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -28,6 +32,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -43,5 +51,6 @@ export declare const SELECT: import("vue").DefineComponent<{
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     options: AnyObject[];
+    lazyRequest: boolean;
 }>;
 export {};

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

@@ -14,6 +14,10 @@ const script = defineComponent({
     value: {
       type: String
     },
+    lazyRequest: {
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Array,
       default: () => []
@@ -60,7 +64,7 @@ const script = defineComponent({
       if (remoteOptions.value)
         return;
       remoteOptions.value = await asyncQueue.addAsync({
-        ...createParams(configFor(props), field.value, title.value)
+        ...createParams(configFor(props), field.value, fieldKey.value)
       });
       function createParams(config, field2, key) {
         const _params = {};
@@ -103,7 +107,7 @@ const script = defineComponent({
         remoteOptions.value = null;
         emit("update:value", null);
       });
-      props.value && fetchData();
+      (props.value || !props.lazyRequest) && fetchData();
     }, {
       immediate: true
     });

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

@@ -1,3 +1,4 @@
+import { WithNull } from '../../../../../es/src/types';
 import { ContextCollector } from '../../../../../es/packages/form-render/src/hooks/useChangeContext';
 import { BusinessCollector, FormItemDepsCollector } from '../hooks';
 import { FormAsyncQueue } from '../types';
@@ -8,7 +9,7 @@ export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>
 export declare const InjectionChangeContextCollector: InjectionKey<ContextCollector>;
 export declare const InjectionFormItemDepsCollector: InjectionKey<FormItemDepsCollector>;
 export declare const InjectionFormUUID: InjectionKey<string>;
-export declare const InjectionAnnotation: InjectionKey<WritableComputedRef<Record<string, string>>>;
+export declare const InjectionAnnotation: InjectionKey<WritableComputedRef<WithNull<Record<string, string>>>>;
 export declare const FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
 export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",

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

@@ -1,15 +1,16 @@
-import { AnyObject } from '../../../../../es/src/types';
+import { WithUndefined } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
-import { FormItemDepsCollector } from '../../../../../es/packages/form-render';
-export declare function useAnchor(props: Readonly<AnyObject>, collector: FormItemDepsCollector): {
+import { Ref } from 'vue';
+import { FormItemDepsCollector, FormRenderProps } from '../../../../../es/packages/form-render';
+export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef: Ref<WithUndefined<HTMLElement>>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
     onScroll: () => void;
-    formHeight: import("vue").ComputedRef<any>;
-    anchorIdList: import("vue").Ref<{
+    formHeight: import("vue").ComputedRef<string | undefined>;
+    anchorIdList: Ref<{
         name: string;
         title: string;
     }[]>;
     generateAnchorList: (schema: ISchema) => void;
-    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
+    scrollbarRef: Ref<WithUndefined<HTMLElement>>;
     scrollTo: (id: string) => Promise<void>;
 };

package/es/packages/form-render/src/hooks/useAnchor.js

@@ -5,7 +5,7 @@ import { ref, computed, watch, nextTick } from 'vue';
 import { FormItemLineBarDepKeyPrepend } from '../../../../packages/form-render/src/constants';
 import { createLinebarId, traverseSchema } from '../../../../packages/form-render/src/utils';
 
-function useAnchor(props, collector) {
+function useAnchor(props, scrollbarRef, collector) {
   const __currentAnchor = ref("");
   const formHeight = computed(() => {
     if (isNumber(props.maxHeight))
@@ -22,7 +22,6 @@ function useAnchor(props, collector) {
       }
     });
   }
-  const scrollbarRef = ref();
   let scrollLock = false;
   async function scrollTo(id) {
     scrollLock = true;

package/es/packages/form-render/src/hooks/useAsyncQueue.d.ts

@@ -1,4 +1,9 @@
+import { AnyObject, WithUndefined } from '../../../../../es/src/types';
 import { FormAsyncQueueItem } from '../types';
+declare type ProcessorOption = Partial<{
+    afterRequest(key: string, payload?: AnyObject[]): WithUndefined<AnyObject[]> | void;
+    beforeRequest(key: string, params?: AnyObject): WithUndefined<AnyObject> | void;
+}>;
 interface EntryCallback {
     (err?: any, result?: any): void;
 }
@@ -32,7 +37,7 @@ export declare class AsyncQueue<T = any, K = any, R = any> {
     private _handlerResult;
 }
 export declare function useAsyncQueue(): {
-    create: (parallelism?: number) => AsyncQueue<FormAsyncQueueItem, any, {
+    create: (parallelism?: number, option?: ProcessorOption) => AsyncQueue<FormAsyncQueueItem, any, {
         label: string;
         value: unknown;
     }[]>;

package/es/packages/form-render/src/hooks/useAsyncQueue.js

@@ -1,3 +1,4 @@
+import { isFunction } from 'lodash-es';
 import { useFormRequest, useCommonLog } from '../../../../packages/form-render';
 
 class AsyncQueueEntry {
@@ -103,11 +104,12 @@ class AsyncQueue {
 }
 function useAsyncQueue() {
   const { getHttpInstance } = useFormRequest();
-  function create(parallelism = 3) {
+  function create(parallelism = 3, option) {
     return new AsyncQueue({
       name: "FormRenderAsyncQueue",
       parallelism,
-      async processor({ method = "post", params, url }, cb, removeCache) {
+      async processor({ key, method = "post", params, url }, cb, removeCache) {
+        var _a, _b;
         const http = getHttpInstance();
         if (!http) {
           useCommonLog().invalidHttpInstanceLog();
@@ -116,11 +118,18 @@ function useAsyncQueue() {
           return;
         }
         try {
+          if (option && isFunction(option.beforeRequest)) {
+            params = (_a = option.beforeRequest(key, params)) != null ? _a : {};
+          }
           const res = await http[method](url, params);
           const { data, success } = res;
           if (!success)
             throw res;
-          cb(void 0, Array.isArray(data) ? data : []);
+          let payload = Array.isArray(data) ? data : [];
+          if (option && isFunction(option.afterRequest)) {
+            payload = (_b = option.afterRequest(key, payload)) != null ? _b : [];
+          }
+          cb(void 0, payload);
         } catch (e) {
           cb(new Error(`Request error => ${e}`));
           removeCache();