ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
root 2025-06-17 10:17:33 +08:00
commit 1788b94653
13 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
View File

@ -233,4 +233,7 @@ onUnmounted(() => {
}
}
:deep(.scale-input-number .ed-input__wrapper::after){
top: -1px;
}
</style>

21
core/core-frontend/src/components/data-visualization/DvToolbar.vue
View File

@ -707,8 +707,25 @@ const fullScreenPreview = () => {
}
.tabline{
width: 1px;
height: 20px;
background-color: rgba(24, 24, 24, 1);
height: 40px;
background-color: rgba(255, 255, 255, 0.15);
margin: 0px 10px;
}
</style>
<style>
.ed-message-box{
background: #212121;
}
.ed-message-box__content{
color: #ffffff;
}
.ed-message-box__btns .ed-button--primary{
background: #0089ff;
border-color: #0089ff;
}
.ed-message-box__btns .ed-button.is-secondary{
color: #F2F4F5 !important;
background-color: #212121 !important;
border: 1px solid #434343 !important;
}
</style>

2
core/core-frontend/src/components/visualization/ComponentButtonLabel.vue
View File

@ -36,7 +36,7 @@ const emits = defineEmits(['customClick'])
}
}
.group_inner {
padding: 0px 10px 4px;
padding: 4px 10px 4px;
display: flex;
cursor: pointer;
flex-direction: column;

5
core/core-frontend/src/components/visualization/DvSidebar.vue
View File

@ -473,7 +473,7 @@ const menuOpt = optName => {
color:#ffffff !important;
}
.ed-collapse-item__wrap .ed-input-number.is-controls-right .ed-input-number__increase{
border-bottom: 1px solid #5f5f5f !important;
border-bottom: 1px solid #434343 !important;
border-left: 1px solid #5f5f5f !important;
}
.ed-collapse-item__wrap .ed-input-number.is-controls-right .ed-input-number__decrease{
@ -593,4 +593,7 @@ color: #ffffff !important;
.ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover{
box-shadow: none!important;;
}
.icon-checkbox:before{
content:''
}
</style>

2
core/core-frontend/src/style/index.less
View File

@ -607,7 +607,7 @@ strong {
.form-item-dark {
.ed-input-number__decrease,
.ed-input-number__increase {
color: #a6a6a6;
color: #a6a6a6 !important;
}
}

2
core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue
View File

@ -394,7 +394,7 @@ color:#ffffff;
color:#ffffff !important;
}
:deep(.ed-input-number.is-controls-right .ed-input-number__increase){
border-bottom: 1px solid #5f5f5f !important;
border-bottom: 1px solid #434343 !important;
border-left: 1px solid #5f5f5f !important;
}
:deep(.ed-input-number.is-controls-right .ed-input-number__decrease){

2
core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
View File

@ -312,7 +312,7 @@ color:#ffffff;
color:#ffffff;
}
:deep(.ed-input-number.is-controls-right .ed-input-number__increase){
border-bottom: 1px solid #5f5f5f !important;
border-bottom: 1px solid #434343 !important;
border-left: 1px solid #5f5f5f !important;
}
:deep(.ed-input-number.is-controls-right .ed-input-number__decrease){

6
core/core-frontend/src/views/chart/components/editor/index.vue
View File

@ -5331,10 +5331,10 @@ span {
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;
color: #ffffff !important;
}
.form-item-dark .ed-input-number__decrease, .form-item-dark .ed-input-number__increase {
color: #ffffff ;
color: #ffffff !important;
}
.de-chart-editor .ed-input-group--append .ed-input-group__append .ed-select:not(.ed-select--disabled):hover .ed-input__wrapper{
box-shadow: none !important;
@ -5346,7 +5346,7 @@ span {
}
.de-chart-editor .ed-input-group--append .ed-input-group__append .ed-select:not(.ed-select--disabled) .ed-input .ed-input__wrapper{
box-shadow: none !important;
border:1px solid #636363 !important;
border:none !important;
border-left: none !important;
}
.de-chart-editor .view-panel-row .ed-collapse-item__header.is-active{

2
core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
View File

@ -654,7 +654,7 @@ const save = () => {
color: #ebebeb !important;
}
.ed-message-box{
background: #212121;
background: #212121 ;
}
.ed-message-box__content{
color: #ffffff;

2
core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
View File

@ -26,6 +26,7 @@ const showmodule = ref(false)
const currentMoudleId = ref('')
const showermission = ref(false)
const showUserInfo = ref(false)
const currentrow = ref({})
watch(
() => props.menuList,
(newVal) => {
@ -54,6 +55,7 @@ function childmenuclick(item: any) {
showUserInfo.value = false
if (item.module_id && item.module_id !== '') {
currentMoudleId.value = item.module_id
console.log('传递给 Assocmodule 的 props:',item)
showmodule.value = true
} else {
showmodule.value = false

2
core/core-frontend/src/viewsnew/application/service/dataset/form/CalcFieldEdit.vue
View File

@ -928,7 +928,7 @@ initFunction()
color:#ffffff !important;
}
.ed-input-number.is-controls-right .ed-input-number__increase{
border-bottom: 1px solid #5f5f5f !important;
border-bottom: 1px solid #434343 !important;
border-left: 1px solid #5f5f5f !important;
}
.ed-input-number.is-controls-right .ed-input-number__decrease{

2
core/core-frontend/src/viewsnew/application/service/dataset/index.vue
View File

@ -1652,7 +1652,7 @@ border-right: 1px solid rgba(54, 54, 54, 1)
color: #F2F4F5;
}
.ed-message-box{
background: #212121;
background: #212121 ;
}
.ed-message-box__content{
color: #ffffff;

2
core/core-frontend/src/viewsnew/data-visualization/index.vue
View File

@ -771,4 +771,4 @@ eventBus.on('tabSort', tabSort)
font-size: 12px;
color: rgb(169, 175, 184);
}
</style>
</style>