From 6b76b3e333e70336e6073dd1ce9463f241d2471c Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Thu, 3 Jul 2025 18:25:24 +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

---
 .../src/assets/svg/reference-setting.svg      |  4 +-
 .../canvas/ComponentWrapper.vue               |  9 +++-
 .../visualization/DePreviewPopDialog.vue      | 49 ++++++++++++++-----
 .../custom-component/common/CommonEvent.vue   | 40 ++++++++++++++-
 core/core-frontend/src/style/index.less       |  2 +-
 .../src/views/common/DeResourceArrow.vue      | 13 +++++
 .../viewsnew/application/menuconfig/index.vue | 20 +-------
 .../service/dataset/form/AddSql.vue           | 15 +++++-
 .../service/dataset/form/DatasetUnion.vue     |  2 +-
 .../service/dataset/form/index.vue            |  6 +--
 .../application/service/dataset/index.vue     | 24 ++++++---
 .../datasource/form/ApiHttpRequestDraw.vue    |  2 +-
 .../service/datasource/form/index.vue         |  6 +++
 .../application/service/datasource/index.vue  | 37 +++++++++++++-
 14 files changed, 177 insertions(+), 52 deletions(-)

diff --git a/core/core-frontend/src/assets/svg/reference-setting.svg b/core/core-frontend/src/assets/svg/reference-setting.svg
index 74107b6..796bd21 100644
--- a/core/core-frontend/src/assets/svg/reference-setting.svg
+++ b/core/core-frontend/src/assets/svg/reference-setting.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11 11.333H14.2393C14.3879 11.333 14.4418 11.3485 14.4961 11.3775C14.5505 11.4066 14.5931 11.4492 14.6221 11.5035C14.6512 11.5579 14.6667 11.6117 14.6667 11.7603V12.239C14.6667 12.3876 14.6512 12.4415 14.6221 12.4958C14.5931 12.5501 14.5505 12.5928 14.4961 12.6218C14.4418 12.6509 14.3879 12.6663 14.2393 12.6663H11V14.239C11 14.3876 10.9845 14.4415 10.9555 14.4958C10.9264 14.5501 10.8838 14.5928 10.8295 14.6218C10.7751 14.6509 10.7213 14.6663 10.5727 14.6663H10.094C9.94539 14.6663 9.89151 14.6509 9.83719 14.6218C9.78287 14.5928 9.74024 14.5501 9.71118 14.4958C9.68213 14.4415 9.66666 14.3876 9.66666 14.239V12.6663H1.76064C1.61206 12.6663 1.55817 12.6509 1.50385 12.6218C1.44953 12.5928 1.4069 12.5501 1.37785 12.4958C1.3488 12.4415 1.33333 12.3876 1.33333 12.239V11.7603C1.33333 11.6117 1.3488 11.5579 1.37785 11.5035C1.4069 11.4492 1.44953 11.4066 1.50385 11.3775C1.55817 11.3485 1.61206 11.333 1.76064 11.333H9.66666V9.76032C9.66666 9.61174 9.68213 9.55785 9.71118 9.50353C9.74024 9.44921 9.78287 9.40658 9.83719 9.37753C9.89151 9.34848 9.94539 9.33301 10.094 9.33301H10.5727C10.7213 9.33301 10.7751 9.34848 10.8295 9.37753C10.8838 9.40658 10.9264 9.44921 10.9555 9.50353C10.9845 9.55785 11 9.61174 11 9.76032V11.333ZM4.99999 3.33301V1.76032C4.99999 1.61174 5.01547 1.55785 5.04452 1.50353C5.07357 1.44921 5.1162 1.40658 5.17052 1.37753C5.22484 1.34848 5.27872 1.33301 5.42731 1.33301H5.90601C6.0546 1.33301 6.10848 1.34848 6.1628 1.37753C6.21712 1.40658 6.25976 1.44921 6.28881 1.50353C6.31786 1.55785 6.33333 1.61174 6.33333 1.76032V3.33301H14.2393C14.3879 3.33301 14.4418 3.34848 14.4961 3.37753C14.5505 3.40658 14.5931 3.44921 14.6221 3.50353C14.6512 3.55785 14.6667 3.61174 14.6667 3.76032V4.23903C14.6667 4.38761 14.6512 4.44149 14.6221 4.49582C14.5931 4.55014 14.5505 4.59277 14.4961 4.62182C14.4418 4.65087 14.3879 4.66634 14.2393 4.66634H6.33333V6.23903C6.33333 6.38761 6.31786 6.44149 6.28881 6.49582C6.25976 6.55014 6.21712 6.59277 6.1628 6.62182C6.10848 6.65087 6.0546 6.66634 5.90601 6.66634H5.42731C5.27872 6.66634 5.22484 6.65087 5.17052 6.62182C5.1162 6.59277 5.07357 6.55014 5.04452 6.49582C5.01547 6.44149 4.99999 6.38761 4.99999 6.23903V4.66634H1.76064C1.61206 4.66634 1.55817 4.65087 1.50385 4.62182C1.44953 4.59277 1.4069 4.55014 1.37785 4.49582C1.3488 4.44149 1.33333 4.38761 1.33333 4.23903V3.76032C1.33333 3.61174 1.3488 3.55785 1.37785 3.50353C1.4069 3.44921 1.44953 3.40658 1.50385 3.37753C1.55817 3.34848 1.61206 3.33301 1.76064 3.33301H4.99999Z" fill="#1F2329"/>
-</svg>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 11.333H14.2393C14.3879 11.333 14.4418 11.3485 14.4961 11.3775C14.5505 11.4066 14.5931 11.4492 14.6221 11.5035C14.6512 11.5579 14.6667 11.6117 14.6667 11.7603V12.239C14.6667 12.3876 14.6512 12.4415 14.6221 12.4958C14.5931 12.5501 14.5505 12.5928 14.4961 12.6218C14.4418 12.6509 14.3879 12.6663 14.2393 12.6663H11V14.239C11 14.3876 10.9845 14.4415 10.9555 14.4958C10.9264 14.5501 10.8838 14.5928 10.8295 14.6218C10.7751 14.6509 10.7213 14.6663 10.5727 14.6663H10.094C9.94539 14.6663 9.89151 14.6509 9.83719 14.6218C9.78287 14.5928 9.74024 14.5501 9.71118 14.4958C9.68213 14.4415 9.66666 14.3876 9.66666 14.239V12.6663H1.76064C1.61206 12.6663 1.55817 12.6509 1.50385 12.6218C1.44953 12.5928 1.4069 12.5501 1.37785 12.4958C1.3488 12.4415 1.33333 12.3876 1.33333 12.239V11.7603C1.33333 11.6117 1.3488 11.5579 1.37785 11.5035C1.4069 11.4492 1.44953 11.4066 1.50385 11.3775C1.55817 11.3485 1.61206 11.333 1.76064 11.333H9.66666V9.76032C9.66666 9.61174 9.68213 9.55785 9.71118 9.50353C9.74024 9.44921 9.78287 9.40658 9.83719 9.37753C9.89151 9.34848 9.94539 9.33301 10.094 9.33301H10.5727C10.7213 9.33301 10.7751 9.34848 10.8295 9.37753C10.8838 9.40658 10.9264 9.44921 10.9555 9.50353C10.9845 9.55785 11 9.61174 11 9.76032V11.333ZM4.99999 3.33301V1.76032C4.99999 1.61174 5.01547 1.55785 5.04452 1.50353C5.07357 1.44921 5.1162 1.40658 5.17052 1.37753C5.22484 1.34848 5.27872 1.33301 5.42731 1.33301H5.90601C6.0546 1.33301 6.10848 1.34848 6.1628 1.37753C6.21712 1.40658 6.25976 1.44921 6.28881 1.50353C6.31786 1.55785 6.33333 1.61174 6.33333 1.76032V3.33301H14.2393C14.3879 3.33301 14.4418 3.34848 14.4961 3.37753C14.5505 3.40658 14.5931 3.44921 14.6221 3.50353C14.6512 3.55785 14.6667 3.61174 14.6667 3.76032V4.23903C14.6667 4.38761 14.6512 4.44149 14.6221 4.49582C14.5931 4.55014 14.5505 4.59277 14.4961 4.62182C14.4418 4.65087 14.3879 4.66634 14.2393 4.66634H6.33333V6.23903C6.33333 6.38761 6.31786 6.44149 6.28881 6.49582C6.25976 6.55014 6.21712 6.59277 6.1628 6.62182C6.10848 6.65087 6.0546 6.66634 5.90601 6.66634H5.42731C5.27872 6.66634 5.22484 6.65087 5.17052 6.62182C5.1162 6.59277 5.07357 6.55014 5.04452 6.49582C5.01547 6.44149 4.99999 6.38761 4.99999 6.23903V4.66634H1.76064C1.61206 4.66634 1.55817 4.65087 1.50385 4.62182C1.44953 4.59277 1.4069 4.55014 1.37785 4.49582C1.3488 4.44149 1.33333 4.38761 1.33333 4.23903V3.76032C1.33333 3.61174 1.3488 3.55785 1.37785 3.50353C1.4069 3.44921 1.44953 3.40658 1.50385 3.37753C1.55817 3.34848 1.61206 3.33301 1.76064 3.33301H4.99999Z" fill="#ffffff"/>
+</svg>
\ No newline at end of file
diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
index 5fe8fa5..bbfda35 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
@@ -16,7 +16,6 @@ import { XpackComponent } from '@/components/plugin'
 import DePreviewPopDialog from '@/components/visualization/DePreviewPopDialog.vue'
 import Icon from '../../icon-custom/src/Icon.vue'
 import replaceOutlined from '@/assets/svg/icon_replace_outlined.svg'
-
 const componentWrapperInnerRef = ref(null)
 const componentEditBarRef = ref(null)
 const dvMainStore = dvMainStoreWithOut()
@@ -329,7 +328,13 @@ const onWrapperClick = e => {
       const jumpType = config.value.events.jump.type
       try {
         if ('newPop' === jumpType) {
-          dePreviewPopDialogRef.value.previewInit({ url, size: 'middle' })
+          dePreviewPopDialogRef.value.previewInit({ 
+            url, 
+            size: config.value.events.jump.size,
+            sizeType:config.value.events.jump.sizeType,
+            width:config.value.events.jump.width?config.value.events.jump.width:'',
+            height:config.value.events.jump.height?config.value.events.jump.height:''
+           })
         } else if ('_blank' === jumpType) {
           if (window['originOpen']) {
             window['originOpen'](url, '_blank')
diff --git a/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue b/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue
index 1262eb1..41b9ac5 100644
--- a/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue
+++ b/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue
@@ -9,7 +9,9 @@
     :modal="false"
     :width="state.width"
   >
-    <div v-if="state.url" class="preview-main-frame-outer">
+    <div v-if="state.url" class="preview-main-frame-outer" 
+    :style="{ width: sizeType == '1'?state.width + 'px':'100%',
+     height: sizeType == '1'?state.height + 'px':'100%' }">
       <iframe
         v-if="state.dialogShow"
         class="preview-main-frame"
@@ -24,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from 'vue'
+import { computed, reactive, ref,onMounted } from 'vue'
 import { useEmbedded } from '@/store/modules/embedded'
 import { XpackComponent } from '@/components/plugin'
 const state = reactive({
@@ -44,24 +46,32 @@ const dialogStyle = computed(() => {
     return { height: state.height }
   }
 })
-
+const sizeType = ref('0') 
 const previewInit = params => {
   if (params.url.includes('?')) {
     state.url = `${params.url}&popWindow=true`
   } else {
     state.url = `${params.url}?popWindow=true`
   }
-  if (params.size === 'large') {
+  sizeType.value= params.sizeType
+  if(params.sizeType == '0'){
+    if (params.size === 'large') {
     state.fullscreen = true
   } else if (params.size === 'middle') {
     state.fullscreen = false
     state.width = '80vw'
     state.height = '80%'
-  } else {
+  } else if(params.size === 'small'){
     state.fullscreen = false
     state.width = '65vw'
     state.height = '65%'
   }
+  }else{
+    state.fullscreen = false
+    state.width = params.width
+    state.height = params.height
+  }
+  
   state.dialogShow = true
   if (embeddedStore.getToken && state.url.includes('#/preview?dvId=')) {
     if (xpackIframe?.value) {
@@ -77,29 +87,46 @@ const previewInit = params => {
 defineExpose({
   previewInit
 })
+onMounted(()=>{
+  console.log(state,999,'DePreviewPopDialog mounted')
+  
+})
 </script>
 
 <style lang="less">
 .preview_pop_custom {
   overflow: hidden;
   .preview-main-frame-outer {
-    width: 100%;
-    height: 100%;
     .preview-main-frame {
       width: 100%;
       height: 100%;
     }
   }
   .ed-dialog__body {
-    height: calc(100% - 42px);
+    // height: calc(100% - 42px);
     padding: 0;
   }
   .ed-dialog__header {
-    height: 36px;
+    height: 0px;
+    padding: 0px;
     .ed-dialog__headerbtn {
-      top: 4px !important;
-      right: 8px !important;
+      width: 40px;
+      height: 40px;
+      background: #434343;
+      top: -48px !important;
+      left: 50% !important;
+      transform: translate(-50%, 0%);
+      border-radius: 50%;
+      .ed-dialog__close{
+        color: #ffffff;
+      }
     }
   }
+  .ed-dialog{
+    padding: 0px;
+  }
+}
+.ed-overlay-dialog{
+  background: rgba(0,0,0,0.5);
 }
 </style>
diff --git a/core/core-frontend/src/custom-component/common/CommonEvent.vue b/core/core-frontend/src/custom-component/common/CommonEvent.vue
index 0ffbd31..5757e5d 100644
--- a/core/core-frontend/src/custom-component/common/CommonEvent.vue
+++ b/core/core-frontend/src/custom-component/common/CommonEvent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import icon_info_outlined from '@/assets/svg/icon_info_outlined.svg'
-import { computed, toRefs } from 'vue'
+import { computed, toRefs,onMounted } from 'vue'
 import { ElFormItem, ElIcon } from 'element-plus-secondary'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import Icon from '../../components/icon-custom/src/Icon.vue'
@@ -49,8 +49,24 @@ const typeMap = {
   refreshDataV: t('visualization.refresh'),
   refreshView: t('visualization.refresh_view')
 }
+onMounted(() => { 
+  if(eventsInfo.value.type === 'jump' && eventsInfo.value.jump.type  === 'newPop'){
+    if(eventsInfo.value.jump.sizeType == undefined){
+      eventsInfo.value.jump.sizeType = '0'
+      eventsInfo.value.jump.size = 'middle'
+    }
+  }
+})
+function sizeTypeChange(type){
+  if(type === '标准'){
+    eventsInfo.value.jump.size = 'middle'
+  }else{
+    eventsInfo.value.jump.width = '500'
+    eventsInfo.value.jump.height = '500'
+  }
+  snapshotStore.recordSnapshotCacheToMobile('events')
+}
 </script>
-
 <template>
   <el-row class="custom-row">
     <el-form label-position="top">
@@ -125,6 +141,26 @@ const typeMap = {
           <el-radio :effect="themes" label="newPop">{{ t('visualization.pop_window') }}</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item class="form-item" label="" v-if="eventsInfo.type === 'jump' && eventsInfo.jump.type  === 'newPop'">
+        <div style="color: #ffffff;font-size: 12px;">尺寸设置</div>
+        <div>
+          <el-checkbox v-model="eventsInfo.jump.sizeType" true-label="0" false-label="1" label="标准" size="large" @change="sizeTypeChange('标准')" />
+            <el-radio-group :disabled="eventsInfo.jump.sizeType === '0'?false:true" v-model="eventsInfo.jump.size">
+            <el-radio label="large">全屏</el-radio>
+            <el-radio label="middle">中等</el-radio>
+            <el-radio label="small">小</el-radio>
+          </el-radio-group>
+        </div>
+        <div>
+          <el-checkbox v-model="eventsInfo.jump.sizeType" true-label="1" false-label="0" label="自定义" size="large" @change="sizeTypeChange('自定义')" />
+          <div style="display: flex;">
+            <div style="width: 30px;">宽</div>
+            <el-input v-model="eventsInfo.jump.width" placeholder="" :disabled="eventsInfo.jump.sizeType === '1'?false:true" style="width: 50%;" />
+            <div style="width: 30px;margin-left: 10px;">高</div>
+            <el-input v-model="eventsInfo.jump.height" placeholder="" :disabled="eventsInfo.jump.sizeType === '1'?false:true" style="width: 50%;"/>
+          </div>
+        </div>
+      </el-form-item>
     </el-form>
   </el-row>
 </template>
diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less
index fb8d4a1..2af4bdd 100644
--- a/core/core-frontend/src/style/index.less
+++ b/core/core-frontend/src/style/index.less
@@ -606,7 +606,7 @@ strong {
 .form-item-dark {
   .ed-input-number__decrease,
   .ed-input-number__increase {
-    color: #a6a6a6 !important;
+    color: #ffffff !important;
   }
 }
 
diff --git a/core/core-frontend/src/views/common/DeResourceArrow.vue b/core/core-frontend/src/views/common/DeResourceArrow.vue
index 418861b..31a5073 100644
--- a/core/core-frontend/src/views/common/DeResourceArrow.vue
+++ b/core/core-frontend/src/views/common/DeResourceArrow.vue
@@ -81,3 +81,16 @@ const handleClick = val => {
   }
 }
 </style>
+<style>
+.menu-more_popper .handle-icon{
+  color: #ffffff;
+}
+.ed-dropdown__popper.ed-popper{
+  border: 1px solid #5f5f5f;
+  background:transparent;
+}
+.ed-dropdown-menu__item:not(.is-disabled):focus, .ed-dropdown-menu__item:not(.is-disabled):hover{
+  background:transparent;
+  color: #ffffff;
+}
+</style>
diff --git a/core/core-frontend/src/viewsnew/application/menuconfig/index.vue b/core/core-frontend/src/viewsnew/application/menuconfig/index.vue
index ebc3954..de47c1d 100644
--- a/core/core-frontend/src/viewsnew/application/menuconfig/index.vue
+++ b/core/core-frontend/src/viewsnew/application/menuconfig/index.vue
@@ -94,22 +94,6 @@ const resetForm = (formEl: FormInstance | undefined) => {
   formEl.resetFields()
   dialogVisible.value = false
 }
-const handleDrop = (
-  draggingNode: Node,
-  dropNode: Node,
-  dropType: NodeDropType,
-  ev: DragEvents
-) => {
-  console.log('tree drop:', draggingNode,dropNode, dropType,ev)
-}
-const allowDrop = (draggingNode: Node, dropNode: Node, type: AllowDropType) => {
-   if (draggingNode.level === dropNode.level) {
-          return type === 'prev' || type === 'next'
-        } else {
-          // 不同级进行处理
-          return false
-        }
-}
 onMounted(() => {
   if (route.query.id) {
     applicationId.value = route.query.id
@@ -248,8 +232,8 @@ function assocsubmit(){
           </div>
           <el-input v-model="filterText" placeholder="请输入" @blur="querytree" />
           <el-tree v-loading="treeloading" ref="treeRef" :data="treeData" node-key="id" :props="defaultProps"
-            default-expand-all :expand-on-click-node="false" highlight-current draggable @node-drop="handleDrop"
-            :allow-drop="allowDrop" @node-click="nodeclick" style="height: calc(100vh - 210px);margin-top: 10px;overflow: auto;">
+            default-expand-all :expand-on-click-node="false" highlight-current
+            @node-click="nodeclick" style="height: calc(100vh - 210px);margin-top: 10px;overflow: auto;">
             <template #default="{ node, data }">
               <div class="custom-tree-node" @mouseenter="handleMouseEnter(node)"
                 @mouseleave="handleMouseLeave()">
diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue
index 0832724..2c9603b 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue
@@ -604,7 +604,7 @@ const mousedownDrag = () => {
   <div class="add-sql-name">
     <el-input class="name" ref="editerName" v-model="sqlNode.tableName" @change="setFlag" />
     <div class="save-or-cancel flex-align-center">
-      <el-button @click="getSQLPreview" text style="color: #1f2329">
+      <el-button @click="getSQLPreview" text style="color: #ffffff">
         <template #icon>
           <el-icon>
             <Icon name="reference-play"><referencePlay class="svg-icon" /></Icon>
@@ -612,7 +612,7 @@ const mousedownDrag = () => {
         </template>
         {{ t('data_set.run') }}
       </el-button>
-      <el-button @click="referenceSetting()" style="color: #1f2329" text>
+      <el-button @click="referenceSetting()" style="color: #ffffff" text>
         <template #icon>
           <el-icon>
             <Icon name="reference-setting"><referenceSetting1 class="svg-icon" /></Icon>
@@ -1358,6 +1358,8 @@ const mousedownDrag = () => {
         width: calc(100% - 48px);
         .border-bottom-tab(24px);
         margin-left: 0px;
+        padding-left: 24px;
+        border-bottom: 1px solid #434343;
       }
 
       .table-sql {
@@ -1464,6 +1466,7 @@ const mousedownDrag = () => {
             font-size: 14px;
             font-weight: 400;
             line-height: 22px;
+            color: #ffffff;
           }
 
           .variable-item {
@@ -1767,4 +1770,12 @@ const mousedownDrag = () => {
 .ed-drawer__header{
   border-bottom: 1px solid #333333;
 }
+.ed-select__wrapper{
+  background-color: transparent !important;
+  border: 1px solid #434343 !important;
+  box-shadow: none !important;
+}
+.ed-select__placeholder{
+  color: #ffffff !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 f4c0e1e..98569e3 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
@@ -1277,7 +1277,7 @@ const emits = defineEmits([
       .label {
         font-weight: 500;
         font-size: 16px;
-        color: #1f2329;
+        color: #ffffff;
         max-width: 500px;
       }
       .name {
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 2abd92e..a5fd46a 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
@@ -3396,7 +3396,7 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
     height: 30px;
   }
   :deep(.ed-table th.ed-table__cell) {
-    background: #282828;
+    background-color: #282828;
   }
 }
 </style>
@@ -3607,7 +3607,7 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
   background: rgba(21, 21, 21, 1);
 }
 .ed-table__body-wrapper tr td.ed-table-fixed-column--left, .ed-table__body-wrapper tr td.ed-table-fixed-column--right, .ed-table__body-wrapper tr th.ed-table-fixed-column--left, .ed-table__body-wrapper tr th.ed-table-fixed-column--right, .ed-table__footer-wrapper tr td.ed-table-fixed-column--left, .ed-table__footer-wrapper tr td.ed-table-fixed-column--right, .ed-table__footer-wrapper tr th.ed-table-fixed-column--left, .ed-table__footer-wrapper tr th.ed-table-fixed-column--right, .ed-table__header-wrapper tr td.ed-table-fixed-column--left, .ed-table__header-wrapper tr td.ed-table-fixed-column--right, .ed-table__header-wrapper tr th.ed-table-fixed-column--left, .ed-table__header-wrapper tr th.ed-table-fixed-column--right{
-  background: rgba(21, 21, 21, 1);
+  background: #272626;
 }
 .ed-table td.ed-table__cell, .ed-table th.ed-table__cell.is-leaf{
 border-bottom: 1px solid rgba(54, 54, 54, 1)
@@ -3687,7 +3687,7 @@ border-right: 1px solid rgba(54, 54, 54, 1)
   border-color: #5f5f5f;
 }
 .ed-table th.ed-table__cell{
-  background-color:#434343;
+  background-color: #282828;
 }
 .ed-table.is-scrolling-none th.ed-table-fixed-column--left, .ed-table.is-scrolling-none th.ed-table-fixed-column--right {
   background-color: #434343 ;
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 054675d..be7d551 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
@@ -1423,14 +1423,8 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
   }
 }
 :deep(.ed-input__inner){
-  background: rgb(33,33,33);
+  background: rgb(37,38,38);
 }
-// :deep(){
-//   background-color: rgba(41, 41, 41, 1) !important;
-//   border-width: 1px;
-//   border-style: solid;
-//   border-color: rgba(70, 70, 70, 1);
-// }
 </style>
 
 <style>
@@ -1603,7 +1597,7 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
   background: rgba(21, 21, 21, 1);
 }
 .ed-table__body-wrapper tr td.ed-table-fixed-column--left, .ed-table__body-wrapper tr td.ed-table-fixed-column--right, .ed-table__body-wrapper tr th.ed-table-fixed-column--left, .ed-table__body-wrapper tr th.ed-table-fixed-column--right, .ed-table__footer-wrapper tr td.ed-table-fixed-column--left, .ed-table__footer-wrapper tr td.ed-table-fixed-column--right, .ed-table__footer-wrapper tr th.ed-table-fixed-column--left, .ed-table__footer-wrapper tr th.ed-table-fixed-column--right, .ed-table__header-wrapper tr td.ed-table-fixed-column--left, .ed-table__header-wrapper tr td.ed-table-fixed-column--right, .ed-table__header-wrapper tr th.ed-table-fixed-column--left, .ed-table__header-wrapper tr th.ed-table-fixed-column--right{
-  background: rgba(21, 21, 21, 1);
+  background: #272626;
 }
 .ed-table td.ed-table__cell, .ed-table th.ed-table__cell.is-leaf{
 border-bottom: 1px solid rgba(54, 54, 54, 1)
@@ -1748,4 +1742,18 @@ border-right: 1px solid rgba(54, 54, 54, 1)
 .tree-cont::-webkit-scrollbar-corner {
   background: #3f3f3f !important;
 }
+.ed-table th.ed-table__cell:hover{
+  background-color: #282828;
+}
+.ed-table.is-scrolling-right th.ed-table-fixed-column--right{
+  background-color: #434343 !important;
+}
+.ed-table-v2__row.is-hovered, .ed-table-v2__row:hover{
+  background-color: #434343 !important;
+}
+.ed-dialog__header {
+  padding: 0px !important;
+  padding-bottom: 10px !important;
+  margin-bottom: 10px !important;
+}
 </style>
\ No newline at end of file
diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/viewsnew/application/service/datasource/form/ApiHttpRequestDraw.vue
index f5d2125..1b0ee00 100644
--- a/core/core-frontend/src/viewsnew/application/service/datasource/form/ApiHttpRequestDraw.vue
+++ b/core/core-frontend/src/viewsnew/application/service/datasource/form/ApiHttpRequestDraw.vue
@@ -1174,7 +1174,7 @@ defineExpose({
   border: 1px solid #636363;
 }
 .ed-table th.ed-table__cell {
-  background-color: #434343;
+  // background-color: #434343;
   color: #fff;
 }
 </style>
diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue b/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue
index 71d0ef9..8b094c1 100644
--- a/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue
@@ -1318,4 +1318,10 @@ defineExpose({
   box-shadow: none !important;
   border: 1px solid #f54a45 !important;
 }
+.ed-step__title.is-finish{
+  color: #ffffff;
+}
+.ed-step__title.is-process{
+  color: #ffffff;
+}
 </style>
diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/index.vue b/core/core-frontend/src/viewsnew/application/service/datasource/index.vue
index 29c4e30..3f2e326 100644
--- a/core/core-frontend/src/viewsnew/application/service/datasource/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/datasource/index.vue
@@ -2479,10 +2479,11 @@ const getMenuList = (val: boolean) => {
   background: rgba(21, 21, 21, 1);
 }
 .ed-table__body-wrapper tr td.ed-table-fixed-column--left, .ed-table__body-wrapper tr td.ed-table-fixed-column--right, .ed-table__body-wrapper tr th.ed-table-fixed-column--left, .ed-table__body-wrapper tr th.ed-table-fixed-column--right, .ed-table__footer-wrapper tr td.ed-table-fixed-column--left, .ed-table__footer-wrapper tr td.ed-table-fixed-column--right, .ed-table__footer-wrapper tr th.ed-table-fixed-column--left, .ed-table__footer-wrapper tr th.ed-table-fixed-column--right, .ed-table__header-wrapper tr td.ed-table-fixed-column--left, .ed-table__header-wrapper tr td.ed-table-fixed-column--right, .ed-table__header-wrapper tr th.ed-table-fixed-column--left, .ed-table__header-wrapper tr th.ed-table-fixed-column--right{
-  background: rgba(21, 21, 21, 1);
+  background: #272626;
 }
 .ed-table td.ed-table__cell, .ed-table th.ed-table__cell.is-leaf{
 border-bottom: 1px solid rgba(54, 54, 54, 1);
+background: #434343;
 }
 .ed-table--border .ed-table__cell{
 border-right: 1px solid rgba(54, 54, 54, 1);
@@ -2634,4 +2635,38 @@ border-right: 1px solid rgba(54, 54, 54, 1);
 .ed-table.is-scrolling-none th.ed-table-fixed-column--left, .ed-table.is-scrolling-none th.ed-table-fixed-column--right {
     background-color: #434343;
 }
+.ed-select__wrapper{
+  background-color: rgba(37, 38, 38, 1) !important;
+  box-shadow: none !important;
+  border: 1px solid #636363 !important;
+  color: #fff !important;
+}
+.ed-select__placeholder{
+  color: #fff !important;
+}
+.ed-select__popper.ed-popper {
+  background: rgb(41, 41, 41) !important;
+  color: #fff  !important;
+  border: 1px solid #434343  !important;
+}
+
+.ed-select-dropdown__item.is-hovering {
+  background: #393939;
+}
+
+.ed-select-dropdown__item {
+  color: #fff !important;
+}
+.ed-select-dropdown__footer {
+  padding: 5px 0px  !important;
+  border-top: 1px solid #434343  !important;
+}
+.ed-table th.ed-table__cell:hover{
+  background-color: #282828;
+}
+.ed-dialog__header {
+  padding: 0px !important;
+  padding-bottom: 10px !important;
+  margin-bottom: 10px;
+}
 </style>