Merge pull request #10630 from dataease/pr@dev-v2@style_fix

Pr@dev v2@style fix

core/core-frontend/src/custom-component/common/CommonStyleSet.vue

@@ -6,7 +6,7 @@
           <el-tooltip
             :key="styleOptionKey.value"
             v-if="styleForm[styleOptionKey.value] !== undefined"
-            :effect="themes"
+            effect="dark"
             placement="bottom"
           >
             <template #content> {{ styleOptionKey.label }} </template>
@@ -104,7 +104,7 @@
           <el-tooltip
             :key="styleOptionKey.value"
             v-if="styleForm[styleOptionKey.value] !== undefined"
-            :effect="themes"
+            effect="dark"
             placement="bottom"
           >
             <template #content> {{ styleOptionKey.label }} </template>

core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue

@@ -500,7 +500,13 @@ const tablePageClass = computed(() => {
       <div style="position: relative; height: 100%" :id="containerId"></div>
     </div>
     <el-row :style="autoStyle" v-if="showPage && !isError">
-      <div class="table-page-info" :class="tablePageClass" :style="tabStyle">
+      <div
+        class="table-page-info"
+        :class="tablePageClass"
+        :style="tabStyle"
+        @keydown.stop
+        @keyup.stop
+      >
         <div>共{{ state.pageInfo.total }}条</div>
         <el-pagination
           v-if="state.pageStyle !== 'general'"