From 77e24f19fb3c501e6343ab211912b82780da48ff Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Tue, 17 May 2022 16:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=AE=BE=E7=BD=AE=20?=
=?UTF-8?q?=E6=8F=8F=E5=86=99=E4=B8=8E=E6=A0=87=E9=A2=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../designer/components/dynamicForm.vue | 1 +
.../bigscreenDesigner/designer/index.vue | 28 +++++++++++++------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue b/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
index 99eb92de..9544eca0 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
@@ -344,6 +344,7 @@ export default {
} else {
this.$set(this.formData, key, val);
}
+
this.$emit("onChanged", this.formData);
// key为当前用户操作的表单组件
for (let i = 0; i < this.options.length; i++) {
diff --git a/report-ui/src/views/bigscreenDesigner/designer/index.vue b/report-ui/src/views/bigscreenDesigner/designer/index.vue
index 06795127..5a989550 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/index.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/index.vue
@@ -199,7 +199,9 @@
'background-origin': 'initial',
'background-clip': 'initial'
}"
- @click.self="setOptionsOnClickScreen" @drop="widgetOnDragged($event)" @dragover="dragOver($event)"
+ @click.self="setOptionsOnClickScreen"
+ @drop="widgetOnDragged($event)"
+ @dragover="dragOver($event)"
>
<div v-if="grade" class="bg-grid"></div>
<widget
@@ -332,7 +334,7 @@ export default {
},
// 大屏的标记
screenCode: "",
- dragWidgetCode:'', //从工具栏拖拽的组件code
+ dragWidgetCode: "", //从工具栏拖拽的组件code
// 大屏画布中的组件
widgets: [
{
@@ -663,16 +665,16 @@ export default {
getPXUnderScale(px) {
return this.bigscreenScaleInWorkbench * px;
},
- dragStart( widgetCode) {
- this.dragWidgetCode =widgetCode;
+ dragStart(widgetCode) {
+ this.dragWidgetCode = widgetCode;
},
dragEnd() {
- this.dragWidgetCode=''
+ this.dragWidgetCode = "";
},
- dragOver(evt){
- evt.preventDefault()
- evt.stopPropagation()
- evt.dataTransfer.dropEffect = 'copy'
+ dragOver(evt) {
+ evt.preventDefault();
+ evt.stopPropagation();
+ evt.dataTransfer.dropEffect = "copy";
},
// 拖动一个组件放到工作区中去，在拖动结束时，放到工作区对应的坐标点上去
widgetOnDragged(evt) {
@@ -819,9 +821,14 @@ export default {
},
// 将当前选中的组件，右侧属性值更新
widgetValueChanged(key, val) {
+ console.log("key", key);
+ console.log("val", val);
+ console.log(this.widgetOptions);
if (this.screenCode == "screen") {
let newSetup = new Array();
this.dashboard = this.deepClone(val);
+ console.log("asd", this.dashboard);
+ console.log(this.widgetOptions);
if (this.bigscreenWidth != this.dashboard.width) {
this.bigscreenWidth = this.dashboard.width;
}
@@ -833,9 +840,12 @@ export default {
el.value = this.bigscreenWidth;
} else if (el.name == "height") {
el.value = this.bigscreenHeight;
+ } else if (this.dashboard.hasOwn(el.name)) {
+ el["value"] = this.dashboard[el.name];
}
newSetup.push(el);
});
+ console.log(newSetup);
this.widgetOptions.setup = newSetup;
} else {
for (let i = 0; i < this.widgets.length; i++) {