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

package/es/components/form-config/index.d.ts

@@ -971,6 +971,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             suffixConfig?: any | any[] | undefined;
             autograph?: string | undefined;
             defined_error_msg?: string | undefined;
+            extendKey?: string | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
             content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -973,6 +973,7 @@ declare const _default: import("vue").DefineComponent<{
             suffixConfig?: any | any[] | undefined;
             autograph?: string | undefined;
             defined_error_msg?: string | undefined;
+            extendKey?: string | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
             content?: string | import("../..").FormRenderer | Record<string, import("../..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -102,6 +102,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         suffixConfig?: any | any[] | undefined;
         autograph?: string | undefined;
         defined_error_msg?: string | undefined;
+        extendKey?: string | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         content?: string | import("../../../../../es/components/form-render").FormRenderer | Record<string, import("../../../../../es/components/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;

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 { validateMessageParser } from './utils/index.js';
+import { validateMessageParser, transformExtendKey } from './utils/index.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
 import '../index.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
@@ -157,8 +157,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return validateMessageParser(message, decoratorProps.fieldItem);
         }
       },
-      getFormValues() {
-        return formModel.getFormState().values;
+      getFormValues(needTransformExtendKey = true) {
+        const result = formModel.getFormState().values;
+        if (!needTransformExtendKey)
+          return result;
+        return transformExtendKey(props.fieldList || [], result);
       },
       setFieldState(path, handler) {
         formModel.setFieldState(path, handler);

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

@@ -181,6 +181,10 @@ export declare type FieldItem = {
      * 合并错误信息
      */
     defined_error_msg: string;
+    /**
+     * 是否使用json格式对该字段值进行合并
+     */
+    extendKey: string;
     /**
      * 数据类型
      */

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

@@ -17,3 +17,4 @@ 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;

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

@@ -133,5 +133,29 @@ function validateMessageParser(message, fieldItem) {
     return (_a = fieldItem[property.trim()]) != null ? _a : "";
   }
 }
+function transformExtendKey(fieldList, values) {
+  const fieldListWithExtendKey = fieldList.filter((field) => isString(field.extendKey) && field.extendKey);
+  if (!fieldListWithExtendKey.length)
+    return values;
+  const result = {};
+  const extendKeyMap = /* @__PURE__ */ new Map();
+  Object.entries(values).forEach(([k, v]) => {
+    const field = fieldListWithExtendKey.find((field2) => field2.val_key === k);
+    if (!field) {
+      return result[k] = v;
+    }
+    const {
+      val_key,
+      extendKey
+    } = field;
+    const extendKeyObject = extendKeyMap.get(extendKey) || {};
+    extendKeyMap.set(extendKey, extendKeyObject);
+    extendKeyObject[val_key] = values[val_key];
+  });
+  [...extendKeyMap.entries()].forEach(([k, v]) => {
+    result[k] = JSON.stringify(v);
+  });
+  return result;
+}
 
-export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, validateMessageParser };
+export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, transformExtendKey, validateMessageParser };

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

@@ -24,7 +24,6 @@ export declare enum WIDGET_TYPE {
     TASKDATE = "TASKDATE",
     AGE = "AGE",
     STATUS = "STATUS",
-    NUMBER = "NUMBER",
     WEBSITE = "WEBSITE",
     IDCARD = "IDCARD",
     COUNTDOWN = "COUNTDOWN",
@@ -44,7 +43,8 @@ export declare enum EDITABLE_WIDGET_TYPE {
     SEPARATE = "SEPARATE",
     SELECT = "SELECT",
     DATE = "DATE",
-    TIME = "TIME"
+    TIME = "TIME",
+    NUMBER = "NUMBER"
 }
 export declare const InjectionIhoTableConfig: InjectionKey<Ref<Nullable<IhoTableConfig>>>;
 export declare const InjectionIhoTableEmits: InjectionKey<(event: string, ...args: unknown[]) => void>;

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

@@ -20,7 +20,6 @@ var WIDGET_TYPE = /* @__PURE__ */ ((WIDGET_TYPE2) => {
   WIDGET_TYPE2["TASKDATE"] = "TASKDATE";
   WIDGET_TYPE2["AGE"] = "AGE";
   WIDGET_TYPE2["STATUS"] = "STATUS";
-  WIDGET_TYPE2["NUMBER"] = "NUMBER";
   WIDGET_TYPE2["WEBSITE"] = "WEBSITE";
   WIDGET_TYPE2["IDCARD"] = "IDCARD";
   WIDGET_TYPE2["COUNTDOWN"] = "COUNTDOWN";
@@ -113,6 +112,7 @@ var EDITABLE_WIDGET_TYPE = /* @__PURE__ */ ((EDITABLE_WIDGET_TYPE2) => {
   EDITABLE_WIDGET_TYPE2["SELECT"] = "SELECT";
   EDITABLE_WIDGET_TYPE2["DATE"] = "DATE";
   EDITABLE_WIDGET_TYPE2["TIME"] = "TIME";
+  EDITABLE_WIDGET_TYPE2["NUMBER"] = "NUMBER";
   return EDITABLE_WIDGET_TYPE2;
 })(EDITABLE_WIDGET_TYPE || {});
 const InjectionIhoTableConfig = Symbol("injectionIhoTableConfig");

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

@@ -19,7 +19,11 @@ function defaultConfigPlugin() {
             mouseConfig: { selected: true },
             editConfig: {
               trigger: "click",
-              mode: "cell"
+              mode: "cell",
+              autoClear: false,
+              activeMethod({ row }) {
+                return !row.$__SEPARATE;
+              }
             },
             keyboardConfig: { isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true }
           },

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

@@ -2,6 +2,7 @@ import * as index from './defaultConfigPlugin/index.js';
 import * as index$1 from './lowCodeFieldAdaptorPlugin/index.js';
 import * as index$2 from './rendererPlugins/editableWidgets/dateRendererPlugin/index.js';
 import * as inputRendererPlugin from './rendererPlugins/editableWidgets/inputRendererPlugin.js';
+import * as numberRendererPlugin from './rendererPlugins/editableWidgets/numberRendererPlugin.js';
 import * as index$3 from './rendererPlugins/editableWidgets/selectRendererPlugin/index.js';
 import * as index$4 from './rendererPlugins/editableWidgets/separateRendererPlugin/index.js';
 import * as timeRendererPlugin from './rendererPlugins/editableWidgets/timeRendererPlugin.js';
@@ -20,6 +21,7 @@ const modules = Object.assign({
   "./lowCodeFieldAdaptorPlugin/index.ts": index$1,
   "./rendererPlugins/editableWidgets/dateRendererPlugin/index.tsx": index$2,
   "./rendererPlugins/editableWidgets/inputRendererPlugin.tsx": inputRendererPlugin,
+  "./rendererPlugins/editableWidgets/numberRendererPlugin.tsx": numberRendererPlugin,
   "./rendererPlugins/editableWidgets/selectRendererPlugin/index.tsx": index$3,
   "./rendererPlugins/editableWidgets/separateRendererPlugin/index.tsx": index$4,
   "./rendererPlugins/editableWidgets/timeRendererPlugin.tsx": timeRendererPlugin,

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

@@ -0,0 +1 @@
+export declare function numberRendererPlugin(): import("../../../../../../../es/components/iho-table").TablePlugin;

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

@@ -0,0 +1,62 @@
+import { createVNode, inject, mergeProps } from 'vue';
+import { NInputNumber } from 'naive-ui';
+import '../../../../index.js';
+import { EDITABLE_WIDGET_TYPE, InjectionIhoTableEmits } from '../../../constants/index.js';
+import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
+
+function numberRendererPlugin() {
+  const pluginName = "numberRendererPlugin";
+  return defineTablePlugin({
+    name: pluginName,
+    vxe(instance) {
+      instance.renderer.add(EDITABLE_WIDGET_TYPE.NUMBER, {
+        renderCell(renderOpts, {
+          row,
+          column
+        }) {
+          return [createVNode("span", null, [row[column.field]])];
+        },
+        renderEdit({
+          props
+        }, {
+          row,
+          column,
+          $rowIndex
+        }) {
+          const emit = inject(InjectionIhoTableEmits);
+          const {
+            placeholder = "\u8BF7\u8F93\u5165"
+          } = (props == null ? void 0 : props.componentProps) || {};
+          const config = {
+            ...(props == null ? void 0 : props.componentProps) || {},
+            clearable: true,
+            placeholder,
+            onBlur,
+            onUpdateValue
+          };
+          const common = {
+            value: row[column.field],
+            row,
+            column,
+            index: $rowIndex
+          };
+          function onBlur() {
+            emit("formChange", {
+              ...common,
+              type: "blur"
+            });
+          }
+          function onUpdateValue() {
+            emit("formChange", common);
+          }
+          return [createVNode(NInputNumber, mergeProps({
+            "value": row[column.field],
+            "onUpdate:value": ($event) => row[column.field] = $event
+          }, config), null)];
+        }
+      });
+    }
+  });
+}
+
+export { numberRendererPlugin };

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

@@ -42,7 +42,7 @@ var EditSelect = defineComponent({
       });
     }
     return () => createVNode(NSelect, mergeProps({
-      "ref": formRef,
+      "ref": "formRef",
       "show": isShow.value,
       "onUpdate:show": ($event) => isShow.value = $event
     }, attrs, {

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

@@ -24,29 +24,29 @@ function timeRendererPlugin() {
           $rowIndex
         }) {
           const emit = inject(InjectionIhoTableEmits);
-          function onUpdateValue() {
-            emit("formChange", {
-              value: row[column.field],
-              row,
-              column,
-              index: $rowIndex
-            });
-          }
           const {
             placeholder = "\u8BF7\u9009\u62E9",
             valueFormat = "HH:mm"
           } = (props == null ? void 0 : props.componentProps) || {};
-          const timeConfig = {
+          const config = {
+            ...(props == null ? void 0 : props.componentProps) || {},
             placeholder,
             valueFormat,
             format: valueFormat || "yyyy-MM-dd HH:mm:ss",
-            ...(props == null ? void 0 : props.componentProps) || {},
             onUpdateFormattedValue: onUpdateValue
           };
+          function onUpdateValue() {
+            emit("formChange", {
+              value: row[column.field],
+              row,
+              column,
+              index: $rowIndex
+            });
+          }
           return [createVNode(NTimePicker, mergeProps({
             "formattedValue": row[column.field],
             "onUpdate:formattedValue": ($event) => row[column.field] = $event
-          }, timeConfig), null)];
+          }, config), null)];
         }
       });
     }

package/es/components/shortcut-setter/index.d.ts

@@ -133,6 +133,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         suffixConfig?: any | any[] | undefined;
         autograph?: string | undefined;
         defined_error_msg?: string | undefined;
+        extendKey?: string | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -135,6 +135,7 @@ declare const _default: import("vue").DefineComponent<{
         suffixConfig?: any | any[] | undefined;
         autograph?: string | undefined;
         defined_error_msg?: string | undefined;
+        extendKey?: string | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         content?: string | import("../../../../es/components/form-render").FormRenderer | Record<string, import("../../../../es/components/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;

package/es/shared/types/index.d.ts

@@ -9,3 +9,11 @@ export declare type UndefinedAble<T> = T | undefined;
 export declare type ArrayAble<T> = T | T[];
 export declare type MapValue<T> = T extends Map<any, infer P> ? P : any;
 export declare type NotNull<T> = T extends null | undefined ? never : T;
+export declare type Merge<T> = {
+    [K in keyof T]: T[K];
+};
+export declare type PropertyRequired<T, K extends keyof T> = Merge<{
+    [KEY in keyof T as KEY extends K ? never : KEY]: T[KEY];
+} & {
+    [KEY in K]-?: T[KEY];
+}>;

package/package.json

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