Merge remote-tracking branch 'fork-siyuan/dev' into v0.28

Hi-Windom · Apr 9, 2024 · 97ef843 · 97ef843
2 parents 7d211b3 + 58038ae
commit 97ef843
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
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.7.0"/>
+              Version="3.0.8.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.28.22",
+  "version": "0.28.23",
   "syv": "3.0.8",
   "sypv": "[3.0.7, 3.0.6]",
   "description": "Build Your Eternal Digital Garden",

diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
@@ -42,6 +42,10 @@
     .layout-tab-bar {
       background-color: transparent;
       font-size: 87.5%;
+
+      .item__text {
+        padding-left: 5px;
+      }
     }
   }
 
@@ -268,7 +272,7 @@
     }
 
     &--header {
-      padding: 5px;
+      padding: 5px 8px;
       display: flex;
       align-items: center;
       transition: background 20ms ease-in 0s;

diff --git a/app/src/layout/Wnd.ts b/app/src/layout/Wnd.ts
@@ -716,7 +716,7 @@ export class Wnd {
                     // 关闭分屏页签后光标消失
                     const editors = getAllModels().editor;
                     if (editors.length === 0) {
-                       clearOBG()
+                       clearOBG();
                     } else {
                         editors.forEach(item => {
                             if (!item.element.classList.contains("fn__none")) {

diff --git a/app/src/layout/dock/Outline.ts b/app/src/layout/dock/Outline.ts
@@ -236,7 +236,7 @@ export class Outline extends Model {
             documentSelf.ondragstart = () => false;
             let ghostElement: HTMLElement;
             let selectItem: HTMLElement;
-            let editor: IProtyle
+            let editor: IProtyle;
             getAllModels().editor.find(editItem => {
                 if (editItem.editor.protyle.block.rootID === this.blockId) {
                     editor = editItem.editor.protyle;

diff --git a/app/src/layout/dock/util.ts b/app/src/layout/dock/util.ts
@@ -238,4 +238,4 @@ export const clearOBG = () => {
         item.blockId = "";
         item.render(undefined);
     });
-}
+};
diff --git a/app/src/protyle/toolbar/InlineMath.ts b/app/src/protyle/toolbar/InlineMath.ts
@@ -19,7 +19,7 @@ export class InlineMath extends ToolbarItem {
             let mathElement = hasClosestByAttribute(range.startContainer, "data-type", "inline-math") as Element;
             if (!mathElement && range.startContainer.nodeType !== 3 && range.startContainer.childNodes[range.startOffset]) {
                 const previousSibling = hasPreviousSibling(range.startContainer.childNodes[range.startOffset]) as HTMLElement;
-                if (previousSibling && previousSibling.getAttribute("data-type").indexOf("inline-math") > -1) {
+                if (previousSibling && previousSibling.nodeType !==3 && previousSibling.getAttribute("data-type").indexOf("inline-math") > -1) {
                     mathElement = previousSibling;
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,4 +238,4 @@ export const clearOBG = () => { @@
             item.blockId = "";
             item.render(undefined);
         });
-    }
+    };