diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss index 3fe331164..5cd96d18e 100644 --- a/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss @@ -2,6 +2,11 @@ .el-tab-pane{ height: 100%; } + .el-switch{ + .el-switch__core { + background-color: $--el-switch-background; + } + } .props-box { width: 500px; position: absolute; @@ -9,7 +14,7 @@ top: 61px; padding: 0 !important; box-sizing: border-box; - right: 0; + right: -1px; background: $--background-color-empty; } .form-row-item{ @@ -52,7 +57,7 @@ display: flex; justify-content: space-between; margin-bottom: 15px; - text-transform: capitalize; + text-transform: initial; } .form-row-content{ margin-bottom: 5px; diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index f2bb0529c..9243c8b6d 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -266,6 +266,8 @@ $--tooltip-border-color: rgba(112,116,122,0.6); $--label-background-color: $--background-color-empty; /* 18 进度条颜色 */ $--el-progress-bar__outer: #19191C; +/* 19 el-switch background*/ +$--el-switch-background: #dcdfe6; /*** themes/common.scss是与主题切换无关的变量 ***/ @import './src/common/var.scss'; @import './common.scss'; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index b456dfea9..bd0a278cf 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -261,6 +261,8 @@ $--tooltip-border-color: rgba(119,131,145,0.6); $--label-background-color: #D8d8d8; /* 18 进度条颜色 */ $--el-progress-bar__outer: #ebeef5; +/* 19 el-switch background*/ +$--el-switch-background: #dcdfe6; /*** themes/common.scss是与主题切换无关的变量 ***/ @import './src/common/var.scss'; @import './common.scss'; diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue index 8fa0d7124..fcb668713 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue @@ -13,6 +13,7 @@
@@ -117,6 +118,7 @@ export default { this.elements = getTopology(this.meta2dId).store.data.pens this.background = getTopology(this.meta2dId).store.data.background || '#ffffff00' this.bkImage = getTopology(this.meta2dId).store.data.bkImage || '' + this.$refs.backgroundNezhaColor.colors = this.background }, methods: { updateShow (key) { @@ -138,7 +140,7 @@ export default { } if (key === 'visible') { obj.visible = !item.visible - if (!item.visible) { + if (item.visible) { if (getTopology(this.meta2dId).store.active.length && item.id === getTopology(this.meta2dId).store.active[0].id) { bus.$emit('changeSelectPens', []) } @@ -151,7 +153,7 @@ export default { } } if (key === 'locked') { - if (!item.locked) { + if (item.locked) { obj.locked = 10 if (getTopology(this.meta2dId).store.active.length && item.id === getTopology(this.meta2dId).store.active[0].id) { bus.$emit('changeSelectPens', []) diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 68ed2fabb..f6cac5c3f 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -989,7 +989,7 @@
- {{$t('overall.addTooltipLegend')}} + {{$t('overall.addTooltipLegend')}}