Merge branch 'hqyDev' of http://git.dayaedu.com/lex/classroom-instruments into online

src/components/Metronome/Metronome.vue

@@ -82,7 +82,12 @@
           :placement="'top'"
           :render-tag="
             ({ option }:any) => {
-              return h('div',{class:'beatName'},[h('div',option.label),h('div','拍')])
+              return h('div',{class:'beatName'},[h('div',option.labelHide),h('div','拍')])
+            }
+          "
+          :render-label="
+            (option:any) => {
+              return h('div', option.labelHide);
             }
           "
         ></n-select>
@@ -95,12 +100,12 @@
           :placement="'top'"
           :render-tag="
             ({ option }:any) => {
-              return h('div', { class: `beatSymbolImg${option.label} beatSymbolImg` });
+              return h('div', { class: `beatSymbolImg${option.labelHide} beatSymbolImg` });
             }
           "
           :render-label="
             (option:any) => {
-              return h('div', { class: `beatSymbolImg${option.label} beatSymbolImg` });
+              return h('div', { class: `beatSymbolImg${option.labelHide} beatSymbolImg` });
             }
           "
         ></n-select>
@@ -149,52 +154,62 @@ const dotDom = ref<HTMLElement>();
 const beatVal = ref('1');
 const beatValOpt = [
   {
-    label: '0',
+    label: '',
+    labelHide: '0',
     value: '0',
     class: 'beatValOptItem'
   },
   {
-    label: '1',
+    label: '',
+    labelHide: '1',
     value: '1',
     class: 'beatValOptItem'
   },
   {
-    label: '2',
+    label: '',
+    labelHide: '2',
     value: '1-1',
     class: 'beatValOptItem'
   },
   {
-    label: '3',
+    label: '',
+    labelHide: '3',
     value: '1-1-1',
     class: 'beatValOptItem'
   },
   {
-    label: '4',
+    label: '',
+    labelHide: '4',
     value: '1-1-1-1',
     class: 'beatValOptItem'
   },
   {
-    label: '5',
+    label: '',
+    labelHide: '5',
     value: '1-1-1-1-1',
     class: 'beatValOptItem'
   },
   {
-    label: '6',
+    label: '',
+    labelHide: '6',
     value: '1-1-1-1-1-1',
     class: 'beatValOptItem'
   },
   {
-    label: '7',
+    label: '',
+    labelHide: '7',
     value: '1-1-1-1-1-1-1',
     class: 'beatValOptItem'
   },
   {
-    label: '8',
+    label: '',
+    labelHide: '8',
     value: '1-1-1-1-1-1-1-1',
     class: 'beatValOptItem'
   },
   {
-    label: '9',
+    label: '',
+    labelHide: '9',
     value: '1-1-1-1-1-1-1-1-1',
     class: 'beatValOptItem'
   }
@@ -202,37 +217,44 @@ const beatValOpt = [
 const beatSymbol = ref('1');
 const beatSymbolOpt = [
   {
-    label: '1',
+    label: '',
+    labelHide: '1',
     value: '1',
     class: 'beatSymbolOptItem'
   },
   {
-    label: '2',
+    label: '',
+    labelHide: '2',
     value: '0.5-0.5',
     class: 'beatSymbolOptItem'
   },
   {
-    label: '3',
+    label: '',
+    labelHide: '3',
     value: '0.3333333-0.3333333-0.3333333',
     class: 'beatSymbolOptItem'
   },
   {
-    label: '4',
+    label: '',
+    labelHide: '4',
     value: '0.25-0.25-0.25-0.25',
     class: 'beatSymbolOptItem'
   },
   {
-    label: '5',
+    label: '',
+    labelHide: '5',
     value: '0.6666666-0.3333333',
     class: 'beatSymbolOptItem'
   },
   {
-    label: '6',
+    label: '',
+    labelHide: '6',
     value: '0.75-0.25',
     class: 'beatSymbolOptItem'
   },
   {
-    label: '7',
+    label: '',
+    labelHide: '7',
     value: '0.5-0.25-0.25',
     class: 'beatSymbolOptItem'
   }