cnhis-design-vue 3.1.29-beta.5 → 3.1.29-beta.6

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

@@ -21,6 +21,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
         onKeydown?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "change" | "keydown", ...args: any[]) => void;
+    popoverRef: import("vue").Ref<null>;
     numberKeys: import("vue").Ref<string[]>;
     days: import("vue").Ref<number[]>;
     doses: import("vue").Ref<number[]>;

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

@@ -36,6 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const ENGLISHOTHERKEY = ["switch", " ", "undo", "Enter"];
     const ENGLISHKEYS = ENGLISHKEY.split("").concat(ENGLISHOTHERKEY);
     const ENGLISHKEYS_ = ENGLISHKEY.split(".")[0].split("").sort().concat(["."], ENGLISHOTHERKEY);
+    const popoverRef = ref(null);
     const numberKeys = ref(NUMBERKEYS.split(""));
     const days = ref(DAYS);
     const doses = ref([2, 3, 4, 5, 6, 7, 8]);
@@ -50,7 +51,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const isDay = computed(() => props.mode === "day");
     const isDose = computed(() => props.mode === "dose");
     function keydown(key) {
-      var _a, _b;
+      var _a, _b, _c;
       if (props.mode === "default") {
         if (key !== "switch") {
           emit("keydown", key);
@@ -66,13 +67,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         case "enter":
           value.value = +inputValue.value;
+          (_a = popoverRef.value) == null ? void 0 : _a.setShow(false);
           emit("change", value.value);
           break;
         default:
           if (typeof key === "number") {
             inputValue.value = key.toString();
           } else {
-            inputValue.value = (((_b = (_a = inputValue.value) == null ? void 0 : _a.toString) == null ? void 0 : _b.call(_a)) || "") + key;
+            inputValue.value = (((_c = (_b = inputValue.value) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) || "") + key;
           }
           break;
       }
@@ -88,16 +90,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return !unref(isDefault) ? (openBlock(), createBlock(unref(NPopover), {
         key: 0,
+        ref_key: "popoverRef",
+        ref: popoverRef,
         trigger: "click",
         "show-arrow": false,
         placement: "bottom-start",
-        style: { "padding": "0" }
+        style: { "padding": "0" },
+        "display-directive": "show"
       }, {
         trigger: withCtx(() => [
           createVNode(unref(NInputNumber), {
             value: value.value,
             "onUpdate:value": _cache[0] || (_cache[0] = ($event) => value.value = $event),
-            style: { "width": "200px" }
+            style: { "width": "200px" },
+            "show-button": false
           }, null, 8, ["value"])
         ]),
         default: withCtx(() => [
@@ -207,7 +213,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ])
         ]),
         _: 1
-      })) : (openBlock(), createElementBlock("div", _hoisted_11, [
+      }, 512)) : (openBlock(), createElementBlock("div", _hoisted_11, [
         createVNode(unref(NSpace), {
           "wrap-item": false,
           align: "center",

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

@@ -21,6 +21,7 @@ declare const _default: import("vue").DefineComponent<{
         onKeydown?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "change" | "keydown", ...args: any[]) => void;
+    popoverRef: import("vue").Ref<null>;
     numberKeys: import("vue").Ref<string[]>;
     days: import("vue").Ref<number[]>;
     doses: import("vue").Ref<number[]>;

package/es/components/shortcut-provider/src/hooks/useShortcuts.js

@@ -3,7 +3,7 @@ import { useEventListener, useDebounceFn } from '@vueuse/core';
 import { once, pick, omit, isFunction, isString } from 'lodash-es';
 import { reactive, ref, unref, computed, getCurrentInstance, inject, onBeforeUnmount, onDeactivated, onActivated } from 'vue';
 import { ShortcutStatus, InjectionShortcutManager } from '../constants/index.js';
-import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, isShortcutProvider } from '../utils/index.js';
+import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, isShortcutProvider, isInvalidKeyboardEvent } from '../utils/index.js';
 
 const GlobalShortcutProvider = Symbol("Glob");
 const ShortcutManagerCacheMap = /* @__PURE__ */ new Map();
@@ -82,7 +82,7 @@ class ShortcutManager {
       if (!isKeyboardEvent(event) || this.disabled)
         return;
       const providerWrapper = findAncestor(event.target, isShortcutProvider);
-      if (providerWrapper && providerWrapper !== unref(this.environmentEle)) {
+      if (providerWrapper && providerWrapper !== unref(this.environmentEle) || isInvalidKeyboardEvent(event)) {
         return;
       }
       const keySignature = getKeySignature(event);
@@ -113,7 +113,9 @@ class ShortcutManager {
 }
 const globManager = new ShortcutManager().start();
 const onceSetupWarn = once(() => ShortcutManager.log("\u975Esetup\u8BED\u5883\u4E0B\u7684shortcut\u5C06\u5F71\u54CD\u5168\u5C40"));
-const onceRegisterWarn = once(() => ShortcutManager.log("\u5728\u975Esetup\u8BED\u5883\u4E0B\u4F7F\u7528register\u51FD\u6570,\u7EC4\u4EF6\u9500\u6BC1\u65F6\u53EF\u80FD\u9700\u8981\u624B\u52A8\u8C03\u7528stop\u51FD\u6570\u4F7F\u5FEB\u6377\u952E\u5931\u6D3B"));
+const onceRegisterWarn = once(
+  () => ShortcutManager.log("\u5728\u975Esetup\u8BED\u5883\u4E0B\u4F7F\u7528register\u51FD\u6570,\u7EC4\u4EF6\u9500\u6BC1\u65F6\u53EF\u80FD\u9700\u8981\u624B\u52A8\u8C03\u7528stop\u51FD\u6570\u4F7F\u5FEB\u6377\u952E\u5931\u6D3B")
+);
 function useShortcuts(scope) {
   function useManager() {
     return computed(() => {

package/es/components/shortcut-provider/src/utils/index.d.ts

@@ -2,8 +2,10 @@ import { ShortcutSignatureInfo } from '../../../../../es/components/shortcut-pro
 export declare function isKeyboardEvent(event: any): event is KeyboardEvent;
 export declare function normalizeSignatureInfo(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): Required<ShortcutSignatureInfo>;
 export declare function getKeySignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): string;
-export declare function inKeyBlackList(key: string): boolean | undefined;
-export declare function isInvalidSignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): boolean | undefined;
+export declare function inKeyBlackList(key: string): boolean;
+export declare function isInvalidKeyboardEvent(event: KeyboardEvent): boolean;
+export declare function isInvalidSignatureAtInput(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): boolean;
+export declare function isInvalidSignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): boolean;
 export declare function getDisplaySignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): string;
 export declare function transformKey2DisplaySignature(keySignature: string): string;
 export declare function isShortcutProvider(ele: HTMLElement): boolean;

package/es/components/shortcut-provider/src/utils/index.js

@@ -1,5 +1,14 @@
 import { isString } from 'lodash-es';
 
+function isAlphanumeric(key) {
+  return /^[\dA-Za-z]$/.test(key);
+}
+function isPunctuation(key) {
+  return /^[，。；‘【】、\-=|+,.\/;’\[\]\\ ]$/.test(key);
+}
+function isFnNumberChar(key) {
+  return /^[!@#$%^&*()_+|~！¥…（）—｜～]$/.test(key);
+}
 function isKeyboardEvent(event) {
   return Reflect.get(event, "view") === window && Reflect.get(event, "shiftKey") != void 0;
 }
@@ -25,24 +34,36 @@ function getKeySignature(info) {
 const keyBlackList = ["CONTROL", "ALT", "SHIFT"];
 function inKeyBlackList(key) {
   if (!isString(key))
-    return;
+    return false;
   return keyBlackList.includes(key.toUpperCase());
 }
-function isInvalidSignature(info) {
+function isInvalidKeyboardEvent(event) {
+  const target = event.target;
+  if (target.tagName !== "INPUT")
+    return false;
+  return isInvalidSignatureAtInput(event);
+}
+function isInvalidSignatureAtInput(info) {
   const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  if (!ctrl && !shift && !alt)
-    return !/F\d/.test(key);
+  if (ctrl || alt)
+    return false;
+  if (shift)
+    return isFnNumberChar(key);
+  return isAlphanumeric(key) || isPunctuation(key);
+}
+function isInvalidSignature(info) {
+  const { key } = normalizeSignatureInfo(info);
   return inKeyBlackList(key);
 }
 function getDisplaySignature(info) {
   const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  return `${ctrl ? "Ctrl+ " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inKeyBlackList(key) ? "" : key}`;
+  return `${ctrl ? "Ctrl + " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inKeyBlackList(key) ? "" : key.replace(" ", "SPACE")}`;
 }
 function transformKey2DisplaySignature(keySignature) {
-  return keySignature.replace(/_/g, " + ");
+  return keySignature.replace(" ", "SPACE").replace(/_/g, " + ");
 }
 function isShortcutProvider(ele) {
   return ele && ele.getAttribute("is-shortcut-capture") != void 0;
 }
 
-export { getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidSignature, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };
+export { getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidKeyboardEvent, isInvalidSignature, isInvalidSignatureAtInput, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.29-beta.5",
+	"version": "3.1.29-beta.6",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "971a1902ff486903e6f5e1987684970a384a5d8b"
+	"gitHead": "512e1266b8b36792254b134e3a861ba60b14d53f"
 }