Merge pull request #9112 from dataease/pr@dev-v2@fix_panel

Pr@dev v2@fix panel

core/core-frontend/src/components/assist-button/ColorButton.vue

@@ -52,17 +52,17 @@ const colorButtonClick = () => {
   padding-left: 5px;
   padding-top: 5px;
   &:hover {
-    padding-left: 4px;
-    padding-top: 4px;
-    border-width: 2px;
+    padding-left: 5px;
+    padding-top: 5px;
+    border-width: 1px;
     border-color: var(--ed-color-primary-99, #3370ff99);
   }
 }
 .color-button-active {
-  padding-left: 4px;
-  padding-top: 4px;
-  border-width: 2px;
-  border-color: var(--ed-color-primary);
+  padding-left: 5px;
+  padding-top: 5px;
+  border-width: 1px;
+  border-color: var(--ed-color-primary) !important;
 }
 
 .color-button-inner {

core/core-frontend/src/components/watermark/watermark.ts

@@ -36,7 +36,7 @@ export function watermark(settings, domId) {
   page_width = page_width - cutWidth
   // 获取页面最大高度
   let page_height = watermarkDom.scrollHeight - 56
-  page_height = page_height < 400 ? 400 : page_height
+  page_height = page_height < 220 ? 220 : page_height
   // page_height = Math.max(page_height, window.innerHeight - 30)
   // 如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
   if (

core/core-frontend/src/utils/DeShortcutKey.ts

@@ -106,6 +106,7 @@ export function listenGlobalKeyDown() {
     if (positionMoveKey[keyCode] && curComponent.value) {
       positionMoveKey[keyCode](keyCode)
       e.preventDefault()
+      e.stopPropagation()
     } else if (keyCode === shiftKey) {
       isShiftDown = true
       composeStore.setIsShiftDownStatus(true)