cnhis-design-vue 3.1.33 → 3.1.34-beta.1

package/es/components/button-print/src/ButtonPrint.vue2.js

@@ -200,6 +200,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         };
         if (props.strategy === "MULTI") {
           for (let i = 0; i < state.printParams.length; i++) {
+            if (i > 0)
+              queryParams.printdlgshow = "0";
             printInstance.printDirect({
               ...queryParams,
               params: getPrintParams(i)

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

@@ -20,7 +20,7 @@ export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, f
 export * from '@formily/core';
 export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './src/utils/business.js';
 export { findNextWidget, queryDecorator, queryInput } from './src/utils/dom.js';
-export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator } from './src/utils/schema.js';
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, createVisitedSetter, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './src/utils/schema.js';
 
 const FormRender = script;
 FormRender.install = function(app) {

package/es/components/form-render/src/components/renderer/levelSearchCascader.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject, Func } from '../../../../../../es/shared/types';
+import { AnyObject } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 declare type ValueType = string | AnyObject[];
 export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
@@ -6,9 +6,6 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
     autograph: {
         type: StringConstructor;
         required: true;
@@ -49,9 +46,6 @@ export declare const LEVEL_SEARCH_CASCADER: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
     autograph: {
         type: StringConstructor;
         required: true;

package/es/components/form-render/src/components/renderer/levelSearchCascader.js

@@ -8,7 +8,7 @@ import { formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import SearchCascader from '../../../../search-cascader/index.js';
 import script$1 from '../../../../../shared/components/no-data/NoData.vue.js';
-import { visitedDecorator, assignUpdateValue } from '../../utils/schema.js';
+import { createVisitedSetter, assignUpdateValue } from '../../utils/schema.js';
 import { useFormField } from '../../hooks/useFormField.js';
 import { useFormRequest } from '../../hooks/useFormRequest.js';
 
@@ -19,9 +19,6 @@ const script = defineComponent({
       type: Array,
       default: () => []
     },
-    onFocus: {
-      type: Function
-    },
     autograph: {
       type: String,
       required: true
@@ -264,7 +261,7 @@ const script = defineComponent({
       "labelKey": labelKey.value,
       "valueKey": valueKey.value,
       "search": fetchData,
-      "onFocus": visitedDecorator(field, props.onFocus)
+      "onFocus": createVisitedSetter(field)
     }, {
       empty: () => createVNode(script$1, null, null)
     });

package/es/components/form-render/src/components/renderer/radio.js

@@ -6,7 +6,7 @@ import '../../../index.js';
 import '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField.js';
 import { useAutographOptions } from '../../hooks/useFormRenderOptions.js';
-import { visitedDecorator, assignUpdateValue } from '../../utils/schema.js';
+import { createVisitedSetter, assignUpdateValue } from '../../utils/schema.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 
 function _isSlot(s) {
@@ -78,7 +78,7 @@ const script = defineComponent({
         "key": key.value,
         "value": valueRef.value,
         "onUpdate:value": ($event) => valueRef.value = $event,
-        "onClick": visitedDecorator(field)
+        "onClick": createVisitedSetter(field)
       }, {
         default: () => [createVNode(NSpace, {
           "vertical": props.vertical

package/es/components/form-render/src/components/renderer/remoteSearch.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject, Func } from '../../../../../../es/shared/types';
+import { AnyObject } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 import { UrlConfig } from '../../../../../../es/components/form-render';
 export declare const REMOTE_SEARCH: import("vue").DefineComponent<{
@@ -16,9 +16,6 @@ export declare const REMOTE_SEARCH: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
     onChange: {};
 }, () => 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: {
@@ -35,9 +32,6 @@ export declare const REMOTE_SEARCH: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
     onChange: {};
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;

package/es/components/form-render/src/components/renderer/remoteSearch.js

@@ -8,7 +8,7 @@ import { InjectionAsyncQueue, InjectionChangeContextCollector, InjectionFormItem
 import { createUrlConfigParams, formRenderLog } from '../../utils/index.js';
 import { useCommonInjection, useSelectOptionProps } from '../../hooks/useCommonInjection.js';
 import { useFormField } from '../../hooks/useFormField.js';
-import { visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
+import { createVisitedSetter, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormRemoteSearch",
@@ -27,9 +27,6 @@ const script = defineComponent({
     urlConfig: {
       type: Object
     },
-    onFocus: {
-      type: Function
-    },
     onChange: {}
   },
   emits: ["update:value"],
@@ -132,7 +129,7 @@ const script = defineComponent({
         "onSearch": fetchData,
         "onUpdate:show": (show) => show && fetchData(),
         "options": parsedOptions.value,
-        "onFocus": visitedDecorator(field, props.onFocus)
+        "onFocus": createVisitedSetter(field)
       }, slots);
     };
   }

package/es/components/form-render/src/components/renderer/searchCascade.js

@@ -1,10 +1,9 @@
 import { defineComponent, ref, computed, inject, watch, createVNode, nextTick } from 'vue';
-import { isField } from '@formily/core';
 import { isEqual, isArray } from 'lodash-es';
+import '../../../index.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import { InjectionAsyncQueue, InjectionFormUUID } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
-import '../../../index.js';
 import '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField.js';
 import '@vueuse/core';
@@ -19,12 +18,13 @@ import '../../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import '../../hooks/useFormValidator.js';
+import '@formily/core';
 import 'date-fns';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './index.js';
 import { NCascader } from 'naive-ui';
-import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
+import { createVisitedSetter, assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormCascader",
@@ -210,14 +210,6 @@ const script = defineComponent({
     const parsedOptions = computed(() => {
       return remoteOptions.value || props.options || [];
     });
-    function visitedDecorator(onFocus) {
-      return (...args) => {
-        if (isField(field.value)) {
-          field.value.visited = true;
-        }
-        onFocus == null ? void 0 : onFocus(...args);
-      };
-    }
     const remote = computed(() => !props.filterable);
     const key = injectValueBindKey(valueRef);
     return () => {
@@ -238,7 +230,7 @@ const script = defineComponent({
         "valueField": valueKey.value,
         "options": parsedOptions.value,
         "onLoad": fetchData,
-        "onFocus": visitedDecorator(props.onFocus)
+        "onFocus": createVisitedSetter(field)
       }, slots);
     };
   }

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble, Func } from '../../../../../../es/shared/types';
+import { AnyObject, ArrayAble } from '../../../../../../es/shared/types';
 import { RecommendItem } from '../../../../../../es/components/recommend-search/src/types';
 import { RecommendIds } from '../../hooks';
 import { UrlConfig } from '../../types';
@@ -19,9 +19,6 @@ export declare const SELECT: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
     onChange: {};
     urlConfig: {
         type: PropType<UrlConfig>;
@@ -84,9 +81,6 @@ export declare const SELECT: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    onFocus: {
-        type: PropType<Func<any[], any>>;
-    };
     onChange: {};
     urlConfig: {
         type: PropType<UrlConfig>;

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

@@ -25,7 +25,7 @@ import { connect, mapProps } from '@formily/vue';
 import './index.js';
 import { useUrlConfigOptions, useAutographOptions, useRecommendOptions } from '../../hooks/useFormRenderOptions.js';
 import { NSelect } from 'naive-ui';
-import { visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
+import { createVisitedSetter, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -45,9 +45,6 @@ const script = defineComponent({
       type: Array,
       default: () => []
     },
-    onFocus: {
-      type: Function
-    },
     onChange: {},
     urlConfig: {
       type: Object
@@ -147,7 +144,7 @@ const script = defineComponent({
       "options": sortedOptions.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "onFocus": visitedDecorator(field, props.onFocus)
+      "onFocus": createVisitedSetter(field)
     }, slots);
   }
 });

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

@@ -9,7 +9,7 @@ import '../../index.js';
 import { NESTED_FORM_ITEM_TYPE } from '../constants/index.js';
 import 'date-fns';
 import { traverseDependKey } from './schema.js';
-export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator } from './schema.js';
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, createVisitedSetter, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
 
 function formRenderLog(message) {
   console.warn(`[FormRender]: ${message}`);

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

@@ -80,4 +80,4 @@ export declare function createObjSchema(properties: Record<string, ISchema>): {
         "x-compile-omitted"?: string[] | undefined;
     }>>;
 };
-export declare function visitedDecorator(field: Ref<GeneralField>, onFocus?: Func): (...args: unknown[]) => any;
+export declare function createVisitedSetter(field: Ref<GeneralField>, callback?: Func): (...args: unknown[]) => any;

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

@@ -1,6 +1,6 @@
 import { isField } from '@formily/core';
 import { isObject } from '@vue/shared';
-import { isString, isArray } from 'lodash-es';
+import { isString, isArray, isFunction } from 'lodash-es';
 
 function traverseSchema(schema, handler) {
   handler(schema);
@@ -93,13 +93,13 @@ function assignClearBindVisited(props, field) {
 function createObjSchema(properties) {
   return { type: "object", properties };
 }
-function visitedDecorator(field, onFocus) {
+function createVisitedSetter(field, callback) {
   return (...args) => {
     if (isField(field.value)) {
       field.value.visited = true;
     }
-    return onFocus == null ? void 0 : onFocus(...args);
+    return isFunction(callback) ? callback(...args) : void 0;
   };
 }
 
-export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator };
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, createVisitedSetter, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };

package/es/components/iho-table/src/plugins/lowCodeFieldAdaptorPlugin/index.js

@@ -16,7 +16,7 @@ function lowCodeFieldAdaptorPlugin() {
           field: _field.columnName,
           showOverflow: Reflect.has(_field, "showOverflow") ? _field.showOverflow : "tooltip",
           visible: _field.isShow !== IHO_TABLE_NUMBER_STATUS.NEGATIVE,
-          width: _field.colWidth,
+          minWidth: _field.colWidth,
           slots: { ..._field.slots, default: _field.slotFn, header: _field.headerSlotFn },
           ...pick(_field, ["title", "treeNode", "resizable"])
         };

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

@@ -1,6 +1,6 @@
 import { Func } from '../../../../../../../../es/shared/types';
 import { PropType } from 'vue';
-import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
+import { VxeTableDefines } from 'vxe-table';
 import { AnyObject } from '../../../../../../../../es/shared/types';
 declare const _default: import("vue").DefineComponent<{
     value: {
@@ -8,14 +8,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };
@@ -27,22 +27,22 @@ declare const _default: import("vue").DefineComponent<{
             default: undefined;
         };
         column: {
-            type: PropType<IhoTableFieldItem>;
+            type: PropType<VxeTableDefines.ColumnInfo>;
             required: true;
         };
         row: {
             type: PropType<AnyObject>;
             required: true;
         };
-        index: {
+        rowIndex: {
             type: NumberConstructor;
             required: true;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
+    emitFormChangeWithParams: (params?: AnyObject) => void;
     emit: (event: "update:value", ...args: any[]) => void;
-    globEmit: import("../../../../../../../../es/components/iho-table").IhoTableEmits;
     formRef: import("vue").Ref<HTMLElement | null>;
     isShow: import("vue").Ref<boolean>;
     formattedValue: import("vue").Ref<string | undefined>;
@@ -77,14 +77,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };

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

@@ -1,9 +1,9 @@
-import { defineComponent, useAttrs, inject, ref, computed, watch, openBlock, createBlock, unref, mergeProps, withCtx, createVNode, isRef } from 'vue';
+import { defineComponent, useAttrs, ref, computed, watch, openBlock, createBlock, unref, mergeProps, withCtx, createVNode, isRef } from 'vue';
 import { generateTimeFormat } from '../../../../../../../shared/utils/index.js';
 import { isFunction, isNaN } from 'lodash-es';
 import { NPopover, NInput, NDatePicker } from 'naive-ui';
-import { InjectionIhoTableEmits } from '../../../../constants/index.js';
-import { useCommon } from '../hooks/useCommon.js';
+import { useIhoTableFormEvent } from '../../../../utils/index.js';
+import { useAutoFocus } from '../hooks/useAutoFocus.js';
 import _export_sfc from '../../../../../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -12,23 +12,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     value: { type: String, default: void 0 },
     column: { type: Object, required: true },
     row: { type: Object, required: true },
-    index: { type: Number, required: true }
+    rowIndex: { type: Number, required: true }
   },
   emits: ["update:value"],
   setup(__props, { emit }) {
     const props = __props;
     const attr = useAttrs();
-    const globEmit = inject(InjectionIhoTableEmits);
-    const { formRef, isShow } = useCommon();
+    const { emitFormChangeWithParams } = useIhoTableFormEvent(props);
+    const { formRef, isShow } = useAutoFocus();
     const formattedValue = ref();
     const onConfirm = (value) => {
+      const oldValue = props.value;
       emit("update:value", value);
-      globEmit("formChange", {
-        value,
-        row: props.row,
-        column: props.column,
-        index: props.index
-      });
+      emitFormChangeWithParams({ oldValue });
     };
     const { isStartDate = false, isEndDate = false } = attr;
     const connectField = attr.connectField || "";

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/index.js

@@ -17,7 +17,7 @@ function dateRendererPlugin() {
           emitFormClick,
           row,
           column,
-          $rowIndex
+          rowIndex
         }) => {
           return [createVNode(EditDate, mergeProps({
             "value": row[column.field],
@@ -25,7 +25,7 @@ function dateRendererPlugin() {
           }, fieldItem.componentProps, {
             "column": column,
             "row": row,
-            "index": $rowIndex,
+            "row-index": rowIndex,
             "onClick": emitFormClick
           }), null)];
         })

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/hooks/{useCommon.d.ts → useAutoFocus.d.ts}

@@ -1,4 +1,5 @@
-export declare const useCommon: () => {
+export declare const useAutoFocus: () => {
     formRef: import("vue").Ref<HTMLElement | null>;
+    setRef: (ref: HTMLElement) => void;
     isShow: import("vue").Ref<boolean>;
 };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/hooks/{useCommon.js → useAutoFocus.js}

@@ -1,7 +1,10 @@
 import { ref, onMounted } from 'vue';
 
-const useCommon = () => {
+const useAutoFocus = () => {
   const formRef = ref(null);
+  function setRef(ref2) {
+    formRef.value = ref2;
+  }
   const isShow = ref(false);
   onMounted(() => {
     var _a;
@@ -10,8 +13,9 @@ const useCommon = () => {
   });
   return {
     formRef,
+    setRef,
     isShow
   };
 };
 
-export { useCommon };
+export { useAutoFocus };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/inputRendererPlugin.js

@@ -10,21 +10,28 @@ function inputRendererPlugin() {
   return defineTablePlugin({
     name: pluginName,
     vxe(instance) {
+      let oldValue = "";
       instance.renderer.add(EDITABLE_WIDGET_TYPE.INPUT, {
         renderCell: IhoTableRenderHelper.createDefaultRenderCell(),
         renderEdit: IhoTableRenderHelper.createRenderEdit(({
           fieldItem,
           row,
           column,
-          emitFormChange,
+          emitFormChangeWithParams,
           emitFormClick
         }) => {
           return [createVNode(NInput, mergeProps({
             "value": row[column.field],
-            "onUpdate:value": ($event) => row[column.field] = $event,
-            "onBlur": emitFormChange,
-            "onClick": emitFormClick
-          }, fieldItem.componentProps), null)];
+            "onUpdate:value": ($event) => row[column.field] = $event
+          }, fieldItem.componentProps, {
+            "onChange": () => {
+              emitFormChangeWithParams({
+                oldValue
+              });
+            },
+            "onClick": emitFormClick,
+            "onFocus": () => oldValue = row[column.field]
+          }), null)];
         })
       });
     }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/numberRendererPlugin.js

@@ -17,8 +17,7 @@ function numberRendererPlugin() {
           column,
           fieldItem,
           emitFormClick,
-          emitFormChange,
-          createCustomEvent
+          emitFormChangeWithParams
         }) => {
           const {
             placeholder = "\u8BF7\u8F93\u5165"
@@ -27,10 +26,17 @@ function numberRendererPlugin() {
             ...fieldItem.componentProps || {},
             clearable: true,
             placeholder,
-            onBlur: createCustomEvent("formChange", {
-              type: "blur"
+            onBlur: () => emitFormChangeWithParams({
+              type: "blur",
+              oldValue: row[column.field]
             }),
-            onUpdateValue: emitFormChange,
+            onUpdateValue: (value) => {
+              const oldValue = row[column.field];
+              row[column.field] = value;
+              emitFormChangeWithParams({
+                oldValue
+              });
+            },
             onClick: emitFormClick
           };
           return [createVNode(NInputNumber, mergeProps({

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/editSelect.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
+import { VxeTableDefines } from 'vxe-table';
 import { AnyObject } from '../../../../../../../../es/shared/types';
 declare const _default: import("vue").DefineComponent<{
     value: {
@@ -7,14 +7,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };
@@ -24,14 +24,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/editSelect.js

@@ -1,7 +1,7 @@
-import { defineComponent, inject, createVNode, mergeProps } from 'vue';
+import { defineComponent, createVNode, mergeProps } from 'vue';
 import { NSelect } from 'naive-ui';
-import { InjectionIhoTableEmits } from '../../../../constants/index.js';
-import { useCommon } from '../hooks/useCommon.js';
+import { useIhoTableFormEvent } from '../../../../utils/index.js';
+import { useAutoFocus } from '../hooks/useAutoFocus.js';
 
 var EditSelect = defineComponent({
   name: "EditSelect",
@@ -22,7 +22,7 @@ var EditSelect = defineComponent({
       type: Object,
       required: true
     },
-    index: {
+    rowIndex: {
       type: Number,
       required: true
     }
@@ -30,25 +30,24 @@ var EditSelect = defineComponent({
   emits: ["update:value"],
   setup(props, {
     attrs,
-    slots,
     emit
   }) {
-    const globEmit = inject(InjectionIhoTableEmits);
     const {
-      formRef,
-      isShow
-    } = useCommon();
+      isShow,
+      setRef
+    } = useAutoFocus();
+    const {
+      emitFormChangeWithParams
+    } = useIhoTableFormEvent(props);
     function onUpdateValue(value) {
+      const oldValue = props.value;
       emit("update:value", value);
-      globEmit("formChange", {
-        value,
-        row: props.row,
-        column: props.column,
-        index: props.index
+      emitFormChangeWithParams({
+        oldValue
       });
     }
     return () => createVNode(NSelect, mergeProps({
-      "ref": "formRef",
+      "ref": setRef,
       "show": isShow.value,
       "onUpdate:show": ($event) => isShow.value = $event
     }, attrs, {

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/index.js

@@ -24,12 +24,12 @@ function selectRendererPlugin() {
           emitFormClick,
           row,
           column,
-          $rowIndex
+          rowIndex
         }) => {
           return [createVNode(EditSelect, mergeProps(fieldItem.componentProps, {
             "column": column,
             "row": row,
-            "index": $rowIndex,
+            "row-index": rowIndex,
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
             "onClick": emitFormClick

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

@@ -1,6 +1,6 @@
 import { AnyObject } from '../../../../../../../../es/shared/types';
 import { CSSProperties, PropType } from 'vue';
-import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
+import { VxeTableDefines } from 'vxe-table';
 declare const _default: import("vue").DefineComponent<{
     value: {};
     height: {
@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
@@ -19,7 +19,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    dataIndex: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };
@@ -31,7 +31,7 @@ declare const _default: import("vue").DefineComponent<{
             default: number;
         };
         column: {
-            type: PropType<IhoTableFieldItem>;
+            type: PropType<VxeTableDefines.ColumnInfo>;
             required: true;
         };
         row: {
@@ -42,15 +42,14 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
-        dataIndex: {
+        rowIndex: {
             type: NumberConstructor;
             required: true;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
-    globEmit: import("../../../../../../../../es/components/iho-table").IhoTableEmits;
-    tableHandler: import("../../../../../../../../es/components/iho-table").IhoTableHandler;
+    tableHandler: import("../../../../types").IhoTableHandler;
     popoverRef: import("vue").Ref<any>;
     editContent: import("vue").Ref<any>;
     setEditContent: (value: any) => void;
@@ -58,6 +57,7 @@ declare const _default: import("vue").DefineComponent<{
     setShow: (v: boolean) => void;
     emit: (event: "update:value", ...args: any[]) => void;
     onShow: () => Promise<void>;
+    emitFormChangeWithParams: (params?: AnyObject) => void;
     onClose: () => Promise<void>;
     updateShow: (show: boolean) => void;
     style: import("vue").ComputedRef<CSSProperties>;
@@ -70,7 +70,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
@@ -81,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    dataIndex: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };

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

@@ -1,7 +1,8 @@
 import { defineComponent, inject, ref, watch, computed, onMounted, onDeactivated, openBlock, createBlock, unref, withCtx, createElementVNode, withModifiers, normalizeStyle, toDisplayString, renderSlot, createVNode } from 'vue';
 import { cloneDeep, isObject, isArray } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
-import { InjectionIhoTableEmits, InjectionIhoTableHandler } from '../../../../constants/index.js';
+import { InjectionIhoTableHandler } from '../../../../constants/index.js';
+import { useIhoTableFormEvent } from '../../../../utils/index.js';
 import _export_sfc from '../../../../../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -12,12 +13,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     column: { type: Object, required: true },
     row: { type: Object, required: true },
     displayContent: { type: String, default: "" },
-    dataIndex: { type: Number, required: true }
+    rowIndex: { type: Number, required: true }
   },
   emits: ["update:value"],
   setup(__props, { emit }) {
     const props = __props;
-    const globEmit = inject(InjectionIhoTableEmits);
     const tableHandler = inject(InjectionIhoTableHandler);
     const popoverRef = ref();
     const editContent = ref();
@@ -36,18 +36,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
       return;
     }
+    const { emitFormChangeWithParams } = useIhoTableFormEvent(props);
     async function onClose() {
       if (!isObject(editContent.value) && !isArray(editContent.value)) {
         if (props.value === editContent.value)
           return;
       }
+      const oldValue = props.value;
       emit("update:value", editContent.value);
-      globEmit("formChange", {
-        value: editContent.value,
-        row: props.row,
-        column: props.column,
-        index: props.dataIndex
-      });
+      emitFormChangeWithParams({ oldValue });
       tableHandler.updateTableDataRef();
     }
     function updateShow(show2) {

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -53,11 +53,11 @@ function separateRendererPlugins() {
           return [createVNode(EditSeparate, {
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
-            "dataIndex": separateRow == null ? void 0 : separateRow.index,
+            "row-index": separateRow == null ? void 0 : separateRow.index,
             "height": height,
             "column": column,
             "row": row,
-            "displayContent": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field],
+            "display-content": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field],
             "onClick": emitFormClick
           }, slots)];
         })

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin.js

@@ -16,7 +16,7 @@ function timeRendererPlugin() {
           fieldItem,
           row,
           column,
-          emitFormChange,
+          emitFormChangeWithParams,
           emitFormClick
         }) => {
           const {
@@ -28,7 +28,13 @@ function timeRendererPlugin() {
             placeholder,
             valueFormat,
             format: valueFormat || "yyyy-MM-dd HH:mm:ss",
-            onUpdateFormattedValue: emitFormChange,
+            onUpdateFormattedValue: (value) => {
+              const oldValue = row[column.field];
+              row[column.field] = value;
+              emitFormChangeWithParams({
+                oldValue
+              });
+            },
             onClick: emitFormClick
           };
           return [createVNode(NTimePicker, mergeProps({

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

@@ -1,8 +1,8 @@
 import { AnyObject, Nullable } from '../../../../../es/shared/types';
 import { MaybeRef } from '@vueuse/core';
-import { VxeTableDefines, VxeTableInstance } from 'vxe-table';
+import { VxeTableInstance } from 'vxe-table';
 import { VxeGlobalRendererHandles } from 'vxe-table/types/v-x-e-table/renderer';
-import { EventListenerToEventName, IhoTableFieldItem, IhoTableFormChangePayload, LowCodeTableFieldItem } from '../../../../../es/components/iho-table';
+import { EventListenerToEventName, IhoTableFieldItem, LowCodeTableFieldItem } from '../../../../../es/components/iho-table';
 export declare function IhoTableLog(message: string): void;
 export declare function IhoTableWarn(message: string): void;
 export declare const IhoTableUtils: Readonly<{
@@ -15,14 +15,11 @@ export declare function useUUIDMap<T>(creator: () => T, isReactive?: boolean): {
     removeItemFromUUID: (uuid: string) => void;
 };
 export declare function getColumnRenderWidth(column: AnyObject, $table: MaybeRef<Nullable<VxeTableInstance>>): Promise<number>;
-export declare function useIhoTableFormEvent({ row, column, $rowIndex }: {
-    row: AnyObject;
-    column: VxeTableDefines.ColumnInfo;
-    $rowIndex: number;
-}): {
+export declare function useIhoTableFormEvent(payload: Pick<VxeGlobalRendererHandles.RenderEditParams, 'row' | 'rowIndex' | 'column'>): {
     emitFormChange: () => void;
     emitFormClick: () => void;
-    createCustomEvent: (eventName: 'formChange' | 'formClick', params: Partial<IhoTableFormChangePayload>) => () => void;
+    emitFormChangeWithParams: (params?: AnyObject) => void;
+    emitFormClickWithParams: (params?: AnyObject) => void;
 };
 export declare function getLowCodeFieldFromField(field: IhoTableFieldItem): LowCodeTableFieldItem | undefined;
 declare function createDefaultRenderCell(): ((renderOpts: import("vxe-table").VxeColumnPropTypes.EditRender, params: VxeGlobalRendererHandles.RenderCellParams) => VxeGlobalRendererHandles.RenderResult) | undefined;

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

@@ -1,6 +1,6 @@
-import { inject, reactive, nextTick, unref, createVNode } from 'vue';
-import { isNumber } from 'lodash-es';
-import { InjectionIhoTableConfig, InjectionIhoTableEmits } from '../constants/index.js';
+import { inject, reactive, nextTick, unref, toRaw, createVNode } from 'vue';
+import { isNumber, cloneDeep } from 'lodash-es';
+import { InjectionIhoTableEmits, InjectionIhoTableConfig } from '../constants/index.js';
 
 function IhoTableWarn(message) {
   return console.warn(`[IhoTable]: ${message}`);
@@ -50,38 +50,39 @@ async function getColumnRenderWidth(column, $table) {
     return isNumber(column.width) ? column.width : 64;
   }
 }
-function useIhoTableFormEvent({
-  row,
-  column,
-  $rowIndex
-}) {
+function useIhoTableFormEvent(payload) {
   const emit = inject(InjectionIhoTableEmits);
   function getPayload() {
     return {
-      value: row[column.field],
-      row,
-      column,
-      index: $rowIndex
+      value: payload.row[payload.column.field],
+      row: payload.row,
+      column: payload.column,
+      index: payload.rowIndex
     };
   }
+  function emitFormChangeWithParams(params = {}) {
+    emit("formChange", {
+      ...getPayload(),
+      ...cloneDeep(toRaw(params))
+    });
+  }
+  function emitFormClickWithParams(params = {}) {
+    emit("formClick", {
+      ...getPayload(),
+      ...cloneDeep(toRaw(params))
+    });
+  }
   function emitFormChange() {
-    emit("formChange", getPayload());
+    emitFormChangeWithParams();
   }
   function emitFormClick() {
-    emit("formClick", getPayload());
-  }
-  function createCustomEvent(eventName, params) {
-    return function() {
-      emit(eventName, {
-        ...getPayload(),
-        ...params
-      });
-    };
+    emitFormClickWithParams();
   }
   return {
     emitFormChange,
     emitFormClick,
-    createCustomEvent
+    emitFormChangeWithParams,
+    emitFormClickWithParams
   };
 }
 function getLowCodeFieldFromField(field) {

package/es/components/index.js

@@ -64,7 +64,7 @@ export { useCommonInjection, useSelectOptionProps } from './form-render/src/hook
 export { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './form-render/src/hooks/useFormRenderOptions.js';
 export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './form-render/src/utils/business.js';
 export { findNextWidget, 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 { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, createVisitedSetter, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './form-render/src/utils/schema.js';
 export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, 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';

package/es/components/select-person/index.d.ts

@@ -104,14 +104,13 @@ declare const SelectPerson: SFCWithInstall<import("vue").DefineComponent<{
     allCheckedKeys: never[];
     isRemote: import("vue").ComputedRef<boolean>;
     init: () => void;
-    transformTree: (tree: any) => void;
     setDisabled: (data: any) => void;
     renderLabel: ({ option }: {
         option: any;
     }) => any;
     getLabelName: (option: any) => any;
     setAllCheckedKeys: (tree: any) => void;
-    searchClick: () => Promise<void>;
+    onSearch: () => Promise<void>;
     setTreeCheckd: (tree: any, checked: any) => void;
     checkedAllChange: (checked: any) => void;
     uniq: (arr: any) => any;

package/es/components/select-person/src/SelectPerson.vue.d.ts

@@ -103,14 +103,13 @@ declare const _default: import("vue").DefineComponent<{
     allCheckedKeys: never[];
     isRemote: import("vue").ComputedRef<boolean>;
     init: () => void;
-    transformTree: (tree: any) => void;
     setDisabled: (data: any) => void;
     renderLabel: ({ option }: {
         option: any;
     }) => any;
     getLabelName: (option: any) => any;
     setAllCheckedKeys: (tree: any) => void;
-    searchClick: () => Promise<void>;
+    onSearch: () => Promise<void>;
     setTreeCheckd: (tree: any, checked: any) => void;
     checkedAllChange: (checked: any) => void;
     uniq: (arr: any) => any;

package/es/components/select-person/src/SelectPerson.vue2.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createVNode, withKeys, createTextVNode, toDisplayString, withDirectives, vShow, createCommentVNode, createElementBlock, createElementVNode, Fragment, renderList } from 'vue';
 import { NGrid, NGi, NSpace, NInputGroup, NInput, NButton, NCheckbox, NTree, NIcon, NTooltip } from 'naive-ui';
 import { CloseCircleSharp } from '@vicons/ionicons5';
-import { filterTree } from './utils/index.js';
+import { filterTree, getExpandedKeys } from './utils/index.js';
 import { cloneDeep } from 'lodash-es';
 
 const _hoisted_1 = {
@@ -88,22 +88,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           setTagData(temp);
         }
       }
-    }
-    function transformTree(tree) {
-      var _a, _b;
-      for (let i = 0, len = tree.length; i < len; i++) {
-        const item = tree[i];
-        item.title = getLabelName(item);
-        if (!item.key)
-          item.key = item[props.wordbookChild.user_id_obj] || item[props.wordbook.parent_id_obj] || Date.now();
-        if ((_a = item.children) == null ? void 0 : _a.length) {
-          transformTree(item.children);
-          setDisabled(item);
-        } else if (((_b = item.children) == null ? void 0 : _b.length) === 0) {
-          Reflect.deleteProperty(item, "children");
+      function transformTree(tree) {
+        var _a, _b;
+        for (let i = 0, len = tree.length; i < len; i++) {
+          const item = tree[i];
+          item.title = getLabelName(item);
+          if (!item.key)
+            item.key = item[props.wordbookChild.user_id_obj] || item[props.wordbook.parent_id_obj] || Date.now();
+          if ((_a = item.children) == null ? void 0 : _a.length) {
+            transformTree(item.children);
+            setDisabled(item);
+          } else if (((_b = item.children) == null ? void 0 : _b.length) === 0) {
+            Reflect.deleteProperty(item, "children");
+          }
+          if (!item.disabled && !item.children)
+            allCheckedKeys.push(item.key);
         }
-        if (!item.disabled && !item.children)
-          allCheckedKeys.push(item.key);
       }
     }
     function setDisabled(data) {
@@ -141,7 +141,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           allCheckedKeys.push(item.key);
       }
     }
-    async function searchClick() {
+    async function onSearch() {
       if (!isRemote.value) {
         treeData.value = filterTree(temp, keyword.value);
         allCheckedKeys = [];
@@ -150,6 +150,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       } else {
         treeData.value = await props.queryTreeSearch(keyword.value);
       }
+      expandedKeys.value = treeData.value.length && keyword.value ? getExpandedKeys(treeData.value) : [];
     }
     function setTreeCheckd(tree, checked) {
       for (let i = 0, len = tree.length; i < len; i++) {
@@ -223,10 +224,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 value: keyword.value,
                 "onUpdate:value": _cache[0] || (_cache[0] = ($event) => keyword.value = $event),
                 placeholder: __props.searchPlaceholder,
-                onKeyup: withKeys(searchClick, ["enter"])
+                onKeyup: withKeys(onSearch, ["enter"])
               }, null, 8, ["value", "placeholder", "onKeyup"]), createVNode(unref(NButton), {
                 type: "primary",
-                onClick: searchClick
+                onClick: onSearch
               }, {
                 default: withCtx(() => [createTextVNode(toDisplayString(__props.searchButtonText), 1)]),
                 _: 1

package/es/components/select-person/src/utils/index.d.ts

@@ -1,2 +1,3 @@
 import { type TreeOption } from 'naive-ui';
 export declare function filterTree(data: TreeOption[], keyword: string): TreeOption[];
+export declare function getExpandedKeys(tree: TreeOption[]): (string | number)[];

package/es/components/select-person/src/utils/index.js

@@ -40,5 +40,19 @@ function filterHandle(data) {
     return false;
   });
 }
+function getExpandedKeys(tree) {
+  const expandedKeys = [];
+  getExpandedKeys2(tree);
+  function getExpandedKeys2(tree2) {
+    for (let i = 0, len = tree2.length; i < len; i++) {
+      const item = tree2[i];
+      if (item.children) {
+        expandedKeys.push(item.key);
+        getExpandedKeys2(item.children);
+      }
+    }
+  }
+  return expandedKeys;
+}
 
-export { filterTree };
+export { filterTree, getExpandedKeys };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.33",
+	"version": "3.1.34-beta.1",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "410dc2e066d1a4349f7239547679dd898c4be32f"
+	"gitHead": "ec71ec029282a8d1463f23fb466b505ff2c1ccb4"
 }