From 8d2321b7572eac48bcc75309230571f2ba138a37 Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Wed, 14 May 2025 09:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/chart-type/ChartType.vue           |  2 +-
 .../src/views/common/DeResourceTree.vue       |  3 +-
 .../service/dataset/form/CreatDsGroup.vue     | 11 +++-
 .../service/dataset/form/DatasetUnion.vue     | 54 ++++++++++++++++++-
 .../service/dataset/form/index.vue            |  7 +--
 .../application/service/dataset/index.vue     | 15 ++++++
 .../src/viewsnew/common/DeResourceTree.vue    |  2 +-
 7 files changed, 85 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue
index 616ffa4..55b3c34 100644
--- a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue
+++ b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue
@@ -245,7 +245,7 @@ const groupActiveChange = category => {
   font-weight: 400;
   font-size: 12px;
   line-height: 20px;
-  color: #1f2329;
+  color: #ebebeb;
   padding: 0 6px 2px;
 }
 .group .group-left .ul-custom{
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 7317a97..f1bec86 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -137,7 +137,6 @@ const dvSvgType = computed(() =>
 )
 
 const isEmbedded = computed(() => appStore.getIsDataEaseBi || appStore.getIsIframe)
-
 const resourceTypeList = computed(() => {
   const list = [
     {
@@ -604,7 +603,7 @@ defineExpose({
         <span class="title"> {{ resourceLabel }} </span>
         <div v-if="rootManage" class="flex-align-center">
           <el-tooltip :content="t('work_branch.new_folder')" placement="top" effect="dark">
-            <el-icon
+            <el-icon 
               class="custom-icon btn"
               style="margin-right: 20px"
               @click="addOperation('newFolder', null, 'folder')"
diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue
index da581b6..4e088c2 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue
@@ -401,7 +401,7 @@ const emits = defineEmits(['finish', 'onDatasetSave'])
 .tree-content {
   width: 552px;
   height: 380px;
-  border: 1px solid #dee0e3;
+  border: 1px solid #5f5f5f;
   border-radius: 4px;
   padding: 8px;
   overflow-y: auto;
@@ -451,4 +451,13 @@ const emits = defineEmits(['finish', 'onDatasetSave'])
     }
   }
 }
+.ed-dialog__footer .ed-button.is-secondary{
+  color: #F2F4F5;
+  background-color: #212121 !important;
+  border: 1px solid #363636 !important;
+}
+.ed-dialog__footer .ed-button--primary{
+  background-color: #0089ff !important;
+  border: 1px solid #0089ff !important;
+}
 </style>
diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue
index 1c84b31..e2d6b0a 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/DatasetUnion.vue
@@ -1108,7 +1108,7 @@ const emits = defineEmits([
           <span class="placeholder">{{ t('data_set.custom_sql_here') }}</span>
           <handle-more
             style="margin-left: auto"
-            :iconName="icon_moreVertical_outlined"
+            :iconName="icon_moreVertical_outlined_white"
             :menuList="ele.type === 'sql' ? [...sqlMenu, ...menuList] : menuList"
             @handle-command="command => handleCommand(ele, command)"
           ></handle-more>
@@ -1418,4 +1418,56 @@ const emits = defineEmits([
     color: #646a73;
   }
 }
+.ed-dropdown-menu{
+background-color: rgb(41, 41, 41);
+
+}
+.ed-dropdown-menu__item{
+  color: #fff;
+}
+.ed-dropdown-menu__item--divided{
+  border-top: 1px solid #5f5f5f;
+}
+.ed-dropdown-menu__item:not(.is-disabled):hover{
+  background-color: rgb(61, 61, 61);
+}
+.ed-dropdown__popper.ed-popper{
+  border: 1px solid #5f5f5f;
+  background:transparent;
+}
+.drag-mask_dataset{
+  background: rgb(21,21,21);
+}
+.de-dataset-form .dataset-db .drag-right .sql-result .ed-tabs{
+  margin-left: 0px !important;
+  padding-left: 24px;
+  border-bottom: 1px solid #5f5f5f;
+}
+.de-dataset-form .dataset-db .drag-right .sql-result .table-preview .preview-field .field-d {
+  border-bottom: 1px solid #5f5f5f !important;
+}
+.de-dataset-form .dataset-db .drag-right .sql-result .table-preview .preview-field .ed-tree-node__content:hover{
+  background: #5f5f5f !important;
+}
+.menu-more_popper_one .ed-cascader-panel .ed-cascader-menu {
+  border-radius: 4px;
+  border: 1px solid #5f5f5f;
+  background: rgb(41, 41, 41);
+  box-shadow: 0px 4px 8px 0px rgba(95, 95, 95, 0.1);
+}
+.ed-cascader-node__label{
+  color: #fff;
+}
+.ed-cascader-menu .ed-cascader-node:hover{
+  background: rgb(61, 61, 61) !important;
+}
+.menu-more_popper_one .ed-cascader-node.in-active-path{
+  background: rgb(61, 61, 61) !important;
+}
+.ed-cascader-menu:last-child .ed-cascader-node:focus{
+  background: rgb(61, 61, 61) !important;
+}
+.ed-cascader-node__postfix{
+  color: #fff;
+}
 </style>
diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue
index 9aaab39..e1e1547 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue
@@ -2820,8 +2820,9 @@ const getDsIconName = data => {
     align-items: center;
     justify-content: space-between;
     padding: 0 24px;
-    background: #050e21;
-    box-shadow: 0px 2px 4px 0px rgba(31, 35, 41, 0.12);
+    background: #252626;
+    // box-shadow: 0px 2px 4px 0px rgba(31, 35, 41, 0.12);
+    border-bottom: 1px solid #4f5052;
 
     .name {
       color: #fff;
@@ -2904,7 +2905,7 @@ const getDsIconName = data => {
       padding-left: 2px;
       border-top-right-radius: 12px;
       border-bottom-right-radius: 12px;
-      background: #262626;
+      background: #fff;
       font-size: 12px;
 
       &:hover {
diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
index e24f625..7f35a20 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
@@ -1572,4 +1572,19 @@ border-right: 1px solid rgba(54, 54, 54, 1)
   background-color:rgba(0, 137, 255, 1);
   color: #F2F4F5;
 }
+.ed-message-box{
+  background: #212121;
+}
+.ed-message-box__content{
+  color: #ffffff;
+}
+.ed-message-box__btns .ed-button--primary{
+  background: #0089ff;
+  border-color: #0089ff;
+}
+.ed-message-box__btns .ed-button.is-secondary{
+  color: #F2F4F5 !important;
+  background-color: #212121 !important;
+  border: 1px solid #434343 !important;
+}
 </style>
\ No newline at end of file
diff --git a/core/core-frontend/src/viewsnew/common/DeResourceTree.vue b/core/core-frontend/src/viewsnew/common/DeResourceTree.vue
index 21f2674..416ca6b 100644
--- a/core/core-frontend/src/viewsnew/common/DeResourceTree.vue
+++ b/core/core-frontend/src/viewsnew/common/DeResourceTree.vue
@@ -921,5 +921,5 @@ defineExpose({
   i {
     display: block;
   }
-}
+} 
 </style>