Merge branch 'iteration-20240618' into jenkins

src/teacher/music/upload/index.module.less

@@ -174,6 +174,7 @@
         border-radius: 10px;
         padding-left: 10px;
         padding-right: 10px;
+        padding-bottom: 12px;
       }
 
       .van-field__word-limit {
@@ -297,7 +298,7 @@
     }
 
     .van-button:active:before {
-      opacity: 1;
+      opacity: 0;
     }
 
     .van-button__text {

src/teacher/music/upload/index.tsx

@@ -654,7 +654,7 @@ export default defineComponent({
             name="xmlFileUrl"
             class={styles.fieldTypeBottom}
             modelValue={this.xmlFileUrl}
-            rules={[{ required: true, message: '请选择XML/MusicXML文件' }]}
+            rules={[{ required: true, message: '请选择XML文件' }]}
           >
             {{
               label: () => (
@@ -662,9 +662,7 @@ export default defineComponent({
                   <span>
                     <i>*</i>上传XML
                   </span>
-                  <span class={styles.titleTip}>
-                    仅支持XML/MusicXML格式文件
-                  </span>
+                  <span class={styles.titleTip}>仅支持XML格式文件</span>
                 </div>
               ),
               input: () =>

src/teacher/music/upload/select-tag/index.tsx

@@ -69,17 +69,24 @@ export default defineComponent({
                 onSelect!(val)
               }}
             >
-              {props.tagList.map((item: any) => (
+              {props.tagList.map((item: any, index: number) => (
                 <Checkbox
                   key={item.id}
                   name={item.id}
                   class={styles.radio}
                   onClick={() => {
-                    if (tagList.value.length >= 3) {
-                      Toast('最多只能选3个标签')
-                      return
+                    if (tagList.value.includes(item.id)) {
+                      const index = tagList.value.findIndex(
+                        tag => tag === item.id
+                      )
+                      tagList.value.splice(index, 1)
+                    } else {
+                      if (tagList.value.length >= 3) {
+                        Toast('最多只能选3个标签')
+                        return
+                      }
+                      onSelect!([item.id])
                     }
-                    onSelect!([item.id])
                   }}
                 >
                   <Tag

src/tenant/music/music-detail/new-index.tsx

@@ -1088,7 +1088,13 @@ export default defineComponent({
                   opacity: loading.value ? 0 : 1
                 }}
                 src={staffData.iframeSrc}
-                onLoad={musicIframeLoad}
+                onLoad={() => {
+                  if (!defaultImgs.value[staff.radio]) {
+                    onChangeStaff(staff.radio)
+                  } else {
+                    musicIframeLoad()
+                  }
+                }}
               ></iframe>
               {/* <OsmdPreview ref={osmdPreviewRef} /> */}
             </>