Merge pull request #862 from Hi-Windom/v0.35

V0.35
Hi-Windom · Jul 9, 2024 · 29b7f12 · 29b7f12
2 parents 673a2a2 + ba67f8e
commit 29b7f12
Show file tree

Hide file tree

Showing 14 changed files with 466 additions and 400 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,4 @@ yarn.lock
 /app/dist-electron
 **/node_modules
 **.pyc
+/app/webpack.*.sillot.ltx
diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json
@@ -2,7 +2,7 @@
   "name": "sillot",
   "displayName": "汐洛 Sillot",
   "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。",
-  "version": "0.35.24070801",
+  "version": "0.35.24070922",
   "preview": true,
   "repository": "https://github.com/Hi-Windom/Sillot",
   "publisher": "Hi-Windom",

diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml
@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
-              Version="3.0.17.0"/>
+              Version="3.1.0.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.35.24070801",
+  "version": "0.35.24070922",
   "syv": "3.1.0",
   "sypv": "[3.0.16, 3.0.17]",
   "description": "Build Your Eternal Digital Garden",
@@ -105,6 +105,7 @@
     "@wixc3/react-board": "^2.5.0",
     "babel-loader": "^9.1.3",
     "brace": "^0.11.1",
+    "circular-dependency-plugin": "^5.2.2",
     "clean-webpack-plugin": "^4.0.0",
     "concurrently": "^8.2.2",
     "css-loader": "^7.1.1",

diff --git a/app/src/editor/rename.ts b/app/src/editor/rename.ts
@@ -8,7 +8,10 @@ import {getAssetName, getDisplayName, pathPosix, setNotebookName} from "../util/
 import {fetchPost} from "../util/fetch";
 import {Constants} from "../constants";
 import {showTooltip} from "../dialog/tooltip";
+/// #if !MOBILE
 import {getAllEditor, getAllModels} from "../layout/getAll";
+import {getCurrentEditor} from "../mobile/editor";
+/// #endif
 
 export const validateName = (name: string, targetElement?: HTMLElement) => {
     window.sout.tracker("invoked");
@@ -140,6 +143,9 @@ export const renameAsset = (assetPath: string) => {
         }
 
         fetchPost("/api/asset/renameAsset", {oldPath: assetPath, newName: inputElement.value}, (response) => {
+            /// #if MOBILE
+            getCurrentEditor()?.reload(false);
+            /// #else
             getAllModels().asset.forEach(item => {
                 if (item.path === assetPath) {
                     item.path = response.data.newPath;
@@ -149,6 +155,7 @@ export const renameAsset = (assetPath: string) => {
             getAllEditor().forEach(item => {
                 item.reload(false);
             });
+            /// #endif
             dialog.destroy();
         });
     });

diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts
@@ -37,7 +37,7 @@ export const initAbout = () => {
         <div class="fn__hr"></div>
         <input class="b3-text-field fn__block" readonly value="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:${location.port}">
         <div class="fn__hr"></div>
-    <button data-url="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:${location.port}" class="b3-button b3-button--outline fn__block ${window.siyuan.config.system.networkServe ? "" : " fn__none"}" onclick="javascript:window.JSAndroid.openURLuseDefaultApp(this.getAttribute('data-url'))">
+    <button data-url="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:${location.port}" class="b3-button b3-button--outline fn__block ${window.siyuan.config.system.networkServe ? "" : " fn__none"}" onclick="javascript:window.JSAndroid.openExternal(this.getAttribute('data-url'))">
         <svg><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.about4}
     </button>
         <div class="b3-label__text">${window.siyuan.languages.about3.replace("${port}", location.port)}</div>