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

package/es/components/form-render/src/FormRender.vue.js

@@ -146,6 +146,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     expose({
+      formModel,
       validate(path = "*") {
         return formModel.validate(path).catch((err) => {
           return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);

package/es/components/form-render/src/FormRenderWrapper.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createBlock, nextTick } from 'vue';
+import { defineComponent, ref, computed, openBlock, createBlock, nextTick } from 'vue';
 import FormRender from './FormRender.vue.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
@@ -29,6 +29,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }, {});
     expose({
       ...exposed,
+      formModel: computed(() => {
+        var _a;
+        return (_a = formRenderRef.value) == null ? void 0 : _a.formModel;
+      }),
       reload
     });
     return (_ctx, _cache) => {

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

@@ -4,8 +4,9 @@ import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import '../../../index.js';
 import '../../utils/index.js';
+import { useFormField } from '../../hooks/useFormField.js';
 import { useAutographOptions } from '../../hooks/useFormRenderOptions.js';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { visitedDecorator, assignUpdateValue } from '../../utils/schema.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 
 function _isSlot(s) {
@@ -57,21 +58,27 @@ const script = defineComponent({
         emit("update:value", v);
       }
     });
+    const {
+      field
+    } = useFormField();
     const {
       labelKey,
       valueKey,
       options
     } = useAutographOptions(props, valueRef);
     const {
-      injectValueBindKey
+      injectValueBindKey,
+      injectValueValidate
     } = useCommonInjection();
+    injectValueValidate(valueRef);
     const key = injectValueBindKey(valueRef);
     return () => {
       let _slot;
       return createVNode(NRadioGroup, {
         "key": key.value,
         "value": valueRef.value,
-        "onUpdate:value": ($event) => valueRef.value = $event
+        "onUpdate:value": ($event) => valueRef.value = $event,
+        "onClick": visitedDecorator(field)
       }, {
         default: () => [createVNode(NSpace, {
           "vertical": props.vertical

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

@@ -1,5 +1,5 @@
 import { AnyObject, UndefinedAble } from '../../../../../es/shared/types';
-import { DataField, Field } from '@formily/core';
+import { DataField, Field, Form } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Component, FunctionalComponent } from 'vue';
 import { FIELD_BUSINESS_TYPE } from '../../../../../es/components/form-render/src/constants';
@@ -26,6 +26,7 @@ export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObje
 export declare type AgeContext = Record<'age' | 'day' | 'month' | 'year' | 'hours', number>;
 export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & AgeContext;
 export declare type FormRenderExpose = {
+    formModel: Form;
     validate(path?: string): Promise<unknown>;
     getFormValues(needCombineExtendKey?: boolean): AnyObject;
     setFormValues(values: AnyObject, needSplitExtendKey?: boolean): AnyObject;

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

@@ -2,7 +2,7 @@ import { createVNode, mergeProps } from 'vue';
 import { NInput } from 'naive-ui';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../constants/index.js';
-import { useIhoTableFormEvent } from '../../../utils/index.js';
+import { IhoTableRenderHelper } from '../../../utils/index.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
 
 function inputRendererPlugin() {
@@ -11,34 +11,21 @@ function inputRendererPlugin() {
     name: pluginName,
     vxe(instance) {
       instance.renderer.add(EDITABLE_WIDGET_TYPE.INPUT, {
-        renderCell(renderOpts, {
-          row,
-          column
-        }) {
-          return [createVNode("span", null, [row[column.field]])];
-        },
-        renderEdit({
-          props
-        }, {
+        renderCell: IhoTableRenderHelper.createDefaultRenderCell(),
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
+          fieldItem,
           row,
           column,
-          $rowIndex
-        }) {
-          const {
-            emitFormClick,
-            emitFormChange
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
+          emitFormChange,
+          emitFormClick
+        }) => {
           return [createVNode(NInput, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
             "onBlur": emitFormChange,
             "onClick": emitFormClick
-          }, props == null ? void 0 : props.componentProps), null)];
-        }
+          }, fieldItem.componentProps), null)];
+        })
       });
     }
   });

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

@@ -2,7 +2,7 @@ import { createVNode, mergeProps } from 'vue';
 import { NInputNumber } from 'naive-ui';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../constants/index.js';
-import { useIhoTableFormEvent } from '../../../utils/index.js';
+import { IhoTableRenderHelper } from '../../../utils/index.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
 
 function numberRendererPlugin() {
@@ -11,33 +11,20 @@ function numberRendererPlugin() {
     name: pluginName,
     vxe(instance) {
       instance.renderer.add(EDITABLE_WIDGET_TYPE.NUMBER, {
-        renderCell(renderOpts, {
-          row,
-          column
-        }) {
-          return [createVNode("span", null, [row[column.field]])];
-        },
-        renderEdit({
-          props
-        }, {
+        renderCell: IhoTableRenderHelper.createDefaultRenderCell(),
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
           row,
           column,
-          $rowIndex
-        }) {
-          const {
-            emitFormClick,
-            emitFormChange,
-            createCustomEvent
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
+          fieldItem,
+          emitFormClick,
+          emitFormChange,
+          createCustomEvent
+        }) => {
           const {
             placeholder = "\u8BF7\u8F93\u5165"
-          } = (props == null ? void 0 : props.componentProps) || {};
+          } = fieldItem.componentProps || {};
           const config = {
-            ...(props == null ? void 0 : props.componentProps) || {},
+            ...fieldItem.componentProps || {},
             clearable: true,
             placeholder,
             onBlur: createCustomEvent("formChange", {
@@ -50,7 +37,7 @@ function numberRendererPlugin() {
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event
           }, config), null)];
-        }
+        })
       });
     }
   });

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

@@ -3,7 +3,7 @@ import { traverse } from '../../../../../../../shared/utils/index.js';
 import { isFunction, isObject } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE, InjectionIhoTableUUID } from '../../../../constants/index.js';
-import { getRowHeight, useIhoTableFormEvent, getColumnRenderWidth } from '../../../../utils/index.js';
+import { IhoTableRenderHelper, getRowHeight, getColumnRenderWidth } from '../../../../utils/index.js';
 import { isSeparateColumn, contentSeparate, getColumnInfoMaxLength, generateSeparateRowData } from './separateUtils.js';
 import EditSeparate from './editSeparate.vue.js';
 import { defineTablePlugin } from '../../../../hooks/useTablePlugin.js';
@@ -35,27 +35,21 @@ function separateRendererPlugins() {
           };
           return createVNode("section", null, [separateRow.separateData[column.field]]);
         },
-        renderEdit(renderOpts, {
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
+          fieldItem,
           column,
           row,
-          $rowIndex
-        }) {
-          var _a, _b;
+          emitFormClick
+        }) => {
+          var _a;
           const uuid = inject(InjectionIhoTableUUID);
           const separateRow = getSeparateRowData(uuid, row);
           const height = getRowHeight();
           const slots = {};
-          if ((_a = renderOpts.props) == null ? void 0 : _a.separateSlot) {
-            const separate = toRaw(renderOpts.props.separateSlot);
+          if (fieldItem.separateSlot) {
+            const separate = toRaw(fieldItem.separateSlot);
             slots.menu = isFunction(separate) ? separate : isObject(separate) ? (props) => h(separate, props) : void 0;
           }
-          const {
-            emitFormClick
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
           return [createVNode(EditSeparate, {
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
@@ -63,10 +57,10 @@ function separateRendererPlugins() {
             "height": height,
             "column": column,
             "row": row,
-            "displayContent": (_b = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _b[column.field],
+            "displayContent": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field],
             "onClick": emitFormClick
           }, slots)];
-        }
+        })
       });
     },
     apply(hooks) {

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

@@ -2,7 +2,7 @@ import { createVNode, mergeProps } from 'vue';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../constants/index.js';
 import { NTimePicker } from 'naive-ui';
-import { useIhoTableFormEvent } from '../../../utils/index.js';
+import { IhoTableRenderHelper } from '../../../utils/index.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
 
 function timeRendererPlugin() {
@@ -11,33 +11,20 @@ function timeRendererPlugin() {
     name: pluginName,
     vxe(instance) {
       instance.renderer.add(EDITABLE_WIDGET_TYPE.TIME, {
-        renderCell(renderOpts, {
-          row,
-          column
-        }) {
-          return [createVNode("span", null, [row[column.field]])];
-        },
-        renderEdit({
-          props
-        }, {
+        renderCell: IhoTableRenderHelper.createDefaultRenderCell(),
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
+          fieldItem,
           row,
           column,
-          $rowIndex
-        }) {
-          const {
-            emitFormClick,
-            emitFormChange
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
+          emitFormChange,
+          emitFormClick
+        }) => {
           const {
             placeholder = "\u8BF7\u9009\u62E9",
             valueFormat = "HH:mm"
-          } = (props == null ? void 0 : props.componentProps) || {};
+          } = fieldItem.componentProps || {};
           const config = {
-            ...(props == null ? void 0 : props.componentProps) || {},
+            ...fieldItem.componentProps || {},
             placeholder,
             valueFormat,
             format: valueFormat || "yyyy-MM-dd HH:mm:ss",
@@ -48,7 +35,7 @@ function timeRendererPlugin() {
             "formattedValue": row[column.field],
             "onUpdate:formattedValue": ($event) => row[column.field] = $event
           }, config), null)];
-        }
+        })
       });
     }
   });

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

@@ -1,6 +1,7 @@
 import { AnyObject, Nullable } from '../../../../../es/shared/types';
 import { MaybeRef } from '@vueuse/core';
 import { VxeTableDefines, 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';
 export declare function IhoTableLog(message: string): void;
 export declare function IhoTableWarn(message: string): void;
@@ -24,3 +25,12 @@ export declare function useIhoTableFormEvent({ row, column, $rowIndex }: {
     createCustomEvent: (eventName: 'formChange' | 'formClick', params: Partial<IhoTableFormChangePayload>) => () => void;
 };
 export declare function getLowCodeFieldFromField(field: IhoTableFieldItem): LowCodeTableFieldItem | undefined;
+declare function createDefaultRenderCell(): ((renderOpts: import("vxe-table").VxeColumnPropTypes.EditRender, params: VxeGlobalRendererHandles.RenderCellParams) => VxeGlobalRendererHandles.RenderResult) | undefined;
+declare function createRenderEdit(renderer: (payload: VxeGlobalRendererHandles.RenderEditParams & {
+    fieldItem: Partial<LowCodeTableFieldItem>;
+} & ReturnType<typeof useIhoTableFormEvent>) => VxeGlobalRendererHandles.RenderResult): ((renderOpts: import("vxe-table").VxeColumnPropTypes.EditRender, params: VxeGlobalRendererHandles.RenderEditParams) => VxeGlobalRendererHandles.RenderResult) | undefined;
+export declare const IhoTableRenderHelper: Readonly<{
+    createDefaultRenderCell: typeof createDefaultRenderCell;
+    createRenderEdit: typeof createRenderEdit;
+}>;
+export {};

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

@@ -1,10 +1,7 @@
+import { inject, reactive, nextTick, unref, createVNode } from 'vue';
 import { isNumber } from 'lodash-es';
-import { inject, reactive, nextTick, unref } from 'vue';
 import { InjectionIhoTableConfig, InjectionIhoTableEmits } from '../constants/index.js';
 
-function IhoTableLog(message) {
-  return console.log(`[IhoTable]: ${message}`);
-}
 function IhoTableWarn(message) {
   return console.warn(`[IhoTable]: ${message}`);
 }
@@ -75,14 +72,44 @@ function useIhoTableFormEvent({
   }
   function createCustomEvent(eventName, params) {
     return function() {
-      emit(eventName, { ...getPayload(), ...params });
+      emit(eventName, {
+        ...getPayload(),
+        ...params
+      });
     };
   }
-  return { emitFormChange, emitFormClick, createCustomEvent };
+  return {
+    emitFormChange,
+    emitFormClick,
+    createCustomEvent
+  };
 }
 function getLowCodeFieldFromField(field) {
   var _a;
   return (_a = field.editRender) == null ? void 0 : _a.props;
 }
+function createDefaultRenderCell() {
+  return function(_, {
+    row,
+    column
+  }) {
+    return [createVNode("span", null, [row[column.field]])];
+  };
+}
+function createRenderEdit(renderer) {
+  return function({
+    props
+  }, params) {
+    return renderer({
+      ...params,
+      fieldItem: props || {},
+      ...useIhoTableFormEvent(params)
+    });
+  };
+}
+const IhoTableRenderHelper = Object.freeze({
+  createDefaultRenderCell,
+  createRenderEdit
+});
 
-export { IhoTableLog, IhoTableUtils, IhoTableWarn, getColumnRenderWidth, getEventName, getLowCodeFieldFromField, getRowHeight, useIhoTableFormEvent, useUUIDMap };
+export { IhoTableRenderHelper, IhoTableUtils, IhoTableWarn, getColumnRenderWidth, getEventName, getLowCodeFieldFromField, getRowHeight, useIhoTableFormEvent, useUUIDMap };

package/package.json

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