From 45f9701b268df03a80ae772e8a05850198d4704e Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Sun, 18 Aug 2024 17:25:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E7=BA=BF=E6=8F=90=E7=A4=BA=E6=A1=86=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=A2=9C=E8=89=B2=E4=B8=8D=E6=98=8E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-senior/components/AssistLine.vue    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
index ef6caff7f5..cdbb75ce87 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
@@ -219,7 +219,7 @@ onMounted(() => {
       <template #header>
         <div class="assist-line-cfg-header">
           <span class="ed-dialog__title">{{ t('chart.assist_line') }}</span>
-          <el-tooltip class="item" effect="dark" placement="top">
+          <el-tooltip class="item" effect="ndark" placement="top">
             <template #content>
               <span> {{ t('chart.assist_line_tip') }}</span>
             </template>
@@ -379,4 +379,13 @@ span {
     font-size: 14px;
   }
 }
+.hint-icon {
+  cursor: pointer;
+  font-size: 14px;
+  color: #646a73;
+
+  &.hint-icon--dark {
+    color: #a6a6a6;
+  }
+}
 </style>

From b5de1cec88ec74abb49eca4676853d5c1463a8e8 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Sun, 18 Aug 2024 17:28:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E6=8C=89?=
 =?UTF-8?q?=E5=88=97=E9=85=8D=E7=BD=AE=E6=9C=80=E5=A4=A7=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=200-200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BasicStyleSelector.vue         | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index 1105d720c8..3915f499b7 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -11,6 +11,8 @@ import { cloneDeep, defaultsDeep } from 'lodash-es'
 import { SERIES_NUMBER_FIELD } from '@antv/s2'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
+import { isNumber } from 'mathjs'
+import { ElMessage } from 'element-plus-secondary'
 
 const dvMainStore = dvMainStoreWithOut()
 const { batchOptStatus } = storeToRefs(dvMainStore)
@@ -167,9 +169,25 @@ const changeFieldColumn = () => {
 }
 const changeFieldColumnWidth = () => {
   const { basicStyleForm, fieldColumnWidth } = state
+  let { width } = fieldColumnWidth
+  let validate = true
+  width = parseFloat(width)
+  if (isNaN(width) || !isNumber(width)) {
+    validate = false
+  }
+  if (width < 0 || width > 200) {
+    validate = false
+  }
   const fieldWidth = basicStyleForm.tableFieldWidth?.find(
     i => i.fieldId === fieldColumnWidth.fieldId
   )
+  if (!validate) {
+    ElMessage.warning('宽度需要在 0-200 之间')
+    if (fieldWidth) {
+      fieldColumnWidth.width = fieldWidth.width
+    }
+    return
+  }
   if (fieldWidth) {
     fieldWidth.width = fieldColumnWidth.width
     changeBasicStyle('tableFieldWidth')
@@ -745,8 +763,6 @@ onMounted(() => {
         v-model.number="state.fieldColumnWidth.width"
         type="number"
         class="basic-input-number"
-        :min="0"
-        :max="100"
         :effect="themes"
         :disabled="batchOptStatus"
         @change="changeFieldColumnWidth()"

From 5ee84d165d0c3db8a51b39a826caad9b715ce0b6 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Sun, 18 Aug 2024 17:28:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=2014px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/editor/common/TableTooltip.vue    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue b/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue
index ad11865fdb..93e8e47691 100644
--- a/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue
+++ b/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue
@@ -74,6 +74,7 @@ const sort = (type?) => {
 </template>
 <style scoped>
 .sort-btn {
+  font-size: 14px;
   cursor: pointer;
 }
 </style>