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

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

@@ -41,7 +41,7 @@ declare const _default: import("vue").DefineComponent<{
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
-    emitFormChange: (params?: AnyObject) => void;
+    emitFormChangeWithParams: (params?: AnyObject) => void;
     emit: (event: "update:value", ...args: any[]) => void;
     formRef: import("vue").Ref<HTMLElement | null>;
     isShow: import("vue").Ref<boolean>;

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

@@ -18,13 +18,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit }) {
     const props = __props;
     const attr = useAttrs();
-    const { emitFormChange } = useIhoTableFormEvent(props);
+    const { emitFormChangeWithParams } = useIhoTableFormEvent(props);
     const { formRef, isShow } = useAutoFocus();
     const formattedValue = ref();
     const onConfirm = (value) => {
       const oldValue = props.value;
       emit("update:value", value);
-      emitFormChange({ oldValue });
+      emitFormChangeWithParams({ oldValue });
     };
     const { isStartDate = false, isEndDate = false } = attr;
     const connectField = attr.connectField || "";

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

@@ -10,23 +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({
-              oldValue: row[column.field]
-            }),
-            "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,7 +17,7 @@ function numberRendererPlugin() {
           column,
           fieldItem,
           emitFormClick,
-          emitFormChange
+          emitFormChangeWithParams
         }) => {
           const {
             placeholder = "\u8BF7\u8F93\u5165"
@@ -26,14 +26,14 @@ function numberRendererPlugin() {
             ...fieldItem.componentProps || {},
             clearable: true,
             placeholder,
-            onBlur: () => emitFormChange({
+            onBlur: () => emitFormChangeWithParams({
               type: "blur",
               oldValue: row[column.field]
             }),
             onUpdateValue: (value) => {
               const oldValue = row[column.field];
               row[column.field] = value;
-              emitFormChange({
+              emitFormChangeWithParams({
                 oldValue
               });
             },

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

@@ -37,12 +37,12 @@ var EditSelect = defineComponent({
       setRef
     } = useAutoFocus();
     const {
-      emitFormChange
+      emitFormChangeWithParams
     } = useIhoTableFormEvent(props);
     function onUpdateValue(value) {
       const oldValue = props.value;
       emit("update:value", value);
-      emitFormChange({
+      emitFormChangeWithParams({
         oldValue
       });
     }

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

@@ -57,7 +57,7 @@ declare const _default: import("vue").DefineComponent<{
     setShow: (v: boolean) => void;
     emit: (event: "update:value", ...args: any[]) => void;
     onShow: () => Promise<void>;
-    emitFormChange: (params?: AnyObject) => void;
+    emitFormChangeWithParams: (params?: AnyObject) => void;
     onClose: () => Promise<void>;
     updateShow: (show: boolean) => void;
     style: import("vue").ComputedRef<CSSProperties>;

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

@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
       return;
     }
-    const { emitFormChange } = useIhoTableFormEvent(props);
+    const { emitFormChangeWithParams } = useIhoTableFormEvent(props);
     async function onClose() {
       if (!isObject(editContent.value) && !isArray(editContent.value)) {
         if (props.value === editContent.value)
@@ -44,7 +44,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       const oldValue = props.value;
       emit("update:value", editContent.value);
-      emitFormChange({ oldValue });
+      emitFormChangeWithParams({ oldValue });
       tableHandler.updateTableDataRef();
     }
     function updateShow(show2) {

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

@@ -16,7 +16,7 @@ function timeRendererPlugin() {
           fieldItem,
           row,
           column,
-          emitFormChange,
+          emitFormChangeWithParams,
           emitFormClick
         }) => {
           const {
@@ -31,7 +31,7 @@ function timeRendererPlugin() {
             onUpdateFormattedValue: (value) => {
               const oldValue = row[column.field];
               row[column.field] = value;
-              emitFormChange({
+              emitFormChangeWithParams({
                 oldValue
               });
             },

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

@@ -16,8 +16,10 @@ export declare function useUUIDMap<T>(creator: () => T, isReactive?: boolean): {
 };
 export declare function getColumnRenderWidth(column: AnyObject, $table: MaybeRef<Nullable<VxeTableInstance>>): Promise<number>;
 export declare function useIhoTableFormEvent(payload: Pick<VxeGlobalRendererHandles.RenderEditParams, 'row' | 'rowIndex' | 'column'>): {
-    emitFormChange: (params?: AnyObject) => void;
-    emitFormClick: (params?: AnyObject) => void;
+    emitFormChange: () => void;
+    emitFormClick: () => 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

@@ -60,21 +60,29 @@ function useIhoTableFormEvent(payload) {
       index: payload.rowIndex
     };
   }
-  function emitFormChange(params = {}) {
+  function emitFormChangeWithParams(params = {}) {
     emit("formChange", {
       ...getPayload(),
       ...cloneDeep(toRaw(params))
     });
   }
-  function emitFormClick(params = {}) {
+  function emitFormClickWithParams(params = {}) {
     emit("formClick", {
       ...getPayload(),
       ...cloneDeep(toRaw(params))
     });
   }
+  function emitFormChange() {
+    emitFormChangeWithParams();
+  }
+  function emitFormClick() {
+    emitFormClickWithParams();
+  }
   return {
     emitFormChange,
-    emitFormClick
+    emitFormClick,
+    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';