diff --git a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue index e6755be..e0a721f 100644 --- a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue +++ b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue @@ -181,7 +181,7 @@ onUnmounted(() => { :deep(.ed-input--dark .ed-input__wrapper), :deep(.ed-input-number--dark:not(.is-disabled) .ed-input-number__decrease:not(.is-disabled)), :deep(.ed-input-number--dark:not(.is-disabled) .ed-input-number__increase:not(.is-disabled)) { - background-color: #1a1a1a; + background-color: #1a1a1a !important; } .custom-divider_scale { diff --git a/core/core-frontend/src/components/visualization/DvSidebar.vue b/core/core-frontend/src/components/visualization/DvSidebar.vue index f7229b8..b6796a0 100644 --- a/core/core-frontend/src/components/visualization/DvSidebar.vue +++ b/core/core-frontend/src/components/visualization/DvSidebar.vue @@ -466,11 +466,11 @@ const menuOpt = optName => { color: #ebebeb !important; } .ed-collapse-item__wrap .ed-input-number__decrease, .ed-input-number__increase{ - background-color: #434343; - color:#ffffff; + background-color: #434343 !important; + color:#ffffff !important; } .ed-input-number__decrease, .ed-input-number__increase{ - color:#ffffff; + color:#ffffff !important; } .ed-collapse-item__wrap .ed-input-number.is-controls-right .ed-input-number__increase{ border-bottom: 1px solid #5f5f5f !important; @@ -569,7 +569,7 @@ color: #ffffff !important; } .ed-input-number--dark:not(.is-disabled) .ed-input-number__decrease:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper, .ed-input-number--dark:not(.is-disabled) .ed-input-number__increase:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper{ box-shadow: none !important; - border: 1px solid #0089ff; + border: 1px solid #0089ff !important; } .ed-input__wrapper.is-focus { box-shadow: none !important; @@ -582,13 +582,13 @@ color: #ffffff !important; } .ed-input-number--light:not(.is-disabled).is-controls-right .ed-input-number__decrease:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper, .ed-input-number--light:not(.is-disabled).is-controls-right .ed-input-number__increase:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper{ box-shadow: none !important; - border: 1px solid #0089ff; + border: 1px solid #0089ff !important; } .ed-input-number--light .ed-input-number__decrease.is-disabled .ed-icon, .ed-input-number--light .ed-input-number__increase.is-disabled .ed-icon { color: #ffffff; } .ed-input-number__decrease:hover, .ed-input-number__increase:hover { - color: #0089ff; + color: #0089ff !important; } .ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover{ box-shadow: none!important;; diff --git a/core/core-frontend/src/custom-component/common/DeInputNum.vue b/core/core-frontend/src/custom-component/common/DeInputNum.vue index e5865f1..061d5ce 100644 --- a/core/core-frontend/src/custom-component/common/DeInputNum.vue +++ b/core/core-frontend/src/custom-component/common/DeInputNum.vue @@ -49,10 +49,10 @@ const { value, min, max, step, themes, disabled } = toRefs(props) .dark-custom-input-number :deep(.ed-input-number__decrease) { background-color: rgba(0, 0, 0, 0) !important; - color: #ffffff; + color: #ffffff !important; } .dark-custom-input-number :deep(.ed-input-number__increase) { background-color: rgba(0, 0, 0, 0) !important; - color: #ffffff; + color: #ffffff !important; } 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 bb72f73..01bd06f 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 @@ -391,14 +391,14 @@ color:#ffffff; } :deep(.ed-input-number__increase){ background-color: #434343 !important; - color:#ffffff; + color:#ffffff !important; } :deep(.ed-input-number.is-controls-right .ed-input-number__increase){ - border-bottom: 1px solid #5f5f5f; - border-left: 1px solid #5f5f5f; + border-bottom: 1px solid #5f5f5f !important; + border-left: 1px solid #5f5f5f !important; } :deep(.ed-input-number.is-controls-right .ed-input-number__decrease){ - border-left: 1px solid #5f5f5f; + border-left: 1px solid #5f5f5f !important; } :deep(.ed-select-dropdown__item){ color: #ffffff !important; 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 efa89ec..a3609a3 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 @@ -312,11 +312,11 @@ color:#ffffff; color:#ffffff; } :deep(.ed-input-number.is-controls-right .ed-input-number__increase){ - border-bottom: 1px solid #5f5f5f; - border-left: 1px solid #5f5f5f; + border-bottom: 1px solid #5f5f5f !important; + border-left: 1px solid #5f5f5f !important; } :deep(.ed-input-number.is-controls-right .ed-input-number__decrease){ - border-left: 1px solid #5f5f5f; + border-left: 1px solid #5f5f5f !important; } .ed-select-group__wrap:not(:last-of-type)::after{ background: #5f5f5f; diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue index 09b79b0..dec11a0 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue @@ -935,6 +935,6 @@ initFunction() border-left: 1px solid #5f5f5f !important; } .ed-input-number--light .ed-input-number__increase .ed-icon{ - color: #fff; + color: #fff !important; }