cnhis-design-vue 3.1.26-beta.3 → 3.1.26-beta.4

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

@@ -27,7 +27,8 @@ export declare type AgeContext = Record<'age' | 'day' | 'month' | 'year', number
 export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & AgeContext;
 export declare type FormRenderExpose = {
     validate(path?: string): Promise<unknown>;
-    getFormValues(): AnyObject;
+    getFormValues(needCombineExtendKey?: boolean): AnyObject;
+    setFormValues(values: AnyObject, needSplitExtendKey?: boolean): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
     resetFields(path?: string): void;
     queryWidget(key: string): Promise<{
@@ -35,6 +36,7 @@ export declare type FormRenderExpose = {
         widgetElementList: HTMLInputElement[];
         decoratorElement: HTMLElement | null;
     }>;
+    reload(): Promise<any>;
 };
 export declare type FormChangeContext = Partial<{
     currentOption: AnyObject;

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

@@ -17,4 +17,5 @@ export declare function optionMatcher(options: AnyObject[], input: Nullable<stri
     keyword?: string;
 }): AnyObject[];
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;
-export declare function transformExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
+export declare function combineExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
+export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;

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

@@ -1,9 +1,9 @@
-import { computed, createVNode, Fragment, inject, provide } from 'vue';
+import { inject, provide, computed, createVNode, Fragment } from 'vue';
 import { arrayed } from '../../../../shared/utils/index.js';
 import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
 import { useMemoize } from '@vueuse/core';
-import { isString, isFunction } from 'lodash-es';
+import { isString, isFunction, omit } from 'lodash-es';
 import 'date-fns';
 import '@formily/core';
 
@@ -133,7 +133,7 @@ function validateMessageParser(message, fieldItem) {
     return (_a = fieldItem[property.trim()]) != null ? _a : "";
   }
 }
-function transformExtendKey(fieldList, values) {
+function combineExtendKey(fieldList, values) {
   const fieldListWithExtendKey = fieldList.filter((field) => isString(field.extendKey) && field.extendKey);
   if (!fieldListWithExtendKey.length)
     return values;
@@ -157,5 +157,27 @@ function transformExtendKey(fieldList, values) {
   });
   return result;
 }
+function splitExtendKey(fieldList, values) {
+  const fieldListWithExtendKey = fieldList.filter((field) => isString(field.extendKey) && field.extendKey);
+  if (!fieldListWithExtendKey.length)
+    return values;
+  const queryFieldValue = useMemoize((extendKey) => {
+    try {
+      return JSON.parse(values[extendKey]);
+    } catch (e) {
+      return {};
+    }
+  });
+  const result = omit(values, fieldListWithExtendKey.map((field) => field.extendKey));
+  fieldListWithExtendKey.forEach(({
+    val_key,
+    extendKey
+  }) => {
+    if (Reflect.has(result, val_key))
+      return;
+    result[val_key] = queryFieldValue(extendKey)[val_key];
+  });
+  return result;
+}
 
-export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, transformExtendKey, validateMessageParser };
+export { combineExtendKey, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };

package/es/components/iho-table/src/IhoTable.js

@@ -1,7 +1,7 @@
 import { defineComponent, provide, ref, computed, watch, resolveComponent, openBlock, createElementBlock, createVNode, mergeProps, unref, withCtx, Fragment, renderList, createBlock } from 'vue';
 import { uuidGenerator } from '../../../shared/utils/index.js';
 import { useDebounceFn } from '@vueuse/core';
-import { VxeEventListenerNameList, InjectionIhoTableEmits, InjectionIhoTableUUID, InjectionIhoTableConfig, InjectionIhoTableHandler } from './constants/index.js';
+import { VxeEventListenerNameList, InjectionIhoTableEmits, InjectionIhoTableUUID, InjectionIhoTableConfig, InjectionIhoTableFieldList, InjectionIhoTableHandler } from './constants/index.js';
 import { createTableHooks, applyTableConfigHooks, applyTableFieldHooks, createTableEventHandlers, createDataTransfer } from './hooks/tapHooks/index.js';
 import 'lodash-es';
 import { getEventName } from './utils/index.js';
@@ -37,6 +37,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       configRef.value.uuid = uuidRef.value;
     }, 10);
     const fieldListRef = ref([]);
+    provide(InjectionIhoTableFieldList, fieldListRef);
     const updateFieldListRef = useDebounceFn(() => {
       fieldListRef.value = applyTableFieldHooks(hooks, props.fieldList, configRef.value);
     }, 10);

package/es/components/iho-table/src/constants/index.d.ts

@@ -1,7 +1,7 @@
 import { Nullable } from '../../../../../es/shared/types';
 import { InjectionKey, Ref } from 'vue';
 import { VxeTableEventProps } from 'vxe-table/types/table';
-import { IhoTableConfig, IhoTableHandler, UnionToTuple } from '../../../../../es/components/iho-table';
+import { IhoTableConfig, IhoTableEmitPayload, IhoTableFieldItem, IhoTableHandler, UnionToTuple } from '../../../../../es/components/iho-table';
 export declare enum WIDGET_TYPE {
     DEFAULT = "DEFAULT",
     PICTURE = "PICTURE",
@@ -46,7 +46,9 @@ export declare enum EDITABLE_WIDGET_TYPE {
     TIME = "TIME",
     NUMBER = "NUMBER"
 }
+export declare const IhoTableEventNameTuple: readonly ["formChange", "settingClick", ...("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[]];
 export declare const InjectionIhoTableConfig: InjectionKey<Ref<Nullable<IhoTableConfig>>>;
-export declare const InjectionIhoTableEmits: InjectionKey<(event: string, ...args: unknown[]) => void>;
+export declare const InjectionIhoTableFieldList: InjectionKey<Ref<Nullable<IhoTableFieldItem[]>>>;
+export declare const InjectionIhoTableEmits: InjectionKey<(<T extends typeof IhoTableEventNameTuple[number]>(event: T, ...args: IhoTableEmitPayload<T>) => void)>;
 export declare const InjectionIhoTableUUID: InjectionKey<Ref<string>>;
 export declare const InjectionIhoTableHandler: InjectionKey<IhoTableHandler>;

package/es/components/iho-table/src/constants/index.js

@@ -1,3 +1,5 @@
+import { getEventName } from '../utils/index.js';
+
 var WIDGET_TYPE = /* @__PURE__ */ ((WIDGET_TYPE2) => {
   WIDGET_TYPE2["DEFAULT"] = "DEFAULT";
   WIDGET_TYPE2["PICTURE"] = "PICTURE";
@@ -115,9 +117,15 @@ var EDITABLE_WIDGET_TYPE = /* @__PURE__ */ ((EDITABLE_WIDGET_TYPE2) => {
   EDITABLE_WIDGET_TYPE2["NUMBER"] = "NUMBER";
   return EDITABLE_WIDGET_TYPE2;
 })(EDITABLE_WIDGET_TYPE || {});
+const IhoTableEventNameTuple = [
+  "formChange",
+  "settingClick",
+  ...VxeEventListenerNameList.map(getEventName)
+];
 const InjectionIhoTableConfig = Symbol("injectionIhoTableConfig");
+const InjectionIhoTableFieldList = Symbol("injectionIhoTableFieldList");
 const InjectionIhoTableEmits = Symbol("InjectionIhoTableEmits");
 const InjectionIhoTableUUID = Symbol("InjectionIhoTableUUID");
 const InjectionIhoTableHandler = Symbol("InjectionIhoTableHandler");
 
-export { EDITABLE_WIDGET_TYPE, HIGHEST_PRIORITY, IhoTableRowGroupSequence, InjectionIhoTableConfig, InjectionIhoTableEmits, InjectionIhoTableHandler, InjectionIhoTableUUID, VxeEventListenerNameList, WIDGET_TYPE };
+export { EDITABLE_WIDGET_TYPE, HIGHEST_PRIORITY, IhoTableEventNameTuple, IhoTableRowGroupSequence, InjectionIhoTableConfig, InjectionIhoTableEmits, InjectionIhoTableFieldList, InjectionIhoTableHandler, InjectionIhoTableUUID, VxeEventListenerNameList, WIDGET_TYPE };

package/es/components/iho-table/src/hooks/useTableContext.d.ts

@@ -0,0 +1,7 @@
+export declare function useTableContext(): {
+    configRef: import("vue").Ref<import("../../../../shared/types").Nullable<import("../types").IhoTableConfig>> | undefined;
+    fieldListRef: import("vue").Ref<import("../../../../shared/types").Nullable<import("../types").IhoTableFieldItem[]>> | undefined;
+    tableHandler: import("../types").IhoTableHandler | undefined;
+    tableEmit: (<T extends "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd">(event: T, ...args: import("../types").IhoTableEmitPayload<T>) => void) | undefined;
+    uuid: import("vue").Ref<string> | undefined;
+};

package/es/components/iho-table/src/hooks/useTableContext.js

@@ -0,0 +1,15 @@
+import { getCurrentInstance, inject } from 'vue';
+import { InjectionIhoTableConfig, InjectionIhoTableFieldList, InjectionIhoTableHandler, InjectionIhoTableUUID, InjectionIhoTableEmits } from '../constants/index.js';
+
+function useTableContext() {
+  if (!getCurrentInstance())
+    throw new Error("useTableContext can only be used in setup environment");
+  const configRef = inject(InjectionIhoTableConfig);
+  const fieldListRef = inject(InjectionIhoTableFieldList);
+  const tableHandler = inject(InjectionIhoTableHandler);
+  const uuid = inject(InjectionIhoTableUUID);
+  const tableEmit = inject(InjectionIhoTableEmits);
+  return { configRef, fieldListRef, tableHandler, tableEmit, uuid };
+}
+
+export { useTableContext };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/editDate.vue.d.ts

@@ -42,7 +42,7 @@ declare const _default: import("vue").DefineComponent<{
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "update:value", ...args: any[]) => void;
-    globEmit: (event: string, ...args: unknown[]) => void;
+    globEmit: <T extends "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd">(event: T, ...args: import("../../../../../../../../es/components/iho-table").IhoTableEmitPayload<T>) => void;
     formRef: import("vue").Ref<HTMLElement | null>;
     isShow: import("vue").Ref<boolean>;
     formattedValue: import("vue").Ref<string | undefined>;

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/editSeparate.vue.d.ts

@@ -49,7 +49,7 @@ declare const _default: import("vue").DefineComponent<{
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
-    globEmit: (event: string, ...args: unknown[]) => void;
+    globEmit: <T extends "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd">(event: T, ...args: import("../../../../../../../../es/components/iho-table").IhoTableEmitPayload<T>) => void;
     tableHandler: import("../../../../../../../../es/components/iho-table").IhoTableHandler;
     popoverRef: import("vue").Ref<any>;
     editContent: import("vue").Ref<any>;

package/es/components/iho-table/src/types/index.d.ts

@@ -1,6 +1,7 @@
 import { AnyObject } from '../../../../../es/shared/types';
 import { VxeTableProps, VxeTableDefines } from 'vxe-table';
-import { IhoTableRowGroupSequence } from '../../../../../es/components/iho-table/src/constants';
+import { VxeTableEventProps } from 'vxe-table/types/table';
+import { IhoTableEventNameTuple, IhoTableRowGroupSequence } from '../../../../../es/components/iho-table/src/constants';
 export * from './pluginType';
 export interface IhoTableRowGroupItem {
     groupName: string;
@@ -40,10 +41,13 @@ export declare type LowCodeTableFieldItem = {
     treeNode: boolean;
 }>;
 export declare type IhoFormChangePayload = {
-    column: VxeTableDefines.ColumnInfo;
+    column: IhoTableFieldItem;
     row: AnyObject;
     value: unknown;
     index: number;
+    type?: string;
 };
 export declare type EventListenerToEventName<T extends string> = T extends `on${infer R}` ? R extends `${infer F}${infer L}` ? `${Lowercase<F>}${L}` : never : never;
+export declare type EventNameToEventListener<T extends string> = T extends `${infer L}${infer R}` ? `on${Uppercase<L>}${R}` : never;
 export declare type IhoTableHandler = Record<'updateConfigRef' | 'updateFieldListRef' | 'updateTableDataRef', () => void>;
+export declare type IhoTableEmitPayload<T extends typeof IhoTableEventNameTuple[number]> = T extends 'formChange' ? [IhoFormChangePayload] : T extends 'settingClick' ? [] : Parameters<NonNullable<VxeTableEventProps[EventNameToEventListener<Exclude<T, 'formChange' | 'settingClick'>>]>>;

package/es/components/index.js

@@ -55,6 +55,10 @@ export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 export { useAutographOptions } from './form-render/src/hooks/useAutographOptions.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './form-render/src/hooks/useCommonInjection.js';
+export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './form-render/src/utils/business.js';
+export { queryDecorator, queryInput } from './form-render/src/utils/dom.js';
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator } from './form-render/src/utils/schema.js';
+export { combineExtendKey, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './form-render/src/utils/index.js';
 export * from '@formily/core';
 export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
 export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature.js';