diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3480621..8a4eec8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
{
- "cSpell.words": ["ICVE", "ocsjs", "userscript", "userscripts"],
+ "cSpell.words": ["greasyfork", "ICVE", "ocsjs", "scriptcat", "userscript", "userscripts"],
"eslint.validate": ["javascript", "javascriptreact", "vue"],
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
diff --git a/packages/app/package.json b/packages/app/package.json
index 856ce82..b589fc3 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
{
"name": "@ocs-desktop/app",
- "version": "2.2.5",
+ "version": "2.3.0",
"description": "desktop for userscript",
"main": "./lib/index.js",
"types": "./lib/types.d.ts",
diff --git a/packages/app/src/window.ts b/packages/app/src/window.ts
index 1c482b3..6b1cbd0 100644
--- a/packages/app/src/window.ts
+++ b/packages/app/src/window.ts
@@ -6,8 +6,8 @@ export function createWindow() {
const win = new BrowserWindow({
title: 'ocs',
icon: path.resolve('./public/favicon.ico'),
- minHeight: 600,
- minWidth: 1000,
+ minHeight: 800,
+ minWidth: 1200,
center: true,
hasShadow: true,
autoHideMenuBar: true,
diff --git a/packages/app/types.ts b/packages/app/types.ts
index 679e8af..f0a6976 100644
--- a/packages/app/types.ts
+++ b/packages/app/types.ts
@@ -18,4 +18,6 @@ export interface UserScripts {
info: any;
/** 是否为本地脚本 */
isLocalScript: boolean;
+ /** 是否为网络链接加载的脚本 */
+ isInternetLinkScript: boolean;
}
diff --git a/packages/web/src/components/CommonSelector.vue b/packages/web/src/components/CommonSelector.vue
new file mode 100644
index 0000000..208a8a9
--- /dev/null
+++ b/packages/web/src/components/CommonSelector.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+ {{ item.key }}
+
+
+
+
+
+
(state.page = page)"
+ >
+
+
+
+
+
+
+ 共选中 {{ selected.length }} 个
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/web/src/components/Icon.vue b/packages/web/src/components/Icon.vue
index de2bfdf..0849234 100644
--- a/packages/web/src/components/Icon.vue
+++ b/packages/web/src/components/Icon.vue
@@ -20,8 +20,8 @@ import { Space } from '@arco-design/web-vue';
import { h, toRefs, useSlots } from 'vue';
const span = h('span');
interface IconProps {
- theme?: 'outlined' | 'filled' | 'rounded' | 'sharp' | 'two-tone';
type: string;
+ theme?: 'outlined' | 'filled' | 'rounded' | 'sharp' | 'two-tone';
title?: string;
active?: boolean;
color?: string;
diff --git a/packages/web/src/pages/user-scripts/ScriptList.vue b/packages/web/src/components/ScriptList.vue
similarity index 68%
rename from packages/web/src/pages/user-scripts/ScriptList.vue
rename to packages/web/src/components/ScriptList.vue
index c89522a..e85c157 100644
--- a/packages/web/src/pages/user-scripts/ScriptList.vue
+++ b/packages/web/src/components/ScriptList.vue
@@ -9,17 +9,20 @@
@mouseleave="selectedScript = 0"
@mouseover="selectedScript = script.id"
>
+
-
-
+
+
+
+
+
+
+
+
+ v{{ script.info.version }}
+
+
+
+
+
+ ⬇️{{ script.info.daily_installs }}
+
+
+
+
+
+ 📦{{ script.info.total_installs }}
+
+
+
+
+
+ ⭐{{ script.info.ratings ? script.info.ratings.toFixed(1) : '无' }}
+
+
+
+
+ {{ new Date(script.info.create_time).toLocaleDateString() }} 创建
+
+
+ {{ getElapsedTime(script.info.create_time) }} 前更新
+
+
+
+
+
-
-
-
- ⬇️{{ script.info.daily_installs }}
-
-
-
-
-
- 📦{{ script.info.total_installs }}
-
-
-
-
-
- v{{ script.info.version }}
-
-
-
-
-
- ⭐{{ script.info.ratings ? script.info.ratings.toFixed(1) : '无' }}
-
-
-
-
- {{ new Date(script.info.createTime).toLocaleDateString() }} 创建
-
-
- {{ getElapsedTime(script.info.updateTime) }} 前更新
-
-
+ :already-installed="isAlreadyInstalled(script)"
+ />
+
@@ -109,22 +123,15 @@
-
-
-
-