cnhis-design-vue 3.1.8 → 3.1.9-beta.11

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

@@ -0,0 +1,11 @@
+import { FormChangeContext } from '../../../../../es/packages/form-render';
+export declare class ContextCollector {
+    private readonly contextMap;
+    setContext(key: string, prop: keyof FormChangeContext, value: any): void;
+    getContext(key: string): Partial<{
+        currentOption: import("../../../../src/types").AnyObject;
+    }>;
+}
+export declare function useChangeContext(): {
+    create: () => ContextCollector;
+};

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

@@ -0,0 +1,21 @@
+class ContextCollector {
+  constructor() {
+    this.contextMap = /* @__PURE__ */ new Map();
+  }
+  setContext(key, prop, value) {
+    const context = this.contextMap.get(key) || {};
+    Reflect.set(context, prop, value);
+    this.contextMap.set(key, context);
+  }
+  getContext(key) {
+    return this.contextMap.get(key) || {};
+  }
+}
+function useChangeContext() {
+  function create() {
+    return new ContextCollector();
+  }
+  return { create };
+}
+
+export { ContextCollector, useChangeContext };

package/es/packages/form-render/src/hooks/{useCommonLog2.mjs → useCommonLog.js}

@@ -1,4 +1,4 @@
-import { formRenderLog } from '../utils/index2.mjs';
+import { formRenderLog } from '../utils/index.js';
 
 function useCommonLog() {
   function invalidHttpInstanceLog() {

package/es/packages/form-render/src/hooks/{useFieldList2Schema2.mjs → useFieldList2Schema.js}

@@ -1,7 +1,7 @@
-import { arrayed, transformDateFormat } from '../utils/index2.mjs';
-import { useFormValidator } from './useFormValidator2.mjs';
+import { arrayed, transformDateFormat } from '../utils/index.js';
+import { useFormValidator } from './useFormValidator.js';
 import { isObject } from '@vueuse/core';
-import { useTypeNormalize } from './useTypeNormalize2.mjs';
+import { useTypeNormalize } from './useTypeNormalize.js';
 
 function useFieldList2Schema(collector) {
   const { createValidatorSchema } = useFormValidator();
@@ -103,12 +103,13 @@ function useFieldList2Schema(collector) {
       step: item.step_length,
       max: item.max_length,
       min: item.min_length,
-      options: item.option
+      option: item.option
     });
     return schema;
   };
   const createCustomSchema = (item) => {
     const schema = createStandardSchema(item);
+    item.fieldType && (schema.type = item.fieldType);
     Object.assign(schema["x-component-props"], {
       fieldItem: item
     });
@@ -126,6 +127,13 @@ function useFieldList2Schema(collector) {
       }
     };
   };
+  const createComplexSchema = (item) => {
+    const schema = createStandardSchema(item);
+    const properties = Array.isArray(item.properties) ? transform(item.properties) : {};
+    schema.type = item.fieldType || "void";
+    schema.properties = properties;
+    return schema;
+  };
   const creatorMap = /* @__PURE__ */ new Map([
     ["LINEBAR", createCollapseSchema],
     ["INPUT", createInputSchema],
@@ -137,7 +145,8 @@ function useFieldList2Schema(collector) {
     ["RADIO", createRadioSchema],
     ["CHECKBOX", createRadioSchema],
     ["SWITCH", createSwitchSchema],
-    ["SLIDER", createSliderSchema]
+    ["SLIDER", createSliderSchema],
+    ["COMPLEX", createComplexSchema]
   ]);
   const createWidgetSchema = (item) => {
     if (item.suffixConfig)
@@ -148,7 +157,7 @@ function useFieldList2Schema(collector) {
   const createWidgetCombinationSchema = (item) => {
     const suffixList = arrayed(item.suffixConfig);
     const fieldList = [{ ...item, suffixConfig: void 0 }].concat(suffixList.map((suffix) => {
-      return { ...suffix, is_show: "1", hide_title: "1" };
+      return { ...suffix, is_show: item.is_show, alias: " " };
     }));
     return {
       type: "void",

package/es/packages/form-render/src/hooks/{useFieldVisitor2.mjs → useFieldVisitor.js}

@@ -1,4 +1,4 @@
-import { arrayed } from '../utils/index2.mjs';
+import { arrayed } from '../utils/index.js';
 import { isFunction } from '@vueuse/core';
 
 function useFieldVisitor() {

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

@@ -1,4 +1,5 @@
 export declare function useFormField(): {
     field: import("vue").Ref<import("@formily/core").GeneralField>;
     title: import("vue").ComputedRef<any>;
+    fieldKey: import("vue").ComputedRef<string>;
 };

package/es/packages/form-render/src/hooks/{useFormField2.mjs → useFormField.js}

@@ -3,7 +3,11 @@ import { computed } from 'vue';
 
 function useFormField() {
   const field = useField();
-  return { field, title: computed(() => field.value.title) };
+  return {
+    field,
+    title: computed(() => field.value.title),
+    fieldKey: computed(() => field.value.props.name.toString())
+  };
 }
 
 export { useFormField };

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

@@ -0,0 +1,8 @@
+export declare class FormItemDepsCollector {
+    private readonly collector;
+    setDeps(key: string, dependKey: string | string[], callback: Function): void;
+    trigger(dependKey: string): void;
+}
+export declare function useFormItemDeps(): {
+    create: () => FormItemDepsCollector;
+};

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

@@ -0,0 +1,29 @@
+import { arrayed } 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();
+      map.set(key, callback);
+      this.collector.set(dependKey2, map);
+    });
+  }
+  trigger(dependKey) {
+    const map = this.collector.get(dependKey);
+    map && map.forEach((cb) => {
+      typeof cb === "function" && cb();
+    });
+  }
+}
+function useFormItemDeps() {
+  function create() {
+    return new FormItemDepsCollector();
+  }
+  return { create };
+}
+
+export { FormItemDepsCollector, useFormItemDeps };

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

@@ -1,4 +1,4 @@
-import { AnyObject } from 'cnhis-design-vue/es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { FieldItem } from '../types';
 export declare function useFormValidator(): {
     createValidatorSchema: (fieldItem: FieldItem) => AnyObject[];

package/es/packages/form-render/src/hooks/{useFormValidator2.mjs → useFormValidator.js}

@@ -1,4 +1,4 @@
-import { arrayed } from '../utils/index2.mjs';
+import { arrayed } from '../utils/index.js';
 import { isFunction } from '@vueuse/core';
 
 function useFormValidator() {
@@ -36,7 +36,7 @@ function useFormValidator() {
       });
     }
     if (max_length) {
-      rules.push({ len: max_length, message });
+      rules.push({ max: max_length, message });
     }
     const ruleCreator = vali_obj && validateMap.get(vali_obj);
     ruleCreator && rules.push(Object.assign({}, commonValidateConfig, ruleCreator(fieldItem)));

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

@@ -1,4 +1,4 @@
-import { AnyObject } from 'cnhis-design-vue/es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 export declare type ValidateItem = Partial<{
     obj_type: string;
     vali_obj: string;
@@ -14,6 +14,7 @@ export declare type ValidateItem = Partial<{
 interface OptionItem {
     text: string;
     value: string;
+    children?: OptionItem[];
 }
 export interface Ievent {
     event_field: string;
@@ -39,6 +40,8 @@ export declare type FieldItem = {
     wordbook?: AnyObject;
     suFieldList?: any[];
     bindEventSetting?: Ievent[];
+    fieldType: 'string' | 'object' | 'array' | 'number' | 'void' | 'boolean' | 'datetime';
+    properties: FieldItem[];
     [key: string]: any;
 }>;
 export {};

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

@@ -1,8 +1,8 @@
-import { AnyObject } from 'cnhis-design-vue/es/src/types';
-import { Field } from "@formily/core";
-import { FieldItem } from "../types";
-import { AsyncQueue } from "../hooks";
-export * from "./fieldItem";
+import { AnyObject } from '../../../../../es/src/types';
+import { DataField, Field } from '@formily/core';
+import { FieldItem } from '../types';
+import { AsyncQueue } from '../hooks';
+export * from './fieldItem';
 export interface FieldVisitorContext {
     field: FieldItem;
     replace(f: FieldItem): void;
@@ -10,7 +10,7 @@ export interface FieldVisitorContext {
     insertAfter(f: FieldItem | FieldItem[]): void;
 }
 export declare type FieldVisitor = Record<string, (context: FieldVisitorContext) => void>;
-export declare type FormRequestType = "post" | "get" | "patch" | "delete" | "put";
+export declare type FormRequestType = 'post' | 'get' | 'patch' | 'delete' | 'put';
 export interface FormAsyncQueueItem {
     key: any;
     url: string;
@@ -18,9 +18,19 @@ export interface FormAsyncQueueItem {
     params?: AnyObject;
 }
 export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObject[]>;
-export declare type IdCardParseInfo = Record<"sex" | "birthday", string> & Record<"age" | "day" | "month" | "year", number>;
+export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & Record<'age' | 'day' | 'month' | 'year', number>;
 export declare type FormRenderExpose = {
-    validate(): Promise<unknown>;
+    validate(): Promise<void>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
 };
+export declare type FormChangeContext = Partial<{
+    currentOption: AnyObject;
+}>;
+export declare type FormChangePayload = {
+    value: any;
+    fieldKey: string;
+    fieldName: string;
+    fieldInstance: DataField;
+    context: FormChangeContext;
+};

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

@@ -1,10 +1,14 @@
-import { GeneralField } from "@formily/core";
-import { InjectionKey } from "vue";
-import { IdCardParseInfo } from "../types";
+import { AnyObject } from '../../../../../es/src/types';
+import { GeneralField } from '@formily/core';
+import { InjectionKey } from 'vue';
+import { 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: any, field: GeneralField): any;
+export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
+    [x: string]: any;
+};
 export declare function transformDateFormat(format: string): "date" | "datetime";
 export declare function isIdCard(idCardNo: string): boolean;
 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;

package/es/packages/form-render/src/utils/{index2.mjs → index.js}

@@ -1,7 +1,7 @@
-import { FIELD_SEX_VALUE } from '../constants/index2.mjs';
+import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
-import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.mjs';
-import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.mjs';
+import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
+import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.js';
 import { inject, provide } from 'vue';
 
 function formRenderLog(message, type = "log") {
@@ -55,5 +55,17 @@ 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;
+      }
+    });
+  }
+  return result;
+}
 
-export { arrayed, assignUpdateValue, formRenderLog, injectOrProvide, isIdCard, parseIdCard, transformDateFormat };
+export { arrayed, assignUpdateValue, formRenderLog, generateUrlParams, injectOrProvide, isIdCard, parseIdCard, transformDateFormat };

package/es/packages/form-render/style/index.css

@@ -1,18 +1,18 @@
-.formily-render__wrapper {
+.form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
-.formily-render__formItem {
+.form-render__formItem {
   grid-column: span var(--form-item-column) / span var(--form-item-column);
 }
-.formily-render__formItem .n-date-picker {
+.form-render__formItem .n-date-picker {
   width: 100%;
 }
-.formily-render__collapse {
+.form-render__collapse {
   grid-column: span var(--column) / span var(--column);
 }
-.formily-render__collapseHeader {
+.form-render__collapseHeader {
   cursor: pointer;
   display: flex;
   background: #fafafa;
@@ -22,44 +22,48 @@
   margin-bottom: 8px;
   border: 1px solid #d9d9d9;
 }
-.formily-render__collapseItem {
+.form-render__collapseItem {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
-.formily-render__inputGroup {
+.form-render__inputGroup {
   grid-column: span var(--column) / span var(--column);
   display: flex;
-  align-items: flex-end;
+  align-items: flex-start;
 }
-.formily-render__inputGroup > div {
+.form-render__inputGroup > div {
   flex: 1;
 }
-.formily-render__inputGroup > div:not(:last-of-type) .n-input__border,
-.formily-render__inputGroup > div:not(:last-of-type) .n-base-selection__border {
+.form-render__inputGroup > div:not(:last-of-type) .n-input__border,
+.form-render__inputGroup > div:not(:last-of-type) .n-base-selection__border {
   border-right: 0;
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
-.formily-render__inputGroup > div:last-of-type .n-input__border,
-.formily-render__inputGroup > div:last-of-type .n-base-selection__border {
+.form-render__inputGroup > div:last-of-type .n-input__border,
+.form-render__inputGroup > div:last-of-type .n-base-selection__border {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
-.formily-render__combination {
+.form-render__combination {
   width: 100%;
 }
-.formily-render__combinationHeader {
+.form-render__combinationHeader {
   display: flex;
   gap: 12px;
 }
-.formily-render__combinationHeader > h3 {
+.form-render__combinationHeader > h3 {
   font-size: 16px;
   font-weight: 700;
   padding: 0;
   margin: 0;
 }
-.formily-render__combinationClose {
+.form-render__combinationHeaderText {
+  font-size: 16px;
+  font-weight: 500;
+}
+.form-render__combinationClose {
   position: absolute;
   right: 0;
   top: 5px;
@@ -75,6 +79,14 @@
   vertical-align: middle;
   font-size: 16px;
 }
-.formily-render__combinationContent {
+.form-render__combinationContent {
   position: relative;
 }
+.form-render__complex {
+  width: 100%;
+}
+.form-render__complexContent {
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  gap: 0 8px;
+}