center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1859 from dataease/v1.8

Browse Source 
V1.8
This commit is contained in:
王嘉豪 2022-03-01 16:22:14 +08:00 committed by GitHub
commit af64927883
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/canvas/components/TextAttr.vue
View File

@ -448,12 +448,13 @@ export default {
display: inline!important; display: inline!important;
} }
::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-outer-spin-button,
::v-deep input::-webkit-inner-spin-button { ::v-deep input::-webkit-inner-spin-button {
/*-webkit-appearance: none !important;*/ -webkit-appearance: none !important;
} }
::v-deep input[type='number'] { ::v-deep input[type='number'] {
/*-moz-appearance: textfield !important;*/ -moz-appearance: textfield !important;
} }
</style> </style>

2
frontend/src/views/background/BackgroundItem.vue
View File

@ -29,7 +29,7 @@ export default {
}, },
computed: { computed: {
itemActive() { itemActive() {
return this.curComponent.commonBackground.innerImage === this.template.url return this.curComponent.commonBackground && this.curComponent.commonBackground.innerImage === this.template.url
}, },
classBackground() { classBackground() {
if (this.template.url) { if (this.template.url) {

2
frontend/src/views/background/index.vue
View File

@ -102,7 +102,7 @@ export default {
} }
}, },
mounted() { mounted() {
if (this.curComponent.commonBackground.outerImage && typeof (this.curComponent.commonBackground.outerImage) === 'string') { if (this.curComponent.commonBackground && this.curComponent.commonBackground.outerImage && typeof (this.curComponent.commonBackground.outerImage) === 'string') {
this.fileList.push({ url: this.curComponent.commonBackground.outerImage }) this.fileList.push({ url: this.curComponent.commonBackground.outerImage })
} }
this.backgroundOrigin = deepCopy(this.curComponent.commonBackground) this.backgroundOrigin = deepCopy(this.curComponent.commonBackground)

4
frontend/src/views/panel/edit/index.vue
View File

@ -619,7 +619,7 @@ export default {
this.currentFilterCom.id = newComponentId this.currentFilterCom.id = newComponentId
this.currentFilterCom.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix this.currentFilterCom.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
this.currentFilterCom.mobileStyle = BASE_MOBILE_STYLE this.currentFilterCom.mobileStyle = BASE_MOBILE_STYLE
this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND) this.currentFilterCom.commonBackground = this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND)
if (this.currentWidget.filterDialog) { if (this.currentWidget.filterDialog) {
this.show = false this.show = false
@ -649,7 +649,7 @@ export default {
// 新拖入的组件矩阵状态 和仪表板当前的矩阵状态 保持一致 // 新拖入的组件矩阵状态 和仪表板当前的矩阵状态 保持一致
component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
// 统一设置背景信息 // 统一设置背景信息
component.commonBackground || deepCopy(COMMON_BACKGROUND) component.commonBackground = component.commonBackground || deepCopy(COMMON_BACKGROUND)
// 视图统一调整为复制 // 视图统一调整为复制
if (componentInfo.type === 'view') { if (componentInfo.type === 'view') {