From a8acd5e058fb4eeaed4ecdee09d77231523b142b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 6 Dec 2022 18:00:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AFTab=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BE=83=E5=B0=8F,=E8=A7=86=E5=9B=BE=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AD=98=E5=9C=A8=E7=A9=BA=E7=99=BD=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/editor/MobileCheckBar.vue | 50 ++++++++--------- .../canvas/components/editor/Preview.vue | 2 +- .../canvas/customComponent/UserView.vue | 1 + frontend/src/components/canvas/store/layer.js | 53 +++++++++++-------- .../src/components/widget/deWidget/DeTabs.vue | 3 +- frontend/src/store/index.js | 6 ++- .../chart/components/ChartComponentS2.vue | 26 ++++++--- .../src/views/panel/edit/ComponentWait.vue | 6 ++- 8 files changed, 87 insertions(+), 60 deletions(-) diff --git a/frontend/src/components/canvas/components/editor/MobileCheckBar.vue b/frontend/src/components/canvas/components/editor/MobileCheckBar.vue index 9ed014e393..ee3fbdbe07 100644 --- a/frontend/src/components/canvas/components/editor/MobileCheckBar.vue +++ b/frontend/src/components/canvas/components/editor/MobileCheckBar.vue @@ -13,6 +13,7 @@ diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue index 453227c1a2..04d33ce7ef 100644 --- a/frontend/src/components/canvas/components/editor/Preview.vue +++ b/frontend/src/components/canvas/components/editor/Preview.vue @@ -635,7 +635,7 @@ export default { component.style[key] = this.format(component.style[key], this.scaleHeight) } if (this.needToChangeWidth.includes(key)) { - if (key === 'fontSize' && (this.terminal === 'mobile' || component.type === 'custom')) { + if ((key === 'fontSize' || key === 'activeFontSize') && (this.terminal === 'mobile' || component.type === 'custom')) { // do nothing 移动端字符大小无需按照比例缩放，当前保持不变(包括 v-text 和 过滤组件) } else { component.style[key] = this.format(component.style[key], this.scaleWidth) diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue index 04c08401fe..ab9caf23a6 100644 --- a/frontend/src/components/canvas/customComponent/UserView.vue +++ b/frontend/src/components/canvas/customComponent/UserView.vue @@ -85,6 +85,7 @@ :ref="element.propValue.id" class="chart-class" :chart="chart" + :terminal-type="scaleCoefficientType" :track-menu="trackMenu" :search-count="searchCount" @onChartClick="chartClick" diff --git a/frontend/src/components/canvas/store/layer.js b/frontend/src/components/canvas/store/layer.js index 7eb799156f..d30413ff64 100644 --- a/frontend/src/components/canvas/store/layer.js +++ b/frontend/src/components/canvas/store/layer.js @@ -5,40 +5,49 @@ export default { mutations: { upComponent({ componentData, curComponent }) { - const curComponentIndex = findCurComponentIndex(componentData, curComponent) - // 上移图层 index，表示元素在数组中越往后 - if (curComponentIndex < componentData.length - 1) { - moveUp(componentData, curComponentIndex) - } else { - toast('已经到顶了') + if (curComponent) { + const curComponentIndex = findCurComponentIndex(componentData, curComponent) + // 上移图层 index，表示元素在数组中越往后 + if (curComponentIndex < componentData.length - 1) { + moveUp(componentData, curComponentIndex) + } else { + toast('已经到顶了') + } } + }, downComponent({ componentData, curComponent }) { - const curComponentIndex = findCurComponentIndex(componentData, curComponent) - // 下移图层 index，表示元素在数组中越往前 - if (curComponentIndex > 0) { - moveDown(componentData, curComponentIndex) - } else { - toast('已经到底了') + if (curComponent) { + const curComponentIndex = findCurComponentIndex(componentData, curComponent) + // 下移图层 index，表示元素在数组中越往前 + if (curComponentIndex > 0) { + moveDown(componentData, curComponentIndex) + } else { + toast('已经到底了') + } } }, topComponent({ componentData, curComponent }) { - const curComponentIndex = findCurComponentIndex(componentData, curComponent) - // 置顶 - if (curComponentIndex < componentData.length - 1) { - toTop(componentData, curComponentIndex) + if (curComponent) { + const curComponentIndex = findCurComponentIndex(componentData, curComponent) + // 置顶 + if (curComponentIndex < componentData.length - 1) { + toTop(componentData, curComponentIndex) + } } }, bottomComponent({ componentData, curComponent }) { - const curComponentIndex = findCurComponentIndex(componentData, curComponent) - // 置底 - if (curComponentIndex > 0) { - toBottom(componentData, curComponentIndex) - } else { - toast('已经到底了') + if (curComponent) { + const curComponentIndex = findCurComponentIndex(componentData, curComponent) + // 置底 + if (curComponentIndex > 0) { + toBottom(componentData, curComponentIndex) + } else { + toast('已经到底了') + } } } } diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue index e1cd98cc16..9440cd6056 100644 --- a/frontend/src/components/widget/deWidget/DeTabs.vue +++ b/frontend/src/components/widget/deWidget/DeTabs.vue @@ -17,7 +17,7 @@ :active-color="activeColor" :border-color="borderColor" :border-active-color="borderActiveColor" - :addable="isEdit" + :addable="isEdit && !mobileLayoutStatus" @tab-add="addTab" @tab-click="handleClick" > @@ -710,6 +710,7 @@ export default { ::v-deep .el-tabs__nav-prev { line-height: 25px; } + ::v-deep .el-tabs__nav-next { line-height: 25px; } diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index cf11a4ff11..8a8b8a015a 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -232,8 +232,8 @@ const data = { } }, setShapeStyle({ curComponent, canvasStyleData, curCanvasScaleMap }, { top, left, width, height, rotate }) { - const curCanvasScaleSelf = curCanvasScaleMap[curComponent.canvasId] if (curComponent) { + const curCanvasScaleSelf = curCanvasScaleMap[curComponent.canvasId] if (top || top === 0) curComponent.style.top = Math.round((top / curCanvasScaleSelf.scalePointHeight)) if (left || left === 0) curComponent.style.left = Math.round((left / curCanvasScaleSelf.scalePointWidth)) if (width || width === 0) curComponent.style.width = Math.round((width / curCanvasScaleSelf.scalePointWidth)) @@ -569,7 +569,7 @@ const data = { // 移动端布局转换 state.componentData.forEach(item => { item.mobileStyle = (item.mobileStyle || BASE_MOBILE_STYLE) - if (item.mobileSelected || item.canvasId !== 'canvas-main') { + if (item.mobileSelected && item.canvasId === 'canvas-main') { item.style.width = item.mobileStyle.style.width item.style.height = item.mobileStyle.style.height item.style.top = item.mobileStyle.style.top @@ -581,6 +581,8 @@ const data = { item.sizey = item.mobileStyle.sizey item.auxiliaryMatrix = item.mobileStyle.auxiliaryMatrix mainComponentData.push(item) + } else if (item.canvasId !== 'canvas-main') { + mainComponentData.push(item) } }) state.componentData = mainComponentData diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index 87f8c75fc2..b1cb8b6555 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -67,8 +67,8 @@ > {{ $t('chart.total') }} {{ - (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) - }} + (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) + }} {{ $t('chart.items') }} @@ -36,7 +37,7 @@ class="component-wait-main" style="padding:10px" > - + @@ -141,7 +142,8 @@ export default { height: 100%; } -::v-deep .el-tabs--top { + +.wait-tab { height: 40px !important; background-color: #9ea6b2; }