Merge branch 'release/v1.4' into fix/isIncognito-value-in-early-start

Author: CodFrm

src/app/service/service_worker/script.ts

@@ -416,6 +416,31 @@ export class ScriptService {
     if (updatetime) {
       script.updatetime = updatetime;
     }
+    // 拖拉安装等同本地创建脚本
+    if (script.origin?.startsWith("file:///*from-local*/")) {
+      script.origin = "";
+      script.originDomain = "";
+      script.downloadUrl = "";
+      script.checkUpdateUrl = "";
+    }
+    // 现存的脚本：以最初的安装(即 createtime)为标准，回填 origin 用于更新检查。
+    // 如果最初是从网络安装，之后拖拉安装本机档案，则保留 origin 资讯。
+    // 如果本机安装的版本号较低，则会在下次更新检查时提醒有更新。那个时候，用户可以选择更新至网络上最新版本，或忽略并保留本机版本。
+    // 跳过 ScriptCat 旧版本 (1.0.0-beta.2 ~ 1.4.x，自 commit d9b0eeede1a8b114f79a43fade99d825323c63f6 @ 2025.07.23)
+    // 误写入的 file:///*from-local*/ 与 file://-/ 前缀
+    if (
+      oldScript &&
+      script.createtime === oldScript.createtime &&
+      oldScript.origin &&
+      !script.origin &&
+      !oldScript.origin.startsWith("file:///*from-local*/") &&
+      !oldScript.origin.startsWith("file://-/")
+    ) {
+      script.origin = oldScript.origin;
+      script.originDomain = oldScript.originDomain;
+      script.downloadUrl = oldScript.downloadUrl;
+      script.checkUpdateUrl = oldScript.checkUpdateUrl;
+    }
     return this.scriptDAO
       .save(script)
       .then(async () => {

src/pages/components/layout/MainLayout.tsx

@@ -473,7 +473,7 @@ const MainLayout: React.FC<{
                             return;
                           }
                           systemConfig.setLanguage(value.key);
-                          Message.success(t("language_change_tip")!);
+                          Message.success(t("language_change_tip", { lng: value.key })!);
                         }}
                       >
                         {value.title}

src/pages/install/App.tsx

@@ -731,7 +731,7 @@ function App() {
             <>
               <Typography.Title heading={3}>{t("install_page_loading")}</Typography.Title>
               <div className="downloading">
-                <Typography.Text>{fetchingState.loadingStatus}</Typography.Text>
+                <Typography.Text style={{ fontFamily: "monospace" }}>{fetchingState.loadingStatus}</Typography.Text>
                 <div className="loader"></div>
               </div>
             </>

src/pages/options/index.css

@@ -93,19 +93,7 @@ h6.arco-typography {
   }
 
   .script-card-grid {
-    grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
-  }
-
-  @media (max-width: 960px) {
-    .script-card-grid {
-      grid-template-columns: 1fr 1fr;
-    }
-  }
-
-  @media (max-width: 640px) {
-    .script-card-grid {
-      grid-template-columns: 1fr;
-    }
+    grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
   }
 
 }

src/pages/options/routes/Setting.tsx

@@ -128,7 +128,7 @@ function Setting() {
                   return;
                 }
                 submitLanguage(value);
-                Message.success(t("language_change_tip")!);
+                Message.success(t("language_change_tip", { lng: value })!);
               }}
             >
               {languageList.map((item) => (