cnhis-design-vue 3.1.39-beta.4 → 3.1.39-beta.5

package/es/components/form-render/src/components/renderer/radio&checkbox.d.ts

@@ -2,7 +2,7 @@ import { AnyObject } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 export declare const RADIO: import("vue").DefineComponent<{
     value: {
-        type: (NumberConstructor | ObjectConstructor | StringConstructor)[];
+        type: (ArrayConstructor | NumberConstructor | ObjectConstructor | StringConstructor)[];
     };
     options: {
         type: PropType<AnyObject[]>;
@@ -44,7 +44,7 @@ export declare const RADIO: import("vue").DefineComponent<{
     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: {
-        type: (NumberConstructor | ObjectConstructor | StringConstructor)[];
+        type: (ArrayConstructor | NumberConstructor | ObjectConstructor | StringConstructor)[];
     };
     options: {
         type: PropType<AnyObject[]>;
@@ -94,7 +94,7 @@ export declare const RADIO: import("vue").DefineComponent<{
 }>;
 export declare const CHECKBOX: import("vue").DefineComponent<{
     value: {
-        type: (NumberConstructor | ObjectConstructor | StringConstructor)[];
+        type: (ArrayConstructor | NumberConstructor | ObjectConstructor | StringConstructor)[];
     };
     options: {
         type: PropType<AnyObject[]>;
@@ -136,7 +136,7 @@ export declare const CHECKBOX: import("vue").DefineComponent<{
     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: {
-        type: (NumberConstructor | ObjectConstructor | StringConstructor)[];
+        type: (ArrayConstructor | NumberConstructor | ObjectConstructor | StringConstructor)[];
     };
     options: {
         type: PropType<AnyObject[]>;

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

@@ -17,7 +17,7 @@ function createComponent(name, Wrapper, Item) {
     name,
     props: {
       value: {
-        type: [String, Number, Object]
+        type: [String, Number, Object, Array]
       },
       options: {
         type: Array,

package/es/components/form-render/src/hooks/useFieldListAdaptor.js

@@ -276,7 +276,8 @@ function useFieldListAdaptor(collector) {
       return fin;
     }, {});
     function bindIndex(schema, idx) {
-      return { ...schema, "x-index": idx };
+      schema["x-index"] = idx;
+      return schema;
     }
     function createFieldName(fieldItem) {
       if (fieldItem.suffixConfig) {

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

@@ -1,10 +1,38 @@
-import { createVNode, mergeProps } from 'vue';
+import { defineComponent, computed, createVNode, mergeProps } from 'vue';
+import { isNumber } from 'lodash-es';
 import { NInputNumber } from 'naive-ui';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../constants/index.js';
 import { IhoTableRenderHelper } from '../../../utils/index.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
 
+const IhoTableInputNumber = defineComponent({
+  name: "IhoTableInputNumber",
+  props: {
+    value: [String, Number]
+  },
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get() {
+        if (isNumber(props.value))
+          return props.value;
+        return props.value ? isNumber(+props.value) ? +props.value : null : null;
+      },
+      set(value) {
+        emit("update:value", value);
+      }
+    });
+    return () => {
+      return createVNode(NInputNumber, {
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event
+      }, null);
+    };
+  }
+});
 function numberRendererPlugin() {
   const pluginName = "numberRendererPlugin";
   return defineTablePlugin({
@@ -23,7 +51,6 @@ function numberRendererPlugin() {
             placeholder = "\u8BF7\u8F93\u5165"
           } = fieldItem.componentProps || {};
           const config = {
-            ...fieldItem.componentProps || {},
             clearable: true,
             placeholder,
             onBlur: () => emitFormChangeWithParams({
@@ -39,10 +66,10 @@ function numberRendererPlugin() {
             },
             onClick: emitFormClick
           };
-          return [createVNode(NInputNumber, mergeProps({
+          return [createVNode(IhoTableInputNumber, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event
-          }, config), null)];
+          }, fieldItem.componentProps, config), null)];
         })
       });
     }

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

@@ -1,4 +1,4 @@
-import { AnyObject } from '../../../../../../../../es/shared/types';
+import { AnyObject, Func } from '../../../../../../../../es/shared/types';
 import { CSSProperties, PropType } from 'vue';
 import { VxeTableDefines } from 'vxe-table';
 declare const _default: import("vue").DefineComponent<{
@@ -47,23 +47,27 @@ declare const _default: import("vue").DefineComponent<{
             required: true;
         };
     }>> & {
+        onClick?: ((...args: any[]) => any) | undefined;
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
+    emit: (event: "click" | "update:value", ...args: any[]) => void;
     tableHandler: import("../../../../types").IhoTableHandler;
-    popoverRef: import("vue").Ref<any>;
-    editContent: import("vue").Ref<any>;
-    setEditContent: (value: any) => void;
+    popoverRef: import("vue").Ref<{
+        syncPosition: Func;
+    } | undefined>;
+    editContent: import("vue").Ref<unknown>;
+    setEditContent: (value: unknown) => void;
     show: import("vue").Ref<boolean>;
     setShow: (v: boolean) => void;
-    emit: (event: "update:value", ...args: any[]) => void;
+    onContentClick: (event: MouseEvent) => void;
+    updateShow: (show: boolean) => void;
     onShow: () => Promise<void>;
     emitFormChangeWithParams: (params?: AnyObject) => void;
     onClose: () => Promise<void>;
-    updateShow: (show: boolean) => void;
     style: import("vue").ComputedRef<CSSProperties>;
     NPopover: any;
     NInput: any;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("click" | "update:value")[], "click" | "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {};
     height: {
         type: NumberConstructor;
@@ -86,6 +90,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
 }>> & {
+    onClick?: ((...args: any[]) => any) | undefined;
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     height: number;

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

@@ -5,6 +5,7 @@ import { InjectionIhoTableHandler } from '../../../../constants/index.js';
 import { useIhoTableFormEvent } from '../../../../utils/index.js';
 import _export_sfc from '../../../../../../../_virtual/plugin-vue_export-helper.js';
 
+const _hoisted_1 = ["onClick"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "editSeparate",
   props: {
@@ -15,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     displayContent: { type: String, default: "" },
     rowIndex: { type: Number, required: true }
   },
-  emits: ["update:value"],
+  emits: ["update:value", "click"],
   setup(__props, { emit }) {
     const props = __props;
     const tableHandler = inject(InjectionIhoTableHandler);
@@ -28,7 +29,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function setShow(v) {
       show.value = v;
     }
+    function onContentClick(event) {
+      show.value = !show.value;
+      emit("click", event);
+    }
     watch(show, updateShow);
+    function updateShow(show2) {
+      show2 ? onShow() : onClose();
+    }
     async function onShow() {
       var _a;
       editContent.value = cloneDeep(props.value);
@@ -47,9 +55,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emitFormChangeWithParams({ oldValue });
       tableHandler.updateTableDataRef();
     }
-    function updateShow(show2) {
-      show2 ? onShow() : onClose();
-    }
     const style = computed(() => ({
       border: "1px solid #f5f5f5",
       height: props.height - 16 + "px",
@@ -69,14 +74,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref: popoverRef,
         trigger: "manual",
         show: show.value,
-        "onUpdate:show": _cache[2] || (_cache[2] = ($event) => show.value = $event),
+        "onUpdate:show": _cache[1] || (_cache[1] = ($event) => show.value = $event),
         "show-arrow": false
       }, {
         trigger: withCtx(() => [
           createElementVNode("div", {
-            onClick: _cache[0] || (_cache[0] = withModifiers(($event) => show.value = !show.value, ["stop"])),
+            onClick: withModifiers(onContentClick, ["stop"]),
             style: normalizeStyle(unref(style))
-          }, toDisplayString(__props.displayContent || " "), 5)
+          }, toDisplayString(__props.displayContent || " "), 13, _hoisted_1)
         ]),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "menu", {
@@ -88,7 +93,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, () => [
             createVNode(unref(NInput), {
               value: editContent.value,
-              "onUpdate:value": _cache[1] || (_cache[1] = ($event) => editContent.value = $event),
+              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => editContent.value = $event),
               type: "textarea"
             }, null, 8, ["value"])
           ])

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, range } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE, InjectionIhoTableUUID } from '../../../../constants/index.js';
-import { IhoTableRenderHelper, getRowHeight, getColumnRenderWidth } from '../../../../utils/index.js';
+import { createIhoTableClearActivedInterceptor, 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';
@@ -24,6 +24,7 @@ function separateRendererPlugins() {
   return defineTablePlugin({
     name: pluginName,
     vxe(instance) {
+      instance.interceptor.add("event.clearActived", createIhoTableClearActivedInterceptor(EDITABLE_WIDGET_TYPE.SEPARATE, (ele) => ele.classList.contains("v-binder-follower-content")));
       instance.renderer.add(EDITABLE_WIDGET_TYPE.SEPARATE, {
         renderCell(renderOpts, {
           column,

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

@@ -25,7 +25,6 @@ function timeRendererPlugin() {
             valueFormat = "HH:mm"
           } = fieldItem.componentProps || {};
           const config = {
-            ...fieldItem.componentProps || {},
             placeholder,
             valueFormat,
             format: valueFormat || "yyyy-MM-dd HH:mm:ss",
@@ -41,7 +40,7 @@ function timeRendererPlugin() {
           return [createVNode(NTimePicker, mergeProps({
             "formattedValue": row[column.field],
             "onUpdate:formattedValue": ($event) => row[column.field] = $event
-          }, config), null)];
+          }, fieldItem.componentProps, config), null)];
         })
       });
     }

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

@@ -65,7 +65,11 @@ export declare type LowCodeTableFieldItem = {
     formType: string;
     fieldSetting: string;
     componentProps: AnyObject;
-    options: AnyObject[];
+    options: {
+        label?: string;
+        value: string;
+        disabled?: boolean;
+    }[];
     annotation: boolean;
     slotFn: NonNullable<IhoTableFieldItem['slots']>['default'];
     headerSlotFn: NonNullable<IhoTableFieldItem['slots']>['header'];

package/es/components/keyboard/index.d.ts

@@ -37,6 +37,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     ENGLISHOTHERKEY: string[];
     ENGLISHKEYS: string[];
     ENGLISHKEYS_: string[];
+    toSelectInputContent: import("vue").Ref<number>;
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         mode: {
             type: import("vue").PropType<"number" | "day" | "dose" | "english">;
@@ -94,6 +95,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     init: () => import("vue").ComputedRef<string> | undefined;
     keydown: (key: string | number) => void;
     onChange: (value: number) => void;
+    select: () => void;
     NPopover: any;
     NInputNumber: any;
     NIcon: any;
@@ -224,6 +226,8 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
                 "onUpdate:status"?: ((...args: any[]) => any) | undefined;
             }>>;
             emit: (event: "update:modelValue" | "update:status", ...args: any[]) => void;
+            inputRef: any;
+            toSelectInputContent: import("vue").Ref<number>;
             update: (value: string | [string, string]) => void;
             validator: (value: string) => boolean;
             calculate: (type: string) => void;

package/es/components/keyboard/src/Keyboard.vue.d.ts

@@ -38,6 +38,7 @@ declare const _default: import("vue").DefineComponent<{
     ENGLISHOTHERKEY: string[];
     ENGLISHKEYS: string[];
     ENGLISHKEYS_: string[];
+    toSelectInputContent: import("vue").Ref<number>;
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         mode: {
             type: PropType<"number" | "day" | "dose" | "english">;
@@ -95,6 +96,7 @@ declare const _default: import("vue").DefineComponent<{
     init: () => import("vue").ComputedRef<string> | undefined;
     keydown: (key: string | number) => void;
     onChange: (value: number) => void;
+    select: () => void;
     NPopover: any;
     NInputNumber: any;
     NIcon: any;
@@ -225,6 +227,8 @@ declare const _default: import("vue").DefineComponent<{
                 "onUpdate:status"?: ((...args: any[]) => any) | undefined;
             }>>;
             emit: (event: "update:modelValue" | "update:status", ...args: any[]) => void;
+            inputRef: any;
+            toSelectInputContent: import("vue").Ref<number>;
             update: (value: string | [string, string]) => void;
             validator: (value: string) => boolean;
             calculate: (type: string) => void;

package/es/components/keyboard/src/Keyboard.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, unref, openBlock, createBlock, withCtx, createVNode, normalizeProps, mergeProps, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, Fragment, renderList, createCommentVNode, createTextVNode, toDisplayString } from 'vue';
+import { defineComponent, ref, provide, computed, unref, openBlock, createBlock, withCtx, createVNode, normalizeProps, mergeProps, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, Fragment, renderList, createCommentVNode, createTextVNode, toDisplayString } from 'vue';
 import { NPopover, NInputNumber, NSpace, NIcon } from 'naive-ui';
 import { Close, GitCompareOutline, ArrowUndoSharp } from '@vicons/ionicons5';
 import NumberPanel from './components/NumberPanel.vue.js';
@@ -23,12 +23,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     "change",
     "keydown"
   ],
-  setup(__props, { emit }) {
+  setup(__props, { expose, emit }) {
     const props = __props;
     const ENGLISHKEY = "QWERTYUIOPASDFGHJKLZXCVBNM.";
     const ENGLISHOTHERKEY = ["Switch", " ", "Undo", "Enter"];
     const ENGLISHKEYS = ENGLISHKEY.split("").concat(ENGLISHOTHERKEY);
     const ENGLISHKEYS_ = ENGLISHKEY.split(".")[0].split("").sort().concat(["."], ENGLISHOTHERKEY);
+    let toSelectInputContent = ref(Date.now());
+    provide("toSelectInputContent", toSelectInputContent);
     const isDefault = computed(() => props.mode === "english");
     const moveNumberPaneOptions = computed(() => {
       return {
@@ -78,6 +80,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       currentValue.value = value;
       emit("change", value);
     }
+    function select() {
+      toSelectInputContent.value = Date.now();
+    }
+    expose({
+      select
+    });
     return (_ctx, _cache) => {
       return !unref(isDefault) && !__props.panel ? (openBlock(), createBlock(unref(NPopover), {
         key: 0,

package/es/components/keyboard/src/components/InputNumber.vue.d.ts

@@ -1,4 +1,4 @@
-import { PropType } from 'vue';
+import { PropType, Ref } from 'vue';
 import { FormValidationStatus } from 'naive-ui/es/form/src/interface';
 declare const _default: import("vue").DefineComponent<{
     modelValue: {
@@ -32,6 +32,8 @@ declare const _default: import("vue").DefineComponent<{
         "onUpdate:status"?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "update:modelValue" | "update:status", ...args: any[]) => void;
+    inputRef: any;
+    toSelectInputContent: Ref<number>;
     update: (value: string | [string, string]) => void;
     validator: (value: string) => boolean;
     calculate: (type: string) => void;

package/es/components/keyboard/src/components/InputNumber.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, openBlock, createBlock, unref, withCtx, createVNode } from 'vue';
+import { defineComponent, ref, inject, watch, openBlock, createBlock, unref, withCtx, createVNode } from 'vue';
 import { NInput, NSpace, NIcon } from 'naive-ui';
 import { CaretUp, CaretDown } from '@vicons/ionicons5';
 import { getNumber } from '../utils/index.js';
@@ -14,6 +14,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue", "update:status"],
   setup(__props, { emit }) {
     const props = __props;
+    const inputRef = ref(null);
+    const toSelectInputContent = inject("toSelectInputContent");
     function update(value) {
       const val = typeof value === "string" ? value : value.join("");
       emit("update:modelValue", val);
@@ -33,8 +35,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("update:modelValue", newValue.toString());
       emit("update:status", "success");
     }
+    watch(
+      () => toSelectInputContent.value,
+      (value) => {
+        var _a, _b;
+        (_b = (_a = inputRef.value) == null ? void 0 : _a.select) == null ? void 0 : _b.call(_a);
+      }
+    );
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NInput), {
+        autofocus: "",
+        ref_key: "inputRef",
+        ref: inputRef,
         value: __props.modelValue,
         "onUpdate:value": update,
         "allow-input": validator,

package/es/components/keyboard/src/components/NumberPanel.vue.d.ts

@@ -124,6 +124,8 @@ declare const _default: import("vue").DefineComponent<{
             "onUpdate:status"?: ((...args: any[]) => any) | undefined;
         }>>;
         emit: (event: "update:modelValue" | "update:status", ...args: any[]) => void;
+        inputRef: any;
+        toSelectInputContent: Ref<number>;
         update: (value: string | [string, string]) => void;
         validator: (value: string) => boolean;
         calculate: (type: string) => void;

package/package.json

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