cnhis-design-vue 2.1.43 → 2.1.44

package/packages/shortcut-setter/src/utils/index.js

@@ -1,12 +1,10 @@
 import { isString } from 'xe-utils';
 
 export function isKeyboardEvent(event) {
-  return Reflect.get(event, 'view') === window && Reflect.get(event, 'shiftKey') != undefined;
+  return Reflect.get(event, 'view') === window && Reflect.get(event, 'shiftKey') !== undefined;
 }
 
-export function normalizeSignatureInfo(
-  info
-) {
+export function normalizeSignatureInfo(info) {
   let ctrl, shift, alt;
   const key = info.key?.toUpperCase() ?? '';
 
@@ -31,13 +29,13 @@ export function inKeyBlackList(key) {
 }
 
 export function isInvalidSignature(info) {
-  const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  if (!ctrl && !shift && !alt) return !/F\d/.test(key);
+  const { /* ctrl, shift, alt,*/ key } = normalizeSignatureInfo(info);
+  // if (!ctrl && !shift && !alt) return !/F\d/.test(key);
   return inKeyBlackList(key);
 }
 
 export 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')}`;
 }