From 068c2689e07e7782f9970a1b351478d79e16bf22 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 15 Jan 2025 18:44:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handle-more/src/DvHandleMore.vue          |  2 +-
 .../components/dialog/TextThresholdEdit.vue   | 44 ++++++-------------
 .../views/common/DeResourceCreateOptV2.vue    |  3 +-
 .../component/MarketPreviewV2.vue             | 18 ++++----
 .../visualized/data/dataset/form/index.vue    |  1 -
 5 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/core/core-frontend/src/components/handle-more/src/DvHandleMore.vue b/core/core-frontend/src/components/handle-more/src/DvHandleMore.vue
index 3e53c74e59..e374e65a53 100644
--- a/core/core-frontend/src/components/handle-more/src/DvHandleMore.vue
+++ b/core/core-frontend/src/components/handle-more/src/DvHandleMore.vue
@@ -91,7 +91,7 @@ const emit = defineEmits(['handleCommand'])
           :disabled="ele.disabled"
           :class="{ 'de-hidden-drop-item': ele.hidden }"
         >
-          <el-icon class="handle-icon" v-if="ele.svgName">
+          <el-icon class="handle-icon" color="#646a73" size="16" v-if="ele.svgName">
             <Icon><component class="svg-icon" :is="ele.svgName"></component></Icon>
           </el-icon>
           {{ ele.label }}
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
index a84a63e60c..a6a60a0ce9 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
@@ -103,7 +103,12 @@ init()
 
 <template>
   <el-col>
-    <div @keydown.stop @keyup.stop class="threshold-editor">
+    <el-button class="circle-button" circle style="margin-bottom: 10px" @click="addThreshold">
+      <template #icon>
+        <Icon name="icon_add_outlined"><icon_add_outlined class="svg-icon" /></Icon>
+      </template>
+    </el-button>
+    <div @keydown.stop @keyup.stop style="max-height: 50vh; overflow-y: auto">
       <el-row
         v-for="(item, index) in state.thresholdArr"
         :key="index"
@@ -185,43 +190,33 @@ init()
             @change="changeThreshold"
           />
         </div>
-        <div style="display: flex; align-items: center; justify-content: center; margin-left: 12px">
+        <div style="display: flex; align-items: center; justify-content: center; margin-left: 8px">
           <el-button
-            class="circle-button m-icon-btn"
+            class="circle-button"
             type="text"
-            text
+            circle
+            style="float: right"
             @click="removeThreshold(index)"
           >
-            <el-icon size="20px" style="color: #646a73">
+            <template #icon>
               <Icon name="icon_delete-trash_outlined"
                 ><icon_deleteTrash_outlined class="svg-icon"
               /></Icon>
-            </el-icon>
+            </template>
           </el-button>
         </div>
       </el-row>
     </div>
-    <el-button class="circle-button" text style="margin-top: 10px" @click="addThreshold">
-      <template #icon>
-        <Icon name="icon_add_outlined"><icon_add_outlined class="svg-icon" /></Icon>
-      </template>
-      {{ t('chart.add_style') }}
-    </el-button>
   </el-col>
 </template>
 
 <style lang="less" scoped>
-.threshold-editor {
-  max-height: 50vh;
-  overflow-y: auto;
-  background: #f5f6f7;
-  border-radius: 4px;
-}
 .line-item {
   width: 100%;
   border-radius: 4px;
+  border: 1px solid #dcdfe6;
   padding: 4px 14px;
-  margin: 8px 0;
+  margin-bottom: 10px;
   display: flex;
   justify-content: left;
   align-items: center;
@@ -287,15 +282,4 @@ span {
     font-size: 12px;
   }
 }
-.m-icon-btn {
-  &:hover {
-    background: rgba(31, 35, 41, 0.1) !important;
-  }
-  &:focus {
-    background: rgba(31, 35, 41, 0.1) !important;
-  }
-  &:active {
-    background: rgba(31, 35, 41, 0.2) !important;
-  }
-}
 </style>
diff --git a/core/core-frontend/src/views/common/DeResourceCreateOptV2.vue b/core/core-frontend/src/views/common/DeResourceCreateOptV2.vue
index 5edadb75b5..30c66af6e4 100644
--- a/core/core-frontend/src/views/common/DeResourceCreateOptV2.vue
+++ b/core/core-frontend/src/views/common/DeResourceCreateOptV2.vue
@@ -36,7 +36,8 @@ defineExpose({
 
 <style lang="less">
 .market-create-dialog {
-  border-radius: 4px;
+  --ed-dialog-border-radius: 4px;
+
   overflow: hidden;
   .ed-dialog__body {
     padding: 0 !important;
diff --git a/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue b/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
index 143c32f975..50cebedcd6 100644
--- a/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
+++ b/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
@@ -364,16 +364,16 @@ onMounted(() => {
 .market-collapse {
   width: 100%;
   border: 0;
-  ::v-deep(.ed-collapse-item__content) {
-    padding: 8px 0;
-    border: 0;
+  :deep(.ed-collapse-item__content) {
+    padding: 8px 0 !important;
+    border: unset !important;
   }
-  ::v-deep(.ed-collapse-item__header) {
-    border: 0;
+  :deep(.ed-collapse-item__header) {
+    border: unset !important;
   }
-  ::v-deep(.ed-collapse-item__wrap) {
-    border: 0;
-    background-color: rgba(245, 246, 247, 1);
+  :deep(.ed-collapse-item__wrap) {
+    border: unset !important;
+    background-color: rgba(245, 246, 247, 1) !important;
   }
 }
 .aside-list {
@@ -382,7 +382,7 @@ onMounted(() => {
   height: calc(100vh - 200px);
   //overflow-y: auto;
   :deep(.ed-collapse) {
-    --ed-collapse-header-font-size: 14px;
+    --ed-collapse-header-font-size: 14px !important;
   }
 }
 
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 52fcb6efd4..19326715e9 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
@@ -891,7 +891,6 @@ const dfsFieldsTips = (arr, list, idArr) => {
   })
 }
 const confirmEditUnion = () => {
-  num = +new Date()
   const { node, parent } = fieldUnion.value
   const to = node.id
   const from = parent.id