修改

dev-dist/sw.js

@@ -20,21 +20,23 @@ if (!self.define) {
   let nextDefineUri;
 
   const singleRequire = (uri, parentUri) => {
-    uri = new URL(uri + '.js', parentUri).href;
-    return (
-      registry[uri] ||
-      new Promise(resolve => {
-        if ('document' in self) {
-          const script = document.createElement('script');
-          script.src = uri;
-          script.onload = resolve;
-          document.head.appendChild(script);
-        } else {
-          nextDefineUri = uri;
-          importScripts(uri);
-          resolve();
-        }
-      }).then(() => {
+    uri = new URL(uri + ".js", parentUri).href;
+    return registry[uri] || (
+      
+        new Promise(resolve => {
+          if ("document" in self) {
+            const script = document.createElement("script");
+            script.src = uri;
+            script.onload = resolve;
+            document.head.appendChild(script);
+          } else {
+            nextDefineUri = uri;
+            importScripts(uri);
+            resolve();
+          }
+        })
+      
+      .then(() => {
         let promise = registry[uri];
         if (!promise) {
           throw new Error(`Module ${uri} didn’t register its module`);
@@ -45,10 +47,7 @@ if (!self.define) {
   };
 
   self.define = (depsNames, factory) => {
-    const uri =
-      nextDefineUri ||
-      ('document' in self ? document.currentScript.src : '') ||
-      location.href;
+    const uri = nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
     if (registry[uri]) {
       // Module is already loading or loaded.
       return;
@@ -60,16 +59,15 @@ if (!self.define) {
       exports,
       require
     };
-    registry[uri] = Promise.all(
-      depsNames.map(depName => specialDeps[depName] || require(depName))
-    ).then(deps => {
+    registry[uri] = Promise.all(depsNames.map(
+      depName => specialDeps[depName] || require(depName)
+    )).then(deps => {
       factory(...deps);
       return exports;
     });
   };
 }
-define(['./workbox-88bf3160'], function (workbox) {
-  'use strict';
+define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
 
   self.skipWaiting();
   workbox.clientsClaim();
@@ -79,33 +77,16 @@ define(['./workbox-88bf3160'], function (workbox) {
    * requests for URLs in the manifest.
    * See https://goo.gl/S9QRab
    */
-  workbox.precacheAndRoute(
-    [
-      {
-        url: 'registerSW.js',
-        revision: '3ca0b8505b4bec776b69afdba2768812'
-      },
-      {
-        url: 'index.html',
-        revision: '0.e2ao6l3d16'
-      }
-    ],
-    {}
-  );
+  workbox.precacheAndRoute([{
+    "url": "registerSW.js",
+    "revision": "3ca0b8505b4bec776b69afdba2768812"
+  }, {
+    "url": "index.html",
+    "revision": "0.ebqjmacp618"
+  }], {});
   workbox.cleanupOutdatedCaches();
-  workbox.registerRoute(
-    new workbox.NavigationRoute(workbox.createHandlerBoundToURL('index.html'), {
-      allowlist: [/^\/$/]
-    }),
-    workbox.strategies.networkOnly()
-  );
-  workbox.routing.registerRoute(
-    new RegExp('.*.html|css'),
-    workbox.strategies.networkFirst()
-  );
-  workbox.routing.registerRoute(
-    new RegExp('|js'),
-    workbox.strategies.networkOnly()
-  );
-});
+  workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
+    allowlist: [/^\/$/]
+  }));
 
+}));

package-lock.json

@@ -30,6 +30,7 @@
         "lodash": "^4.17.21",
         "lodash-es": "^4.17.21",
         "moveable": "^0.49.0",
+        "naive-ui": "^2.38.2",
         "numeral": "^2.0.6",
         "pinia": "^2.1.4",
         "plyr": "^3.7.8",
@@ -73,7 +74,6 @@
         "husky": "^8.0.0",
         "less": "^4.1.3",
         "lint-staged": "^13.2.2",
-        "naive-ui": "^2.38.1",
         "plop": "^3.1.2",
         "postcss-px-to-viewport": "^1.1.1",
         "prettier": "^2.8.7",
@@ -1615,18 +1615,17 @@
       }
     },
     "node_modules/@css-render/plugin-bem": {
-      "version": "0.15.12",
-      "dev": true,
-      "license": "MIT",
+      "version": "0.15.14",
+      "resolved": "https://registry.npmmirror.com/@css-render/plugin-bem/-/plugin-bem-0.15.14.tgz",
+      "integrity": "sha512-QK513CJ7yEQxm/P3EwsI+d+ha8kSOcjGvD6SevM41neEMxdULE+18iuQK6tEChAWMOQNQPLG/Rw3Khb69r5neg==",
       "peerDependencies": {
-        "css-render": "~0.15.12"
+        "css-render": "~0.15.14"
       }
     },
     "node_modules/@css-render/vue3-ssr": {
-      "version": "0.15.12",
-      "resolved": "https://registry.npmmirror.com/@css-render/vue3-ssr/-/vue3-ssr-0.15.12.tgz",
-      "integrity": "sha512-AQLGhhaE0F+rwybRCkKUdzBdTEM/5PZBYy+fSYe1T9z9+yxMuV/k7ZRqa4M69X+EI1W8pa4kc9Iq2VjQkZx4rg==",
-      "dev": true,
+      "version": "0.15.14",
+      "resolved": "https://registry.npmmirror.com/@css-render/vue3-ssr/-/vue3-ssr-0.15.14.tgz",
+      "integrity": "sha512-//8027GSbxE9n3QlD73xFY6z4ZbHbvrOVB7AO6hsmrEzGbg+h2A09HboUyDgu+xsmj7JnvJD39Irt+2D0+iV8g==",
       "peerDependencies": {
         "vue": "^3.0.11"
       }
@@ -1656,8 +1655,8 @@
     },
     "node_modules/@emotion/hash": {
       "version": "0.8.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmmirror.com/@emotion/hash/-/hash-0.8.0.tgz",
+      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
@@ -1889,8 +1888,7 @@
     "node_modules/@juggle/resize-observer": {
       "version": "3.4.0",
       "resolved": "https://registry.npmmirror.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",
-      "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",
-      "dev": true
+      "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -2324,8 +2322,7 @@
     "node_modules/@types/katex": {
       "version": "0.16.7",
       "resolved": "https://registry.npmmirror.com/@types/katex/-/katex-0.16.7.tgz",
-      "integrity": "sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==",
-      "dev": true
+      "integrity": "sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ=="
     },
     "node_modules/@types/liftoff": {
       "version": "4.0.0",
@@ -2337,16 +2334,14 @@
       }
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.0.tgz",
-      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==",
-      "dev": true
+      "version": "4.17.14",
+      "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A=="
     },
     "node_modules/@types/lodash-es": {
       "version": "4.17.12",
       "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
-      "dev": true,
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -2932,10 +2927,6 @@
         "csstype": "^3.1.1"
       }
     },
-    "node_modules/@vue/runtime-dom/node_modules/csstype": {
-      "version": "3.1.2",
-      "license": "MIT"
-    },
     "node_modules/@vue/server-renderer": {
       "version": "3.3.4",
       "license": "MIT",
@@ -3168,8 +3159,8 @@
     },
     "node_modules/async-validator": {
       "version": "4.2.5",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz",
+      "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -3887,14 +3878,19 @@
       }
     },
     "node_modules/css-render": {
-      "version": "0.15.12",
-      "dev": true,
-      "license": "MIT",
+      "version": "0.15.14",
+      "resolved": "https://registry.npmmirror.com/css-render/-/css-render-0.15.14.tgz",
+      "integrity": "sha512-9nF4PdUle+5ta4W5SyZdLCCmFd37uVimSjg1evcTqKJCyvCEEj12WKzOSBNak6r4im4J4iYXKH1OWpUV5LBYFg==",
       "dependencies": {
         "@emotion/hash": "~0.8.0",
         "csstype": "~3.0.5"
       }
     },
+    "node_modules/css-render/node_modules/csstype": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.0.11.tgz",
+      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
+    },
     "node_modules/css-styled": {
       "version": "1.0.8",
       "license": "MIT",
@@ -3922,9 +3918,9 @@
       }
     },
     "node_modules/csstype": {
-      "version": "3.0.11",
-      "dev": true,
-      "license": "MIT"
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "node_modules/custom-event-polyfill": {
       "version": "1.0.7",
@@ -4688,8 +4684,7 @@
     "node_modules/evtd": {
       "version": "0.2.4",
       "resolved": "https://registry.npmmirror.com/evtd/-/evtd-0.2.4.tgz",
-      "integrity": "sha512-qaeGN5bx63s/AXgQo8gj6fBkxge+OoLddLniox5qtLAEY5HSnuSlISXVPxnSae1dWblvTh4/HoMIB+mbMsvZzw==",
-      "dev": true
+      "integrity": "sha512-qaeGN5bx63s/AXgQo8gj6fBkxge+OoLddLniox5qtLAEY5HSnuSlISXVPxnSae1dWblvTh4/HoMIB+mbMsvZzw=="
     },
     "node_modules/execa": {
       "version": "7.2.0",
@@ -5400,9 +5395,9 @@
       }
     },
     "node_modules/highlight.js": {
-      "version": "11.8.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
+      "version": "11.11.1",
+      "resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.1.tgz",
+      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
       "engines": {
         "node": ">=12.0.0"
       }
@@ -7010,10 +7005,9 @@
       "license": "ISC"
     },
     "node_modules/naive-ui": {
-      "version": "2.38.1",
-      "resolved": "https://registry.npmmirror.com/naive-ui/-/naive-ui-2.38.1.tgz",
-      "integrity": "sha512-AnU1FQ7K/CbhguAX++V4kCFjk7h7RvWt4nvZPRjORMpq+fUIlzD+EcQ5Cv1VqDloNF8+eMv4Akc2Ogacc9S+5A==",
-      "dev": true,
+      "version": "2.38.2",
+      "resolved": "https://registry.npmmirror.com/naive-ui/-/naive-ui-2.38.2.tgz",
+      "integrity": "sha512-WhZ+6DW61aYSmFyfH7evcSGFmd2xR68Yq1mNRrVdJwBhZsnNdAUsMN9IeNCVEPMCND/jzYZghkStoNoR5Xa09g==",
       "dependencies": {
         "@css-render/plugin-bem": "^0.15.12",
         "@css-render/vue3-ssr": "^0.15.12",
@@ -7039,17 +7033,10 @@
         "vue": "^3.0.0"
       }
     },
-    "node_modules/naive-ui/node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "dev": true
-    },
     "node_modules/naive-ui/node_modules/date-fns-tz": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/date-fns-tz/-/date-fns-tz-2.0.1.tgz",
       "integrity": "sha512-fJCG3Pwx8HUoLhkepdsP7Z5RsucUi+ZBOxyM5d0ZZ6c4SdYustq0VMmOu6Wf7bli+yS/Jwp91TOCqn9jMcVrUA==",
-      "dev": true,
       "peerDependencies": {
         "date-fns": "2.x"
       }
@@ -8469,10 +8456,9 @@
       "optional": true
     },
     "node_modules/seemly": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmmirror.com/seemly/-/seemly-0.3.8.tgz",
-      "integrity": "sha512-MW8Qs6vbzo0pHmDpFSYPna+lwpZ6Zk1ancbajw/7E8TKtHdV+1DfZZD+kKJEhG/cAoB/i+LiT+5msZOqj0DwRA==",
-      "dev": true
+      "version": "0.3.9",
+      "resolved": "https://registry.npmmirror.com/seemly/-/seemly-0.3.9.tgz",
+      "integrity": "sha512-bMLcaEqhIViiPbaumjLN8t1y+JpD/N8SiyYOyp0i0W6RgdyLWboIsUWAbZojF//JyerxPZR5Tgda+x3Pdne75A=="
     },
     "node_modules/selecto": {
       "version": "1.26.0",
@@ -9111,8 +9097,8 @@
     },
     "node_modules/treemate": {
       "version": "0.3.11",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmmirror.com/treemate/-/treemate-0.3.11.tgz",
+      "integrity": "sha512-M8RGFoKtZ8dF+iwJfAJTOH/SM4KluKOKRJpjCMhI8bG3qB74zrFoArKZ62ll0Fr3mqkMJiQOmWYkdYgDeITYQg=="
     },
     "node_modules/tslib": {
       "version": "2.3.0",
@@ -9486,7 +9472,6 @@
       "version": "0.1.8",
       "resolved": "https://registry.npmmirror.com/vdirs/-/vdirs-0.1.8.tgz",
       "integrity": "sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==",
-      "dev": true,
       "dependencies": {
         "evtd": "^0.2.2"
       },
@@ -9649,7 +9634,6 @@
       "version": "0.2.12",
       "resolved": "https://registry.npmmirror.com/vooks/-/vooks-0.2.12.tgz",
       "integrity": "sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==",
-      "dev": true,
       "dependencies": {
         "evtd": "^0.2.2"
       },
@@ -9925,10 +9909,9 @@
       }
     },
     "node_modules/vueuc": {
-      "version": "0.4.58",
-      "resolved": "https://registry.npmmirror.com/vueuc/-/vueuc-0.4.58.tgz",
-      "integrity": "sha512-Wnj/N8WbPRSxSt+9ji1jtDHPzda5h2OH/0sFBhvdxDRuyCZbjGg3/cKMaKqEoe+dErTexG2R+i6Q8S/Toq1MYg==",
-      "dev": true,
+      "version": "0.4.64",
+      "resolved": "https://registry.npmmirror.com/vueuc/-/vueuc-0.4.64.tgz",
+      "integrity": "sha512-wlJQj7fIwKK2pOEoOq4Aro8JdPOGpX8aWQhV8YkTW9OgWD2uj2O8ANzvSsIGjx7LTOc7QbS7sXdxHi6XvRnHPA==",
       "dependencies": {
         "@css-render/vue3-ssr": "^0.15.10",
         "@juggle/resize-observer": "^3.3.1",

package.json

@@ -44,6 +44,7 @@
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "moveable": "^0.49.0",
+    "naive-ui": "^2.38.2",
     "numeral": "^2.0.6",
     "pinia": "^2.1.4",
     "plyr": "^3.7.8",
@@ -87,7 +88,6 @@
     "husky": "^8.0.0",
     "less": "^4.1.3",
     "lint-staged": "^13.2.2",
-    "naive-ui": "^2.38.1",
     "plop": "^3.1.2",
     "postcss-px-to-viewport": "^1.1.1",
     "prettier": "^2.8.7",

src/App.tsx

@@ -12,7 +12,6 @@ import UpdateTips from './update-tips';
 export default defineComponent({
   name: 'App',
   setup() {
-    const upload = true;
     const { needRefresh, offlineReady, updateServiceWorker } = useRegisterSW({
       onRegistered(r: any) {
         console.log(r, 'registered');

src/components/layout/guide-section/guide-drag.ts

@@ -410,15 +410,19 @@ export default function useDrag(
       baseSize.height = baseSize.winHeight;
     } else if (windowInfo.windowType === 'LARGE') {
       windowInfo.windowType = 'SMALL';
-      const translateY = (baseSize.windowHeight - baseSize.defaultHeight) / 2;
-      baseSize.transformX =
-        baseSize.windowWidth - baseSize.defaultWidth - initPos.right;
-      baseSize.transformY =
-        translateY > initPos.top
-          ? translateY + (translateY - initPos.top)
-          : translateY;
-      baseSize.width = baseSize.defaultWidth;
-      baseSize.height = baseSize.defaultHeight;
+      if (windowInfo.currentType === 'SMALL') {
+        baseSize.transformX =
+          baseSize.windowWidth - baseSize.defaultWidth - initPos.right;
+        baseSize.transformY =
+          baseSize.windowHeight - baseSize.defaultHeight - initPos.top;
+        baseSize.width = baseSize.defaultWidth;
+        baseSize.height = baseSize.defaultHeight;
+      } else if (windowInfo.currentType === 'LARGE') {
+        baseSize.transformX = baseSize.windowWidth - baseSize.defaultWidth;
+        baseSize.transformY = 0;
+        baseSize.width = baseSize.defaultWidth;
+        baseSize.height = baseSize.maxHeight;
+      }
     }
   }
 

src/components/layout/guide-section/index.tsx

@@ -9,6 +9,7 @@ import {
 } from 'vue';
 import styles from './index.module.less';
 import {
+  ImageRenderToolbarProps,
   NCollapse,
   NCollapseItem,
   NImage,
@@ -336,21 +337,22 @@ export default defineComponent({
                         : 'none'
                   }}>
                   {previewImgList.value.length > 0 && (
-                    <NImageGroup>
+                    <NImageGroup
+                      renderToolbar={({ nodes }: ImageRenderToolbarProps) => {
+                        return [
+                          nodes.prev,
+                          nodes.next,
+                          nodes.rotateCounterclockwise,
+                          nodes.rotateClockwise,
+                          nodes.resizeToOriginalSize,
+                          nodes.zoomOut,
+                          nodes.zoomIn,
+                          nodes.close
+                        ];
+                      }}>
                       <NSpace>
                         {previewImgList.value.map((src: string) => (
                           <NImage
-                            renderToolbar={({ nodes }: any) => {
-                              return [
-                                nodes.prev,
-                                nodes.next,
-                                nodes.rotateCounterclockwise,
-                                nodes.rotateClockwise,
-                                nodes.resizeToOriginalSize,
-                                nodes.zoomOut,
-                                nodes.close
-                              ];
-                            }}
                             width="0"
                             src={src}></NImage>
                         ))}