adtec-core-package 2.7.2 → 2.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "private": false,
   "type": "module",
   "scripts": {

package/src/hooks/useListenerHooks.ts

@@ -95,43 +95,62 @@ const blurEvent = (event: FocusEvent) => {
 
 const keyUpEvent = (event: KeyboardEvent) => {
   if (event.key === 'Enter') {
-    const applicationModule = moduleName.value || sessionStorage.getItem('applicationModule')
-    //首先判断当前页面有没有抽屉
-    const docTemp = event.currentTarget as any
-    const doc =
-      applicationModule === 'system'
-        ? (docTemp as Document)
-        : (docTemp && docTemp[applicationModule ?? 'default'] && docTemp[applicationModule ?? 'default'].document) || undefined
-    if (!doc) return
-    if (!doc) return
-    const loginButton = doc.body.querySelector('.login_button')
-    if (loginButton) {
-      event.stopPropagation()
-      ;(loginButton as HTMLElement).click()
-      return
+    const applicationModule = moduleName.value || sessionStorage.getItem('applicationModule');
+    // 首先判断当前页面有没有抽屉
+    const docTemp = event.currentTarget as any;
+    const doc = applicationModule === 'system'
+      ? (docTemp as Document)
+      : (docTemp && docTemp[applicationModule ?? 'default'] && docTemp[applicationModule ?? 'default'].document) || undefined;
+
+    if (!doc) return;
+
+    // 工具函数：判断元素是否可见（未隐藏、display不为none、visibility不为hidden）
+    const isElementVisible = (el: HTMLElement | null): boolean => {
+      if (!el) return false;
+      // 1. 元素本身隐藏（v-if=false 会导致 el 为 null，已在入参过滤）
+      // 2. display: none
+      if (el.style.display === 'none' || getComputedStyle(el).display === 'none') return false;
+      // 3. visibility: hidden
+      if (el.style.visibility === 'hidden' || getComputedStyle(el).visibility === 'hidden') return false;
+      // 4. 父元素隐藏导致该元素不可见
+      let parent = el.parentElement;
+      while (parent) {
+        if (parent.style.display === 'none' || getComputedStyle(parent).display === 'none') return false;
+        parent = parent.parentElement;
+      }
+      return true;
+    };
+
+    // 1. 优先查找登录按钮（可见时才点击）
+    const loginButton = doc.body.querySelector('.login_button') as HTMLElement;
+    if (loginButton && isElementVisible(loginButton)) {
+      event.stopPropagation();
+      event.preventDefault(); // 新增：阻止表单默认提交（避免页面刷新）
+      loginButton.click();
+      return;
     }
-    if (
-      doc.body.className === 'el-popup-parent--hidden' ||
-      doc.body.querySelector('.el-drawer .open')
-    ) {
-      const drawer = doc.body.querySelector('.el-drawer__body')
+
+    // 2. 判断是否有打开的抽屉
+    const hasDrawer = doc.body.className === 'el-popup-parent--hidden' || doc.body.querySelector('.el-drawer .open');
+    let target: HTMLElement | null = null;
+    const routeCode = sessionStorage.getItem('activationRouteCode') as string;
+
+    if (hasDrawer) {
+      const drawer = doc.body.querySelector('.el-drawer__body');
       if (drawer) {
-        const target = drawer.querySelector(
-          '.' + (sessionStorage.getItem('activationRouteCode') as string) + '_search',
-        )
-        if (target) {
-          event.stopPropagation()
-          ;(target as HTMLElement).click()
-        }
+        // 抽屉内的搜索按钮（需可见）
+        target = drawer.querySelector(`.${routeCode}_search`) as HTMLElement;
       }
     } else {
-      const target = doc.body.querySelector(
-        '.' + (sessionStorage.getItem('activationRouteCode') as string) + '_search',
-      )
-      if (target) {
-        event.stopPropagation()
-        ;(target as HTMLElement).click()
-      }
+      // 页面内的搜索按钮（需可见）
+      target = doc.body.querySelector(`.${routeCode}_search`) as HTMLElement;
+    }
+
+    // 3. 目标元素存在且可见时，才执行点击
+    if (target && isElementVisible(target)) {
+      event.stopPropagation();
+      event.preventDefault(); // 新增：阻止表单默认提交（避免页面刷新）
+      target.click();
     }
   }
-}
+};