From 158b3a1e2964f5c0283a247ae7dbe88adc077bc0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sun, 10 Oct 2021 23:44:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=94=BB=E5=B8=83=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/index.vue        | 36 ++++++++++---------
 .../components/canvas/components/Toolbar.vue  | 21 ++++++++---
 .../src/views/panel/SubjectSetting/index.vue  | 24 ++++++-------
 3 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 0440f50e0e..276a746f31 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -1007,7 +1007,7 @@ export default {
       handler(newVal, oldVla) {
         // console.log('newVal:' + JSON.stringify(newVal) + ';oldVla:' + JSON.stringify(oldVla))
         // 初始化时componentData 加载可能出现慢的情况 此时重新初始化一下matrix
-        if (this.lastComponentDataLength === 0 && newVal.length > 0) {
+        if (newVal.length !== this.lastComponentDataLength) {
           this.lastComponentDataLength = newVal.length
           this.initMatrix()
         }
@@ -1676,23 +1676,25 @@ export default {
       })
     },
     startMoveIn() {
-      const moveInItemInfo = this.$store.state.dragComponentInfo
-      this.addItemBox(moveInItemInfo)
-      // console.log('startMoveIn:')
-      const vm = this
-      // e.preventDefault();
-      if (!this.infoBox) {
-        this.infoBox = {}
+      if (this.canvasStyleData.auxiliaryMatrix) {
+        const moveInItemInfo = this.$store.state.dragComponentInfo
+        this.addItemBox(moveInItemInfo)
+        console.log('startMoveIn:')
+        const vm = this
+        // e.preventDefault();
+        if (!this.infoBox) {
+          this.infoBox = {}
+        }
+        const infoBox = this.infoBox
+
+        infoBox.moveItem = moveInItemInfo
+        infoBox.moveItemIndex = this.yourList.length - 1
+
+        infoBox.oldX = 1 // 实际对象原始X位置
+        infoBox.oldY = 1
+        infoBox.oldSizeX = moveInItemInfo.sizex
+        infoBox.oldSizeY = moveInItemInfo.sizey
       }
-      const infoBox = this.infoBox
-
-      infoBox.moveItem = moveInItemInfo
-      infoBox.moveItemIndex = this.yourList.length - 1
-
-      infoBox.oldX = 1 // 实际对象原始X位置
-      infoBox.oldY = 1
-      infoBox.oldSizeX = moveInItemInfo.sizex
-      infoBox.oldSizeY = moveInItemInfo.sizey
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 37a74de395..c400d1f7cc 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -13,10 +13,21 @@
     </div>
     <div v-else class="toolbar">
 
-      <!--      <div class="canvas-config" style="margin-right: 10px">-->
-      <!--        <el-switch v-model="canvasStyleData.auxiliaryMatrix" :width="35" name="auxiliaryMatrix" />-->
-      <!--        <span>{{ $t('panel.matrix_design') }}</span>-->
-      <!--      </div>-->
+      <!--      <el-tooltip :content="$t('panel.new_element_distribution')">-->
+      <!--        <el-switch-->
+      <!--          v-model="canvasStyleData.auxiliaryMatrix"-->
+      <!--          :width="35"-->
+      <!--          active-color="#13ce66"-->
+      <!--          inactive-color="#ff4949"-->
+      <!--          :active-text="$t('panel.matrix')"-->
+      <!--          :inactive-text="$t('panel.suspension')"-->
+      <!--        />-->
+      <!--      </el-tooltip>-->
+
+      <div class="canvas-config" style="margin-right: 10px">
+        <el-switch v-model="canvasStyleData.auxiliaryMatrix" :width="35" name="auxiliaryMatrix" />
+        <span>{{ $t('panel.matrix_design') }}</span>
+      </div>
       <!--      <div class="canvas-config" style="margin-right: 10px">-->
       <!--        <span> {{ $t('panel.canvas_scale') }} </span>-->
       <!--        <input v-model="scale" @input="handleScaleChange"> %-->
@@ -371,7 +382,7 @@ export default {
     float: right;
     height: 35px;
     line-height: 35px;
-    min-width: 400px;
+    min-width: 500px;
     /*background: #fff;*/
     /*border-bottom: 1px solid #ddd;*/
 
diff --git a/frontend/src/views/panel/SubjectSetting/index.vue b/frontend/src/views/panel/SubjectSetting/index.vue
index 5f45741582..64841972f4 100644
--- a/frontend/src/views/panel/SubjectSetting/index.vue
+++ b/frontend/src/views/panel/SubjectSetting/index.vue
@@ -9,18 +9,18 @@
     <div v-if="collapseShow" style="margin: 10px;overflow-y: auto">
       <el-collapse v-model="activeNames" @change="handleChange">
         <el-collapse-item :title="$t('panel.panel')" name="panel">
-          <el-row class="shape-item">
-            <span class="shape-item" style="margin-left: 10px">{{ $t('panel.new_element_distribution') }}:</span>
-            <!--            <el-switch v-model="canvasStyleData.auxiliaryMatrix" :width="35" name="auxiliaryMatrix" />-->
-            <el-radio-group v-model="canvasStyleData.auxiliaryMatrix" size="mini" name="auxiliaryMatrix" @change="styleChange">
-              <el-radio-button :label="true">
-                {{ $t('panel.matrix') }}<i class="icon iconfont icon-shujujuzhen" />
-              </el-radio-button>
-              <el-radio-button :label="false">
-                {{ $t('panel.suspension') }}<i class="icon iconfont icon-xuanfuanniu" />
-              </el-radio-button>
-            </el-radio-group>
-          </el-row>
+<!--          <el-row class="shape-item">-->
+<!--            <span class="shape-item" style="margin-left: 10px">{{ $t('panel.new_element_distribution') }}:</span>-->
+<!--            &lt;!&ndash;            <el-switch v-model="canvasStyleData.auxiliaryMatrix" :width="35" name="auxiliaryMatrix" />&ndash;&gt;-->
+<!--            <el-radio-group v-model="canvasStyleData.auxiliaryMatrix" size="mini" name="auxiliaryMatrix" @change="styleChange">-->
+<!--              <el-radio-button :label="true">-->
+<!--                {{ $t('panel.matrix') }}<i class="icon iconfont icon-shujujuzhen" />-->
+<!--              </el-radio-button>-->
+<!--              <el-radio-button :label="false">-->
+<!--                {{ $t('panel.suspension') }}<i class="icon iconfont icon-xuanfuanniu" />-->
+<!--              </el-radio-button>-->
+<!--            </el-radio-group>-->
+<!--          </el-row>-->
           <el-row style="background-color: #f7f8fa; margin: 5px">
             <background-selector class="attr-selector" />
             <component-gap class="attr-selector" />