feat: 新增OCS桌面版 MAC 版本适配

ocsjs · Oct 21, 2023 · da2e91a · da2e91a
1 parent 1b5f72a
commit da2e91a
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
 		"dist"
 	],
 	"scripts": {
-		"build": "gulp -f ./scripts/build-app.js",
+		"build": "npm run tsc && gulp -f ./scripts/build-app.js",
 		"release": "sh ./scripts/release.sh",
 		"changelog": "conventional-changelog -p angular -i CHANGELOG.md --same-file -r 0",
 		"tsc": "pnpm lint && gulp -f ./scripts/tsc.js",

diff --git a/packages/app/src/tasks/remote.register.ts b/packages/app/src/tasks/remote.register.ts
@@ -93,7 +93,8 @@ const methods = {
 	getValidBrowsers: getValidBrowsers,
 	systemProcesses: () => si.processes(),
 	exportExcel: exportExcel,
-	statisticFolderSize: statisticFolderSize
+	statisticFolderSize: statisticFolderSize,
+	getPlatform: () => process.platform
 };
 
 /**

diff --git a/packages/app/src/window.ts b/packages/app/src/window.ts
@@ -8,6 +8,8 @@ export function createWindow() {
 		icon: path.resolve('./public/favicon.ico'),
 		minHeight: 800,
 		minWidth: 1200,
+		width: 1200,
+		height: 800,
 		center: true,
 		hasShadow: true,
 		autoHideMenuBar: true,

diff --git a/packages/app/src/worker/index.ts b/packages/app/src/worker/index.ts
@@ -44,6 +44,7 @@ export class ScriptWorker {
 		// 拓展文件夹路径
 		this.extensionPaths = fs
 			.readdirSync(store.paths.extensionsFolder)
+			.filter((f) => f !== '.DS_Store')
 			.map((file) => path.join(store.paths.extensionsFolder, file));
 
 		// 自动化脚本

diff --git a/packages/web/src/components/Title.vue b/packages/web/src/components/Title.vue
@@ -1,6 +1,7 @@
 <template>
 	<div class="title ps-2">
 		<span
+			class="logo"
 			style="cursor: pointer; -webkit-app-region: no-drag"
 			@click="shell.openExternal('https://docs.ocsjs.com')"
 		>
@@ -12,7 +13,6 @@
 		</span>
 		<a-dropdown
 			class="tittle-dropdown"
-			position="bl"
 			trigger="hover"
 			:popup-max-height="false"
 		>
@@ -44,7 +44,6 @@
 		</a-dropdown>
 		<a-dropdown
 			class="tittle-dropdown"
-			position="bl"
 			trigger="hover"
 			:popup-max-height="false"
 		>
@@ -133,7 +132,7 @@
 
 		<a-dropdown
 			class="tittle-dropdown"
-			position="bl"
+			position="bottom"
 			trigger="hover"
 			:popup-max-height="false"
 		>
@@ -344,6 +343,10 @@ function reset() {
 			background-color: #f0f0f0;
 		}
 	}
+
+	> span {
+		display: flex;
+	}
 }
 :deep(.ant-dropdown-menu-item) {
 	font-size: 12px;
@@ -359,7 +362,9 @@ function reset() {
 	padding: 8px 12px 0px 12px !important;
 }
 
-.logo {
-	width: 18px;
+body.platform-darwin {
+	.title {
+		justify-content: center;
+	}
 }
 </style>
diff --git a/packages/web/src/components/browsers/FileOperators.vue b/packages/web/src/components/browsers/FileOperators.vue
@@ -82,6 +82,7 @@ import { RawPlaywrightScript } from '../playwright-scripts';
 import PlaywrightScriptSelector from '../playwright-scripts/PlaywrightScriptSelector.vue';
 import PlaywrightScriptTable from '../playwright-scripts/PlaywrightScriptTable.vue';
 import { remote } from '../../utils/remote';
+import { Message } from '@arco-design/web-vue';
 
 const state = reactive({
 	showPlaywrightScriptSelector: false,
@@ -114,6 +115,10 @@ function newFolder() {
 	currentFolder.value.children[id] = folder;
 }
 function newBrowser(opts?: { name: string; playwrightScripts?: RawPlaywrightScript[]; store?: object }) {
+	if (!store?.render?.setting?.launchOptions?.executablePath) {
+		Message.error('检测到浏览器路径未填写，请在左侧软件设置中设置，然后重新创建浏览器！');
+		return;
+	}
 	// 关闭搜索模式
 	resetSearch();
 	const id = Entity.uuid();

diff --git a/packages/web/src/components/setting/BrowserPath.vue b/packages/web/src/components/setting/BrowserPath.vue
@@ -49,6 +49,7 @@ const launchOptions = store.render.setting.launchOptions;
  */
 async function onDiy() {
 	if (launchOptions.executablePath) {
+		launchOptions.executablePath = launchOptions.executablePath.trim();
 		const exists = await remote.fs.call('existsSync', launchOptions.executablePath);
 		if (!exists) {
 			Message.error('浏览器路径不存在, 请点击右侧按钮查看教程。');

diff --git a/packages/web/src/fs/browser.ts b/packages/web/src/fs/browser.ts
@@ -71,7 +71,7 @@ export class Browser extends Entity implements BrowserOptions {
 			'--window-position=0,0',
 			'--no-first-run',
 			'--no-default-browser-check',
-			`--user-data-dir=${this.cachePath}`
+			`--user-data-dir="${this.cachePath}"`
 		]
 			.concat(formatExtensionArguments(extensionPaths))
 			.join(' ')} http://localhost:${store.server.port || 15319}/index.html#/bookmarks`;
@@ -155,6 +155,9 @@ export class Browser extends Entity implements BrowserOptions {
 }
 
 function formatExtensionArguments(extensionPaths: string[]) {
-	const paths = extensionPaths.map((p) => p.replace(/\\/g, '/')).join(',');
-	return [`--disable-extensions-except=${paths}`, `--load-extension=${paths}`];
+	const paths = extensionPaths
+		.filter((f) => f.includes('.DS_Store') === false)
+		.map((p) => p.replace(/\\/g, '/'))
+		.join(',');
+	return [`--load-extension="${paths}"`];
 }
diff --git a/packages/web/src/pages/resources/index.vue b/packages/web/src/pages/resources/index.vue
@@ -77,6 +77,7 @@
 						<a-col
 							v-if="fileStatus[file.url]"
 							flex="64px"
+							class="d-flex justify-content-center"
 						>
 							<a-space>
 								<template v-if="fileStatus[file.url].exists || fileStatus[file.url].downloadRate === 100">

diff --git a/packages/web/src/utils/index.ts b/packages/web/src/utils/index.ts
@@ -218,21 +218,25 @@ export async function about() {
 	});
 }
 
-export function changeTheme() {
-	if (store.render.setting.theme.dark) {
-		// 设置为暗黑主题
-		document.body.setAttribute('arco-theme', 'dark');
-		remote.win.call('setTitleBarOverlay', {
-			color: '#2C2C2C',
-			symbolColor: 'white'
-		});
-	} else {
-		// 恢复亮色主题
-		document.body.removeAttribute('arco-theme');
-		remote.win.call('setTitleBarOverlay', {
-			color: '#fff',
-			symbolColor: 'black'
-		});
+export async function changeTheme() {
+	const platform = await remote.methods.call('getPlatform');
+	document.body.classList.add('platform-' + platform);
+	if (platform !== 'darwin') {
+		if (store.render.setting.theme.dark) {
+			// 设置为暗黑主题
+			document.body.setAttribute('arco-theme', 'dark');
+			remote.win.call('setTitleBarOverlay', {
+				color: '#2C2C2C',
+				symbolColor: 'white'
+			});
+		} else {
+			// 恢复亮色主题
+			document.body.removeAttribute('arco-theme');
+			remote.win.call('setTitleBarOverlay', {
+				color: '#fff',
+				symbolColor: 'black'
+			});
+		}
 	}
 }