dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 仪表板批量操作面板样式调整#3442

Browse Source
This commit is contained in:
dataeaseShu 2022-10-26 10:29:24 +08:00
parent 59eef06a6f
commit f2bda7578e
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/canvas/components/Editor/DeEditor.vue
View File

@ -65,8 +65,8 @@
<de-out-widget
v-if="renderOk && item.type==='custom'"
:id="'component' + item.id"
:canvas-id="canvasId"
ref="wrapperChild"
:canvas-id="canvasId"
class="component"
:style="getComponentStyleDefault(item.style)"
:prop-value="item.propValue"
@ -80,8 +80,8 @@
:is="item.component"
v-else-if="renderOk && item.type==='other'"
:id="'component' + item.id"
:canvas-id="canvasId"
ref="wrapperChild"
:canvas-id="canvasId"
class="component"
:style="getComponentStyle(item.style)"
:prop-value="item.propValue"
@ -93,8 +93,8 @@
:is="item.component"
v-else-if="renderOk"
:id="'component' + item.id"
:canvas-id="canvasId"
ref="wrapperChild"
:canvas-id="canvasId"
class="component"
:filters="filterMap[item.propValue && item.propValue.viewId]"
:style="getComponentStyleDefault(item.style)"
@ -1436,7 +1436,7 @@ export default {
matrixStyleOriginWidth: this.matrixStyle.originWidth,
matrixStyleOriginHeight: this.matrixStyle.originHeight
})
if(this.canvasId === 'canvas-main'){
if (this.canvasId === 'canvas-main') {
this.$store.commit('setPreviewCanvasScale', {
scaleWidth: this.scalePointWidth,
scaleHeight: this.scalePointHeight

2
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -439,7 +439,7 @@ export default {
} else {
this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height// 获取高度比
}
if(this.canvasId === 'canvas-main'){
if (this.canvasId === 'canvas-main') {
this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) })
}
this.handleScaleChange()

2
frontend/src/components/dataease/DeOutWidget.vue
View File

@ -39,8 +39,8 @@
:is="element.component"
v-if="element.type==='custom'"
:id="'component' + element.id"
:canvas-id="canvasId"
ref="deOutWidget"
:canvas-id="canvasId"
class="component-custom"
:out-style="element.style"
:is-relation="isRelation"

4
frontend/src/store/index.js
View File

@ -290,7 +290,7 @@ const data = {
const filterComponentId = condition.componentId
const canvasId = data.canvasId
//过滤时 主画布的过滤组件可以过滤所有的视图
// 过滤时 主画布的过滤组件可以过滤所有的视图
const canvasViewIds = state.componentData.filter(item => item.type === 'view' && (canvasId === 'canvas-main' || item.canvasId === canvasId)).map((itemView) => {
return itemView.propValue.viewId
})
@ -492,7 +492,7 @@ const data = {
}
},
deleteComponent(state) {
this.commit('deleteComponentWithId',state.curComponent.id)
this.commit('deleteComponentWithId', state.curComponent.id)
},
setLinkageInfo(state, targetLinkageInfo) {
state.linkageSettingStatus = true

11
frontend/src/views/chart/view/ChartStyle.vue
View File

@ -18,7 +18,7 @@
style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;padding-right: 6px"
class="attr-style theme-border-class"
>
<el-row>
<el-row class="de-collapse-style">
<span class="padding-lr">{{ $t('chart.shape_attr') }}</span>
<el-collapse
v-model="attrActiveNames"
@ -475,6 +475,15 @@ export default {
</script>
<style lang='scss' scoped>
.de-collapse-style {
.el-collapse-item__header {
height: 34px !important;
line-height: 34px !important;
padding: 0 0 0 6px !important;
font-size: 12px !important;
font-weight: 400 !important;
}
}
.padding-lr {
padding: 0 6px;
}