Merge branch 'master' of http://git.dayaedu.com/liushengqiang/notation

dist/index.html

@@ -12,7 +12,7 @@
   <script src="./flexible.js"></script>
   <script src="./abc2svg/xml2abc.js"></script>
   <script src="./abc2svg/jquery-1.11.1.min.js"></script>
-  <script type="module" crossorigin src="./assets/index-2d3d59de.js"></script>
+  <script type="module" crossorigin src="./assets/index-f18eee57.js"></script>
   <link rel="stylesheet" href="./assets/index-fad06a20.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>
@@ -23,7 +23,7 @@
   
   <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-156bda60.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-df05fd02.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-1bb048d5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

src/pc/home/index.tsx

@@ -11,7 +11,7 @@ import TheIcon from "/src/components/The-icon";
 import { cloneDeep } from "lodash";
 import TheSpeed from "./component/the-speed";
 import { getImage } from "./images";
-import { NButton, NDropdown, NGi, NGrid, NIcon, NInput, NInputNumber, NModal, NPopover, NPopselect, NSelect, NSpace, NSpin, useMessage } from "naive-ui";
+import { NButton, NDropdown, NGi, NGrid, NIcon, NInput, NInputNumber, NModal, NPopover, NPopselect, NSelect, NSpace, NSpin, useDialog, useMessage } from "naive-ui";
 import { LongArrowAltDown, LongArrowAltUp, GripLinesVertical } from "@vicons/fa";
 import { svg2canvas } from "/src/utils/svg2canvas";
 import { downloadFile } from "/src/utils";
@@ -144,6 +144,7 @@ export default defineComponent({
   setup() {
     const route = useRoute();
     const message = useMessage();
+    const dialog = useDialog();
     const popup = reactive({
       instrument: false,
       selectSubjectShow: false, // 声部弹窗
@@ -548,7 +549,26 @@ export default defineComponent({
             "*"
           );
         } else {
-          window.close();
+          dialog.warning({
+            autoFocus: false,
+            class: "deleteDialog",
+            title: "退出制谱",
+            content: () => <div style={{ paddingRight: "calc(var(--n-close-size) + 6px)" }}>是否退出制谱功能？</div>,
+            positiveText: "取消",
+            positiveButtonProps: {
+              type: "default",
+            },
+            negativeText: "确定",
+            negativeButtonProps: {
+              type: "primary",
+              ghost: false,
+            },
+            onPositiveClick: () => {},
+            onNegativeClick: async () => {
+              window.onbeforeunload = null;
+              window.close();
+            },
+          });
         }
       }
       // console.log(params, activeNote);