Merge branch 'develop'

* develop: (315 commits) fix: 同步更新 🎨 siyuan-note#9303 🎨 fix siyuan-note#9358 🎨 Block ref anchor text no longer contains contents of inline-level memos siyuan-note#9363 🎨 Block ref anchor text no longer contains contents of inline-level memos siyuan-note#9363 🎨 fix siyuan-note#9362 🎨 Improve bookmark panel rendering siyuan-note#9361 🎨 💄 siyuan-note#9359 🎨 database 🎨 database 🎨 Database column icon siyuan-note#9304 🎨 Database column icon siyuan-note#9304 🎨 database 🎨 database 🎨 Database column icon siyuan-note#9304 🎨 Database template col type 💄 https://ld246.com/article/1696512420662 🐛 focus av 🎨 fix siyuan-note#9351 ... # Conflicts: # app/package.json # app/pnpm-lock.yaml
EightDoor · Oct 7, 2023 · 6ba5455 · 6ba5455
2 parents 7c3e893 + e97f360
commit 6ba5455
Show file tree

Hide file tree

Showing 204 changed files with 5,899 additions and 2,704 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -2,8 +2,10 @@
 
 ## Get the source code
 
-* `git clone --recurse-submodules [email protected]:siyuan-note/siyuan.git` For example saved in `D:/siyuan/`
-* switch to dev branch
+* `git clone --depth=1 [email protected]:siyuan-note/siyuan.git`
+* switch to dev branch `git checkout dev`
+
+Note: `app/stage/protyle/**` is managed by git lfs, and you don't need to pay attention to it under normal circumstances, related to [#9253](https://github.com/siyuan-note/siyuan/issues/9253).
 
 ## User Interface
 
@@ -14,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@25.7.0 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.3.0 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
-    * `pnpm install electron@25.7.0 -D`
+    * `pnpm install electron@26.3.0 -D`
 
 NPM mirror:
 
@@ -28,7 +30,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@25.7.0 -D`
+* `pnpm install electron@26.3.0 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md
@@ -2,8 +2,10 @@
 
 ## 获取源码
 
-* `git clone --recurse-submodules [email protected]:siyuan-note/siyuan.git` 例如保存在 `D:/siyuan/`
-* 切换到 dev 分支
+* `git clone --depth=1 [email protected]:siyuan-note/siyuan.git`
+* 切换到 dev 分支 `git checkout dev`
+
+备注：`app/stage/protyle/**` 使用 git lfs 管理，正常情况下无需关注，关联 [#9253](https://github.com/siyuan-note/siyuan/issues/9253)。
 
 ## NPM 依赖
 
@@ -16,11 +18,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.7.0 -D
+ ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.3.0 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
-    * `pnpm install electron@25.7.0 -D`
+    * `pnpm install electron@26.3.0 -D`
 
 NPM 镜像：
 
@@ -30,7 +32,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@25.7.0 -D`
+* `pnpm install electron@26.3.0 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -16,6 +16,22 @@ jobs:
       contents: read
 
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
       - name: Check out the repo
         uses: actions/checkout@v3
 
@@ -33,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:v2.10.5 .
+          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.10.8 .
diff --git a/README.md b/README.md
@@ -42,33 +42,32 @@
 
 ![b3logos.jpg](https://b3logfile.com/file/2020/08/b3logos-032af045.jpg)
 
-## 🔮 特性
-
-大部分功能是免费的，即使是在商业环境下使用。
-
-* 内容块
-    * 块级引用和双向链接
-    * 自定义属性
-    * SQL 查询嵌入
-    * 协议 `siyuan://`
-* 编辑器
-    * Block 风格
-    * Markdown 所见即所得
-    * 列表大纲
-    * 块缩放聚焦
-    * 块横向排版
-    * 百万字大文档编辑
-    * 数学公式、图表、流程图、甘特图、时序图、五线谱等
-    * 网页剪藏
-    * PDF 标注双链
-* 导出
-    * 引用块和嵌入块
-    * 带 assets 文件夹的标准 Markdown
-    * PDF、Word 和 HTML
-    * 复制到微信公众号、知乎和语雀
-* 间隔重复
-* 模板片段
-* JavaScript/CSS 代码片段
+* Content block
+  * Block-level reference and two-way links
+  * Custom attributes
+  * SQL query embed
+  * Protocol `siyuan://`
+* Editor
+  * Block-style
+  * Markdown WYSIWYG
+  * List outline
+  * Block zoom-in
+  * Block horizontal layout
+  * Million-word large document editing
+  * Mathematical formulas, charts, flowcharts, Gantt charts, timing charts, staffs, etc.
+  * Web clipping
+  * PDF Annotation link
+* Export
+  * Block ref and embed
+  * Standard Markdown with assets
+  * PDF, Word and HTML
+  * Copy to WeChat MP, Zhihu and Yuque
+* Database
+  * Table view
+* Spaced repetition
+* Multi-tab, drag and drop to split screen
+* Template snippet
+* JavaScript/CSS snippet
 * Android/iOS APP
 * Docker 部署
 * [API](API_zh_CN.md)
@@ -136,17 +135,24 @@
 
 构建 Docker 镜像时设置了入口：`ENTRYPOINT [ "/opt/siyuan/kernel" ]`，使用 `docker run b3log/siyuan` 并带参即可启动：
 
-* `--workspace` 指定工作空间文件夹路径，在宿主机上通过 `-v` 挂载到容器中
+* `--workspace`: Specifies the workspace folder path, mounted to the container via `-v` on the host
+* `--accessAuthCode`: Specifies the access authorization code
+
+More parameters can refer to `--help`. The following is an example of a startup command:
+
+```
+docker run -v workspace_dir_host:workspace_dir_container -p 6806:6806 b3log/siyuan --workspace=workspace_dir_container --accessAuthCode=xxx
+```
 
-更多的参数可参考 `--help`
-。下面是一条启动命令示例：`docker run -v workspace_dir_host:workspace_dir_container -p 6806:6806 b3log/siyuan --workspace=workspace_dir_container`
+* `workspace_dir_host`: The workspace folder path on the host
+* `workspace_dir_container`: The path of the workspace folder in the container, which is the same as specified in `--workspace`
+* `accessAuthCode`: Access authorization code, please **be sure to modify**, otherwise anyone can read and write your data
 
-* `workspace_dir_host`：宿主机上的工作空间文件夹路径
-* `workspace_dir_container`：容器内工作空间文件夹路径，和后面 `--workspace` 指定成一样的
+To simplify, it is recommended to configure the workspace folder path to be consistent on the host and container, such as: `workspace_dir_host` and `workspace_dir_container` are configured as `/siyuan/workspace`, the corresponding startup commands is:
 
-为了简化，建议将 workspace 文件夹路径在宿主机和容器上配置为一致的，比如将 `workspace_dir_host`
-和 `workspace_dir_container` 都配置为 `/siyuan/workspace`
-，对应的启动命令示例：`docker run -v /siyuan/workspace:/siyuan/workspace -p 6806:6806 -u 1000:1000 b3log/siyuan --workspace=/siyuan/workspace/`。
+```
+docker run -v /siyuan/workspace:/siyuan/workspace -p 6806:6806 -u 1000:1000 b3log/siyuan --workspace=/siyuan/workspace/ --accessAuthCode=xxx
+```
 
 #### 用户权限
 
@@ -237,9 +243,7 @@
   选项，这样思源会自动下载最新版安装包并提示安装
 * 如果是通过手动安装包安装的，请再次下载安装包安装
 
-可在 <kbd>设置</kbd> - <kbd>关于</kbd> - <kbd>当前版本</kbd> 中 <kbd>检查更新</kbd>
-，也可以通过关注[官方网站](https://b3log.org/siyuan/)
-或者 [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) 来获取新版本。
+You can <kbd>Check update</kbd> in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Current Version</kbd>, or pay attention to [Official website](https://b3log.org/siyuan/) or [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) to get the new version.
 
 **注意**：切勿将工作空间放置于安装目录下，因为更新版本会清空安装目录下的所有文件
 

diff --git a/README_en.md b/README_en.md
@@ -61,6 +61,8 @@
   * 带 assets 文件夹的标准 Markdown
   * PDF、Word 和 HTML
   * 复制到微信公众号、知乎和语雀
+* 数据库
+  * 表格视图
 * 间隔重复
 * 模板片段
 * JavaScript/CSS 代码片段
@@ -131,14 +133,24 @@
 
 构建 Docker 镜像时设置了入口：`ENTRYPOINT [ "/opt/siyuan/kernel" ]`，使用 `docker run b3log/siyuan` 并带参即可启动：
 
-* `--workspace` 指定工作空间文件夹路径，在宿主机上通过 `-v` 挂载到容器中
+* `--workspace`：指定工作空间文件夹路径，在宿主机上通过 `-v` 挂载到容器中
+* `--accessAuthCode`：指定访问授权码
 
-更多的参数可参考 `--help`。下面是一条启动命令示例：`docker run -v workspace_dir_host:workspace_dir_container -p 6806:6806 b3log/siyuan --workspace=workspace_dir_container`
+更多的参数可参考 `--help`。下面是一条启动命令示例：
+
+```
+docker run -v workspace_dir_host:workspace_dir_container -p 6806:6806 b3log/siyuan --workspace=workspace_dir_container --accessAuthCode=xxx
+```
 
 * `workspace_dir_host`：宿主机上的工作空间文件夹路径
 * `workspace_dir_container`：容器内工作空间文件夹路径，和后面 `--workspace` 指定成一样的
+* `accessAuthCode`：访问授权码，请**务必修改**，否则任何人都可以读写你的数据
+
+为了简化，建议将 workspace 文件夹路径在宿主机和容器上配置为一致的，比如将 `workspace_dir_host` 和 `workspace_dir_container` 都配置为 `/siyuan/workspace`，对应的启动命令示例：
 
-为了简化，建议将 workspace 文件夹路径在宿主机和容器上配置为一致的，比如将 `workspace_dir_host` 和 `workspace_dir_container` 都配置为 `/siyuan/workspace`，对应的启动命令示例：`docker run -v /siyuan/workspace:/siyuan/workspace -p 6806:6806 -u 1000:1000 b3log/siyuan --workspace=/siyuan/workspace/`。
+```
+docker run -v /siyuan/workspace:/siyuan/workspace -p 6806:6806 -u 1000:1000 b3log/siyuan --workspace=/siyuan/workspace/ --accessAuthCode=xxx
+```
 
 #### 用户权限
 

diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js
diff --git a/app/appearance/icons/ant/icon.json b/app/appearance/icons/ant/icon.json
@@ -2,5 +2,5 @@
   "name": "ant",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.23.0"
+  "version": "1.23.1"
 }
diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html
@@ -508,12 +508,6 @@ <h2>SiYuan</h2>
         </svg>
         iconBazaar
     </div>
-    <div>
-        <svg>
-            <use xlink:href="#iconCalendar"></use>
-        </svg>
-        iconCalendar
-    </div>
     <div>
         <svg>
             <use xlink:href="#iconKeymap"></use>

diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js
diff --git a/app/appearance/icons/material/icon.json b/app/appearance/icons/material/icon.json
@@ -2,5 +2,5 @@
   "name": "material",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.23.0"
+  "version": "1.23.1"
 }