From 26984f39df38195c1da49fd07cb2a544d90500e8 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 16 Apr 2024 09:01:08 +0800 Subject: [PATCH 1/4] :memo: Update changelogs --- app/changelogs/v3.0.10/v3.0.10.md | 1 + app/changelogs/v3.0.10/v3.0.10_zh_CHT.md | 1 + app/changelogs/v3.0.10/v3.0.10_zh_CN.md | 1 + 3 files changed, 3 insertions(+) diff --git a/app/changelogs/v3.0.10/v3.0.10.md b/app/changelogs/v3.0.10/v3.0.10.md index c73475477..f955cf509 100644 --- a/app/changelogs/v3.0.10/v3.0.10.md +++ b/app/changelogs/v3.0.10/v3.0.10.md @@ -28,6 +28,7 @@ Below are the detailed changes in this version. * [Add database `lineNumber` field type](https://github.com/siyuan-note/siyuan/pull/11008) * [Improve mobile app appearance language setting](https://github.com/siyuan-note/siyuan/issues/11009) * [Improve database template field calc](https://github.com/siyuan-note/siyuan/issues/11011) +* [Improve database unbind block](https://github.com/siyuan-note/siyuan/issues/11013) * [Improve database checkbox field sorting](https://github.com/siyuan-note/siyuan/issues/11016) * [The block icon menu will no longer be displayed after selecting Delete through the block icon menu](https://github.com/siyuan-note/siyuan/issues/11028) * [Improve database template field to use relation/rollup field](https://github.com/siyuan-note/siyuan/issues/11029) diff --git a/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md b/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md index 88fa808ce..614665df7 100644 --- a/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md +++ b/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md @@ -28,6 +28,7 @@ * [新增資料庫 `行號` 欄位類型](https://github.com/siyuan-note/siyuan/pull/11008) * [改進行動應用程式外觀語言設定](https://github.com/siyuan-note/siyuan/issues/11009) * [改進資料庫範本欄位計算](https://github.com/siyuan-note/siyuan/issues/11011) +* [改進資料庫解綁區塊](https://github.com/siyuan-note/siyuan/issues/11013) * [改進資料庫勾選方塊欄位排序](https://github.com/siyuan-note/siyuan/issues/11016) * [透過區塊圖示選單選擇刪除後，區塊圖示選單將不再顯示](https://github.com/siyuan-note/siyuan/issues/11028) * [改進資料庫範本欄位使用關聯/匯總欄位](https://github.com/siyuan-note/siyuan/issues/11029) diff --git a/app/changelogs/v3.0.10/v3.0.10_zh_CN.md b/app/changelogs/v3.0.10/v3.0.10_zh_CN.md index fa0e12d10..324026542 100644 --- a/app/changelogs/v3.0.10/v3.0.10_zh_CN.md +++ b/app/changelogs/v3.0.10/v3.0.10_zh_CN.md @@ -28,6 +28,7 @@ * [添加数据库 `行号` 字段类型](https://github.com/siyuan-note/siyuan/pull/11008) * [改进移动应用程序外观语言设置](https://github.com/siyuan-note/siyuan/issues/11009) * [改进数据库模板字段计算](https://github.com/siyuan-note/siyuan/issues/11011) +* [改进数据库解绑块](https://github.com/siyuan-note/siyuan/issues/11013) * [改进数据库勾选框字段排序](https://github.com/siyuan-note/siyuan/issues/11016) * [通过块图标菜单选择删除后，块图标菜单将不再显示](https://github.com/siyuan-note/siyuan/issues/11028) * [改进数据库模板字段使用关联/汇总字段](https://github.com/siyuan-note/siyuan/issues/11029) From 94d3ccfa9f5cdd596f11b679fa6b93579704cda2 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 16 Apr 2024 09:01:56 +0800 Subject: [PATCH 2/4] :art: Clean code --- app/electron/main.js | 4 ++-- app/src/boot/globalEvent/keydown.ts | 4 ++-- app/src/layout/dock/util.ts | 2 +- app/src/layout/util.ts | 24 +++++++++++------------ app/src/protyle/gutter/index.ts | 4 ++-- app/src/protyle/header/openTitleMenu.ts | 2 +- app/src/protyle/render/av/cell.ts | 2 +- app/src/protyle/render/av/filter.ts | 18 ++++++++--------- app/src/protyle/render/highlightRender.ts | 2 +- app/src/protyle/upload/index.ts | 12 ++++++------ app/src/protyle/util/selection.ts | 2 +- app/src/protyle/wysiwyg/input.ts | 2 +- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/electron/main.js b/app/electron/main.js index c0407376d..57a543a1d 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -713,8 +713,8 @@ app.whenReady().then(() => { }), new MenuItem({ role: "selectAll", label: langs.selectAll })]; - const menu = Menu.buildFromTemplate(template) - menu.popup({window: BrowserWindow.fromWebContents(event.sender)}) + const menu = Menu.buildFromTemplate(template); + menu.popup({window: BrowserWindow.fromWebContents(event.sender)}); }); ipcMain.on("siyuan-open-folder", (event, filePath) => { shell.showItemInFolder(filePath); diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts index f8d4df7e6..0821df3db 100644 --- a/app/src/boot/globalEvent/keydown.ts +++ b/app/src/boot/globalEvent/keydown.ts @@ -328,7 +328,7 @@ const editKeydown = (app: App, event: KeyboardEvent) => { srcIDs: sourceIds, avID, }]); - focusByRange(range) + focusByRange(range); }); } else { const selectElement: Element[] = []; @@ -363,7 +363,7 @@ const editKeydown = (app: App, event: KeyboardEvent) => { srcIDs: sourceIds, avID, }]); - focusByRange(range) + focusByRange(range); }); } event.preventDefault(); diff --git a/app/src/layout/dock/util.ts b/app/src/layout/dock/util.ts index ef00f181f..3f6298dbc 100644 --- a/app/src/layout/dock/util.ts +++ b/app/src/layout/dock/util.ts @@ -160,7 +160,7 @@ export const openOutline = async (protyle: IProtyle) => { } }), false, false); newWnd.element.style.width = "200px"; - newWnd.element.classList.remove("fn__flex-1") + newWnd.element.classList.remove("fn__flex-1"); switchWnd(newWnd, wnd); fixWndFlex1(newWnd.parent); saveLayout(); diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts index 2401df715..209d8cba1 100644 --- a/app/src/layout/util.ts +++ b/app/src/layout/util.ts @@ -910,7 +910,7 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout. export const fixWndFlex1 = (layout: Layout) => { if (layout.children.length < 2) { - return + return; } if (layout.children[layout.children.length - 2].element.classList.contains("fn__flex-1")) { return; @@ -919,27 +919,27 @@ export const fixWndFlex1 = (layout: Layout) => { if (index !== layout.children.length - 2) { if (layout.direction === "lr") { if (item.element.classList.contains("fn__flex-1")) { - item.element.style.width = item.element.clientWidth + "px" - item.element.classList.remove("fn__flex-1") + item.element.style.width = item.element.clientWidth + "px"; + item.element.classList.remove("fn__flex-1"); } } else { if (item.element.classList.contains("fn__flex-1")) { - item.element.style.height = item.element.clientHeight + "px" - item.element.classList.remove("fn__flex-1") + item.element.style.height = item.element.clientHeight + "px"; + item.element.classList.remove("fn__flex-1"); } } } - }) - const flex1Element = layout.children[layout.children.length - 2].element + }); + const flex1Element = layout.children[layout.children.length - 2].element; if (layout.direction === "lr") { if (flex1Element.style.width) { - flex1Element.style.width = "" - flex1Element.classList.add("fn__flex-1") + flex1Element.style.width = ""; + flex1Element.classList.add("fn__flex-1"); } } else { if (flex1Element.style.height) { - flex1Element.style.height = "" - flex1Element.classList.add("fn__flex-1") + flex1Element.style.height = ""; + flex1Element.classList.add("fn__flex-1"); } } -} +}; diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index b0c3e22f8..1d4f72a66 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -811,7 +811,7 @@ export class Gutter { }); } }).element); - const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined + const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined; window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.addToDatabase, accelerator: window.siyuan.config.keymap.general.addToDatabase.custom, @@ -1279,7 +1279,7 @@ export class Gutter { }); } }).element); - const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined + const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined; window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.addToDatabase, accelerator: window.siyuan.config.keymap.general.addToDatabase.custom, diff --git a/app/src/protyle/header/openTitleMenu.ts b/app/src/protyle/header/openTitleMenu.ts index 8b16b5edf..287e65448 100644 --- a/app/src/protyle/header/openTitleMenu.ts +++ b/app/src/protyle/header/openTitleMenu.ts @@ -45,7 +45,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { }).element); if (!protyle.disabled) { window.siyuan.menus.menu.append(movePathToMenu([protyle.path])); - const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined + const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined; window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.addToDatabase, accelerator: window.siyuan.config.keymap.general.addToDatabase.custom, diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index 564419607..1e681e928 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -589,7 +589,7 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va return; } if (type === "block" && !item.dataset.detached) { - const newId = Lute.NewNodeID() + const newId = Lute.NewNodeID(); doOperations.push({ action: "unbindAttrViewBlock", id: rowID, diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts index 520e04c04..2ba4c4157 100644 --- a/app/src/protyle/render/av/filter.ts +++ b/app/src/protyle/render/av/filter.ts @@ -57,17 +57,17 @@ const toggleEmpty = (element: HTMLElement, operator: string, type: TAVCol) => { const filterSelect = (key: string) => { window.siyuan.menus.menu.element.querySelectorAll(".b3-menu__item").forEach((item) => { - const nameElement = item.querySelector(".b3-chip.b3-chip--middle") as HTMLElement + const nameElement = item.querySelector(".b3-chip.b3-chip--middle") as HTMLElement; if (nameElement) { - const itemName = nameElement.dataset.name.toLowerCase() + const itemName = nameElement.dataset.name.toLowerCase(); if (!key || (key.indexOf(itemName) > -1 || itemName.indexOf(key) > -1)) { item.classList.remove("fn__none"); } else { item.classList.add("fn__none"); } } - }) -} + }); +}; export const setFilter = async (options: { filter: IAVFilter, @@ -332,7 +332,7 @@ export const setFilter = async (options: { type: "readonly", label: ``, bind(element) { - const selectSearchElement = element.querySelector("input") + const selectSearchElement = element.querySelector("input"); selectSearchElement.addEventListener("keydown", (event: KeyboardEvent) => { if (event.isComposing) { return; @@ -344,18 +344,18 @@ export const setFilter = async (options: { } currentElement.dispatchEvent(new CustomEvent("click")); } - }) + }); selectSearchElement.addEventListener("input", (event: InputEvent) => { if (event.isComposing) { return; } filterSelect(selectSearchElement.value.toLowerCase()); - }) + }); selectSearchElement.addEventListener("compositionend", () => { filterSelect(selectSearchElement.value.toLowerCase()); - }) + }); } - }) + }); } colData.options?.forEach((option) => { let icon = "iconUncheck"; diff --git a/app/src/protyle/render/highlightRender.ts b/app/src/protyle/render/highlightRender.ts index f7872e593..80accfb7b 100644 --- a/app/src/protyle/render/highlightRender.ts +++ b/app/src/protyle/render/highlightRender.ts @@ -125,7 +125,7 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) = }; export const lineNumberRender = (block: HTMLElement) => { - const lineNumber = block.parentElement.getAttribute("lineNumber") + const lineNumber = block.parentElement.getAttribute("lineNumber"); if (lineNumber === "false") { return; } diff --git a/app/src/protyle/upload/index.ts b/app/src/protyle/upload/index.ts index 6b41340d1..25a0c1b30 100644 --- a/app/src/protyle/upload/index.ts +++ b/app/src/protyle/upload/index.ts @@ -145,20 +145,20 @@ const genUploadedLabel = (responseText: string, protyle: IProtyle) => { }); if ((nodeElement && nodeElement.classList.contains("av"))) { - const cellElements: HTMLElement[] = [] + const cellElements: HTMLElement[] = []; nodeElement.querySelectorAll(".av__row--select:not(.av__row--header)").forEach(item => { item.querySelectorAll(".av__cell").forEach((cellItem: HTMLElement) => { if (getTypeByCellElement(cellItem) === "mAsset") { cellElements.push(cellItem); } - }) - }) + }); + }); if (cellElements.length === 0) { protyle.wysiwyg.element.querySelectorAll(".av__cell--active").forEach((item: HTMLElement) => { if (getTypeByCellElement(item) === "mAsset") { cellElements.push(item); } - }) + }); } if (cellElements.length > 0) { updateCellsValue(protyle, nodeElement, avAssets, cellElements); @@ -170,12 +170,12 @@ const genUploadedLabel = (responseText: string, protyle: IProtyle) => { } if (document.querySelector(".av__panel")) { - const cellElements: HTMLElement[] = [] + const cellElements: HTMLElement[] = []; protyle.wysiwyg.element.querySelectorAll(".av__cell--active").forEach((item: HTMLElement) => { if (getTypeByCellElement(item) === "mAsset") { cellElements.push(item); } - }) + }); if (cellElements.length > 0) { const blockElement = hasClosestBlock(cellElements[0]); if (blockElement) { diff --git a/app/src/protyle/util/selection.ts b/app/src/protyle/util/selection.ts index a5401a901..7f0f280b9 100644 --- a/app/src/protyle/util/selection.ts +++ b/app/src/protyle/util/selection.ts @@ -532,7 +532,7 @@ export const focusBlock = (element: Element, parentElement?: HTMLElement, toStar range.collapse(true); setRange = true; } else if (type === "NodeAttributeView") { - const cursorElement = element.querySelector(".av__cursor") + const cursorElement = element.querySelector(".av__cursor"); if (cursorElement) { range.setStart(cursorElement.firstChild, 0); setRange = true; diff --git a/app/src/protyle/wysiwyg/input.ts b/app/src/protyle/wysiwyg/input.ts index fbc2d5e61..a984c39b0 100644 --- a/app/src/protyle/wysiwyg/input.ts +++ b/app/src/protyle/wysiwyg/input.ts @@ -20,7 +20,7 @@ export const input = async (protyle: IProtyle, blockElement: HTMLElement, range: return; } if (blockElement.classList.contains("av")) { - const avCursorElement = hasClosestByClassName(range.startContainer, "av__cursor") + const avCursorElement = hasClosestByClassName(range.startContainer, "av__cursor"); if (avCursorElement) { range.startContainer.textContent = Constants.ZWSP; } else { From 54ae0edc3398e61daeb73e8752d144a52c4eda17 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 16 Apr 2024 09:29:23 +0800 Subject: [PATCH 3/4] :memo: Update changelogs --- app/changelogs/v3.0.10/v3.0.10.md | 1 + app/changelogs/v3.0.10/v3.0.10_zh_CHT.md | 1 + app/changelogs/v3.0.10/v3.0.10_zh_CN.md | 1 + 3 files changed, 3 insertions(+) diff --git a/app/changelogs/v3.0.10/v3.0.10.md b/app/changelogs/v3.0.10/v3.0.10.md index f955cf509..b04f11878 100644 --- a/app/changelogs/v3.0.10/v3.0.10.md +++ b/app/changelogs/v3.0.10/v3.0.10.md @@ -47,6 +47,7 @@ Below are the detailed changes in this version. * [Hyperlinks affect backlink calculation issue](https://github.com/siyuan-note/siyuan/issues/11001) * [Dynamic loading results in incomplete list display](https://github.com/siyuan-note/siyuan/issues/11004) * [Primary key value unexpectedly updated when database adds row](https://github.com/siyuan-note/siyuan/issues/11018) +* [The floating window disappears when editing a new row in the database in the floating window](https://github.com/siyuan-note/siyuan/issues/11046) ## Download diff --git a/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md b/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md index 614665df7..723ba06af 100644 --- a/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md +++ b/app/changelogs/v3.0.10/v3.0.10_zh_CHT.md @@ -47,6 +47,7 @@ * [超連結影響反向連結計算問題](https://github.com/siyuan-note/siyuan/issues/11001) * [動態載入導致清單顯示不完整](https://github.com/siyuan-note/siyuan/issues/11004) * [資料庫新增行時主鍵值意外更新](https://github.com/siyuan-note/siyuan/issues/11018) +* [在浮動浮窗中編輯資料庫新建一行時浮窗消失](https://github.com/siyuan-note/siyuan/issues/11046) ## 下載 diff --git a/app/changelogs/v3.0.10/v3.0.10_zh_CN.md b/app/changelogs/v3.0.10/v3.0.10_zh_CN.md index 324026542..1c6c70d27 100644 --- a/app/changelogs/v3.0.10/v3.0.10_zh_CN.md +++ b/app/changelogs/v3.0.10/v3.0.10_zh_CN.md @@ -47,6 +47,7 @@ * [超链接影响反向链接计算问题](https://github.com/siyuan-note/siyuan/issues/11001) * [动态加载导致列表显示不完整](https://github.com/siyuan-note/siyuan/issues/11004) * [数据库添加行时主键值意外更新](https://github.com/siyuan-note/siyuan/issues/11018) +* [在浮动浮窗中编辑数据库新建一行时浮窗消失](https://github.com/siyuan-note/siyuan/issues/11046) ## 下载 From 9b64cf0079c6526d2c5a0a8ee99bc5559ae0a80d Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 16 Apr 2024 09:31:28 +0800 Subject: [PATCH 4/4] :bookmark: Release v3.0.10 --- .github/workflows/dockerimage.yml | 2 +- app/appx/AppxManifest.xml | 2 +- app/package.json | 2 +- kernel/util/working.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 16e0b5fc4..bdb3c5fff 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -49,4 +49,4 @@ jobs: - name: Build the Docker image run: | - docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v3.0.9 . \ No newline at end of file + docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v3.0.10 . \ No newline at end of file diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml index e45407099..02f8311ab 100644 --- a/app/appx/AppxManifest.xml +++ b/app/appx/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="3.0.10.0"/> SiYuan 云南链滴科技有限公司 diff --git a/app/package.json b/app/package.json index 37465016c..ce7459b6e 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "3.0.9", + "version": "3.0.10", "description": "Refactor your thinking", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", diff --git a/kernel/util/working.go b/kernel/util/working.go index ef9fe20b3..552f5e705 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -43,7 +43,7 @@ import ( var Mode = "prod" const ( - Ver = "3.0.9" + Ver = "3.0.10" IsInsider = false )