|
@@ -72,24 +72,23 @@ const resetFrequency = (list: any[]) => {
|
|
* 乐器指法处理
|
|
* 乐器指法处理
|
|
*/
|
|
*/
|
|
const setNoteHalfTone = (list: any[]) => {
|
|
const setNoteHalfTone = (list: any[]) => {
|
|
- const instrumentNames = ['melodica']
|
|
|
|
|
|
+ const instrumentNames = ["melodica"];
|
|
if (!state.fingeringInfo?.name || !instrumentNames.includes(state.fingeringInfo.name)) return list;
|
|
if (!state.fingeringInfo?.name || !instrumentNames.includes(state.fingeringInfo.name)) return list;
|
|
for (let i = 0; i < list.length; i++) {
|
|
for (let i = 0; i < list.length; i++) {
|
|
const note = list[i];
|
|
const note = list[i];
|
|
- if (note.noteElement?.pitch?.accidentalXml){
|
|
|
|
|
|
+ if (note.noteElement?.pitch?.accidentalXml) {
|
|
const accidentalXml = note.noteElement?.pitch?.accidentalXml;
|
|
const accidentalXml = note.noteElement?.pitch?.accidentalXml;
|
|
if ([]) {
|
|
if ([]) {
|
|
-
|
|
|
|
}
|
|
}
|
|
- if (accidentalXml === 'flat'){
|
|
|
|
|
|
+ if (accidentalXml === "flat") {
|
|
// note.realKey = note.realKey + 1;
|
|
// note.realKey = note.realKey + 1;
|
|
- } else if (accidentalXml === 'sharp'){
|
|
|
|
|
|
+ } else if (accidentalXml === "sharp") {
|
|
// note.realKey = note.realKey + 1;
|
|
// note.realKey = note.realKey + 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return list;
|
|
return list;
|
|
-}
|
|
|
|
|
|
+};
|
|
|
|
|
|
export default defineComponent({
|
|
export default defineComponent({
|
|
name: "music-list",
|
|
name: "music-list",
|
|
@@ -175,7 +174,7 @@ export default defineComponent({
|
|
state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";
|
|
state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";
|
|
state.originSpeed = state.speed = data.playSpeed;
|
|
state.originSpeed = state.speed = data.playSpeed;
|
|
const track = data.code || data.track;
|
|
const track = data.code || data.track;
|
|
- state.track = track ? track.replace(/ /g, '').toLocaleLowerCase() : "";
|
|
|
|
|
|
+ state.track = track ? track.replace(/ /g, "").toLocaleLowerCase() : "";
|
|
state.enableNotation = data.notation ? true : false;
|
|
state.enableNotation = data.notation ? true : false;
|
|
|
|
|
|
// 映射声部ID
|
|
// 映射声部ID
|
|
@@ -340,7 +339,7 @@ export default defineComponent({
|
|
});
|
|
});
|
|
const browsInfo = browser();
|
|
const browsInfo = browser();
|
|
const handleOpenFignerView = () => {
|
|
const handleOpenFignerView = () => {
|
|
- if (!query.modelType){
|
|
|
|
|
|
+ if (!query.modelType) {
|
|
detailData.orientation = state.fingeringInfo.orientation || 0;
|
|
detailData.orientation = state.fingeringInfo.orientation || 0;
|
|
api_setRequestedOrientation(detailData.orientation);
|
|
api_setRequestedOrientation(detailData.orientation);
|
|
}
|
|
}
|
|
@@ -357,7 +356,7 @@ export default defineComponent({
|
|
detailData.fingerPreView = true;
|
|
detailData.fingerPreView = true;
|
|
};
|
|
};
|
|
const handleCloseFignerView = () => {
|
|
const handleCloseFignerView = () => {
|
|
- if (!query.modelType && detailData.orientation == 1){
|
|
|
|
|
|
+ if (!query.modelType && detailData.orientation == 1) {
|
|
api_setRequestedOrientation(0);
|
|
api_setRequestedOrientation(0);
|
|
}
|
|
}
|
|
detailData.fingerPreView = false;
|
|
detailData.fingerPreView = false;
|
|
@@ -437,20 +436,24 @@ export default defineComponent({
|
|
{storeData.isApp && <RecordingTime />}
|
|
{storeData.isApp && <RecordingTime />}
|
|
{/* 作业 */}
|
|
{/* 作业 */}
|
|
{query.workRecord && <WorkIndex />}
|
|
{query.workRecord && <WorkIndex />}
|
|
- {followData.start + ""}
|
|
|
|
{/* 曲谱列表 */}
|
|
{/* 曲谱列表 */}
|
|
{state.playState == "play" ||
|
|
{state.playState == "play" ||
|
|
followData.start ||
|
|
followData.start ||
|
|
evaluatingData.startBegin ||
|
|
evaluatingData.startBegin ||
|
|
query.workRecord ||
|
|
query.workRecord ||
|
|
- query.modelType ? null : (
|
|
|
|
|
|
+ query.modelType ||
|
|
|
|
+ state.platform === IPlatform.PC ? null : (
|
|
<TheMusicList />
|
|
<TheMusicList />
|
|
)}
|
|
)}
|
|
</>
|
|
</>
|
|
)}
|
|
)}
|
|
|
|
|
|
<Popup teleport="body" v-model:show={detailData.fingerPreView} position="bottom">
|
|
<Popup teleport="body" v-model:show={detailData.fingerPreView} position="bottom">
|
|
- <ViewFigner subject={state.fingeringInfo.name} isComponent={true} onClose={handleCloseFignerView} />
|
|
|
|
|
|
+ <ViewFigner
|
|
|
|
+ subject={state.fingeringInfo.name}
|
|
|
|
+ isComponent={true}
|
|
|
|
+ onClose={handleCloseFignerView}
|
|
|
|
+ />
|
|
</Popup>
|
|
</Popup>
|
|
</div>
|
|
</div>
|
|
);
|
|
);
|