yz-yuki-plugin 1.0.3-rc.2 → 1.0.3-rc.3

package/README.md

@@ -15,11 +15,22 @@
 
 ##### ```Yunzai-Next：```
 
-1. yunzai-next npm包 方式 安装插件：
+1. 方式1： yunzai-next npm包 安装插件：
 >```
 > yarn add yz-yuki-plugin -W
 >```
-接着修改 `yunzaijs/yunzai.config.js`：
+接着修改 `yunzaijs/yunzai.config.js`，按版本选择修改方式：
+
+Yunzai-Next v4.1.28+及以上版本：
+```js
+import { defineConfig } from 'yunzai'
+export default defineConfig({
+  applications: ['yz-system', 'yz-yuki-plugin'], //该行添加 'yz-yuki-plugin'
+  middlewares: ['yz-mw-runtime', 'yunzai-mys/mw']
+})
+```
+
+旧版本：
 ```js
 import yuki from 'yz-yuki-plugin' //新增该行
 export default defineConfig({
@@ -28,7 +39,7 @@ export default defineConfig({
 })
 ```
 
-2. 旧的方式安装：
+2. 方式2（V3的方式）：
 >gitee仓库：
 >```
 >git clone --branch main https://gitee.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
@@ -52,6 +63,8 @@ export default defineConfig({
 
 #### 2. 安装依赖
 * Yunzai-Next:
+
+方式2（V3的方式）安装则需要执行：
 ```
 yarn install
 ```

package/lib/utils/puppeteer.render.js

@@ -23,10 +23,10 @@ class YukiPuppeteerRender extends Puppeteer {
                 await page.setExtraHTTPHeaders(Options.header);
             }
             await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: ["load", "networkidle0"] });
-            const body = await page.$(Options?.tab ?? 'body');
-            if (!body)
+            const element = await page.$(Options?.tab ?? 'body');
+            if (!element)
                 return false;
-            const boundingBox = await body.boundingBox();
+            const boundingBox = await element.boundingBox();
             const num = Options?.isSplit ? Math.ceil(boundingBox.height / pageHeight) : 1;
             pageHeight = Math.round(boundingBox.height / num);
             await page.setViewport({
@@ -71,7 +71,7 @@ class YukiPuppeteerRender extends Puppeteer {
                         height: Math.min(pageHeight, boundingBox.height - pageHeight * (i - 1)),
                     },
                 };
-                buff = await page.screenshot(screenshotOptions).catch(err => {
+                buff = await element.screenshot(screenshotOptions).catch(err => {
                     logger.error('[puppeteer]', 'screenshot', err);
                     return false;
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "1.0.3-rc.2",
+  "version": "1.0.3-rc.3",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -32,7 +32,7 @@
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.2",
+    "react-puppeteer": "1.0.3",
     "redis": "^4.7.0",
     "yaml": "^2.5.0",
     "yarn": "^1.19.1"
@@ -67,7 +67,7 @@
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.2",
+    "react-puppeteer": "1.0.3",
     "redis": "^4.7.0",
     "rollup": "^4.20.0",
     "rollup-plugin-auto-external": "^2.0.0",

package/resources/css/loginQrcode/Page.css

@@ -8,6 +8,7 @@
 body {
   width: 563px !important;
   font-family: "OPSans", Arial, sans-serif;
+  margin: auto;
 }
 
 .container {