From 50e068c99f77302dfd36f861a2fcfe87a62060e7 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 9 Apr 2024 17:55:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/style/index.less       |  4 +++
 .../views/data-visualization/PreviewHead.vue  | 30 +++++++++++++------
 .../visualized/data/dataset/form/index.vue    |  2 +-
 .../data/datasource/form/EditorDetail.vue     |  2 ++
 .../visualized/data/datasource/form/index.vue |  6 ++--
 .../visualized/data/datasource/index.vue      |  9 +++---
 .../src/views/workbranch/index.vue            |  4 +++
 7 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less
index c6f7fba22e..387c479c75 100644
--- a/core/core-frontend/src/style/index.less
+++ b/core/core-frontend/src/style/index.less
@@ -398,3 +398,7 @@ strong {
 .ed-date-editor .ed-range__icon {
   font-size: 16px !important;
 }
+
+.ed-picker__popper {
+  --ed-datepicker-border-color: #DEE0E3 !important;
+}
diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index b0a6d04fb6..77518a14b1 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -125,15 +125,7 @@ const initOpenHandler = newWindow => {
         编辑</el-button
       >
       <el-dropdown trigger="click">
-        <el-icon
-          :style="{
-            color: '#1f2329 !important',
-            marginLeft: '8px',
-            height: '20px !important',
-            width: '20px !important'
-          }"
-          class="hover-icon"
-        >
+        <el-icon class="head-more-icon">
           <Icon name="dv-head-more"></Icon>
         </el-icon>
         <template #dropdown>
@@ -198,6 +190,26 @@ const initOpenHandler = newWindow => {
     justify-content: right;
     align-items: center;
     flex: 1;
+    .head-more-icon {
+      color: #1f2329;
+      margin-left: 12px;
+      cursor: pointer;
+      font-size: 20px;
+      border-radius: 4px;
+      position: relative;
+      &:hover {
+        &::after {
+          content: '';
+          position: absolute;
+          top: -4px;
+          left: -4px;
+          border-radius: 4px;
+          height: 28px;
+          width: 28px;
+          background: #1f23291a;
+        }
+      }
+    }
   }
 }
 .info-tips {
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 2cca259fa0..9ccf993290 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -236,7 +236,7 @@ const pushDataset = () => {
 
 const backToMain = () => {
   if (isUpdate) {
-    ElMessageBox.confirm('数据集未保存,确认退出吗?', {
+    ElMessageBox.confirm('当前的更改尚未保存,确定退出吗?', {
       confirmButtonText: t('dataset.confirm'),
       cancelButtonText: t('common.cancel'),
       showCancelButton: true,
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
index d020b624df..bb48a24eda 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@@ -1145,6 +1145,8 @@ defineExpose({
     border-radius: 2px;
     padding: 1px 6px;
     height: 24px;
+    font-size: 14px;
+
     &.invalid {
       color: #646a73;
       background: rgba(31, 35, 41, 0.1);
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index ec944bb3eb..d1063980e4 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -509,9 +509,11 @@ const beforeClose = () => {
     wsCache.set('ds-new-success', false)
   }
   if (!showFinishPage.value && ((!editDs.value && activeStep.value !== 0) || isUpdate)) {
-    ElMessageBox.confirm(t('chart.tips'), {
+    ElMessageBox.confirm('当前的更改尚未保存,确定退出吗?', {
+      confirmButtonText: t('dataset.confirm'),
+      cancelButtonText: t('common.cancel'),
+      showCancelButton: true,
       confirmButtonType: 'primary',
-      tip: '你填写的信息未保存，确认退出吗？',
       type: 'warning',
       autofocus: false,
       showClose: false
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 3285048056..ab59494148 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -1029,7 +1029,7 @@ const getMenuList = (val: boolean) => {
                 <template #default="scope">
                   <div class="flex-align-center">
                     <template v-if="scope.row.status === 'Completed'">
-                      <el-icon>
+                      <el-icon style="margin-right: 8px">
                         <icon name="icon_succeed_filled"></icon>
                       </el-icon>
                       {{ t('dataset.completed') }}
@@ -1038,7 +1038,7 @@ const getMenuList = (val: boolean) => {
                       {{ t('dataset.underway') }}
                     </template>
                     <template v-if="scope.row.status === 'Error' || scope.row.status === 'Warning'">
-                      <el-icon>
+                      <el-icon style="margin-right: 8px">
                         <icon class="field-icon-red" name="icon_close_filled"></icon>
                       </el-icon>
                       {{ t('dataset.error') }}
@@ -1425,7 +1425,7 @@ const getMenuList = (val: boolean) => {
           <template #default="scope">
             <div class="flex-align-center">
               <template v-if="scope.row.taskStatus === 'Completed'">
-                <el-icon>
+                <el-icon style="margin-right: 8px">
                   <icon name="icon_succeed_filled"></icon>
                 </el-icon>
                 {{ t('dataset.completed') }}
@@ -1437,7 +1437,7 @@ const getMenuList = (val: boolean) => {
               <template
                 v-if="scope.row.taskStatus === 'Error' || scope.row.taskStatus === 'Warning'"
               >
-                <el-icon>
+                <el-icon style="margin-right: 8px">
                   <icon class="field-icon-red" name="icon_close_filled"></icon>
                 </el-icon>
                 {{ t('dataset.error') }}
@@ -1665,6 +1665,7 @@ const getMenuList = (val: boolean) => {
       border-radius: 2px;
       padding: 1px 6px;
       height: 24px;
+      font-size: 14px;
     }
 
     .error-color {
diff --git a/core/core-frontend/src/views/workbranch/index.vue b/core/core-frontend/src/views/workbranch/index.vue
index ff0bb7ae55..dd7e74911d 100644
--- a/core/core-frontend/src/views/workbranch/index.vue
+++ b/core/core-frontend/src/views/workbranch/index.vue
@@ -605,6 +605,10 @@ initMarketTemplate()
           line-height: 22px;
           border-radius: 4px;
 
+          button {
+            cursor: pointer;
+          }
+
           .flex-center {
             padding: 0 4px;
             color: #646a73;