diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index 1b5a112..468eebc 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -116,12 +116,12 @@ body { } .header-cell { - background-color: #f5f6f7 !important; + background-color: #252626 !important; border-top: 1px solid rgba(31, 35, 41, 0.15); } .excel-header-cell { - background-color: #f5f6f7 !important; + background-color: #252626 !important; .ed-table-v2__header-cell { background-color: transparent; diff --git a/core/core-frontend/src/style/mixin.less b/core/core-frontend/src/style/mixin.less index 4612968..5dd7b8b 100644 --- a/core/core-frontend/src/style/mixin.less +++ b/core/core-frontend/src/style/mixin.less @@ -46,4 +46,13 @@ // } +:deep(.ed-step__title.is-process){ + color: #fff ; +} +:deep(.ed-step__title .is-finish){ + color: #fff ; +} +:deep(.excel-info_base .name){ + color: #fff ; +} 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 565fa08..5da3b7c 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 @@ -1369,7 +1369,7 @@ const mousedownDrag = () => { .table-scroll { .ed-table-v2 { - --ed-table-header-bg-color: #f5f6f7; + --ed-table-header-bg-color: #252626; :deep(.header-cell) { border-top: none; } 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 ab0ea2f..2abd92e 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 @@ -2868,7 +2868,7 @@ const getIconNameCalc = (deType, extField, dimension = false) => { } .ed-table { - --ed-table-header-bg-color: #f5f6f7; + --ed-table-header-bg-color: #252626; } .de-dataset-form { @@ -3170,7 +3170,7 @@ const getIconNameCalc = (deType, extField, dimension = false) => { width: calc(100% - 260px); :deep(.ed-table-v2__header-cell) { - background-color: #f5f6f7 !important; + background-color: #252626 !important; } :deep(.header-cell) { @@ -3690,7 +3690,7 @@ border-right: 1px solid rgba(54, 54, 54, 1) background-color:#434343; } .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; + background-color: #434343 ; } .de-dataset-form .container .table-list .select-ds .left-outlined:hover .ed-icon{ color: #fff !important; 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 d115776..054675d 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue @@ -1197,7 +1197,7 @@ const proxyAllowDrop = debounce((arg1, arg2) => { outline: none !important; } &:hover { - background: #f5f6f7; + background: #252626; } &:active { @@ -1285,7 +1285,7 @@ const proxyAllowDrop = debounce((arg1, arg2) => { } .dataset-content { - // background: #f5f6f7; + // background: #252626; &.auto { height: auto; } diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/ExcelInfo.vue b/core/core-frontend/src/viewsnew/application/service/datasource/ExcelInfo.vue index 4984a01..7719e12 100644 --- a/core/core-frontend/src/viewsnew/application/service/datasource/ExcelInfo.vue +++ b/core/core-frontend/src/viewsnew/application/service/datasource/ExcelInfo.vue @@ -56,7 +56,7 @@ const del = () => { width: 80%; .name { - color: #1f2329; + color: #fff; font-size: 14px; line-height: 22px; width: 100%; diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/SheetTabs.vue b/core/core-frontend/src/viewsnew/application/service/datasource/SheetTabs.vue index 3866f4f..c221525 100644 --- a/core/core-frontend/src/viewsnew/application/service/datasource/SheetTabs.vue +++ b/core/core-frontend/src/viewsnew/application/service/datasource/SheetTabs.vue @@ -181,13 +181,13 @@ const nextClick = () => { } } .active { - box-shadow: 0px -1px 0px 0px #f5f6f7 inset; + box-shadow: 0px -1px 0px 0px #252626 inset; color: var(--ed-color-primary); border: 1px solid rgba(31, 35, 41, 0.15); border-bottom: none; border-top-left-radius: 4px; border-top-right-radius: 4px; - background: #f5f6f7; + background: #252626; &::before, &::after { 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 391b99f..f5d2125 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 @@ -1135,7 +1135,7 @@ defineExpose({ .info-table { min-height: 300px; .ed-table-v2__header-cell { - background-color: #f5f6f7; + background-color: #252626; } } diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelDetail.vue b/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelDetail.vue index cd5d783..3f3f3ad 100644 --- a/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelDetail.vue +++ b/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelDetail.vue @@ -818,7 +818,7 @@ defineExpose({ display: flex; align-items: center; justify-content: space-between; - background: #f5f6f7; + background: #252626; padding: 16px; .btn-select { width: 164px; @@ -826,7 +826,7 @@ defineExpose({ display: flex; align-items: center; justify-content: center; - background: #ffffff; + background: rgb(38,38,38); border: 1px solid #bbbfc4; border-radius: 4px; diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelRemoteDetail.vue b/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelRemoteDetail.vue index 7c89c51..5119b06 100644 --- a/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelRemoteDetail.vue +++ b/core/core-frontend/src/viewsnew/application/service/datasource/form/ExcelRemoteDetail.vue @@ -1281,7 +1281,7 @@ defineExpose({ display: flex; align-items: center; justify-content: space-between; - background: #f5f6f7; + background: #252626; padding: 16px; .btn-select { min-width: 164px; @@ -1290,7 +1290,7 @@ defineExpose({ display: flex; align-items: center; justify-content: center; - background: #ffffff; + background: rgb(38,38,38); border: 1px solid #bbbfc4; border-radius: 4px; 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 3ba89cd..71d0ef9 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 @@ -1133,7 +1133,6 @@ defineExpose({ top: 0; left: 24px; z-index: 5; - background: white; padding: 0 17px; &::before { content: ''; 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 216b6da..29c4e30 100644 --- a/core/core-frontend/src/viewsnew/application/service/datasource/index.vue +++ b/core/core-frontend/src/viewsnew/application/service/datasource/index.vue @@ -1977,8 +1977,8 @@ const getMenuList = (val: boolean) => { outline: none !important; } &:hover { - background: #f5f6f7; - } + background: #252626; + }252626 &:active { background: #eff0f1; @@ -2630,4 +2630,8 @@ border-right: 1px solid rgba(54, 54, 54, 1); .arrow-side-tree .ed-icon{ color: #fff !important; } + +.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/common/DeResourceArrow.vue b/core/core-frontend/src/viewsnew/common/DeResourceArrow.vue index 418861b..61e3fcb 100644 --- a/core/core-frontend/src/viewsnew/common/DeResourceArrow.vue +++ b/core/core-frontend/src/viewsnew/common/DeResourceArrow.vue @@ -73,7 +73,7 @@ const handleClick = val => { z-index: 10; &:hover { .ed-icon { - color: var(--ed-color-primary); + color: #fff; } } .ed-icon { diff --git a/core/core-frontend/src/viewsnew/common/DeResourceTree.vue b/core/core-frontend/src/viewsnew/common/DeResourceTree.vue index db9107f..4367ab9 100644 --- a/core/core-frontend/src/viewsnew/common/DeResourceTree.vue +++ b/core/core-frontend/src/viewsnew/common/DeResourceTree.vue @@ -879,7 +879,7 @@ defineExpose({ outline: none !important; } &:hover { - background: #f5f6f7; + background: #252626; } &:active { diff --git a/core/core-frontend/src/viewsnew/data-visualization/DvPreview.vue b/core/core-frontend/src/viewsnew/data-visualization/DvPreview.vue index ac91e34..62563a7 100644 --- a/core/core-frontend/src/viewsnew/data-visualization/DvPreview.vue +++ b/core/core-frontend/src/viewsnew/data-visualization/DvPreview.vue @@ -97,7 +97,7 @@ defineExpose({ width: 100%; // height: calc(100vh - 112px); height: calc(100vh - 60px); - background: #f5f6f7; + background: #252626; display: flex; overflow-y: auto; align-items: center;