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

package/es/components/big-table/src/components/edit-form/edit-input.js

@@ -63,9 +63,11 @@ var EditInput = defineComponent({
     };
     function keyup(event) {
       if (event.key == "Enter") {
-        setTimeout(() => {
-          onBlur();
-        }, 100);
+        emit("formChange", {
+          value: __value.value,
+          ...commData,
+          type: "enter"
+        });
       }
     }
     watch(() => attrs.value, (value) => {

package/es/components/big-table/src/hooks/useEdit.js

@@ -88,13 +88,11 @@ const useEdit = (props, state, emit, xGrid, loadData) => {
     if (["separate"].includes(column == null ? void 0 : column.formType)) {
       loadData(props.data);
     }
-    const activeRow = xGrid.value.getCurrentRecord();
-    const rowIndex = xGrid.value.getRowIndex(activeRow);
     emit("formChange", {
       value,
       row,
       column,
-      index: !~rowIndex ? index : rowIndex,
+      index,
       oldValue,
       ...type ? { type } : {}
     });

package/es/components/big-table/src/hooks/useEvent.js

@@ -17,15 +17,12 @@ const useEvent = (props, state, emit, xGrid, anchorEvent) => {
     if (!activeRow && !isEdit)
       return;
     if (isEdit) {
-      setTimeout(() => {
-        const { row, column, $rowIndex } = xGridRef.getSelectedCell() || {};
-        emit("keyboard", {
-          key: $event.key,
-          index: $rowIndex != null ? $rowIndex : index,
-          row: row || activeRow,
-          column
-        });
-        ["Tab", "Enter"].includes($event.key) && column && xGridRef.setEditCell(row, column);
+      const { row, $rowIndex, rowIndex, column } = xGridRef.getEditRecord() || {};
+      emit("keyboard", {
+        key: $event.key,
+        index: $rowIndex != null ? $rowIndex : rowIndex,
+        row,
+        column
       });
       return;
     }

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

@@ -8,7 +8,7 @@ import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from './constants/index.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle.js';
 import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides.js';
-import './utils/index.js';
+import { validateMessageParser } from './utils/index.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
 import '../index.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
@@ -143,28 +143,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         function bindEleInfo(info) {
           if (info.decoratorElement)
             return info;
-          info.title = formModel.query(info.path).get("title");
-          info.decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
-          Object.assign(info, queryInput(info.decoratorElement));
-          return info;
+          const pattern = formModel.query(info.path);
+          const title = pattern.get("title");
+          const messages = info.messages.map(
+            (message) => errMessageNormalize(message, pattern.get("decoratorProps"))
+          );
+          const decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
+          return { ...info, messages, title, decoratorElement, ...queryInput(info.decoratorElement) };
+        }
+        function errMessageNormalize(message, decoratorProps) {
+          if (!decoratorProps || !decoratorProps.fieldItem)
+            return message;
+          return validateMessageParser(message, decoratorProps.fieldItem);
         }
       },
       getFormValues() {
         return formModel.getFormState().values;
       },
       setFieldState(path, handler) {
-        formModel.setFieldState(path, (state) => {
-          handler(
-            new Proxy(state, {
-              get(target, key, receiver) {
-                return Reflect.get(target, key, receiver);
-              },
-              set(target, key, value, receiver) {
-                return Reflect.set(target, key, value, receiver);
-              }
-            })
-          );
-        });
+        formModel.setFieldState(path, handler);
       },
       resetFields(path = "*") {
         formModel.reset(path);

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

@@ -4,7 +4,7 @@ import { isFunction } from 'lodash-es';
 import { NButton } from 'naive-ui';
 import { createSlot } from '../../utils/index.js';
 
-function createPropFor(props) {
+function pathToFieldItem(props) {
   return (property) => {
     var _a;
     return (_a = props.fieldItem) == null ? void 0 : _a[property];
@@ -27,10 +27,10 @@ const TEXT = connect(textScript, mapProps((props) => {
   };
 }));
 const buttonScript = (props) => {
-  const propFor = createPropFor(props);
+  const fieldItem = pathToFieldItem(props);
   function onClick() {
     var _a;
-    const cb = propFor("onClick") || ((_a = propFor("componentProps")) == null ? void 0 : _a.onClick);
+    const cb = fieldItem("onClick") || ((_a = fieldItem("componentProps")) == null ? void 0 : _a.onClick);
     return () => isFunction(cb) && cb(props.fieldItem);
   }
   return createVNode(NButton, {

package/es/components/grid/src/hooks.js

@@ -23,6 +23,7 @@ const useMethods = () => {
     "removeCurrentRow",
     "removeMergeCells",
     "removeMergeFooterItems",
+    "getEditRecord",
     "getRowIndex",
     "getVTRowIndex",
     "getVMRowIndex",

package/es/shared/utils/index.js

@@ -1,5 +1,5 @@
 import { useMemoize } from '@vueuse/core';
-import { isArray, isString, isObject } from 'lodash-es';
+import { isArray, isString, isObject, isFunction } from 'lodash-es';
 
 function traverse(target, handler, keys = "children", parent) {
   function stop() {
@@ -101,7 +101,7 @@ function deepOmit(target, keys) {
         return result;
       if (isArray(v)) {
         result[k] = v.map((child) => search(child, keys2));
-      } else if (isObject(v)) {
+      } else if (isObject(v) && !isFunction(v)) {
         result[k] = search(v, keys2);
       } else {
         result[k] = v;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.25-beta.3",
+	"version": "3.1.25-beta.4",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "af26b0b0ef7d474ccfa12e74c02fc34841c45a13"
+	"gitHead": "aa7ce9ac5ef2d3ef0f06718f1f95ee15f2615bfb"
 }