Merge branch 'feature-wxl-newVersion' into ktyq-test-new

src/page-instrument/header-top/index.module.less

@@ -430,7 +430,8 @@
         position: relative;
         top: 50%;
         transform: translateY(-50%);
-        &.twoModeBox{
+
+        &.twoModeBox {
             justify-content: center;
 
             >.modeImg+.modeImg {

src/page-instrument/view-detail/index.module.less

@@ -86,212 +86,217 @@
         transition: height .2s;
         transition: padding-bottom .2s;
         overflow: hidden;
-        :global{
-            #musicAndSelection {
-                // 其他位置 这个高度留白是36，这里加了一点，让旋律线靠下一点
-                padding-top: 40px;
-            }
-        }
-    }
 
-    .pcContainer {
-        // height: calc(100vh - var(--header-height) - var(--pc-header-height));
-    }
-
-    .fingeringCon {
-        transition: scale 0.2s;
-    }
-}
-
-
-:global {
-    #cursorImg-0 {
-        width: 2PX !important;
-        min-height: 58PX;
-        height: 58PX;
-        content: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-        margin-top: -13PX;
-        border-radius: 4Px;
-        background-color: rgba(25, 140, 254, 0.7);
-        // opacity: var(--corsor-opacity);
-        //transform: translateX(10PX);
-        z-index: 1 !important;
-        opacity: 0; // 新版小酷AI不显示光标指针
-    }
-
-    .staff {
-        #cursorImg-0 {
-            width: 14Px;
-            transform: translateX(11Px);
+        <<<<<<< HEAD :global {
+            ======= :global {
+                >>>>>>>feature-wxl-newVersion #musicAndSelection {
+                    // 其他位置 这个高度留白是36，这里加了一点，让旋律线靠下一点
+                    padding-top: 40px;
+                }
+            }
         }
-    }
 
-    .jianpuTone {
-        #cursorImg-0 {
-            width: 18Px;
-            transform: translateX(6.3Px) !important;
+        .pcContainer {
+            // height: calc(100vh - var(--header-height) - var(--pc-header-height));
         }
-    }
 
-    .eyeProtection {
-        #cursorImg-0 {
-            background-color: rgb(255, 159, 88);
+        .fingeringCon {
+            transition: scale 0.2s;
         }
     }
 
-    #osmdCanvasPage1 {
-        //padding-bottom: 60px;
-    }
-}
-
-.xiaomi {
-    :global {
-        #cursorImg-0 {
-            height: 58PX !important;
-            min-height: auto !important;
-        }
-    }
-}
 
-.PC {
     :global {
         #cursorImg-0 {
-            margin-top: -18PX;
-            min-height: 94Px;
-            border-radius: 10Px;
+            width: 2PX !important;
+            min-height: 58PX;
+            height: 58PX;
+            content: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+            margin-top: -13PX;
+            border-radius: 4Px;
+            background-color: rgba(25, 140, 254, 0.7);
+            // opacity: var(--corsor-opacity);
+            //transform: translateX(10PX);
+            z-index: 1 !important;
+            opacity: 0; // 新版小酷AI不显示光标指针
         }
 
         .staff {
             #cursorImg-0 {
-                width: 35Px;
-                transform: translateX(21Px) !important;
+                width: 14Px;
+                transform: translateX(11Px);
             }
         }
 
         .jianpuTone {
             #cursorImg-0 {
-                width: 29Px;
-                transform: translateX(13Px) !important;
+                width: 18Px;
+                transform: translateX(6.3Px) !important;
             }
         }
 
-        .headTopBackBtn {
-            display: none;
+        .eyeProtection {
+            #cursorImg-0 {
+                background-color: rgb(255, 159, 88);
+            }
         }
 
-        .pcTitle {
-            position: absolute;
-            left: 20%;
-            top: 50%;
-            transform: translate(-50%, -50%);
+        #osmdCanvasPage1 {
+            //padding-bottom: 60px;
+        }
+    }
 
-            .van-notice-bar__wrap {
-                justify-content: center;
+    .xiaomi {
+        :global {
+            #cursorImg-0 {
+                height: 58PX !important;
+                min-height: auto !important;
             }
         }
     }
 
-    .headHeight.headHide {
-        // margin-top: 0 !important;
-    }
-}
+    .PC {
+        :global {
+            #cursorImg-0 {
+                margin-top: -18PX;
+                min-height: 94Px;
+                border-radius: 10Px;
+            }
 
+            .staff {
+                #cursorImg-0 {
+                    width: 35Px;
+                    transform: translateX(21Px) !important;
+                }
+            }
+
+            .jianpuTone {
+                #cursorImg-0 {
+                    width: 29Px;
+                    transform: translateX(13Px) !important;
+                }
+            }
+
+            .headTopBackBtn {
+                display: none;
+            }
+
+            .pcTitle {
+                position: absolute;
+                left: 20%;
+                top: 50%;
+                transform: translate(-50%, -50%);
 
-.preViewDetail {
-    background: #fff !important;
+                .van-notice-bar__wrap {
+                    justify-content: center;
+                }
+            }
+        }
 
-    >.pageBg {
-        display: none;
+        .headHeight.headHide {
+            // margin-top: 0 !important;
+        }
     }
 
-    .headHeight {
+
+    .preViewDetail {
         background: #fff !important;
-    }
 
-    .container {
-        height: 100%;
-        padding-bottom: 0 !important;
-        padding-right: 0 !important;
-    }
+        >.pageBg {
+            display: none;
+        }
 
-    :global {
-        #osmdCanvasPage1 {
-            padding-bottom: 0 !important;
+        .headHeight {
+            background: #fff !important;
         }
 
-        #cursorImg-0 {
-            opacity: 0 !important;
+        .container {
+            height: 100%;
+            padding-bottom: 0 !important;
+            padding-right: 0 !important;
         }
 
-        .noteActive {
-            path {
-                fill: #000000;
-                stroke: #000000;
+        :global {
+            #osmdCanvasPage1 {
+                padding-bottom: 0 !important;
             }
 
-            rect {
-                stroke: #000000;
+            #cursorImg-0 {
+                opacity: 0 !important;
+            }
+
+            .noteActive {
+                path {
+                    fill: #000000;
+                    stroke: #000000;
+                }
+
+                rect {
+                    stroke: #000000;
+                }
             }
         }
     }
-}
-
-.preJson {
-    width: 1px;
-    height: 1px;
-    visibility: hidden;
-    background: transparent;
-    opacity: 0;
-}
 
-@keyframes headerDown {
-    100% {
-        transform: translateY(0%);
+    .preJson {
+        width: 1px;
+        height: 1px;
+        visibility: hidden;
+        background: transparent;
+        opacity: 0;
     }
-}
 
-.loadingPop {
-    position: fixed;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    width: 100vw;
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    z-index: 10000;
-    background: rgba(0, 0, 0, .6);
-    &.isPreView{
-        background:transparent;
-        .loadingTip{
-            color: #999;
+    @keyframes headerDown {
+        100% {
+            transform: translateY(0%);
         }
     }
-    .lottie{
-        width: 120px;
-    }
 
-    .loadingTip {
-        font-size: 14px;
-        color: #fff;
+    .loadingPop {
+        position: fixed;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        width: 100vw;
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        z-index: 10000;
+        background: rgba(0, 0, 0, .6);
+
+        &.isPreView {
+            background: transparent;
+
+            .loadingTip {
+                color: #999;
+            }
+        }
+
+        .lottie {
+            width: 120px;
+        }
+
+        .loadingTip {
+            font-size: 14px;
+            color: #fff;
+        }
     }
-}
 
-.bg2Left {
-    width: 52px;
-    height: 125px;
-    position: absolute;
-    left: 0;
-    top: 0;
-}
+    .bg2Left {
+        width: 52px;
+        height: 125px;
+        position: absolute;
+        left: 0;
+        top: 0;
+    }
 
-.bg2Right {
-    width: 52px;
-    height: 125px;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
+    .bg2Right {
+        width: 52px;
+        height: 125px;
+        position: absolute;
+        right: 0;
+        top: 0;
+    }

src/page-instrument/view-figner/index.tsx

@@ -341,39 +341,17 @@ export default defineComponent({
           };
           if (Array.isArray(row.instruments)) {
             row.instruments.forEach((i: any) => {
+              const code = i.code ? i.code.split(",") : [];
               tempList.children.push({
                 text: i.name,
                 id: i.id,
-                value: mappingVoicePart(i.code, "INSTRUMENT"),
+                value: mappingVoicePart(code[0] || "", "INSTRUMENT"),
               });
             });
           }
           tempSubjects.push(tempList);
-          // if (row.instruments && row.instruments.length > 0) {
-          //   if (row.instruments.length > 1) {
-          //     row.instruments.forEach((i: any) => {
-          //       tempList.children.push({
-          //         text: i.name,
-          //         id: i.id,
-          //         value: mappingVoicePart(i.code, "INSTRUMENT"),
-          //       });
-          //     });
-          //   } else {
-          //     const singleRow = row.instruments[0];
-          //     if (singleRow.code) {
-          //       tempList.value = mappingVoicePart(singleRow.code, "INSTRUMENT");
-          //       tempList.id = singleRow.id;
-          //     }
-          //   }
-          // }
-          // data.subjects.push(tempList);
         });
         console.log(data.subject, "data.subject");
-        // tempSubjects.forEach((item: any) => {
-        //   if (item.value === data.subject && item.children?.length > 1) {
-        //     data.subject = item.children[0].value;
-        //   }
-        // });
         data.subjects = tempSubjects;
       } catch (e) {
         //