cnhis-design-vue 3.1.9-beta.1 → 3.1.9-beta.2

package/es/packages/big-table/index.d.ts

@@ -621,6 +621,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         type: string;
         fixed: string;
         align: string;
+        visible: any;
         resizable: boolean;
         width: string;
         showOverflow: boolean;
@@ -628,7 +629,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             header: () => any[];
             default?: undefined;
         };
-        visible?: undefined;
     } | {
         type: any;
         fixed: string;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -620,6 +620,7 @@ declare const _default: import("vue").DefineComponent<{
         type: string;
         fixed: string;
         align: string;
+        visible: any;
         resizable: boolean;
         width: string;
         showOverflow: boolean;
@@ -627,7 +628,6 @@ declare const _default: import("vue").DefineComponent<{
             header: () => any[];
             default?: undefined;
         };
-        visible?: undefined;
     } | {
         type: any;
         fixed: string;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.mjs

@@ -333,7 +333,8 @@ var script = /* @__PURE__ */ defineComponent({
         isScanMultiTable: isScanMultiTable2,
         isEdit = false,
         editConfig = {},
-        rowConfig = {}
+        rowConfig = {},
+        showSeq = true
       } = map;
       if (isEdit) {
         state.editConfig = Object.assign(state.editConfig, editConfig);
@@ -380,6 +381,7 @@ var script = /* @__PURE__ */ defineComponent({
         type: "seq",
         fixed: props.isNestTable ? "" : "left",
         align: "center",
+        visible: showSeq,
         resizable: true,
         width: "34",
         showOverflow: true,

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

@@ -188,7 +188,8 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     emit: (event: "formChange", ...args: any[]) => void;
     create: () => import("./src/hooks").BusinessCollector;
     trigger: (collector: import("./src/hooks").BusinessCollector, formModel: import("@formily/core").Form<any>, fieldName: string, value: unknown) => void;
-    collector: import("./src/hooks").BusinessCollector;
+    businessCollector: import("./src/hooks").BusinessCollector;
+    changeContextCollector: import("./src/hooks").ContextCollector;
     formModel: import("@formily/core").Form<{
         [x: string]: any;
     }>;

package/es/packages/form-render/index.mjs

@@ -11,6 +11,8 @@ export { useFieldVisitor } from './src/hooks/useFieldVisitor.mjs';
 export { useTypeNormalize } from './src/hooks/useTypeNormalize.mjs';
 export { useFormValidator } from './src/hooks/useFormValidator.mjs';
 export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding.mjs';
+export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.mjs';
+export { useUrlDeps } from './src/hooks/useUrlDeps.mjs';
 
 const FormRender = script;
 FormRender.install = function(app) {

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

@@ -188,7 +188,8 @@ declare const _default: import("vue").DefineComponent<{
     emit: (event: "formChange", ...args: any[]) => void;
     create: () => import("./hooks").BusinessCollector;
     trigger: (collector: import("./hooks").BusinessCollector, formModel: import("@formily/core").Form<any>, fieldName: string, value: unknown) => void;
-    collector: import("./hooks").BusinessCollector;
+    businessCollector: import("./hooks").BusinessCollector;
+    changeContextCollector: import("./hooks").ContextCollector;
     formModel: import("@formily/core").Form<{
         [x: string]: any;
     }>;

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.mjs

@@ -1,12 +1,13 @@
 import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, renderSlot, createBlock, createElementVNode, toDisplayString, createCommentVNode } from 'vue';
 import { injectOrProvide } from './utils/index.mjs';
 import { cloneDeep } from 'lodash-es';
-import { InjectionBusinessCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.mjs';
+import { InjectionBusinessCollector, InjectAsyncQueue, InjectionChangeContextCollector, InjectionSchemaField } from './constants/index.mjs';
 import * as index from './components/index.mjs';
 import { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer, createSchemaField } from '@formily/vue';
 import { useBusinessBinding } from './hooks/useBusinessBinding.mjs';
 import { useAsyncQueue } from './hooks/useAsyncQueue.mjs';
+import { useChangeContext } from './hooks/useChangeContext.mjs';
 import { useFieldVisitor } from './hooks/useFieldVisitor.mjs';
 import { useFieldList2Schema } from './hooks/useFieldList2Schema.mjs';
 
@@ -33,19 +34,22 @@ var script = /* @__PURE__ */ defineComponent({
   setup(__props, { expose, emit }) {
     const props = __props;
     const { create, trigger } = useBusinessBinding();
-    const collector = injectOrProvide(InjectionBusinessCollector, create);
+    const businessCollector = injectOrProvide(InjectionBusinessCollector, create);
     injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism));
+    const changeContextCollector = injectOrProvide(InjectionChangeContextCollector, useChangeContext().create);
     const formModel = createForm({
       initialValues: props.initialData,
       effects() {
         onFieldValueChange("*", (field) => {
+          const fieldKey = field.props.name.toString();
           emit("formChange", {
             fieldInstance: field,
-            fieldKey: field.props.name,
+            fieldKey,
             fieldName: field.title,
-            value: field.value
+            value: field.value,
+            context: changeContextCollector.getContext(fieldKey)
           });
-          trigger(collector, formModel, field.props.name, field.value);
+          trigger(businessCollector, formModel, fieldKey, field.value);
         });
       }
     });
@@ -54,11 +58,12 @@ var script = /* @__PURE__ */ defineComponent({
       scope: props.scope
     }).SchemaField);
     const { traverse } = useFieldVisitor();
-    const { transform } = useFieldList2Schema(collector);
+    const { transform } = useFieldList2Schema(businessCollector);
     const renderSchema = computed(() => {
       if (props.schema) {
         return props.schema;
-      } else if (props.fieldList) {
+      }
+      if (props.fieldList) {
         const _fieldList = traverse(cloneDeep(props.fieldList), props.fieldVisitor);
         return { type: "object", properties: transform(_fieldList) };
       }

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

@@ -8,6 +8,9 @@ declare type UrlConfig = {
     valueKey: string;
 };
 export declare const SELECT: import("vue").DefineComponent<{
+    value: {
+        type: StringConstructor;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -18,7 +21,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     onChange: {
         type: FunctionConstructor;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => 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<{
+    value: {
+        type: StringConstructor;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -29,7 +35,9 @@ export declare const SELECT: import("vue").DefineComponent<{
     onChange: {
         type: FunctionConstructor;
     };
-}>>, {
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
     options: AnyObject[];
 }>;
 export {};

package/es/packages/form-render/src/components/select.mjs

@@ -1,14 +1,18 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
-import { InjectAsyncQueue } from '../constants/index.mjs';
+import { cloneDeep } from 'lodash-es';
+import { InjectAsyncQueue, InjectionChangeContextCollector } from '../constants/index.mjs';
 import { assignUpdateValue, formRenderLog } from '../utils/index.mjs';
 import { isObject } from '@vueuse/core';
-import { connect, mapProps } from '@formily/vue';
+import { useField, connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
 import { useFormField } from '../hooks/useFormField.mjs';
 
 const script = defineComponent({
   name: "FormSelect",
   props: {
+    value: {
+      type: String
+    },
     options: {
       type: Array,
       default: () => []
@@ -20,8 +24,10 @@ const script = defineComponent({
       type: Function
     }
   },
+  emits: ["update:value"],
   setup(props, {
     slots,
+    emit,
     attrs
   }) {
     const _options = ref(null);
@@ -79,9 +85,20 @@ const script = defineComponent({
     }, {
       immediate: true
     });
+    const field = useField();
+    const fieldKey = computed(() => {
+      return field.value.props.name.toString();
+    });
+    const changeContextCollector = inject(InjectionChangeContextCollector);
+    function update(v, option) {
+      changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, "currentOption", cloneDeep(option));
+      emit("update:value", v);
+    }
     return () => {
       var _a, _b, _c, _d;
       return createVNode(NSelect, {
+        "value": props.value,
+        "onUpdate:value": update,
         "remote": true,
         "filterable": true,
         "labelField": (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text",

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

@@ -1,9 +1,11 @@
+import { ContextCollector } from 'cnhis-design-vue/es/packages/form-render/src/hooks/useChangeContext';
 import { BusinessCollector } from '../hooks';
 import { FormAsyncQueue } from '../types';
 import { Component, InjectionKey } from 'vue';
 export declare const InjectAsyncQueue: InjectionKey<FormAsyncQueue>;
 export declare const InjectionSchemaField: InjectionKey<Component>;
 export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>;
+export declare const InjectionChangeContextCollector: InjectionKey<ContextCollector>;
 export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",
     ID_CARD = "id_card",

package/es/packages/form-render/src/constants/index.mjs

@@ -1,6 +1,7 @@
 const InjectAsyncQueue = Symbol("InjectAsyncQueue");
 const InjectionSchemaField = Symbol("InjectionSchemaField");
 const InjectionBusinessCollector = Symbol("InjectionBusinessCollector");
+const InjectionChangeContextCollector = Symbol("InjectionChangeContextCollector");
 var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
   FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
   FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
@@ -23,4 +24,4 @@ var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
   return FIELD_SEX_VALUE2;
 })(FIELD_SEX_VALUE || {});
 
-export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, InjectAsyncQueue, InjectionBusinessCollector, InjectionSchemaField };
+export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionSchemaField };

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

@@ -1,9 +1,11 @@
-export * from "./useFieldList2Schema";
-export * from "./useFormRequest";
-export * from "./useCommonLog";
-export * from "./useFormField";
-export * from "./useAsyncQueue";
-export * from "./useFieldVisitor";
-export * from "./useTypeNormalize";
-export * from "./useFormValidator";
-export * from "./useBusinessBinding";
+export * from './useFieldList2Schema';
+export * from './useFormRequest';
+export * from './useCommonLog';
+export * from './useFormField';
+export * from './useAsyncQueue';
+export * from './useFieldVisitor';
+export * from './useTypeNormalize';
+export * from './useFormValidator';
+export * from './useBusinessBinding';
+export * from './useChangeContext';
+export * from './useUrlDeps';

package/es/packages/form-render/src/hooks/index.mjs

@@ -7,3 +7,5 @@ export { useFieldVisitor } from './useFieldVisitor.mjs';
 export { useTypeNormalize } from './useTypeNormalize.mjs';
 export { useFormValidator } from './useFormValidator.mjs';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.mjs';
+export { ContextCollector, useChangeContext } from './useChangeContext.mjs';
+export { useUrlDeps } from './useUrlDeps.mjs';

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

@@ -1,27 +1,7 @@
-import { FormAsyncQueueItem } from "../types";
-declare enum ENTRY_STATE {
-    PENDING = 0,
-    DONE = 1
-}
+import { FormAsyncQueueItem } from '../types';
 interface EntryCallback {
     (err?: any, result?: any): void;
 }
-declare class AsyncQueueEntry<K = any> {
-    key: K;
-    item: any;
-    state: ENTRY_STATE;
-    callback?: EntryCallback;
-    callbacks?: EntryCallback[];
-    result?: any;
-    error?: any;
-    constructor(item: any, key: K, callback: EntryCallback);
-}
-declare class ArrayQueue<K = any> {
-    _list: AsyncQueueEntry<K>[];
-    constructor(items?: AsyncQueueEntry<K>[]);
-    enqueue(item: AsyncQueueEntry<K>): void;
-    dequeue(): AsyncQueueEntry<K> | undefined;
-}
 interface Processor<T, R = any> {
     (item: T, cb: (err?: any, result?: R) => void, removeCache: () => void): void;
 }
@@ -35,21 +15,21 @@ interface AsyncQueueOptions<T = any, K = any> {
  * @constructor 并发控制器
  */
 export declare class AsyncQueue<T = any, K = any, R = any> {
-    name: string;
-    processor: Processor<T, R>;
-    getKey: AsyncQueueOptions<T, K>["getKey"];
-    parallelism: number;
-    _queued: ArrayQueue<K>;
-    _entries: Map<K, AsyncQueueEntry<K>>;
-    _activeTasks: number;
-    _processingLock: boolean;
-    _stopped: boolean;
+    readonly name: string;
+    private readonly processor;
+    private readonly getKey;
+    private readonly parallelism;
+    private readonly _queued;
+    private readonly _entries;
+    private _activeTasks;
+    private _processingLock;
+    private _stopped;
     constructor({ name, processor, getKey, parallelism }: AsyncQueueOptions<T>);
     add(item: T, callback: EntryCallback): void;
     addAsync(item: T): Promise<R>;
-    _ensureProcessing(): void;
-    _startProcess(entry: AsyncQueueEntry): void;
-    _handlerResult(entry: AsyncQueueEntry, e?: any, r?: any): void;
+    private _ensureProcessing;
+    private _startProcess;
+    private _handlerResult;
 }
 export declare function useAsyncQueue(): {
     create: (parallelism?: number) => AsyncQueue<FormAsyncQueueItem, any, {

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

@@ -1,8 +1,8 @@
 import { Form } from '@formily/core';
 import { FIELD_BUSINESS_TYPE } from '../constants';
 export declare class BusinessCollector {
-    typeCollector: Map<FIELD_BUSINESS_TYPE, Set<string>>;
-    fieldNameCollector: Map<string, FIELD_BUSINESS_TYPE>;
+    private readonly typeCollector;
+    private readonly fieldNameCollector;
     collect(type: FIELD_BUSINESS_TYPE, fieldName: string): void;
     getField(type: FIELD_BUSINESS_TYPE): string[];
     getType(fieldName: string): FIELD_BUSINESS_TYPE | undefined;

package/es/packages/form-render/src/hooks/useBusinessBinding.mjs

@@ -49,7 +49,7 @@ function useBusinessBinding() {
   }
   const handlerMap = /* @__PURE__ */ new Map([[FIELD_BUSINESS_TYPE.ID_CARD, handlerIdCardType]]);
   function trigger(collector, formModel, fieldName, value) {
-    const type = collector.fieldNameCollector.get(fieldName);
+    const type = collector.getType(fieldName);
     if (!type || !handlerMap.has(type))
       return;
     handlerMap.get(type)(formModel, collector, value);

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

@@ -0,0 +1,11 @@
+import { FormChangeContext } from 'cnhis-design-vue/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.mjs

@@ -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/useUrlDeps.d.ts

@@ -0,0 +1 @@
+export declare function useUrlDeps(): void;

package/es/packages/form-render/src/hooks/useUrlDeps.mjs

@@ -0,0 +1,4 @@
+function useUrlDeps() {
+}
+
+export { useUrlDeps };

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 { 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>;
     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/index.mjs

@@ -39,6 +39,8 @@ export { useFieldVisitor } from './form-render/src/hooks/useFieldVisitor.mjs';
 export { useTypeNormalize } from './form-render/src/hooks/useTypeNormalize.mjs';
 export { useFormValidator } from './form-render/src/hooks/useFormValidator.mjs';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding.mjs';
+export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.mjs';
+export { useUrlDeps } from './form-render/src/hooks/useUrlDeps.mjs';
 
 const components = {
   CGrid: Grid,

package/es/packages/select-person/src/SelectPerson.vue_vue_type_script_setup_true_lang.mjs

@@ -505,11 +505,11 @@ var script = /* @__PURE__ */ defineComponent({
       });
     };
     const staticDataSearch = () => {
+      state.expandedKeys = [];
       if (!state.title) {
         state.treeData.main = JSON.parse(JSON.stringify(props.data));
         return;
       }
-      state.expandedKeys = [];
       let copyData = JSON.parse(JSON.stringify(props.data));
       state.treeData.main = filterTree({
         value: state.title,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.9-beta.1",
+  "version": "3.1.9-beta.2",
   "license": "ISC",
   "module": "es/packages/index.mjs",
   "main": "es/packages/index.mjs",