Merge branch 'dsy'

src/components/Adult/preview/VoiceMatrix.vue

@@ -42,8 +42,8 @@
             :key="`top-${i}`"
             :class="[
               'matrix-top',
-              selectColumn === i ||
-                (selectedLine.type === 'column' && selectedLine.index === i)
+              curQue.voiceMatrix.columnSelection && (selectColumn === i ||
+                (selectedLine.type === 'column' && selectedLine.index === i))
                 ? 'read'
                 : ''
             ]"
@@ -72,8 +72,8 @@
             :key="`start-${i}`"
             :class="[
               'column-wrapper',
-              selectRow === i ||
-                (selectedLine.type === 'row' && selectedLine.index === i)
+              curQue.voiceMatrix.rowSelection && (selectRow === i ||
+                (selectedLine.type === 'row' && selectedLine.index === i))
                 ? 'read'
                 : ''
             ]"
@@ -100,10 +100,10 @@
               :key="`wrapper-${i}-${j}`"
               :class="[
                 'column-wrapper',
-                selectRow === i ||
-                  selectColumn === j ||
-                  (selectedLine.type === 'column' && selectedLine.index === j) ||
-                  (selectedLine.type === 'row' && selectedLine.index === i)
+                (curQue.voiceMatrix.rowSelection && selectRow === i) ||
+                  (curQue.voiceMatrix.columnSelection && selectColumn === j) ||
+                  (curQue.voiceMatrix.columnSelection && selectedLine.type === 'column' && selectedLine.index === j) ||
+                  (curQue.voiceMatrix.rowSelection && selectedLine.type === 'row' && selectedLine.index === i)
                   ? 'read'
                   : '',
                 (i === 0 && curQue.voiceMatrix.firstLineHighlight) || (j === row.length - 1 && curQue.voiceMatrix.lastColumnHighlight)
@@ -201,8 +201,8 @@
           <div
             :key="`end-${i}`"
             :class="[
-              selectRow === i ||
-                (selectedLine.type === 'row' && selectedLine.index === i)
+              curQue.voiceMatrix.rowSelection && (selectRow === i ||
+                (selectedLine.type === 'row' && selectedLine.index === i))
                 ? 'read'
                 : ''
             ]"
@@ -216,8 +216,8 @@
             :key="`bottom-${i}`"
             :class="[
               'matrix-bottom',
-              selectColumn === i ||
-                (selectedLine.type === 'column' && selectedLine.index === i)
+              curQue.voiceMatrix.columnSelection && (selectColumn === i ||
+                (selectedLine.type === 'column' && selectedLine.index === i))
                 ? 'read'
                 : ''
             ]"