Browse Source

Merge branch '2023-9-1_多选'

liushengqiang 1 year ago
parent
commit
81f3a752c8
1 changed files with 5 additions and 4 deletions
  1. 5 4
      src/pc/home/index.tsx

+ 5 - 4
src/pc/home/index.tsx

@@ -262,7 +262,8 @@ export default defineComponent({
 				if (data.multiSelectList.length > 0) {
 					data.multilList = [];
 					if (data.multiSelectList[0].startChar > active.startChar) {
-						data.multiSelectList = [cleanDeep(data.multiSelectList[1]), cleanDeep(active)];
+						const start = data.multiSelectList[1] || data.multiSelectList[0];
+						data.multiSelectList = [cleanDeep(start), cleanDeep(active)];
 					} else {
 						data.multiSelectList = [cleanDeep(data.multiSelectList[0]), cleanDeep(active)];
 					}
@@ -1377,8 +1378,9 @@ export default defineComponent({
 
 		/** 移调 */
 		const handleMoveKey = async (item: (typeof ABC_DATA.key)[0]) => {
-			// const moveData = getKeyStep(item.value, abcData.abc.key, data.moveKeyType);
-			// console.log("🚀 ~ item:", abcData.abc.key, "=>", item.value, moveData);
+			console.log(item);
+			const moveData = getKeyStep(item.value, abcData.abc.key, data.moveKeyType);
+			console.log("🚀 ~ item:", abcData.abc.key, "=>", item.value, moveData);
 			// 将所有的音符移调
 			// for (let i = 0; i < abcData.abc.measures.length; i++) {
 			// 	const measure = abcData.abc.measures[i];
@@ -1407,7 +1409,6 @@ export default defineComponent({
 			// 			? item.step
 			// 			: item.step + 12
 			// 		: item.step;
-			console.log(item);
 			abcData.abc.visualTranspose = item.step;
 			abcData.abc.visualKey = item.value;
 			popup.moveKeyShow = false;