diff --git a/electron/build.js b/electron/build.js index 934935fb0..2dcda3182 100644 --- a/electron/build.js +++ b/electron/build.js @@ -695,7 +695,6 @@ if (["dev"].includes(argv[2])) { }); } else { // 手编译(默认) - let cachedConfig = {}; try { const buildConfigPath = path.join(__dirname, '.build'); @@ -736,7 +735,7 @@ if (["dev"].includes(argv[2])) { type: 'checkbox', name: 'arch', message: "选择系统架构", - choices: ({ platform }) => { + choices: ({platform}) => { const array = [ { name: "arm64", @@ -774,14 +773,14 @@ if (["dev"].includes(argv[2])) { name: "是", value: true }], - default: (cachedConfig && cachedConfig.publish !== undefined) ? - (cachedConfig.publish ? 1 : 0) : 0 + default: (cachedConfig && cachedConfig.publish !== undefined) ? + (cachedConfig.publish ? 1 : 0) : 0 }, { type: 'list', name: 'release', message: "选择升级方式", - when: ({ publish }) => publish, + when: ({publish}) => publish, choices: [{ name: "弹出提示", value: true @@ -789,14 +788,14 @@ if (["dev"].includes(argv[2])) { name: "静默", value: false }], - default: (cachedConfig && cachedConfig.release !== undefined) ? - (cachedConfig.release ? 0 : 1) : 0 + default: (cachedConfig && cachedConfig.release !== undefined) ? + (cachedConfig.release ? 0 : 1) : 0 }, { type: 'list', name: 'notarize', - message: ({ platform }) => platform.length > 1 ? "选择是否公证(仅MacOS)" : "选择是否公证", - when: ({ platform }) => platform.find(item => item === 'build-mac'), + message: ({platform}) => platform.length > 1 ? "选择是否公证(仅MacOS)" : "选择是否公证", + when: ({platform}) => platform.find(item => item === 'build-mac'), choices: [{ name: "否", value: false @@ -804,8 +803,8 @@ if (["dev"].includes(argv[2])) { name: "是", value: true }], - default: (cachedConfig && cachedConfig.notarize !== undefined) ? - (cachedConfig.notarize ? 1 : 0) : 0 + default: (cachedConfig && cachedConfig.notarize !== undefined) ? + (cachedConfig.notarize ? 1 : 0) : 0 } ]; diff --git a/electron/package.json b/electron/package.json index 7f593d363..835c6cc63 100755 --- a/electron/package.json +++ b/electron/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "start": "electron-forge start", - "start-quiet": "sleep 3 && electron-forge start &> /dev/null", + "start-quiet": "sleep 3 && electron-forge start", "build": "electron-builder", "build-mac": "electron-builder --mac", "build-win": "electron-builder --win", diff --git a/language/original-web.txt b/language/original-web.txt index 48b3cd7e8..b806d6e49 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -2017,6 +2017,7 @@ API请求的URL路径 报告不存在或已被删除 文件读取失败:(*) 独立窗口显示 +独立窗口 在消息中显示 添加机器人 @@ -2032,3 +2033,5 @@ API请求的URL路径 后退 前进 + +你可能要发送的照片 diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss index 75f43c6a0..721f46f6c 100644 --- a/resources/assets/sass/pages/page-apply.scss +++ b/resources/assets/sass/pages/page-apply.scss @@ -414,9 +414,9 @@ } .modal-item-btns { - button + button { - margin-left: 12px; - } + display: flex; + flex-wrap: wrap; + gap: 12px; } } }