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) => {
- + {{ logic === 'or' ? 'OR' : 'AND' }} @@ -183,6 +183,7 @@ const del = (index, child) => { margin-right: 11px; line-height: 28px; height: 28px; + color: #F2F4F5 !important; } } @@ -206,7 +207,7 @@ const del = (index, child) => { width: 40px; height: 28px; line-height: 28px; - background-color: #212121; + background-color: #434343; z-index: 1; display: none; border-right: 1px solid #434343; @@ -283,4 +284,5 @@ const del = (index, child) => { background:rgba(41, 41, 41, 1); border: 1px solid rgba(70, 70, 70, 1); } + \ No newline at end of file diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue index 0de73ab..b772e93 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue @@ -87,11 +87,11 @@ const del = (index, child) => {
- + {{ logic === 'or' ? 'OR' : 'AND' }} - + {{ logic === 'or' ? 'OR' : 'AND' }} @@ -200,7 +200,7 @@ const del = (index, child) => { width: 40px; height: 28px; line-height: 28px; - background-color: #f8f8fa; + background-color: #434343; z-index: 1; display: none; @@ -212,6 +212,7 @@ const del = (index, child) => { cursor: pointer; position: relative; z-index: 10; + color: #fff; } } } @@ -245,4 +246,5 @@ const del = (index, child) => { } } } + 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 5ea66dc..9351a74 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -4227,10 +4227,12 @@ const deleteChartFieldItem = id => { border: none; } :deep(.ed-input__wrapper) { - box-shadow: 0 0 0 1px hsla(0, 0%, 100%, 0.15) inset !important; + box-shadow: none; + border: 1px solid #636363; } :deep(.ed-input__wrapper:hover) { - box-shadow: 0 0 0 1px var(--ed-color-primary, #3370ff) inset !important; + box-shadow: none; + border: 1px solid #3370ff; } } .query-style-tab { @@ -5300,9 +5302,40 @@ span { color: #fff !important; } .de-chart-editor .ed-input.is-disabled .ed-input__wrapper { - box-shadow: 0 0 0 1px #5f5f5f inset; + box-shadow: none !important; background-color: #373737; } +.de-chart-editor .dataset-search-input.dark .ed-input__wrapper{ + box-shadow: none !important; + border-top: none !important; + border-left: none !important; + border-right: none !important; +} +.de-chart-editor .field-name { + color: #ffffff !important; +} +.ed-input--dark .ed-input__wrapper:hover{ + box-shadow: none !important; +} +.ed-input--dark .ed-input__wrapper.is-focus{ + box-shadow: none !important; +} +.ed-select .ed-input__wrapper:hover{ + box-shadow: none !important; +} +.ed-select .ed-input__wrapper.is-focus{ + box-shadow: none !important; +} +.ed-select .ed-input.is-focus .ed-input__wrapper{ + box-shadow: none !important; + border: 1px solid #3370ff; +} +.ed-input-number--dark .ed-input-number__decrease.is-disabled .ed-icon, .ed-input-number--dark .ed-input-number__increase.is-disabled .ed-icon{ + color: #ffffff; +} +.form-item-dark .ed-input-number__decrease, .form-item-dark .ed-input-number__increase { + color: #ffffff ; +} .de-chart-editor .ed-input-group--append .ed-input-group__append .ed-select:not(.ed-select--disabled):hover .ed-input__wrapper{ box-shadow: 0 1px 0 0 #5f5f5f inset, 0 -1px 0 0 #5f5f5f inset, -1px 0 0 0 #5f5f5f inset !important; } @@ -5341,9 +5374,6 @@ span { .ed-tree-node__content:hover{ background: rgba(235, 235, 235, 0.1); } -.de-chart-editor .field-name{ - color: #A6A6A6 !important; -} .de-chart-editor .field-search-icon-btn{ color: #A6A6A6 !important; } diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/AuthTree.vue b/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/AuthTree.vue index cc42e93..7dfe4e3 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/AuthTree.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/AuthTree.vue @@ -84,11 +84,11 @@ const del = (index, child) => {
- + {{ logic === 'or' ? 'OR' : 'AND' }} - + {{ logic === 'or' ? 'OR' : 'AND' }} @@ -197,7 +197,7 @@ const del = (index, child) => { width: 40px; height: 28px; line-height: 28px; - background-color: #f8f8fa; + background-color: #434343; z-index: 1; display: none; diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue b/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue index dcb594e..3e4cfc4 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/auth-tree/FilterFiled.vue @@ -786,7 +786,8 @@ const emits = defineEmits(['update:item', 'del']) box-shadow: none; border-bottom: 1px solid #e5e5e5; &:focus { - box-shadow: 0 0 0 2px rgb(46 116 255 / 20%); + box-shadow:none !important; + border: 1px solid rgb(46 116 255 / 20%) !important; border-right-width: 1px !important; outline: 0; border-color: 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 e14ce26..c78a276 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 @@ -3466,7 +3466,8 @@ const getDsIconName = data => { border-style: solid; border-color: rgba(51, 51, 51, 0); border-radius: 4px; - box-shadow:0 0 0 1px rgba(67, 67, 67, 1) ; + box-shadow:none !important; + border: 1px solid #636363 !important; } .ed-input__inner{ background-color: rgba(37, 38, 38, 1); @@ -3478,11 +3479,13 @@ const getDsIconName = data => { color: #fff; } .ed-input__wrapper:hover{ - box-shadow:0 0 0 1px rgba(80, 80, 80, 1) ; + box-shadow:none !important; + border: 1px solid #3370ff !important; } .ed-input.is-disabled .ed-input__wrapper{ background-color: rgba(37, 38, 38, 0); - box-shadow:0 0 0 1px rgba(80, 80, 80, 1) ; + box-shadow:none !important; + border: 1px solid rgba(80, 80, 80, 1) !important; } .ed-input.is-disabled .ed-input__inner{ background-color: rgba(37, 38, 38, 0); 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 39bcc69..ae24460 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue @@ -1416,43 +1416,127 @@ const proxyAllowDrop = debounce((arg1, arg2) => { } } } - +:deep(.ed-input__inner){ + background: rgb(33,33,33); +} +// :deep(){ +// background-color: rgba(41, 41, 41, 1) !important; +// border-width: 1px; +// border-style: solid; +// border-color: rgba(70, 70, 70, 1); +// } \ No newline at end of file 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 864c15e..722dc63 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 @@ -1184,7 +1184,8 @@ defineExpose({ box-sizing: border-box; border: none !important; border-radius: 4px; - box-shadow: 0 0 0 1px #636363; + box-shadow: none; + border: 1px solid #636363; } .ed-textarea .ed-input__count { color: #636363; 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 336f32e..44860b3 100644 --- a/core/core-frontend/src/viewsnew/application/service/datasource/index.vue +++ b/core/core-frontend/src/viewsnew/application/service/datasource/index.vue @@ -2328,7 +2328,28 @@ const getMenuList = (val: boolean) => { border-style: solid; border-color: rgba(51, 51, 51, 0); border-radius: 4px; - box-shadow:0 0 0 1px #636363 ; + box-shadow:none; + border: 1px solid #636363 !important; +} +.ed-input__wrapper:hover{ + box-shadow:none !important; + border: 1px solid #3370ff !important; +} +.ed-input__wrapper.is-focus{ + box-shadow:none; + border: 1px solid #3370ff !important; +} +.ed-textarea__inner{ + box-shadow:none !important; + border: 1px solid #636363 !important; +} +.ed-textarea__inner:hover{ + box-shadow:none !important; + border: 1px solid #3370ff !important; +} +.ed-textarea__inner.is-focus{ + box-shadow:none; + border: 1px solid #3370ff !important; } .ed-input__inner{ background-color: rgba(37, 38, 38, 1); @@ -2530,4 +2551,17 @@ border-right: 1px solid rgba(54, 54, 54, 1); .el-loading-mask{ background-color: rgba(41, 41, 41, 1) !important; } +.arrow-side-tree{ + border: 1px solid #9d9d9d !important; + background: #979797 !important; + color: #fff !important; +} +.arrow-side-tree:hover{ + border: 1px solid #0089ff !important; + background: #0089ff !important; + color: #fff !important; +} +.arrow-side-tree .ed-icon{ + color: #fff !important; +} \ No newline at end of file