diff --git a/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue b/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue index d30ac95..073bd61 100644 --- a/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue +++ b/core/core-frontend/src/components/empty-background/src/EmptyBackground.vue @@ -52,7 +52,7 @@ const getAssetsFile = { :deep(.ed-empty__description) { margin-top: 8px; - color: var(--N600, #646a73); + color: var(--N600, #d2d2d2); text-align: center; /* 正文-字号 14,行高 22,字重适中(Regular),用于列表Feed会话 */ font-family: var(--de-custom_font, 'PingFang'); diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index 438168e..82a497c 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -663,7 +663,7 @@ const resourceType = computed(() => dvInfo.value.type === 'dashboard' ? t('work_branch.dashboard') : t('work_branch.big_data_screen') ) -const selectSourceTips = t('visualization.select_target_resource') +const selectSourceTips = t('visualization.select_target_resource') const targetSource = t('visualization.target_dashboard_dataV') @@ -1108,7 +1108,7 @@ defineExpose({ .preview { margin-top: 5px; - border: 1px solid #e6e6e6; + border: 1px solid #434343; border-radius: 4px; height: 470px !important; overflow: hidden; @@ -1116,7 +1116,7 @@ defineExpose({ } .preview-show { - border-left: 1px solid #e6e6e6; + border-left: 1px solid #434343; height: 470px; background-size: 100% 100% !important; } @@ -1209,7 +1209,7 @@ defineExpose({ margin-right: 16px; font-weight: 400; font-size: 12px; - color: #646a73; + color: #D2D2D2; .ed-switch { margin-left: 8px; } @@ -1324,7 +1324,7 @@ span { .top-area-text { font-weight: 400; font-size: 14px; - color: #646a73; + color: #D2D2D2; &.margin-left { margin-left: 24px; @@ -1335,25 +1335,29 @@ span { .settings-header { height: auto; - border-bottom: 1px solid #e6e6e6; + border-bottom: 1px solid #434343; .radio-group-box { margin-top: 8px; margin-bottom: 8px; .title { - color: #646a73; + color: #d2d2d2; font-size: 14px; font-style: normal; font-weight: 400; } :deep(.ed-radio__label) { - color: #1f2329; + color: #ffffff; font-size: 14px; font-style: normal; font-weight: 400; } + :deep(.ed-radio__inner){ + background-color:transparent; + border-color:#5f5f5f; + } } } @@ -1591,4 +1595,28 @@ span { color: var(--ed-color-primary); cursor: pointer; } +.root-class .ed-button{ + color: #F2F4F5; + background-color: #212121; + border: 1px solid #434343; +} +.root-class .ed-button--primary{ + background-color:#0089FF; + border: 1px solid #0089FF; +} +:deep(.ed-checkbox__inner){ + border:1px solid #5f5f5f; + background-color:transparent; +} +:deep(.ed-tree){ + background: transparent; + color: #fff; +} +:deep(.ed-tree--highlight-current .ed-tree-node.is-current>.ed-tree-node__content){ + background-color:rgb(61,61,61); +} +:deep(.ed-input__wrapper){ + background-color: #252424; + box-shadow: 0 0 0 1px #5f5f5f inset; +} diff --git a/core/core-frontend/src/components/visualization/LinkageSet.vue b/core/core-frontend/src/components/visualization/LinkageSet.vue index f15ac4d..cdd6d67 100644 --- a/core/core-frontend/src/components/visualization/LinkageSet.vue +++ b/core/core-frontend/src/components/visualization/LinkageSet.vue @@ -701,7 +701,7 @@ defineExpose({ flex-direction: column; span { line-height: 22px; - color: #646a73; + color: #909399; } } @@ -742,7 +742,7 @@ defineExpose({ margin-right: 16px; font-weight: 400; font-size: 12px; - color: #969696; + color: #d2d2d2; .ed-switch { margin-left: 8px; } @@ -847,7 +847,7 @@ span { .top-area-text { font-weight: 400; font-size: 14px; - color: #fff; + color: #d2d2d2; margin-left: 24px; } @@ -870,7 +870,7 @@ span { margin-left: 16px; font-weight: 500; font-size: 14px; - color: #1f2329; + color: #d2d2d2; line-height: 32px; margin-right: 16px; } @@ -1014,4 +1014,5 @@ span { background-color:#0089FF; border: 1px solid #0089FF; } + diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue index 9ffa745..b3b6398 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue @@ -516,4 +516,27 @@ watch( color: var(--N600-Dark, #a6a6a6); } } +.dialog-footer .ed-button{ + color: #F2F4F5; + background-color: #212121; + border: 1px solid #434343; + } +.dialog-footer .ed-button--primary{ + background-color:#0089FF; + border: 1px solid #0089FF; +} +:deep(.ed-textarea__inner){ + background-color: #252424 ; + box-shadow: 0 0 0 1px #434343 inset; + color: #fff; +} +:deep(.ed-textarea__inner:hover){ + box-shadow: 0 0 0 1px #5f5f5f inset; +} +:deep(.ed-textarea__inner:focus){ + box-shadow: 0 0 0 1px #0089ff inset; +} +:deep(.ed-form-item__label){ + color: #D2D2D2 !important; +} diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 66200bc..b08db50 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -5280,3 +5280,11 @@ span { } } + \ No newline at end of file diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue index 21f2674..d5a5340 100644 --- a/core/core-frontend/src/views/common/DeResourceTree.vue +++ b/core/core-frontend/src/views/common/DeResourceTree.vue @@ -765,11 +765,11 @@ defineExpose({ diff --git a/core/core-frontend/src/views/common/MultiplexingCanvas.vue b/core/core-frontend/src/views/common/MultiplexingCanvas.vue index e839928..8fd3a1b 100644 --- a/core/core-frontend/src/views/common/MultiplexingCanvas.vue +++ b/core/core-frontend/src/views/common/MultiplexingCanvas.vue @@ -119,13 +119,37 @@ defineExpose({ } .multiplexing-footer { position: relative; + .ed-button{ + color: #F2F4F5; + background-color: #212121; + border: 1px solid #434343; + } + .ed-button--primary{ + background-color:#0089FF; + border: 1px solid #0089FF; + } + .ed-button.is-disabled{ + background-color:#99b8ff; + border: 1px solid #99b8ff; + } + :deep(.ed-input__wrapper){ + background-color:#212121 !important; + box-shadow: 0 0 0 1px #434343; + color: #ffffff; + } + :deep(.ed-input__inner){ + color: #ffffff; + } + :deep(.ed-select-dropdown__item){ + color: #ffffff !important; + } } .adapt-count { position: absolute; top: 18px; left: 20px; - color: #646a73; + color: #ffffff; font-size: 14px; font-weight: 400; line-height: 22px; @@ -139,7 +163,7 @@ defineExpose({ .adapt-text { font-size: 14px; font-weight: 400; - color: #1f2329; + color: #ffffff; line-height: 22px; } @@ -149,11 +173,23 @@ defineExpose({ .ed-drawer__footer { height: 64px !important; padding: 0px !important; - box-shadow: 0 -1px 0px #d7d7d7 !important; + box-shadow: 0 -1px 0px #5f5f5f; } .ed-drawer__body { padding: 0 0 64px 0 !important; } } +.ed-select-dropdown__item{ + color: #ffffff ; +} +.ed-select-dropdown__item.hover, .ed-select-dropdown__item:hover{ + background: rgb(61,61,61); +} +.ed-drawer__header{ + color: #fff; +} +.ed-drawer__close-btn:hover{ + background:rgb(61,61,61) +} diff --git a/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue b/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue index d328317..7430064 100644 --- a/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue +++ b/core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue @@ -320,13 +320,13 @@ onBeforeMount(() => { height: 40px; line-height: 40px; font-size: 12px; - color: #3d4d66; - background-color: white; + color: #5f5f5f; + background-color: rgb(33,33,33); .head-text { margin-left: 16px; font-weight: 500; font-size: 14px; - color: #1f2329; + color: #ffffff; } .head-filter { flex: 1; @@ -336,7 +336,7 @@ onBeforeMount(() => { margin-right: 16px; font-weight: 400; font-size: 12px; - color: #646a73; + color: #ababab; .ed-switch { margin-left: 8px; } @@ -571,7 +571,7 @@ span { width: 100%; height: 100%; padding: 12px; - background: #ffffff; + background: rgb(33,33,33); } .view-show-content { position: relative; @@ -580,7 +580,14 @@ span { .wrapper-content { width: 100%; height: 100%; - background-size: 100% 100% !important; + background-size: 100% 100% !important; } } +:deep(.ed-tree){ + background-color: rgb(33,33,33); +} +:deep(.ed-checkbox__inner){ + background-color: rgb(33,33,33); + border-color: #818181; +} diff --git a/core/core-frontend/src/views/data-visualization/PreviewShow.vue b/core/core-frontend/src/views/data-visualization/PreviewShow.vue index a520f04..87fab43 100644 --- a/core/core-frontend/src/views/data-visualization/PreviewShow.vue +++ b/core/core-frontend/src/views/data-visualization/PreviewShow.vue @@ -330,7 +330,7 @@ onBeforeMount(() => { height: 100%; overflow: hidden; display: flex; - background: #ffffff; + background: rgb(33,33,33); position: relative; .resource-area { position: relative; @@ -338,7 +338,7 @@ onBeforeMount(() => { width: 279px; padding: 0; overflow: visible; - border-right: 1px solid #d7d7d7; + border-right: 1px solid #5f5f5f; &.retract { display: none; @@ -392,6 +392,6 @@ onBeforeMount(() => { .multiplexing-content { padding: 12px; - background-color: rgb(245, 246, 247); + background-color: #2d2d2d; } 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 1ce50eb..4fc5758 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue @@ -2352,4 +2352,5 @@ const getMenuList = (val: boolean) => { color: var(--deTextPrimary, #1f2329); } } + diff --git a/core/core-frontend/src/viewsnew/application/index.vue b/core/core-frontend/src/viewsnew/application/index.vue index bda0945..8f82814 100644 --- a/core/core-frontend/src/viewsnew/application/index.vue +++ b/core/core-frontend/src/viewsnew/application/index.vue @@ -126,7 +126,7 @@ function delClick(row){ - diff --git a/core/core-frontend/src/viewsnew/data-visualization/PreviewShow.vue b/core/core-frontend/src/viewsnew/data-visualization/PreviewShow.vue index a520f04..7a64d41 100644 --- a/core/core-frontend/src/viewsnew/data-visualization/PreviewShow.vue +++ b/core/core-frontend/src/viewsnew/data-visualization/PreviewShow.vue @@ -392,6 +392,6 @@ onBeforeMount(() => { .multiplexing-content { padding: 12px; - background-color: rgb(245, 246, 247); + background-color: rgb(33,33,33); }