cnhis-design-vue 3.1.14-beta.8 → 3.1.15-beta.0

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

@@ -1,14 +1,15 @@
 import { isObject } from '@vueuse/core';
-import { isArray, pick } from 'lodash-es';
+import { pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { fieldKeyEscape, createLinebarId, arrayed, transformDateFormat } from '../utils/index.js';
+import { fieldKeyEscape, arrayed, createLinebarId, elementIdEscape, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
   const createStandardSchema = (item) => {
+    var _a;
     const result = {
       name: item.val_key,
-      type: "string",
+      type: (_a = item.fieldType) != null ? _a : "string",
       title: item.alias || item.name,
       "x-component": item.html_type,
       "x-component-props": {
@@ -30,7 +31,7 @@ function useFieldListAdaptor(collector, uuid) {
           showLabel: item.hide_title !== "1",
           propertyKey: item.val_key,
           annotation: item.annotation,
-          id: `${uuid}-${item.val_key}`,
+          id: elementIdEscape(`${uuid}-${item.val_key}`),
           ...item.decoratorProps || {}
         }
       });
@@ -80,7 +81,7 @@ function useFieldListAdaptor(collector, uuid) {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
       urlConfig: item.urlConfig,
-      deep: (_a = item.wordbook) == null ? void 0 : _a.level_num,
+      depth: (_a = item.wordbook) == null ? void 0 : _a.level_num,
       options: item.option
     });
     return schema;
@@ -95,9 +96,13 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createCombinationSchema = (item) => {
     const schema = createStandardSchema(item);
-    schema["x-decorator-props"].showLabel = false;
+    Object.assign(schema["x-decorator-props"], {
+      showLabel: false,
+      showFeedback: false
+    });
     Object.assign(schema["x-component-props"], {
       title: item.alias || item.name,
+      maxGroupNum: item.maxGroupNum,
       getProperties: () => item.children || []
     });
     return schema;
@@ -108,7 +113,9 @@ function useFieldListAdaptor(collector, uuid) {
     Object.assign(schema["x-component-props"], {
       precision: decimal_length || (validate == null ? void 0 : validate.decimal_length),
       max: validate == null ? void 0 : validate.max_value,
-      min: validate == null ? void 0 : validate.min_value
+      min: validate == null ? void 0 : validate.min_value,
+      prefix: item.prefix,
+      suffix: item.suffix
     });
     return schema;
   };
@@ -124,7 +131,6 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createCustomSchema = (item) => {
     const schema = createStandardSchema(item);
-    item.fieldType && (schema.type = item.fieldType);
     Object.assign(schema["x-component-props"], {
       fieldItem: item
     });
@@ -213,8 +219,8 @@ function useFieldListAdaptor(collector, uuid) {
       return schema;
     }
     function createFieldName(fieldItem) {
-      if (isArray(fieldItem.suffixConfig)) {
-        return fieldKeyEscape([fieldItem, ...fieldItem.suffixConfig]);
+      if (fieldItem.suffixConfig) {
+        return fieldKeyEscape([fieldItem, ...arrayed(fieldItem.suffixConfig)]);
       }
       return fieldItem.val_key;
     }

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

@@ -1,8 +1,9 @@
 import { Func } from '../../../../../es/src/types';
+import { DependKeyType } from '../../../../../es/packages/form-render';
 export declare class FormItemDepsCollector {
     private readonly collector;
-    setDeps(key: string, dependKey: string | string[], callback: Func): void;
-    trigger(dependKey: string, payload?: any): void;
+    setDeps(key: string, dependKeys: DependKeyType, callback: Func): void;
+    trigger(dependKey: string, payload?: unknown): void;
 }
 export declare function useFormItemDeps(): {
     create: () => FormItemDepsCollector;

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

@@ -1,16 +1,15 @@
 import { isFunction } from 'lodash-es';
-import { arrayed } from '../../../../packages/form-render/src/utils';
+import { traverseDependKey } from '../../../../packages/form-render/src/utils';
 
 class FormItemDepsCollector {
   constructor() {
     this.collector = /* @__PURE__ */ new Map();
   }
-  setDeps(key, dependKey, callback) {
-    dependKey = arrayed(dependKey);
-    dependKey.forEach((dependKey2) => {
-      const map = this.collector.get(dependKey2) || /* @__PURE__ */ new Map();
+  setDeps(key, dependKeys, callback) {
+    traverseDependKey(dependKeys, (dependKey) => {
+      const map = this.collector.get(dependKey) || /* @__PURE__ */ new Map();
       map.set(key, callback);
-      this.collector.set(dependKey2, map);
+      this.collector.set(dependKey, map);
     });
   }
   trigger(dependKey, payload) {

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

@@ -1,7 +1,7 @@
-import { Func } from '../../../../../es/src/types';
+import { Func, WithNull } from '../../../../../es/src/types';
 declare type RequestInstance = Record<string, Func>;
 export declare function useFormRequest(): {
-    getHttpInstance: () => RequestInstance | null;
+    getHttpInstance: () => WithNull<RequestInstance>;
     registGlobHttpInstance: (instance: RequestInstance) => void;
 };
 export {};

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

@@ -1,14 +1,24 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
+import { SchemaReaction } from '@formily/json-schema/esm/types';
+import { SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
+import { DependKeyType, FormCommonState } from '../../../../../es/packages/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';
 export declare type ValidateItem = Partial<{
-    obj_type: string;
+    /**
+     * 业务类型
+     */
+    obj_type: FieldBusinessType;
+    /**
+     * 校验类型
+     */
     vali_obj: string;
     max_value: string | number;
     min_value: string | number;
     min_length: string | number;
     max_length: string | number;
     decimal_length: string | number;
-    regular_expression: any;
+    regular_expression: RegExp | string;
     regular_error_tip: string;
     [key: string]: any;
 }>;
@@ -17,10 +27,6 @@ interface OptionItem {
     value: any;
     children?: OptionItem[];
 }
-export interface Ievent {
-    event_field: string;
-    event_type: string;
-}
 interface FormRendererPayload {
     clearable: boolean;
     disabled: boolean;
@@ -36,64 +42,146 @@ interface SwitchProperty {
     describe?: string;
 }
 export declare type FieldItem = {
+    /**
+     * 字段的key
+     */
     val_key: string;
+    /**
+     * 控件类型
+     */
     html_type: string;
 } & Partial<{
+    /**
+     * 是否开启批注(需要先在表单维度开启)
+     */
     annotation: boolean;
+    /**
+     * 定制化字段, AGE类型控件时的单位字段
+     */
     val_key_unit: string;
-    is_edit: string;
+    /**
+     * 是否允许编辑('1'为允许编辑)
+     */
+    is_edit: FormCommonState;
+    /**
+     * 控件在栅栏系统中的的宽度值, 默认为3
+     */
     elem_width: number;
-    is_show: string | number;
-    is_null: string;
+    /**
+     * 是否展示('1'为展示)
+     */
+    is_show: FormCommonState;
+    /**
+     * 是否允许为空('1'为允许为空)
+     */
+    is_null: FormCommonState;
+    /**
+     * 字段label
+     */
     name: string;
+    /**
+     * 字段label(优先级比name高)
+     */
     alias: string;
+    /**
+     * 默认值
+     */
     default_val: any;
-    is_empty: string;
-    group: string;
-    hide_title: string;
+    /**
+     * 是否开启清空功能('0'表示开启)
+     */
+    is_empty: FormCommonState;
+    /**
+     * 是否隐藏label('1'表示隐藏)
+     */
+    hide_title: FormCommonState;
     placeholder: string;
     validate: ValidateItem;
     option: OptionItem[];
-    wordbook: AnyObject;
-    suFieldList: any[];
-    bindEventSetting: Ievent[];
+    /**
+     * 用于cascader控件提供层级参数
+     */
+    wordbook: {
+        level_num: number;
+    };
+    /**
+     * switch控件,开启状态参数
+     */
     open: SwitchProperty;
+    /**
+     * switch控件,关闭状态参数
+     */
     close: SwitchProperty;
+    /**
+     * date控件value格式
+     */
     date_format: string;
+    /**
+     * slider控件间距
+     */
     step_length: string | number;
     urlConfig: Partial<{
         url: string;
         method: 'post' | 'get' | 'put' | 'patch' | 'delete';
-        dependKey: string | string[];
+        /**
+         * 请求参数依赖关系
+         */
+        dependKey: DependKeyType;
         params: AnyObject;
         nameKey: string;
         valueKey: string;
     }>;
-    suffixConfig: FieldItem[] | FieldItem;
-    fieldType: 'string' | 'object' | 'array' | 'number' | 'void' | 'boolean' | 'datetime';
+    /**
+     * 控件组
+     */
+    suffixConfig: ArrayAble<FieldItem>;
+    /**
+     * 数据类型
+     */
+    fieldType: SchemaTypes;
+    /**
+     * BUTTON/TEXT控件内容
+     */
     content: string | FormRenderer | Record<string, FormRenderer>;
-    properties: FieldItem[];
+    /**
+     * COMBINATION控件最大表单组数量
+     */
+    maxGroupNum: number;
+    /**
+     * COMBINATION控件子项
+     */
     children: FieldItem[];
+    /**
+     * 子项
+     */
+    properties: FieldItem[];
+    /**
+     * 控件额外的props
+     */
     componentProps: AnyObject;
+    /**
+     * FormItem额外的props
+     */
     decoratorProps: AnyObject;
+    /**
+     * COMPLEX控件布局类型
+     */
     display: 'grid' | 'flex';
+    /**
+     * COMPLEX控件额外样式
+     */
     wrapperStyle: CSSProperties | Record<string, string>;
-    validator: (value: any, fieldItem: FieldItem) => void | string;
-    reactions: {
-        target?: string;
-        dependencies?: string[];
-        fulfill: {
-            state?: Partial<{
-                value: string;
-                disabled: string;
-                display: string;
-                componentProps: AnyObject;
-                decoratorProps: AnyObject;
-                selfErrors: string;
-                [key: string]: string | AnyObject;
-            }>;
-        };
-    };
+    /**
+     * 自定义校验规则
+     * @param value 表单当前控件的值
+     * @param fieldItem 配置参数
+     * @return {void|string} 返回校验信息
+     */
+    validator: (value: unknown, fieldItem: FieldItem) => void | string;
+    /**
+     * 表单联动配置
+     */
+    reactions: ArrayAble<SchemaReaction>;
     [key: string]: any;
 }>;
 export {};

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

@@ -1,9 +1,10 @@
-import { AnyObject } from '../../../../../es/src/types';
+import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
 import { FIELD_BUSINESS_TYPE } from '../../../../../es/packages/form-render/src/constants';
 import { FieldItem } from '../types';
 import { AsyncQueue } from '../hooks';
 export * from './fieldItem';
+export declare type FormCommonState = '0' | '1';
 export interface FieldVisitorContext {
     field: FieldItem;
     replace(f: FieldItem): void;
@@ -15,7 +16,7 @@ export declare type FormRequestType = 'post' | 'get' | 'patch' | 'delete' | 'put
 export interface FormAsyncQueueItem {
     key: any;
     url: string;
-    method: FormRequestType;
+    method?: FormRequestType;
     params?: AnyObject;
 }
 export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObject[]>;
@@ -48,3 +49,4 @@ 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>>;

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

@@ -1,8 +1,8 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { GeneralField } from '@formily/core';
-import { InjectionKey, VNode } from 'vue';
-import { AgeContext, FieldItem, IdCardParseInfo } from '../types';
+import { FunctionalComponent, InjectionKey, VNode } from 'vue';
+import { AgeContext, DependKeyType, FieldItem, IdCardParseInfo } from '../types';
 export declare function formRenderLog(message: string, type?: keyof Console): void;
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
@@ -14,10 +14,12 @@ export declare function isMobile(mobile: string): boolean;
 export declare function parseBirthday(birthday: string): AgeContext;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
-export declare function generateUrlParams(field: GeneralField, dependKeys?: string | string[]): AnyObject;
+export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
+    (dependKey: string, valueKey: string): void;
+}): void;
 export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
 export declare function uuidGenerator(): string;
-export declare function createSlot(renderer: unknown, props: any): Record<string, () => ArrayAble<VNode>> | {
+export declare function createSlot(renderer: unknown, props: AnyObject): Record<string, () => ArrayAble<VNode>> | {
     default(): any;
 };
 export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
@@ -26,5 +28,7 @@ export declare function queryInput(decoratorElement?: HTMLElement | null): {
     widgetElementList: HTMLInputElement[];
 };
 export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
+export declare function elementIdEscape(id: string): string;
 export declare function createLinebarId(id: string): string;
 export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
+export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;

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

@@ -1,11 +1,11 @@
-import { isObject, isFunction } from 'lodash-es';
+import { inject, provide, computed, createVNode, Fragment } from 'vue';
+import { isArray, isObject, isString, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
 import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.js';
 import differenceInYears from '../../../../node_modules/date-fns/esm/differenceInYears/index.js';
 import '../../../../node_modules/date-fns/esm/parse/_lib/parsers/index.js';
-import { inject, provide } from 'vue';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -16,7 +16,9 @@ function arrayed(maybeArray) {
   return [maybeArray];
 }
 function assignUpdateValue(props, field) {
-  const _props = { ...props };
+  const _props = {
+    ...props
+  };
   if (isField(field)) {
     Object.assign(_props, {
       "onUpdate:value"(value) {
@@ -69,17 +71,29 @@ function injectOrProvide(key, creator) {
   }
   return injected;
 }
-function generateUrlParams(field, dependKeys) {
-  const result = {};
-  if (dependKeys) {
-    arrayed(dependKeys).forEach((dependKey) => {
-      const _field = field.query(dependKey).take();
-      if (isField(_field)) {
-        result[dependKey] = _field.value;
-      }
-    });
+function traverseDependKey(dependKeys, handler) {
+  if (!dependKeys)
+    return;
+  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
+    handler(dependKey, valueKey);
+  });
+  function createDependKeyMap() {
+    let result = {};
+    if (isArray(dependKeys)) {
+      dependKeys.forEach((k) => {
+        if (isObject(k)) {
+          result[k.paramName] = k.paramValue;
+        } else {
+          result[k] = k;
+        }
+      });
+    } else if (isObject(dependKeys)) {
+      result = dependKeys;
+    } else if (isString(dependKeys)) {
+      result[dependKeys] = dependKeys;
+    }
+    return result;
   }
-  return result;
 }
 function traverseSchema(schema, handler) {
   handler(schema);
@@ -110,7 +124,7 @@ function createSlot(renderer, props) {
   };
 }
 function queryDecorator(key, wrapperElement, formUUID) {
-  return wrapperElement.querySelector(`#${formUUID}-${key}`);
+  return wrapperElement.querySelector(elementIdEscape(`#${formUUID}-${key}`));
 }
 function queryInput(decoratorElement) {
   var _a;
@@ -136,11 +150,26 @@ function getParentLinebar(key, fieldList) {
     return field.html_type === "LINEBAR";
   }
 }
+function elementIdEscape(id) {
+  return id.replace(".", "-");
+}
 function createLinebarId(id) {
-  return `id-${id}`;
+  return elementIdEscape(`id-${id}`);
 }
 function fieldKeyEscape(fieldList) {
   return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
 }
+function createInputSlot(props) {
+  return computed(() => {
+    const res = {};
+    if (props.prefix) {
+      res.prefix = () => createVNode(Fragment, null, [createSlot(props.prefix, props).default()]);
+    }
+    if (props.suffix) {
+      res.suffix = () => createVNode(Fragment, null, [createSlot(props.suffix, props).default()]);
+    }
+    return res;
+  });
+}
 
-export { arrayed, assignUpdateValue, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, generateUrlParams, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };

package/es/packages/form-table/index.js

@@ -1,7 +1,6 @@
 import { COMPONENT_NAMESPACE } from '../../src/global/variable';
 import { safeComponentRegister } from '../../src/utils';
-import './src/FormTable.js';
-import script from './src/FormTable.vue_vue_type_script_setup_true_lang.js';
+import script from './src/FormTable.js';
 
 const FormTable = script;
 FormTable.install = function(app) {