refactor: 更改矩阵设计按钮位置

frontend/src/components/canvas/components/Editor/index.vue

@@ -15,9 +15,9 @@
     @scroll="canvasScroll"
   >
     <!-- 网格线 -->
-    <!--    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
+<!--        <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
     <!--    positionBox:{{positionBoxInfo}}-->
-    <!--    <PGrid :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />-->
+<!--        <PGrid :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />-->
 
     <!-- 仪表板联动清除按钮-->
     <canvas-opt-bar />

frontend/src/components/canvas/components/Toolbar.vue

@@ -13,10 +13,10 @@
     </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>
+      <!--      <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"> %-->
@@ -202,12 +202,12 @@ export default {
 
     compose() {
       this.$store.commit('compose')
-      this.$store.commit('recordSnapshot','compose')
+      this.$store.commit('recordSnapshot', 'compose')
     },
 
     decompose() {
       this.$store.commit('decompose')
-      this.$store.commit('recordSnapshot','decompose')
+      this.$store.commit('recordSnapshot', 'decompose')
     },
 
     undo() {
@@ -255,7 +255,7 @@ export default {
             }
           })
 
-          this.$store.commit('recordSnapshot','handleFileChange')
+          this.$store.commit('recordSnapshot', 'handleFileChange')
         }
 
         img.src = fileResult
@@ -294,7 +294,7 @@ export default {
     clearCanvas() {
       this.$store.commit('setComponentData', [])
       this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
-      this.$store.commit('recordSnapshot','clearCanvas')
+      this.$store.commit('recordSnapshot', 'clearCanvas')
     },
 
     handlePreviewChange() {

frontend/src/lang/en.js

@@ -1314,6 +1314,7 @@ export default {
     no_drill_field: 'Miss relation field',
     matrix: 'matrix',
     suspension: 'suspension',
+    new_element_distribution: 'New element Distribution',
     subject_no_edit: 'System Subject Can Not Edit',
     subject_name_not_null: 'Subject Name Can Not Be Null And Less Than 20 charts'
   },

frontend/src/lang/tw.js

@@ -1315,8 +1315,9 @@ export default {
     details: '詳情',
     setting: '設置',
     no_drill_field: '缺少關聯字段',
-    matrix: '矩阵分布',
+    matrix: '矩阵',
     suspension: '悬浮',
+    new_element_distribution: '新元素分布方式',
     subject_no_edit: '系统主题不能修改',
     subject_name_not_null: '主题名称需要1~20字符'
   },

frontend/src/lang/zh.js

@@ -1320,8 +1320,9 @@ export default {
     details: '详情',
     setting: '设置',
     no_drill_field: '缺少关联字段',
-    matrix: '矩阵分布',
+    matrix: '矩阵',
     suspension: '悬浮',
+    new_element_distribution: '新元素分布方式',
     subject_no_edit: '系统主题不能修改',
     subject_name_not_null: '主题名称需要1~20字符'
   },

frontend/src/views/panel/SubjectSetting/index.vue

@@ -9,6 +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 style="background-color: #f7f8fa; margin: 5px">
             <background-selector class="attr-selector" />
             <component-gap class="attr-selector" />
@@ -139,6 +151,9 @@ export default {
       canvasStyleData.chart = chart
       this.$store.commit('setCanvasStyle', canvasStyleData)
       this.$store.commit('recordSnapshot', 'save')
+    },
+    styleChange() {
+      this.$store.state.styleChangeTimes++
     }
   }
 }