liushengqiang 1 jaar geleden
bovenliggende
commit
664c3a9157
3 gewijzigde bestanden met toevoegingen van 40 en 14 verwijderingen
  1. 21 2
      src/pc/create/component/the-create/index.tsx
  2. 18 10
      src/pc/create/index.tsx
  3. 1 2
      src/pc/home/index.tsx

+ 21 - 2
src/pc/create/component/the-create/index.tsx

@@ -84,6 +84,14 @@ export default defineComponent({
 		});
 
 		const handleCreate = async () => {
+			if (!froms.speed) {
+				message.warning("请输入开始速度");
+				return;
+			}
+			if (!froms.measure) {
+				message.warning("请输入小节数量");
+				return;
+			}
 			formsOptions.loading = true;
 			try {
 				await api_musicSheetCreationSave({
@@ -217,7 +225,13 @@ export default defineComponent({
 							<div>
 								<div class={styles.lineTitle}>速度</div>
 								<div class={styles.beatItem}>
-									<NInputNumber size="large" v-model:value={froms.speed} showButton={false} min={50}>
+									<NInputNumber
+										size="large"
+										v-model:value={froms.speed}
+										placeholder="开始速度"
+										showButton={false}
+										min={50}
+									>
 										{{
 											prefix: () => (
 												<div class={styles.speedIcon}>
@@ -231,7 +245,12 @@ export default defineComponent({
 							<div>
 								<div class={styles.lineTitle}>小节</div>
 								<div class={styles.beatItem}>
-									<NInputNumber size="large" v-model:value={froms.measure} min={4}></NInputNumber>
+									<NInputNumber
+										placeholder="小节数量"
+										size="large"
+										v-model:value={froms.measure}
+										min={4}
+									></NInputNumber>
 								</div>
 							</div>
 						</NSpace>

+ 18 - 10
src/pc/create/index.tsx

@@ -61,14 +61,17 @@ export default defineComponent({
 		const loadingRef = ref();
 		onMounted(() => {
 			getList();
-			const obv = new IntersectionObserver((entries) => {
-				if (entries[0].isIntersecting) {
-					if (data.finish || data.loading) return;
-					forms.page++;
-					getList();
-				}
-			});
-			obv.observe(loadingRef.value?.$el);
+            if(loadingRef.value){
+
+                const obv = new IntersectionObserver((entries) => {
+                    if (entries[0].isIntersecting) {
+                        if (data.finish || data.loading) return;
+                        forms.page++;
+                        getList();
+                    }
+                });
+                obv.observe(loadingRef.value?.$el);
+            }
 		});
 		const handleOpenNotaion = (item: any) => {
 			window.parent.postMessage(
@@ -80,7 +83,9 @@ export default defineComponent({
 			);
 		};
 		const productSvg = (abc: string, id: string) => {
-			const a = ABCJS.renderAbc(id, abc, {selectTypes: false, add_classes: true});
+            if(abc) {
+                const a = ABCJS.renderAbc(id, abc, {selectTypes: false, add_classes: true});
+            }
 		};
 		return () => (
 			<div class={styles.wrap}>
@@ -114,7 +119,10 @@ export default defineComponent({
 									<img
 										class={styles.bottomBtn}
 										src={getImage("icon_29_3.png")}
-										onClick={() => handleDelte(item)}
+										onClick={(e: Event) => {
+                                            e.stopPropagation();
+                                            handleDelte(item)
+                                        }}
 									/>
 								</div>
 							</div>

+ 1 - 2
src/pc/home/index.tsx

@@ -803,8 +803,7 @@ export default defineComponent({
 		const handleDeleteNote = () => {
 			if (!data.active) return;
 			if (data.active.startChar === 0) return;
-			data.music =
-				data.music.substring(0, data.active.startChar) + data.music.substring(data.active.endChar);
+			abcData.abc.measures[data.active.measureIndex].notes.splice(data.active.noteIndex, 1)
 			handleResetRender();
 			data.active = null as unknown as INoteActive;
 		};