Merge branch 'feature/0429-musicV2' into develop

src/views/music-library/music-sheet/component/music-list.tsx

@@ -72,7 +72,8 @@ export default defineComponent({
         categoriesId: null, //是否审核版本
         musicCategoryId: null, //曲目分类
         musicalInstrumentId: null, // 乐器ID
-        dataCorrect: null // 数据修复
+        dataCorrect: null, // 数据修复
+        generateMetronomeAudio: null, // 是否生成节拍器音频
       },
       dataList: [] as any,
       subjectList: [] as any,
@@ -145,9 +146,11 @@ export default defineComponent({
                 <NDescriptionsItem label="分类">
                   <TheTooltip content={row.musicCategoryName} />
                 </NDescriptionsItem>
-                <NDescriptionsItem label="可用声部">
-                  <TheTooltip content={row.subjectNames} />
-                </NDescriptionsItem>
+                {!row.isAllSubject && (
+                    <NDescriptionsItem label="可用声部">
+                      <TheTooltip content={row.subjectNames}/>
+                    </NDescriptionsItem>
+                )}
                 {/*<NDescriptionsItem label="可用乐器">*/}
                 {/*  <TheTooltip content={row.musicalInstrumentNames} />*/}
                 {/*</NDescriptionsItem>*/}
@@ -772,6 +775,25 @@ export default defineComponent({
               }
             />
           </NFormItem>
+          <NFormItem label="生成节拍器音频" path="generateMetronomeAudio">
+            <NSelect
+              v-model={[state.searchForm.generateMetronomeAudio, 'value']}
+              placeholder="请选择是否生成节拍器音频"
+              clearable
+              options={
+                [
+                  {
+                    label: '已生成',
+                    value: true
+                  },
+                  {
+                    label: '未生成',
+                    value: false
+                  }
+                ] as any
+              }
+            />
+          </NFormItem>
           <NFormItem>
             <NSpace>
               <NButton type="primary" onClick={onSearch}>

vite.config.ts

@@ -19,9 +19,9 @@ function pathResolve(dir: string) {
 }
 
 // const proxyUrl = 'https://dev.lexiaoya.cn'
-//const proxyUrl = 'http://127.0.0.1:7293/'
+const proxyUrl = 'http://127.0.0.1:7293/'
 // const proxyUrl = 'https://resource.colexiu.com/'
-const proxyUrl = 'https://dev.resource.colexiu.com'
+// const proxyUrl = 'https://dev.resource.colexiu.com'
 // https://test.resource.colexiu.com/
 
 export default ({ command, mode }: ConfigEnv): UserConfig => {