cnhis-design-vue 3.1.15-beta.8 → 3.1.15-beta.9

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

@@ -3454,7 +3454,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
                 beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject>;
-                afterRequest(fieldKey: string, payload?: import("../../../../src/types").AnyObject[] | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject[]>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../../src/types").AnyObject[];
             }>>;
         };
     }, {
@@ -3569,7 +3569,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
                     beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject>;
-                    afterRequest(fieldKey: string, payload?: import("../../../../src/types").AnyObject[] | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject[]>;
+                    afterRequest(fieldKey: string, payload?: any): import("../../../../src/types").AnyObject[];
                 }>>;
             };
         }>> & {
@@ -5071,7 +5071,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
                 beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject>;
-                afterRequest(fieldKey: string, payload?: import("../../../../src/types").AnyObject[] | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject[]>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../../src/types").AnyObject[];
             }>>;
         };
     }>> & {

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

@@ -74,13 +74,11 @@ declare const _default: import("vue").DefineComponent<{}, {
         urlConfig?: {
             url?: string | undefined;
             method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
-            dependKey?: Record<string, string> | import("../../../../../es/src/types").ArrayAble<string> | {
+            dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
-                paramValue: string;
-            } | {
-                paramName: string;
-                paramValue: string;
-            }[] | undefined;
+                paramValue?: string | undefined;
+                required?: boolean | undefined;
+            })[] | undefined;
             params?: AnyObject | undefined;
             nameKey?: string | undefined;
             valueKey?: string | undefined;

package/es/packages/form-config/src/hooks/useConfigurationField.js

@@ -18,10 +18,12 @@ function useConfigurationField() {
         elem_width: 12,
         option: [
           { text: "\u6574\u884C", value: 12 },
+          { text: "\u534A\u884C", value: 6 },
           { text: "5/6", value: 10 },
-          { text: "4/6", value: 8 },
-          { text: "3/6", value: 6 },
-          { text: "2/6", value: 4 },
+          { text: "2/3", value: 8 },
+          { text: "1/3", value: 4 },
+          { text: "3/4", value: 9 },
+          { text: "1/4", value: 3 },
           { text: "1/6", value: 2 }
         ]
       }

package/es/packages/form-config/src/hooks/usePresetRenderer.d.ts

@@ -1,5 +1,5 @@
 import { FieldItem } from '../../../../../es/packages/form-render';
-import { FormConfigTextFilter } from '../types';
-export declare function usePresetRenderer(textFilter: FormConfigTextFilter): {
+import { FormConfigTextFormatter } from '../types';
+export declare function usePresetRenderer(textFormatter: FormConfigTextFormatter): {
     getRenderer: (fieldItem: FieldItem) => import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>;
 };

package/es/packages/form-config/src/hooks/usePresetRenderer.js

@@ -5,7 +5,7 @@ import { InjectionActiveFieldItem, WidgetTextMap } from '../../../../packages/fo
 import { useSortable } from '../../../../packages/form-config/src/hooks';
 import { NEllipsis } from 'naive-ui';
 
-function usePresetRenderer(textFilter) {
+function usePresetRenderer(textFormatter) {
   const renderDefaultNode = {
     matcher: () => true,
     renderer({
@@ -26,7 +26,7 @@ function usePresetRenderer(textFilter) {
         default: () => getDisplayText()
       })]);
       function getDisplayText() {
-        return textFilter(fieldItem, `${fieldItem.alias}(${WidgetTextMap[fieldItem.html_type] || "\u63A7\u4EF6"})`);
+        return textFormatter(fieldItem, `${fieldItem.alias}(${WidgetTextMap[fieldItem.html_type] || "\u63A7\u4EF6"})`);
       }
     }
   };

package/es/packages/form-config/src/types/index.d.ts

@@ -8,7 +8,7 @@ export declare type FormConfigRenderer = {
     matcher: ArrayAble<string> | RegExp | Matcher;
     renderer: Component | FunctionalComponent;
 };
-export interface FormConfigTextFilter {
+export interface FormConfigTextFormatter {
     (fieldItem: FieldItem, parsedText: string): string;
 }
 export interface FormConfigExpose {

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

@@ -113,7 +113,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         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[]>;
+            afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
         }>>;
     };
 }, {
@@ -228,7 +228,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             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[]>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
     }>> & {
@@ -1730,7 +1730,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         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[]>;
+            afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
         }>>;
     };
 }>> & {

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

@@ -113,7 +113,7 @@ declare const _default: import("vue").DefineComponent<{
         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[]>;
+            afterRequest(fieldKey: string, payload?: any): AnyObject[];
         }>>;
     };
 }, {
@@ -228,7 +228,7 @@ declare const _default: import("vue").DefineComponent<{
             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[]>;
+                afterRequest(fieldKey: string, payload?: any): AnyObject[];
             }>>;
         };
     }>> & {
@@ -1730,7 +1730,7 @@ declare const _default: import("vue").DefineComponent<{
         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[]>;
+            afterRequest(fieldKey: string, payload?: any): AnyObject[];
         }>>;
     };
 }>> & {

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

@@ -63,16 +63,23 @@ const script = defineComponent({
       if (remoteOptions.value)
         return;
       remoteOptions.value = await asyncQueue.addAsync({
-        ...createParams(configFor(props), field.value, fieldKey.value)
+        ...await createParams(configFor(props), field.value, fieldKey.value)
       });
-      function createParams(config, field2, key) {
+      async function createParams(config, field2, key) {
         const _params = {};
-        traverseDependKey(config.dependKey, (dependKey, valueKey2) => {
-          const _field = field2.query(dependKey).take();
-          if (isField(_field)) {
-            _params[valueKey2] = _field.value;
-          }
-        });
+        try {
+          traverseDependKey(config.dependKey, (dependKey, valueKey2, required) => {
+            const _field = field2.query(dependKey).take();
+            if (isField(_field)) {
+              if (required && _field.value == null) {
+                throw `\u7F3A\u5C11\u5FC5\u987B\u7684\u53C2\u6570=>${dependKey}`;
+              }
+              _params[valueKey2] = _field.value;
+            }
+          });
+        } catch (e) {
+          return Promise.reject(e);
+        }
         return {
           ...config,
           params: Object.assign({}, config.params, _params),

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

@@ -1,8 +1,8 @@
 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;
+    afterRequest(key: string, payload?: unknown): AnyObject[];
+    beforeRequest(key: string, params?: unknown): WithUndefined<AnyObject> | void;
 }>;
 interface EntryCallback {
     (err?: any, result?: any): void;

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

@@ -109,7 +109,7 @@ function useAsyncQueue() {
       name: "FormRenderAsyncQueue",
       parallelism,
       async processor({ key, method = "post", params, url }, cb, removeCache) {
-        var _a, _b;
+        var _a;
         const http = getHttpInstance();
         if (!http) {
           useCommonLog().invalidHttpInstanceLog();
@@ -121,15 +121,11 @@ function useAsyncQueue() {
           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;
-          let payload = Array.isArray(data) ? data : [];
+          let res = await http[method](url, params);
           if (option && isFunction(option.afterRequest)) {
-            payload = (_b = option.afterRequest(key, payload)) != null ? _b : [];
+            res = option.afterRequest(key, res);
           }
-          cb(void 0, payload);
+          cb(void 0, Array.isArray(res) ? res : []);
         } catch (e) {
           cb(new Error(`Request error => ${e}`));
           removeCache();

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

@@ -13,12 +13,18 @@ function useFormContext(props) {
   const { callLifeCycle } = useFormRenderLifeCycle(props);
   const asyncQueue = injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism, {
     beforeRequest(...args) {
-      var _a;
-      return (_a = callLifeCycle("beforeRequest", cloneDeep(args))) != null ? _a : args[1];
+      return callLifeCycle("beforeRequest", cloneDeep(args)) || args[1];
     },
     afterRequest(...args) {
-      var _a;
-      return (_a = callLifeCycle("afterRequest", cloneDeep(args))) != null ? _a : args[1];
+      return callLifeCycle("afterRequest", cloneDeep(args)) || presetHandler(args[1]);
+      function presetHandler(res) {
+        if (!isObject(res))
+          throw res;
+        const { data, success } = res;
+        if (!success)
+          throw res;
+        return data;
+      }
     }
   }));
   const SchemaField = injectOrProvide(InjectionSchemaField, () => createSchemaField({

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

@@ -4,10 +4,10 @@ export declare function useFormRenderLifeCycle(props: FormRenderProps): {
     callLifeCycle: <T extends "onSetup" | "beforeRequest" | "afterRequest">(lifeCycleName: T, payload?: Parameters<Required<Partial<{
         onSetup(): void;
         beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
-        afterRequest(fieldKey: string, payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
+        afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
     }>>[T]> | undefined) => WithUndefined<ReturnType<Required<Partial<{
         onSetup(): void;
         beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
-        afterRequest(fieldKey: string, payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
+        afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
     }>>[T]>>;
 };

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble, WithUndefined } from '../../../../../es/src/types';
+import { AnyObject, WithUndefined } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Component, FunctionalComponent } from 'vue';
@@ -51,11 +51,15 @@ export declare type FormBusinessFilter = (payload: {
     type: FIELD_BUSINESS_TYPE;
     context?: any;
 }) => unknown;
-export declare type DependKeyType = ArrayAble<string> | Record<string, string> | ArrayAble<Record<'paramName' | 'paramValue', string>>;
+export declare type DependKeyType = string | Record<string, string> | Array<{
+    paramName: string;
+    paramValue?: string;
+    required?: boolean;
+} | string>;
 export declare type FormRenderLifeCycle = Partial<{
     onSetup(): void;
     beforeRequest(fieldKey: string, params?: AnyObject): WithUndefined<AnyObject> | void;
-    afterRequest(fieldKey: string, payload?: AnyObject[]): WithUndefined<AnyObject[]> | void;
+    afterRequest(fieldKey: string, payload?: any): AnyObject[];
 }>;
 export declare type FormRenderProps = Partial<{
     fieldList: FieldItem[];

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

@@ -16,7 +16,7 @@ export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldI
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
-    (dependKey: string, valueKey: string): void;
+    (dependKey: string, valueKey: string, required?: boolean): void;
 }): void;
 export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
 export declare function uuidGenerator(): string;

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

@@ -1,6 +1,6 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
 import { isObject } from '@vue/shared';
-import { isArray, isString, isFunction } from 'lodash-es';
+import { isString, isArray, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import { differenceInDays, differenceInMonths, differenceInYears } from 'date-fns';
@@ -104,23 +104,34 @@ function injectOrProvide(key, creator) {
 function traverseDependKey(dependKeys, handler) {
   if (!dependKeys)
     return;
+  createDependKeyMap().forEach((valueKey, dependKey) => {
+    if (isString(valueKey))
+      return handler(dependKey, valueKey);
+    handler(dependKey, valueKey.key, valueKey.required);
+  });
   Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
     handler(dependKey, valueKey);
   });
   function createDependKeyMap() {
-    let result = {};
+    const result = /* @__PURE__ */ new Map();
     if (isArray(dependKeys)) {
       dependKeys.forEach((k) => {
+        var _a;
         if (isObject(k)) {
-          result[k.paramName] = k.paramValue;
+          result.set(k.paramName, {
+            key: (_a = k.paramName) != null ? _a : k.paramValue,
+            required: k.required
+          });
         } else {
-          result[k] = k;
+          result.set(k, k);
         }
       });
     } else if (isObject(dependKeys)) {
-      result = dependKeys;
+      Object.entries(dependKeys).forEach(([k, v]) => {
+        result.set(k, v);
+      });
     } else if (isString(dependKeys)) {
-      result[dependKeys] = dependKeys;
+      result.set(dependKeys, dependKeys);
     }
     return result;
   }

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

@@ -4398,7 +4398,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             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[]>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
     }, {
@@ -4513,7 +4513,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 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[]>;
+                    afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };
         }>> & {
@@ -6015,7 +6015,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             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[]>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
     }>> & {

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

@@ -4398,7 +4398,7 @@ declare const _default: import("vue").DefineComponent<{
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
                 beforeRequest(fieldKey: string, params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
-                afterRequest(fieldKey: string, payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../src/types").AnyObject[];
             }>>;
         };
     }, {
@@ -4513,7 +4513,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
                     beforeRequest(fieldKey: string, params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
-                    afterRequest(fieldKey: string, payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
+                    afterRequest(fieldKey: string, payload?: any): import("../../../src/types").AnyObject[];
                 }>>;
             };
         }>> & {
@@ -6015,7 +6015,7 @@ declare const _default: import("vue").DefineComponent<{
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
                 beforeRequest(fieldKey: string, params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
-                afterRequest(fieldKey: string, payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../src/types").AnyObject[];
             }>>;
         };
     }>> & {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.15-beta.8",
+  "version": "3.1.15-beta.9",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",