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

package/es/components/iho-table/src/components/IhoTableColumn.js

@@ -33,7 +33,7 @@ const ColumnComponent = defineComponent({
         }
       }, {
         default: () => props.field.title
-      }))]]), vIf(hasAnnotation, createVNode(Annotation, {
+      }))]]), vIf(hasAnnotation, () => createVNode(Annotation, {
         "modelValue": props.annotation[props.field.field],
         "onUpdate:modelValue": ($event) => props.annotation[props.field.field] = $event
       }, null))]);

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

@@ -18,6 +18,9 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
             y: number;
         };
     };
+    defaultValue: {
+        type: NumberConstructor;
+    };
 }, {
     NUMBERKEYS: string;
     DAYS: number[];
@@ -44,6 +47,9 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
                 y: number;
             };
         };
+        defaultValue: {
+            type: NumberConstructor;
+        };
     }>> & {
         onChange?: ((...args: any[]) => any) | undefined;
         onKeydown?: ((...args: any[]) => any) | undefined;
@@ -55,7 +61,6 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     days: import("vue").Ref<number[]>;
     doses: import("vue").Ref<number[]>;
     englishKeys: import("vue").Ref<string[]>;
-    value: import("vue").Ref<any>;
     inputValue: import("vue").Ref<string>;
     integerValue: import("vue").Ref<any>;
     numeratorValue: import("vue").Ref<any>;
@@ -162,6 +167,9 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
             y: number;
         };
     };
+    defaultValue: {
+        type: NumberConstructor;
+    };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
     onKeydown?: ((...args: any[]) => any) | undefined;

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

@@ -27,7 +27,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   props: {
     mode: { type: String, default: "english" },
     dragable: { type: Boolean, default: false },
-    positionInitialValue: { type: Object, default: () => ({ x: 0, y: 0 }) }
+    positionInitialValue: { type: Object, default: () => ({ x: 0, y: 0 }) },
+    defaultValue: { type: Number }
   },
   emits: [
     "change",
@@ -47,7 +48,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const days = ref(DAYS);
     const doses = ref([2, 3, 4, 5, 6, 7, 8]);
     const englishKeys = ref(ENGLISHKEYS.slice());
-    const value = ref();
     const inputValue = ref("");
     const integerValue = ref();
     const numeratorValue = ref();
@@ -64,6 +64,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       preventDefault: true,
       handle: keyboardDragRef
     });
+    if (props.defaultValue) {
+      inputValue.value = props.defaultValue.toString();
+    }
     function keydown(key) {
       var _a, _b;
       if (props.mode === "english") {
@@ -81,8 +84,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           break;
         }
         case "Enter":
-          value.value = +inputValue.value;
-          emit("change", value.value);
+          emit("change", +inputValue.value);
           break;
         default:
           if (typeof key === "number") {
@@ -94,17 +96,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           break;
       }
     }
-    function updateFraction(value2) {
+    function updateFraction(value) {
       if (!setInputStatus(inputValue, inputValueStatus))
         return;
-      inputValue.value = (Math.round(+inputValue.value * (1 / value2) * 100) / 100).toString();
+      inputValue.value = (Math.round(+inputValue.value * (1 / value) * 100) / 100).toString();
       setInputValueStatus();
     }
     function calculateFraction() {
       if (!setInputStatus(inputValue, inputValueStatus) || !setInputStatus(numeratorValue, numeratorValueStatus, true) || !setInputStatus(denominatorValue, denominatorValueStatus, true))
         return;
-      const value2 = getNumber(integerValue.value) + getNumber(numeratorValue.value) / getNumber(denominatorValue.value);
-      inputValue.value = (Math.round(+inputValue.value * value2 * 100) / 100).toString();
+      const value = getNumber(integerValue.value) + getNumber(numeratorValue.value) / getNumber(denominatorValue.value);
+      inputValue.value = (Math.round(+inputValue.value * value * 100) / 100).toString();
       setInputValueStatus();
     }
     function setInputStatus(valueRef, statusRef, isInteger) {
@@ -244,7 +246,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               justify: "space-between",
               ref_key: "keyboardDragRef",
               ref: keyboardDragRef,
-              style: { "cursor": "move" }
+              style: normalizeStyle({ cursor: __props.dragable ? "move" : "default" })
             }, {
               default: withCtx(() => [
                 _hoisted_11,
@@ -254,7 +256,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["component"])
               ]),
               _: 1
-            }, 512),
+            }, 8, ["style"]),
             createElementVNode("div", _hoisted_12, [
               (openBlock(true), createElementBlock(Fragment, null, renderList(englishKeys.value, (key, index) => {
                 return openBlock(), createElementBlock("span", {

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

@@ -19,6 +19,9 @@ declare const _default: import("vue").DefineComponent<{
             y: number;
         };
     };
+    defaultValue: {
+        type: NumberConstructor;
+    };
 }, {
     NUMBERKEYS: string;
     DAYS: number[];
@@ -42,6 +45,9 @@ declare const _default: import("vue").DefineComponent<{
                 y: number;
             };
         };
+        defaultValue: {
+            type: NumberConstructor;
+        };
     }>> & {
         onChange?: ((...args: any[]) => any) | undefined;
         onKeydown?: ((...args: any[]) => any) | undefined;
@@ -53,7 +59,6 @@ declare const _default: import("vue").DefineComponent<{
     days: Ref<number[]>;
     doses: Ref<number[]>;
     englishKeys: Ref<string[]>;
-    value: Ref<any>;
     inputValue: Ref<string>;
     integerValue: Ref<any>;
     numeratorValue: Ref<any>;
@@ -157,6 +162,9 @@ declare const _default: import("vue").DefineComponent<{
             y: number;
         };
     };
+    defaultValue: {
+        type: NumberConstructor;
+    };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
     onKeydown?: ((...args: any[]) => any) | undefined;

package/es/components/search-cascader/src/components/SearchMenu.js

@@ -1,9 +1,9 @@
-import { defineComponent, computed, inject, createVNode, withModifiers, ref, createTextVNode } from 'vue';
+import { defineComponent, computed, inject, createVNode, ref, withModifiers, createTextVNode } from 'vue';
 import { vIf, traverse } from '../../../../shared/utils/index.js';
 import { Reload, ChevronForward } from '@vicons/ionicons5';
 import { NOOP } from '@vue/shared';
 import { useVirtualList } from '@vueuse/core';
-import { isNumber, isArray, isEqual, isString, isFunction } from 'lodash-es';
+import { isNumber, isArray, isFunction, isEqual, isString } from 'lodash-es';
 import { NCheckbox } from 'naive-ui';
 import { InjectionSearchCascaderLoadingNode, InjectionSearchCascaderValue, InjectionSearchCascaderCheckAbleLevel } from '../constants/index.js';
 
@@ -102,7 +102,7 @@ const SearchMenuList = defineComponent({
           "title": item.data[props.labelKey]
         }, [createVNode("div", {
           "class": "search-cascader__optionText"
-        }, [vIf(showCheckbox.value, createVNode(NCheckbox, {
+        }, [vIf(showCheckbox.value, () => createVNode(NCheckbox, {
           "style": {
             marginRight: "8px"
           },

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

@@ -11,4 +11,4 @@ export declare function deepOmit<T extends AnyObject>(target: T, keys: Array<key
 export declare function separateMetaModule<T extends AnyObject>(modules: Record<string, unknown>): T;
 export declare function findAncestor(ele: HTMLElement | null, finder: (ele: HTMLElement) => boolean): HTMLElement | null;
 export declare function widthAppend(value: string | number, append?: string): string;
-export declare function vIf(solution: unknown, node: unknown): unknown;
+export declare function vIf(solution: unknown, getNode: () => unknown): unknown;

package/es/shared/utils/index.js

@@ -136,8 +136,8 @@ function widthAppend(value, append = "px") {
     return value.endsWith(append) ? value : `${value}${append}`;
   throw new Error(`invalid width value ${value}, it need to be a string or number!`);
 }
-function vIf(solution, node) {
-  return solution ? node : null;
+function vIf(solution, getNode) {
+  return solution ? getNode() : null;
 }
 
 export { DMZ, arrayed, deepOmit, findAncestor, generateTimeFormat, getStringWidth, safeComponentRegister, separateMetaModule, traverse, uuidGenerator, vIf, widthAppend };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.31-beta.2",
+	"version": "3.1.31-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": "e88e2a027d3e80c600af95e026ea502b33b3a64f"
+	"gitHead": "559e8746f97e7089a0005e8d097ec9a420588652"
 }