合并

dist/index.html

@@ -26,7 +26,11 @@
   <script src="./flexible.js"></script>
   <script src="./abc2svg/xml2abc.js"></script>
   <script src="./abc2svg/jquery-1.11.1.min.js"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-1e492ee9.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-c94515b8.js"></script>
+>>>>>>> iteration-20240620-small
   <link rel="stylesheet" href="./assets/index-77819ea9.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -37,7 +41,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a19b005e.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-79d06967.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-7a1a9c11.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240620-small
 </body>
 
 </html>

src/pc/create/component/the-create/index.tsx

@@ -119,7 +119,7 @@ export default defineComponent({
     };
 
     return () => (
-      <NModal unstableShowMask={false} transformOrigin="center" autoFocus={false} show={props.show} onUpdate:show={(val) => emit("update:show", val)}>
+      <NModal maskClosable={false} unstableShowMask={false} transformOrigin="center" autoFocus={false} show={props.show} onUpdate:show={(val) => emit("update:show", val)}>
         <div class={styles.setbox}>
           <div class={styles.head}>
             <div>新建乐谱</div>

src/pc/home/component/the-jianpu/index.tsx

@@ -4,42 +4,36 @@ import styles from "./index.module.less";
 import { Close } from "@vicons/ionicons5";
 
 export default defineComponent({
-	name: "TheJianpu",
-	props: {
-		show: {
-			type: Boolean,
-			default: false,
-		},
-        abc:{
-            type:String,
-            default:""
-        }
-	},
-	emits: ["update:show"],
-	setup(props, { emit }) {
-		const src = computed(() => {
-			return `${location.origin}${location.pathname}jianpu/index.html?c=` + encodeURIComponent(props.abc);
-		});
-		return () => (
-			<NModal displayDirective="if" autoFocus={false} show={props.show} onUpdate:show={(val) => emit("update:show", val)}>
-				<div class={styles.jianpu}>
-					<div class={styles.head}>
-						<div>简谱预览</div>
-						<NButton
-							class={styles.close}
-							quaternary
-							circle
-							size="small"
-							onClick={() => emit("update:show", false)}
-						>
-							<NIcon component={Close} size={18} />
-						</NButton>
-					</div>
-					<div class={styles.content}>
-						<iframe class={styles.iframe} src={src.value}></iframe>
-					</div>
-				</div>
-			</NModal>
-		);
-	},
+  name: "TheJianpu",
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    abc: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["update:show"],
+  setup(props, { emit }) {
+    const src = computed(() => {
+      return `${location.origin}${location.pathname}jianpu/index.html?c=` + encodeURIComponent(props.abc);
+    });
+    return () => (
+      <NModal maskClosable={false} displayDirective="if" autoFocus={false} show={props.show} onUpdate:show={(val) => emit("update:show", val)}>
+        <div class={styles.jianpu}>
+          <div class={styles.head}>
+            <div>简谱预览</div>
+            <NButton class={styles.close} quaternary circle size="small" onClick={() => emit("update:show", false)}>
+              <NIcon component={Close} size={18} />
+            </NButton>
+          </div>
+          <div class={styles.content}>
+            <iframe class={styles.iframe} src={src.value}></iframe>
+          </div>
+        </div>
+      </NModal>
+    );
+  },
 });

src/pc/home/component/the-setting/index.tsx

@@ -1,223 +1,198 @@
-import {
-	NButton,
-	NCard,
-	NIcon,
-	NLayout,
-	NLayoutContent,
-	NLayoutSider,
-	NModal,
-	NRadio,
-	NRadioGroup,
-	NScrollbar,
-	NSpace,
-	NTabPane,
-	NTable,
-	NTabs,
-	useMessage,
-} from "naive-ui";
+import { NButton, NCard, NIcon, NLayout, NLayoutContent, NLayoutSider, NModal, NRadio, NRadioGroup, NScrollbar, NSpace, NTabPane, NTable, NTabs, useMessage } from "naive-ui";
 import { defineComponent, reactive, watch } from "vue";
 import { Close } from "@vicons/ionicons5";
 import styles from "./index.module.less";
 import { getImage } from "../../images";
 import { settings } from "../../runtime";
 export default defineComponent({
-	name: "TheSetting",
-	props: {
-		show: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	emits: ["update:show"],
-	setup(props, { emit }) {
-		const message = useMessage();
-		const data = reactive({
-			show: false,
-			btns: [
-				{
-					label: "播放设置",
-					key: "1",
-					icon: getImage("icon_28_1.png"),
-				},
-				{
-					label: "快捷键",
-					key: "3",
-					icon: getImage("icon_28_3.png"),
-				},
-			],
-			active: "3",
-		});
-		watch(
-			() => props.show,
-			() => {
-				data.show = props.show;
-			}
-		);
+  name: "TheSetting",
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["update:show"],
+  setup(props, { emit }) {
+    const message = useMessage();
+    const data = reactive({
+      show: false,
+      btns: [
+        {
+          label: "播放设置",
+          key: "1",
+          icon: getImage("icon_28_1.png"),
+        },
+        {
+          label: "快捷键",
+          key: "3",
+          icon: getImage("icon_28_3.png"),
+        },
+      ],
+      active: "3",
+    });
+    watch(
+      () => props.show,
+      () => {
+        data.show = props.show;
+      }
+    );
 
-		const keys = [
-			{
-				label: "音符向上",
-				value: "↑",
-			},
-			{
-				label: "音符向下",
-				value: "↓",
-			},
-			{
-				label: "音符C",
-				value: "C",
-			},
-			{
-				label: "音符D",
-				value: "D",
-			},
-			{
-				label: "音符E",
-				value: "E",
-			},
-			{
-				label: "音符F",
-				value: "F",
-			},
-			{
-				label: "音符G",
-				value: "G",
-			},
-			{
-				label: "音符A",
-				value: "A",
-			},
-			{
-				label: "音符B",
-				value: "B",
-			},
-			{
-				label: "删除音符",
-				value: "BackSpace",
-			},
-			{
-				label: "撤回",
-				value: "Ctrl + z",
-			},
-			{
-				label: "多选",
-				value: "Shift",
-			},
-			{
-				label: "休止符",
-				value: "0",
-			},
-			{
-				label: "三十二分音符",
-				value: "1",
-			},
-			{
-				label: "十六分音符",
-				value: "2",
-			},
-			{
-				label: "八分音符",
-				value: "3",
-			},
-			{
-				label: "四分音符",
-				value: "4",
-			},
-			{
-				label: "二分音符",
-				value: "5",
-			},
-			{
-				label: "全音符",
-				value: "6",
-			},
-			{
-				label: "还原记号",
-				value: "7",
-			},
-			{
-				label: "升记号",
-				value: "8",
-			},
-			{
-				label: "降记号",
-				value: "9",
-			},
-		];
-		return () => (
-			<NModal autoFocus={false} show={props.show} onUpdate:show={(val) => emit("update:show", val)}>
-				<div class={styles.setbox}>
-					<div class={styles.head}>
-						<div>设置</div>
-						<NButton
-							class={styles.close}
-							quaternary
-							circle
-							size="small"
-							onClick={() => emit("update:show", false)}
-						>
-							<NIcon component={Close} size={18} />
-						</NButton>
-					</div>
-					<div class={styles.content}>
-						<div class={styles.slide}>
-							<NSpace vertical align="center" wrapItem={false}>
-								{data.btns.map((item) => (
-									<NButton
-										quaternary
-										block
-										class={[styles.btn, data.active === item.key && styles.activeBtn]}
-										onClick={() => (data.active = item.key)}
-									>
-										{{
-											icon: () => <img class={styles.btnIcon} src={item.icon} />,
-											default: () => item.label,
-										}}
-									</NButton>
-								))}
-							</NSpace>
-						</div>
-						<div class={styles.box}>
-							<NTabs v-model:value={data.active}>
-								<NTabPane name="1" tab="1">
-									<div class={styles.keyBox}>
-										<NCard title="光标设置" bordered={false}>
-											<NRadioGroup v-model:value={settings.cursorType}>
-												<NSpace>
-													<NRadio value="beat" disabled>光标跟随节拍</NRadio>
-													<NRadio value="note">光标跟随音符</NRadio>
-												</NSpace>
-											</NRadioGroup>
-										</NCard>
-									</div>
-								</NTabPane>
-								<NTabPane name="3" tab="3">
-									<NScrollbar>
-										<div class={styles.keyBox}>
-											<NTable class={styles.table} striped>
-												<thead>
-													<tr>
-														<th>命令</th>
-														<th>快捷键</th>
-													</tr>
-												</thead>
-												<tbody>
-													{keys.map((item) => (
-														<tr>
-															<td>{item.label}</td>
-															<td>{item.value}</td>
-														</tr>
-													))}
-												</tbody>
-											</NTable>
-										</div>
-									</NScrollbar>
-								</NTabPane>
-							</NTabs>
-						</div>
-					</div>
-				</div>
-			</NModal>
-		);
-	},
+    const keys = [
+      {
+        label: "音符向上",
+        value: "↑",
+      },
+      {
+        label: "音符向下",
+        value: "↓",
+      },
+      {
+        label: "音符C",
+        value: "C",
+      },
+      {
+        label: "音符D",
+        value: "D",
+      },
+      {
+        label: "音符E",
+        value: "E",
+      },
+      {
+        label: "音符F",
+        value: "F",
+      },
+      {
+        label: "音符G",
+        value: "G",
+      },
+      {
+        label: "音符A",
+        value: "A",
+      },
+      {
+        label: "音符B",
+        value: "B",
+      },
+      {
+        label: "删除音符",
+        value: "BackSpace",
+      },
+      {
+        label: "撤回",
+        value: "Ctrl + z",
+      },
+      {
+        label: "多选",
+        value: "Shift",
+      },
+      {
+        label: "休止符",
+        value: "0",
+      },
+      {
+        label: "三十二分音符",
+        value: "1",
+      },
+      {
+        label: "十六分音符",
+        value: "2",
+      },
+      {
+        label: "八分音符",
+        value: "3",
+      },
+      {
+        label: "四分音符",
+        value: "4",
+      },
+      {
+        label: "二分音符",
+        value: "5",
+      },
+      {
+        label: "全音符",
+        value: "6",
+      },
+      {
+        label: "还原记号",
+        value: "7",
+      },
+      {
+        label: "升记号",
+        value: "8",
+      },
+      {
+        label: "降记号",
+        value: "9",
+      },
+    ];
+    return () => (
+      <NModal maskClosable={false} autoFocus={false} show={props.show} onUpdate:show={(val) => emit("update:show", val)}>
+        <div class={styles.setbox}>
+          <div class={styles.head}>
+            <div>设置</div>
+            <NButton class={styles.close} quaternary circle size="small" onClick={() => emit("update:show", false)}>
+              <NIcon component={Close} size={18} />
+            </NButton>
+          </div>
+          <div class={styles.content}>
+            <div class={styles.slide}>
+              <NSpace vertical align="center" wrapItem={false}>
+                {data.btns.map((item) => (
+                  <NButton quaternary block class={[styles.btn, data.active === item.key && styles.activeBtn]} onClick={() => (data.active = item.key)}>
+                    {{
+                      icon: () => <img class={styles.btnIcon} src={item.icon} />,
+                      default: () => item.label,
+                    }}
+                  </NButton>
+                ))}
+              </NSpace>
+            </div>
+            <div class={styles.box}>
+              <NTabs v-model:value={data.active}>
+                <NTabPane name="1" tab="1">
+                  <div class={styles.keyBox}>
+                    <NCard title="光标设置" bordered={false}>
+                      <NRadioGroup v-model:value={settings.cursorType}>
+                        <NSpace>
+                          <NRadio value="beat" disabled>
+                            光标跟随节拍
+                          </NRadio>
+                          <NRadio value="note">光标跟随音符</NRadio>
+                        </NSpace>
+                      </NRadioGroup>
+                    </NCard>
+                  </div>
+                </NTabPane>
+                <NTabPane name="3" tab="3">
+                  <NScrollbar>
+                    <div class={styles.keyBox}>
+                      <NTable class={styles.table} striped>
+                        <thead>
+                          <tr>
+                            <th>命令</th>
+                            <th>快捷键</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          {keys.map((item) => (
+                            <tr>
+                              <td>{item.label}</td>
+                              <td>{item.value}</td>
+                            </tr>
+                          ))}
+                        </tbody>
+                      </NTable>
+                    </div>
+                  </NScrollbar>
+                </NTabPane>
+              </NTabs>
+            </div>
+          </div>
+        </div>
+      </NModal>
+    );
+  },
 });