From 53313b5dddc2718245e373f810e135b3cca29d59 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 2 Aug 2022 11:53:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=9F=A9=E5=BD=A2=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E4=B8=A2=E5=A4=B1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Editor/ComponentWrapper.vue    |  7 ++++++-
 .../canvas/components/Editor/EditBar.vue      |  6 +++++-
 .../canvas/components/Editor/Preview.vue      |  1 +
 frontend/src/components/canvas/store/copy.js  | 19 ++++++++++++-------
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 06ea2fb30b..1e2092f4e7 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -5,7 +5,7 @@
     @click="handleClick"
     @mousedown="elementMouseDown"
   >
-    <edit-bar v-if="componentActiveFlag" :element="config" :show-position="showPosition" @showViewDetails="showViewDetails" />
+    <edit-bar v-if="componentActiveFlag" :source-element="sourceConfig" :element="config" :show-position="showPosition" @showViewDetails="showViewDetails" />
     <div :id="componentCanvasId" :style="commonStyle" class="main_view">
       <close-bar v-if="previewVisible" @closePreview="closePreview" />
       <de-out-widget
@@ -62,6 +62,11 @@ export default {
   components: { CloseBar, MobileCheckBar, DeOutWidget, EditBar },
   mixins: [mixins],
   props: {
+    sourceConfig: {
+      type: Object,
+      require: true,
+      default: null
+    },
     config: {
       type: Object,
       require: true,
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 1f9efcce4d..84408c7dc2 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -58,6 +58,10 @@ export default {
   components: { SettingMenu, LinkageField },
 
   props: {
+    sourceElement: {
+      type: Object,
+      required: true
+    },
     element: {
       type: Object,
       required: true
@@ -180,7 +184,7 @@ export default {
     multiplexingCheck(val) {
       if (val) {
         // push
-        this.$store.commit('addCurMultiplexingComponent', { 'component': this.element, 'componentId': this.element.id })
+        this.$store.commit('addCurMultiplexingComponent', { 'component': this.sourceElement, 'componentId': this.element.id })
       } else {
         // remove
         this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id)
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index cc0ea8e755..d16bf49c09 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -26,6 +26,7 @@
           :key="index"
           ref="viewWrapperChild"
           :config="item"
+          :source-config="componentData[index]"
           :search-count="searchCount"
           :in-screen="inScreen"
           :terminal="terminal"
diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index d483731abb..a353aa4737 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -9,13 +9,13 @@ export default {
   state: {
     copyData: null, // 复制粘贴剪切
     isCut: false,
+    baseStyle: {
+      width: 300,
+      height: 200,
+      top: 0,
+      left: 0
+    },
     viewBase: {
-      style: {
-        width: 300,
-        height: 200,
-        top: 0,
-        left: 0
-      },
       x: 1,
       y: 216,
       sizex: 48,
@@ -39,10 +39,15 @@ export default {
         const component =
           {
             ...deepCopy(state.curMultiplexingComponents[componentId]),
-            ...deepCopy(deepCopy(state.viewBase)),
+            ...deepCopy(state.viewBase),
             'auxiliaryMatrix': canvasStyleData.auxiliaryMatrix
           }
 
+        component.style = {
+          ...component.style,
+          ...deepCopy(state.baseStyle)
+        }
+
         const tilePosition = index % 3
         const divisiblePosition = parseInt(index / 3)
         if (canvasStyleData.auxiliaryMatrix) {