From d0121cd9501987a9228dd9da502d0b53777928e2 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 8 Oct 2023 09:39:41 +0800 Subject: [PATCH 1/3] :art: Downgrade Electron https://github.com/siyuan-note/siyuan/issues/9342 --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- app/package.json | 2 +- app/pnpm-lock.yaml | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e425eddf6..5fb343787 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.3.0 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.9.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@26.3.0 -D` + * `pnpm install electron@25.9.0 -D` NPM mirror: @@ -30,7 +30,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@26.3.0 -D` +* `pnpm install electron@25.9.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 1563232f4..2134d3a99 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -18,11 +18,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.3.0 -D + ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.9.0 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@26.3.0 -D` + * `pnpm install electron@25.9.0 -D` NPM 镜像： @@ -32,7 +32,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@26.3.0 -D` +* `pnpm install electron@25.9.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 9d6d677b4..ef7f4dc75 100644 --- a/app/package.json +++ b/app/package.json @@ -53,7 +53,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "26.3.0", + "electron": "25.9.0", "electron-builder": "^24.6.3", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 4507ac7fa..3566e0010 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -7,7 +7,7 @@ settings: dependencies: '@electron/remote': specifier: ^2.0.11 - version: 2.0.11(electron@26.3.0) + version: 2.0.11(electron@25.9.0) devDependencies: '@types/node': @@ -32,8 +32,8 @@ devDependencies: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 26.3.0 - version: 26.3.0 + specifier: 25.9.0 + version: 25.9.0 electron-builder: specifier: ^24.6.3 version: 24.6.3 @@ -160,12 +160,12 @@ packages: - supports-color dev: true - /@electron/remote@2.0.11(electron@26.3.0): + /@electron/remote@2.0.11(electron@25.9.0): resolution: {integrity: sha512-PYEs7W3GrQNuhgiMHjFEvL5MbAL6C7m1AwSAHGqC+xc33IdP7rcGtJSdTP2eg1ssyB3oI00KwTsiSlsQbAoXpA==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 26.3.0 + electron: 25.9.0 dev: false /@electron/universal@1.3.4: @@ -1669,8 +1669,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron@26.3.0: - resolution: {integrity: sha512-7ZpvSHu+jmqialSvywTZnOQZZGLqlyj+yV5HGDrEzFnMiFaXBRpbByHgoUhaExJ/8t/0xKQjKlMRAY65w+zNZQ==} + /electron@25.9.0: + resolution: {integrity: sha512-wgscxf2ORHL/8mAQfy7l9rVDG//wrG9RUQndG508kCCMHRq9deFyZ4psOMzySheBRSfGMcFoRFYSlkAeZr8cFg==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true From 549a8eeea4f67dee4f11092cff589b82f29bd8e0 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 8 Oct 2023 10:44:23 +0800 Subject: [PATCH 2/3] :art: Database template column supports `created` and `updated` built-in variables https://github.com/siyuan-note/siyuan/issues/9364 --- kernel/model/attribute_view.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index dfa7a380e..3d92c68c7 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -21,6 +21,7 @@ import ( "sort" "strings" "text/template" + "time" "github.com/88250/gulu" "github.com/88250/lute/ast" @@ -53,6 +54,27 @@ func renderTemplateCol(blockID, tplContent string, rowValues []*av.KeyValues) st dataModel := map[string]interface{}{} // 复制一份 IAL 以避免修改原始数据 for k, v := range ial { dataModel[strings.ReplaceAll(k, "custom-", "custom_")] = v + + // Database template column supports `created` and `updated` built-in variables https://github.com/siyuan-note/siyuan/issues/9364 + createdStr := ial["id"] + if "" != createdStr { + createdStr = createdStr[:len("20060102150405")] + } + created, parseErr := time.Parse("20060102150405", createdStr) + if nil != parseErr { + dataModel["created"] = created + } else { + logging.LogWarnf("parse created [%s] failed: %s", createdStr, parseErr) + dataModel["created"] = time.Now() + } + updatedStr := ial["updated"] + updated, parseErr := time.Parse("20060102150405", updatedStr) + if nil != parseErr { + dataModel["updated"] = updated + } else { + logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr) + dataModel["updated"] = time.Now() + } } for _, rowValue := range rowValues { if 0 < len(rowValue.Values) { From 5c8fb01dc2fa075eccbeca83e9ebf5fdb1d108ab Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 8 Oct 2023 10:54:29 +0800 Subject: [PATCH 3/3] :art: Database template column supports `created` and `updated` built-in variables https://github.com/siyuan-note/siyuan/issues/9364 --- kernel/model/attribute_view.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 3d92c68c7..884d01a4f 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -61,7 +61,7 @@ func renderTemplateCol(blockID, tplContent string, rowValues []*av.KeyValues) st createdStr = createdStr[:len("20060102150405")] } created, parseErr := time.Parse("20060102150405", createdStr) - if nil != parseErr { + if nil == parseErr { dataModel["created"] = created } else { logging.LogWarnf("parse created [%s] failed: %s", createdStr, parseErr) @@ -69,7 +69,7 @@ func renderTemplateCol(blockID, tplContent string, rowValues []*av.KeyValues) st } updatedStr := ial["updated"] updated, parseErr := time.Parse("20060102150405", updatedStr) - if nil != parseErr { + if nil == parseErr { dataModel["updated"] = updated } else { logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr)