Merge pull request #11810 from dataease/pr@dev-v2@refactor_group-batch

fix(数据大屏): 修复分组未参与批量设置问题
This commit is contained in:
王嘉豪 2024-08-28 14:25:20 +08:00 committed by GitHub
commit 5f8c62ac51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 18 deletions

View File

@ -422,7 +422,7 @@ const createGroup = () => {
let style = { left: 0, top: 0, right: 0, bottom: 0 }
if (component.component == 'Group') {
component.propValue.forEach(item => {
const rectInfo = _$(`#component${item.id}`).getBoundingClientRect()
const rectInfo = _$(`#shape-id-${item.id}`).getBoundingClientRect()
style.left = rectInfo.left - editorX.value
style.top = rectInfo.top - editorY.value
style.right = rectInfo.right - editorX.value
@ -1545,23 +1545,6 @@ defineExpose({
:dv-info="dvInfo"
:canvas-active="canvasActive"
/>
<component
v-else-if="item.component.includes('Svg')"
:is="findComponent(item.component)"
:id="'component' + item.id"
:scale="curBaseScale"
class="component"
:is-edit="true"
:style="getSvgComponentStyle(item.style)"
:prop-value="item.propValue"
:element="item"
:request="item.request"
:canvas-style-data="canvasStyleData"
:canvas-view-info="canvasViewInfo"
:dv-info="dvInfo"
:active="item.id === curComponentId"
:canvas-active="canvasActive"
/>
<component
v-else
:is="findComponent(item.component)"

View File

@ -249,6 +249,18 @@ export const commonAttr = {
// 编辑器左侧组件列表
const list = [
{
component: 'Group',
name: '组合',
label: '组合',
propValue: '&nbsp;',
icon: 'icon_graphical',
innerType: 'Group',
style: {
width: 200,
height: 200
}
},
{
id: 100000001,
component: 'GroupArea',