cnhis-design-vue 3.1.27-beta.1 → 3.1.27-beta.4

package/es/components/fabric-chart/src/hooks/useCenter.js

@@ -643,12 +643,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     }
     redrawPoints();
   }
-  function redrawPoints() {
-    var _a;
-    if (!gridPoints.size)
-      return;
+  function getRemovePoints(points) {
     const removePoints = [];
-    [...gridPoints].forEach((point) => {
+    points.forEach((point) => {
       point && removePoints.push(point);
       (point == null ? void 0 : point.leftLine) && removePoints.push(point == null ? void 0 : point.leftLine);
       (point == null ? void 0 : point.rightLine) && removePoints.push(point == null ? void 0 : point.rightLine);
@@ -656,7 +653,13 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         (o == null ? void 0 : o.obj) && removePoints.push(o == null ? void 0 : o.obj);
       });
     });
-    (_a = canvas.value) == null ? void 0 : _a.remove(...removePoints);
+    return removePoints;
+  }
+  function redrawPoints() {
+    var _a;
+    if (!gridPoints.size)
+      return;
+    (_a = canvas.value) == null ? void 0 : _a.remove(...getRemovePoints([...gridPoints]));
     shadowPointCache = [];
     gridPoints.clear();
     maiboPoints.clear();

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

@@ -271,6 +271,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("..").RequestInstance>;
+                };
             }, {
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     fieldList: {
@@ -386,6 +389,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                             afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                         }>>;
                     };
+                    requestInstance: {
+                        type: import("vue").PropType<import("..").RequestInstance>;
+                    };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
                 }>>;
@@ -756,6 +762,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("..").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }, {
@@ -2706,6 +2715,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("..").RequestInstance>;
+                };
             }, {
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     fieldList: {
@@ -2821,6 +2833,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                             afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                         }>>;
                     };
+                    requestInstance: {
+                        type: import("vue").PropType<import("..").RequestInstance>;
+                    };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
                 }>>;
@@ -3191,6 +3206,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("..").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }, {

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

@@ -273,6 +273,9 @@ declare const _default: import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: PropType<import("../..").RequestInstance>;
+                };
             }, {
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     fieldList: {
@@ -388,6 +391,9 @@ declare const _default: import("vue").DefineComponent<{
                             afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                         }>>;
                     };
+                    requestInstance: {
+                        type: PropType<import("../..").RequestInstance>;
+                    };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
                 }>>;
@@ -758,6 +764,9 @@ declare const _default: import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: PropType<import("../..").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }, {
@@ -2708,6 +2717,9 @@ declare const _default: import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: PropType<import("../..").RequestInstance>;
+                };
             }, {
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     fieldList: {
@@ -2823,6 +2835,9 @@ declare const _default: import("vue").DefineComponent<{
                             afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                         }>>;
                     };
+                    requestInstance: {
+                        type: PropType<import("../..").RequestInstance>;
+                    };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
                 }>>;
@@ -3193,6 +3208,9 @@ declare const _default: import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: PropType<import("../..").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }, {

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

@@ -135,6 +135,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                     afterRequest(fieldKey: string, payload?: any): import("../../../../shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
+            };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
@@ -250,6 +253,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                         afterRequest(fieldKey: string, payload?: any): import("../../../../shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }>>;
@@ -620,6 +626,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                     afterRequest(fieldKey: string, payload?: any): import("../../../../shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }, {

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

@@ -1829,6 +1829,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                     afterRequest(fieldKey: string, payload?: any): import("../../../../../es/shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
+            };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
@@ -1944,6 +1947,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                         afterRequest(fieldKey: string, payload?: any): import("../../../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }>>;
@@ -2314,6 +2320,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                     afterRequest(fieldKey: string, payload?: any): import("../../../../../es/shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }, {

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

@@ -122,6 +122,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
             }>>;
         };
+        requestInstance: {
+            type: import("vue").PropType<import("./src/hooks").RequestInstance>;
+        };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
@@ -237,6 +240,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("./src/hooks").RequestInstance>;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }>>;
@@ -607,6 +613,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
             }>>;
         };
+        requestInstance: {
+            type: import("vue").PropType<import("./src/hooks").RequestInstance>;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }, {

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

@@ -55,7 +55,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     annotation: { type: Object },
     consumer: { type: Boolean, default: false },
     uuid: { type: String },
-    lifeCycle: { type: Object }
+    lifeCycle: { type: Object },
+    requestInstance: { type: Object }
   },
   emits: [
     "formChange"

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

@@ -1,5 +1,6 @@
 import { AnyObject } from '../../../../es/shared/types';
 import { Component, FunctionalComponent, PropType } from 'vue';
+import { RequestInstance } from './hooks';
 import { FieldItem, FieldVisitor, FormBusinessFormatter } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
@@ -115,6 +116,9 @@ declare const _default: import("vue").DefineComponent<{
             afterRequest(fieldKey: string, payload?: any): AnyObject[];
         }>>;
     };
+    requestInstance: {
+        type: PropType<RequestInstance>;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -230,6 +234,9 @@ declare const _default: import("vue").DefineComponent<{
                 afterRequest(fieldKey: string, payload?: any): AnyObject[];
             }>>;
         };
+        requestInstance: {
+            type: PropType<RequestInstance>;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
@@ -600,6 +607,9 @@ declare const _default: import("vue").DefineComponent<{
             afterRequest(fieldKey: string, payload?: any): AnyObject[];
         }>>;
     };
+    requestInstance: {
+        type: PropType<RequestInstance>;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
 }, {

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

@@ -119,6 +119,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                 afterRequest(fieldKey: string, payload?: any): import("../../../shared/types").AnyObject[];
             }>>;
         };
+        requestInstance: {
+            type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+        };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
@@ -234,6 +237,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                     afterRequest(fieldKey: string, payload?: any): import("../../../shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }>>;
@@ -604,6 +610,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                 afterRequest(fieldKey: string, payload?: any): import("../../../shared/types").AnyObject[];
             }>>;
         };
+        requestInstance: {
+            type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }, {

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

@@ -1,5 +1,7 @@
 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, payload?: unknown): AnyObject[];
     beforeRequest(key: string, params?: unknown): UndefinedAble<AnyObject> | void;
@@ -36,7 +38,7 @@ export declare class AsyncQueue<T = any, K = any, R = any> {
     private _startProcess;
     private _handlerResult;
 }
-export declare function useAsyncQueue(): {
+export declare function useAsyncQueue(requestInstance: ComputedRef<UndefinedAble<RequestInstance>>): {
     create: (parallelism?: number, option?: ProcessorOption) => AsyncQueue<FormAsyncQueueItem, any, {
         label: string;
         value: unknown;

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

@@ -1,5 +1,6 @@
 import { uuidGenerator } from '../../../../shared/utils/index.js';
 import { cloneDeep, isFunction } from 'lodash-es';
+import { unref } from 'vue';
 import '../../index.js';
 import { useCommonLog } from './useCommonLog.js';
 import { useFormRequest } from './useFormRequest.js';
@@ -109,15 +110,15 @@ class AsyncQueue {
     }
   }
 }
-function useAsyncQueue() {
+function useAsyncQueue(requestInstance) {
   const { getHttpInstance } = useFormRequest();
   function create(parallelism = 3, option) {
     return new AsyncQueue({
       name: "FormRenderAsyncQueue",
       parallelism,
       async processor({ key, method = "post", params, url }, cb, removeCache) {
-        var _a;
-        const http = getHttpInstance();
+        var _a, _b;
+        const http = (_a = unref(requestInstance)) != null ? _a : getHttpInstance();
         if (!http) {
           useCommonLog().invalidHttpInstanceLog();
           cb();
@@ -126,7 +127,7 @@ function useAsyncQueue() {
         }
         try {
           if (option && isFunction(option.beforeRequest)) {
-            params = (_a = option.beforeRequest(key, params)) != null ? _a : {};
+            params = (_b = option.beforeRequest(key, params)) != null ? _b : {};
           }
           let res = await http[method](url, params);
           if (option && isFunction(option.afterRequest)) {

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

@@ -1,7 +1,7 @@
 import { uuidGenerator } from '../../../../shared/utils/index.js';
 import { isObject } from '@vue/shared';
 import { cloneDeep } from 'lodash-es';
-import { provide, computed, readonly } from 'vue';
+import { computed, provide, readonly } from 'vue';
 import { createSchemaField } from '@formily/vue';
 import '../../index.js';
 import components from '../components/renderer/index.js';
@@ -18,7 +18,7 @@ function useFormContext(props, formModel) {
   const { callLifeCycle } = useFormRenderLifeCycle(props);
   const asyncQueue = injectOrProvide(
     InjectAsyncQueue,
-    () => useAsyncQueue().create(props.parallelism, {
+    () => useAsyncQueue(computed(() => props.requestInstance)).create(props.parallelism, {
       beforeRequest(...args) {
         return callLifeCycle("beforeRequest", cloneDeep(args)) || args[1];
       },

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

@@ -1,6 +1,6 @@
 import { Func, Nullable } from '../../../../../es/shared/types';
 import { FormRequestType } from '../../../../../es/components/form-render';
-declare type RequestInstance = Record<string, Func>;
+export declare type RequestInstance = Record<string, Func>;
 declare type SearchRequestInfo = {
     method: FormRequestType;
     url: string;

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

@@ -4,7 +4,7 @@ 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 { AsyncQueue } from '../hooks';
+import { AsyncQueue, RequestInstance } from '../hooks';
 export * from './fieldItem';
 export declare type FormCommonState = '0' | '1';
 export interface FieldVisitorContext {
@@ -74,6 +74,7 @@ export declare type FormRenderProps = Partial<{
     uuid: string;
     lifeCycle: FormRenderLifeCycle;
     businessFormatter: FormBusinessFormatter;
+    requestInstance: RequestInstance;
 }>;
 export declare type FormBusinessFormatter = (payload: {
     fieldKey: string;

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

@@ -133,8 +133,17 @@ function validateMessageParser(message, fieldItem) {
     return (_a = fieldItem[property.trim()]) != null ? _a : "";
   }
 }
+function findExtendKeyField(fieldList) {
+  return fieldList.reduce((result, field) => {
+    isString(field.extendKey) && field.extendKey && result.push(field);
+    if (field.html_type === "COMPLEX") {
+      result.push(...findExtendKeyField(field.children || []));
+    }
+    return result;
+  }, []);
+}
 function combineExtendKey(fieldList, values) {
-  const fieldListWithExtendKey = fieldList.filter((field) => isString(field.extendKey) && field.extendKey);
+  const fieldListWithExtendKey = findExtendKeyField(fieldList);
   if (!fieldListWithExtendKey.length)
     return values;
   const result = {};
@@ -158,7 +167,7 @@ function combineExtendKey(fieldList, values) {
   return result;
 }
 function splitExtendKey(fieldList, values) {
-  const fieldListWithExtendKey = fieldList.filter((field) => isString(field.extendKey) && field.extendKey);
+  const fieldListWithExtendKey = findExtendKeyField(fieldList);
   if (!fieldListWithExtendKey.length)
     return values;
   const queryFieldValue = useMemoize((extendKey) => {

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

@@ -1831,6 +1831,9 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("..").RequestInstance>;
+            };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
@@ -1946,6 +1949,9 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("..").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }>>;
@@ -2316,6 +2322,9 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("..").RequestInstance>;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }, {

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

@@ -1833,6 +1833,9 @@ declare const _default: import("vue").DefineComponent<{
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+            };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
@@ -1948,6 +1951,9 @@ declare const _default: import("vue").DefineComponent<{
                         afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                     }>>;
                 };
+                requestInstance: {
+                    type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }>>;
@@ -2318,6 +2324,9 @@ declare const _default: import("vue").DefineComponent<{
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/shared/types").AnyObject[];
                 }>>;
             };
+            requestInstance: {
+                type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.27-beta.1",
+	"version": "3.1.27-beta.4",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",