diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue index 4acc3ac..8c7e7d0 100644 --- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue +++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue @@ -669,7 +669,7 @@ const fullScreenPreview = () => { border: 1px solid #0089ff; } .divider { - background: #ffffff; + background: #5f5f5f; width: 1px; height: 18px; margin-right: 20px; diff --git a/core/core-frontend/src/components/visualization/DvSidebar.vue b/core/core-frontend/src/components/visualization/DvSidebar.vue index 3c881db..b9532d7 100644 --- a/core/core-frontend/src/components/visualization/DvSidebar.vue +++ b/core/core-frontend/src/components/visualization/DvSidebar.vue @@ -430,7 +430,7 @@ const menuOpt = optName => { } .ed-collapse-item__wrap .ed-input.is-disabled .ed-input__wrapper{ background-color: #373737; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; } .ed-collapse-item__wrap .ed-input--light .ed-input-group__append .ed-select.ed-select--disabled .ed-input__wrapper { background: #373737 !important; @@ -518,7 +518,7 @@ color: #ffffff !important; color: #bbbfc4 !important; } .editor-light .editor-title{ -color: #ebebeb; + color: #ebebeb; } .editor-dark { border-left: solid 1px rgba(235, 235, 235, 0.15) !important; @@ -548,4 +548,11 @@ color: #ebebeb; .editor-light .item-span-style{ color: #fff !important; } +.ed-input--dark .ed-input__wrapper { + background-color: #292929; + box-shadow: none; +} +.el-loading-mask{ + background-color: rgba(41, 41, 41, 1) !important; +} diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index 82a497c..5be55cb 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -1617,6 +1617,7 @@ span { } :deep(.ed-input__wrapper){ background-color: #252424; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } diff --git a/core/core-frontend/src/components/visualization/LinkageSet.vue b/core/core-frontend/src/components/visualization/LinkageSet.vue index cdd6d67..149179d 100644 --- a/core/core-frontend/src/components/visualization/LinkageSet.vue +++ b/core/core-frontend/src/components/visualization/LinkageSet.vue @@ -1003,7 +1003,8 @@ span { } :deep(.ed-input__wrapper){ background-color: #252424 ; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } .root-class .ed-button{ color: #F2F4F5; diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index 9fb261f..5fc122b 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -574,7 +574,8 @@ defineExpose({ } :deep(.ed-input__wrapper){ background: rgba(41, 41, 41, 1); - box-shadow: 0 0 0 1px #434343; + box-shadow: none; + border: 1px solid #636363; } :deep(.ed-input__inner){ color: #fff; diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index 1430f57..ebffbf7 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -3914,7 +3914,8 @@ defineExpose({ } .ed-input__wrapper{ background-color: #252424 ; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } .ed-input__inner{ color: #fff; diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue index 98d4962..b102c75 100644 --- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue +++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue @@ -395,7 +395,7 @@ onMounted(() => { :deep(.ed-input__wrapper) { cursor: pointer; padding: 1px 11px; - + .ed-input__inner { cursor: pointer; font-size: 12px; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue index 16b367f..bb72f73 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue @@ -379,7 +379,8 @@ span { } :deep(.ed-input__wrapper){ background-color: #292929 ; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } :deep(.ed-input__inner){ color: #fff; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/LineThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/LineThresholdEdit.vue index b0a414e..4296f11 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/LineThresholdEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/LineThresholdEdit.vue @@ -592,7 +592,8 @@ span { } :deep(.ed-input__wrapper){ background-color: #252424 ; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } :deep(.ed-input__inner){ color: #fff; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue index 23c254a..bb13a15 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue @@ -615,7 +615,8 @@ span { } :deep(.ed-input__wrapper){ background-color: #252424 ; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } :deep(.ed-input__inner){ color: #fff; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue index 51f88e2..43c68d1 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue @@ -916,7 +916,8 @@ span { } :deep(.ed-input__wrapper){ background-color: #252424 ; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } :deep(.ed-input__inner){ color: #fff; 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 85cb46f..efa89ec 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 @@ -294,7 +294,8 @@ span { } :deep(.ed-input__wrapper){ background-color: #292929; - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none; + border: 1px solid #636363; } :deep(.ed-color-picker__trigger){ border-color: #5f5f5f; diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue index e581574..d5ec300 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue @@ -937,7 +937,9 @@ const isGauge = computed(() => props.chart.type === 'gauge') .invalid-field { :deep(.ed-input__wrapper) { - box-shadow: 0 0 0 1px rgb(245, 74, 69) inset !important; + // box-shadow: 0 0 0 1px rgb(245, 74, 69) inset !important; + box-shadow: none; + border: 1px solid rgb(245, 74, 69); } } diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue index 1b9683a..8597c0f 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue @@ -87,7 +87,7 @@ const del = (index, child) => {