更新：README文件

.dockerignore

@@ -2,3 +2,8 @@ node_modules
 .git
 dist
 .history
+images
+docs
+Dockerfile
+README.md
+build.sh

Dockerfile

@@ -1,6 +1,5 @@
 FROM mafgwo/wkhtmltopdf-nodejs:11.15.0
 
-RUN mkdir -p /opt/stackedit
 WORKDIR /opt/stackedit
 
 COPY package*json /opt/stackedit/

README.md

@@ -1,76 +1,183 @@
-# StackEdit中文版
+<h1 align="center" style="text-align:center;">
+<img src="chrome-app/icon-512.png" width="128" />
+<br />
+StackEdit中文版
+</h1>
+<p align="center">
+	<strong>笔记利器，在线Markdown编辑器。</strong><br>
+  项目clone自<a href="https://gitee.com/mafgwo/stackedit" target="_blank" title="豆萁">豆萁/stackedit</a>，如果你喜欢该项目，请过去点一下Star，您的肯定是作者最大的动力！
+</p>
+<p align="center">
+	<a href="https://stackedit.cn/">https://stackedit.cn</a>
+</p>
+<p align="center">
+    <a target="_blank" href="https://www.apache.org/licenses/LICENSE-2.0.txt">
+		<img src="https://img.shields.io/:license-Apache2-blue.svg" alt="Apache 2" />
+	</a>
+    <a target="_blank" href="https://hub.docker.com/r/mafgwo/stackedit">
+		<img src="https://img.shields.io/docker/pulls/mafgwo/stackedit.svg" alt="Docker Pulls" />
+	</a>
+    <a target="_blank" href='https://gitee.com/mafgwo/stackedit/stargazers'>
+		<img src='https://gitee.com/mafgwo/stackedit/badge/star.svg' alt='gitee star'/>
+	</a>
+</p>
+<br/>
+<hr />
+1 笔记支持Gitee、GitHub、Gitea等Git仓库存储。<br>
+2 支持直接上传图片，也支持多种外部图床（GitHub、Gitea、SM.MS、自定义图床）粘贴或拖拽上传。<br>
+3 编辑区域支持选择主题或自定义，总有你喜欢的主题。<br>
+4 支持历史版本管理，不用担心编辑覆盖后无法回滚。<br>
+5 支持ChatGPT辅助写作。<br>
+6 支持KaTeX数学表达式、Mermaid UML图、乐谱等扩展。
+<hr />
 
-**目前正准备支持粘贴自动上传图片到指定图床的功能，大家有什么好的图床推荐，可以在 [Issue](https://gitee.com/mafgwo/stackedit/issues/I5E6FJ) 给我留言**
+## 说明
 
-从 [StackEdit 官方](https://github.com/benweet/stackedit) fork出来，然后加上了 **Gitee** 的支持，并且已经重新打了镜像，以下官方的部署方式，除了Docker镜像地址不同，其他均一致。
+本项目为本人clone修改自用，如果你也喜欢，请至原作者处获取及交流。
 
-### Fork出来修改的原因
-StackEdit的作者可能因为什么原因，已经很久不维护了，Github授权登录很早之前就登录不了了，并且还没法支持国内常用的Gitee，所以想到Fork出来改，大概花了周末一整天终于改好了。
+## 截图
 
-新的Docker镜像在中央仓库为：[mafgwo/stackedit](https://hub.docker.com/r/mafgwo/stackedit)
+**亮暗主题切换、编辑主题切换**
+![](./images/theme.gif)
 
-并增加了以下2个环境变量：
-- `GITEE_CLIENT_ID` Gitee 的 Client ID
-- `GITEE_CLIENT_SECRET` Gitee 的 Client Secret
+**支持的文档空间**
+![](./images/workspace.png)
 
-### TODO: 关于后续的一些想法
-- 支持**Gitea**、**Gogs**两个轻量级且适于自建的Git仓库（毕竟Gitlab对机器配置要求较高）。想支持这两个主要也是考虑到其实很多公司已经禁用了Github或Gitee仓库，在公司都没法连上自己的Git仓库。 -- 已完成（Gogs无法支持）
-- 汉化，毕竟大家最熟悉的还是母语，并且该编辑器功能页面也不多，汉化工作量并不会很大。-- 已完成
-- 替换主文档空间为Gitee（原版本主文档空间是Google Drive，国内只有fan墙才可以用）-- 已完成
-- 支持图片粘贴自动上传到指定图床。-- 进行中（已完成SM.MS图床接入)
-- 引入mdnice，右边预览增加mdnice预览选项，主要含选主题(含mdnice常用20多个主题)、支持自定义主题、复制到公众号、复制到知乎、复制到稀土掘金等基本功能，便于喜欢写公众号、博客的同学可以更好更快的排版。
-- ... 另外，朋友们有好的想法也可以在Issue或者加我微信 qicoding 提给我。
+**拖拽粘贴上传图片**
+![](./images/uploadimg.gif)
 
-#### TODO 进度
+**支持文档搜索**
+![](./images/search.gif)
 
-**已支持Gitea (2022-05-25)，自建Gitea要支持跨域，不知道如何支持跨域提issue我会回答**
-对应Docker版本：5.15.3, tag: v5.15.3
+**ChatGPT集成协助写作**
+![](./images/chatgpt.gif)
 
-**Gogs目前无法支持，因为API目前不支持直接把Markdown推上去，如果后续Gogs的API支持了再添加**
+## 相比国外开源版本的区别：
 
-**已汉化主要功能部分（2022-06-01）**
-对应Docker版本：5.15.5, tag: v5.15.5
+- 修复了Github授权登录问题
+- 支持了Gitee仓库（2022-05-25）
+- 支持了Gitea仓库（2022-05-25）
+- 汉化（2022-06-01）
+- 主文档空间从GoogleDrive切换为Gitee（2022-06-04）
+- 支持SM.MS图床粘贴/拖拽图片自动上传（2022-07-01）
+- 支持Gitea图床粘贴/拖拽图片自动上传（2022-07-02）
+- 支持自定义图床粘贴/拖拽图片自动上传（2022-07-04）
+- 支持GitHub图床粘贴/拖拽图片自动上传（2022-07-31）
+- 支持了右上角一键切换主题，补全了深色主题的样式（2022-08-07）
+- 编辑与预览区域样式优化（2022-08-10）
+- 左边栏文件资源管理支持搜索文件（2022-08-17）
+- 支持[TOC]目录（2022-09-04）
+- 发布支持填写提交信息[针对Gitee、GitHub、Gitea、Gitlab]（2022-09-10）
+- 支持文档空间关闭自动同步[针对Gitee、GitHub、Gitea、Gitlab]，关闭后可自定义提交信息（2022-09-23）
+- Gitea支持后端配置指定应用ID和Secret（2022-10-03）
+- 支持编辑区域选择主题样式（2022-10-06）
+- 支持图片直接存储到当前文档空间（2022-10-29）
+- 支持MD文档之间链接跳转（2022-11-20）
+- 支持预览区域选择主题样式（2022-12-04）
+- Gitlab的支持优化（2023-02-23）
+- 导出HTML、PDF支持带预览主题导出（2023-02-26）
+- 支持分享文档（2023-03-30）
+- 支持ChatGPT生成内容（2023-04-10）
+- GitLab授权接口调整（2023-08-26）
+- 主文档空间支持GitHub登录（2023-10-19）
 
-**已完成修改主文档空间为Gitee（2022-06-04）**
-对应Docker版本：5.15.6, tag: v5.15.6
+## 国外开源版本弊端：
 
-**已完成粘贴/拖拽图片自动上传SM.MS图床功能（2022-07-01）**
-对应Docker版本：5.15.7, tag: v5.15.7
+- 作者已经不维护了或很少维护了
+- 不支持国内常用Gitee
+- 强依赖GoogleDrive，而Google Drive在国内不能正常访问
 
-**已完成粘贴/拖拽图片自动上传Gitea图床功能（2022-07-02）**
-对应Docker版本：5.15.7-1
+## 部署说明
 
-**已完成粘贴/拖拽图片自动上传自定义图床功能（2022-07-10）**
-对应Docker版本：5.15.8
+> 建议docker-compose方式部署，其他部署方式如遇到问题欢迎提issue。
 
+docker官方仓库下载太慢可以使用阿里云的镜像仓库，镜像仓库地址：registry.cn-hangzhou.aliyuncs.com/mafgwo/stackedit:【版本号】
 
-### 目前已部署地址
-https://stackedit.cn/ 
+`docker-compose.yml`如下：
 
-该地址可以作为试用或长期使用，本人承诺绝对没采集任何人的Token等敏感信息，不需要担心私有仓库泄漏。
+```yaml
+version: "3.7"
+services:
+  stackedit:
+    image: mafgwo/stackedit:【docker中央仓库找到最新版本】
+    container_name: stackedit
+    environment:
+      - LISTENING_PORT=8080
+      - ROOT_URL=/
+      - USER_BUCKET_NAME=root
+      - DROPBOX_APP_KEY=【不需要支持则删掉】
+      - DROPBOX_APP_KEY_FULL=【不需要支持则删掉】
+      - GITHUB_CLIENT_ID=【不需要支持则删掉】
+      - GITHUB_CLIENT_SECRET=【不需要支持则删掉】
+      - GITEE_CLIENT_ID=【不需要支持则删掉】
+      - GITEE_CLIENT_SECRET=【不需要支持则删掉】
+      - GOOGLE_CLIENT_ID=【不需要支持则删掉】
+      - GOOGLE_API_KEY=【不需要支持则删掉】
+      - GITEA_CLIENT_ID=【不需要支持则删掉】
+      - GITEA_CLIENT_SECRET=【不需要支持则删掉】
+      - GITEA_URL=【不需要支持则删掉】
+      - GITLAB_CLIENT_ID=【不需要支持则删掉】
+      - GITLAB_CLIENT_SECRET=【不需要支持则删掉】
+      - GITLAB_URL=【不需要支持则删掉】
+    ports:
+      - 8080:8080/tcp
+    network_mode: bridge
+    restart: always
+```
 
-
-# 以下是官方原有README内容
-
-# StackEdit
-
-[![Build Status](https://img.shields.io/travis/benweet/stackedit.svg?style=flat)](https://travis-ci.org/benweet/stackedit) [![NPM version](https://img.shields.io/npm/v/stackedit.svg?style=flat)](https://www.npmjs.org/package/stackedit)
-
-> Full-featured, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.
-
-https://stackedit.io/
-
-### Ecosystem
-
-- [Chrome app](https://chrome.google.com/webstore/detail/iiooodelglhkcpgbajoejffhijaclcdg)
-- NEW! Embed StackEdit in any website with [stackedit.js](https://github.com/benweet/stackedit.js)
-- NEW! [Chrome extension](https://chrome.google.com/webstore/detail/ajehldoplanpchfokmeempkekhnhmoha) that uses stackedit.js
-- [Community](https://community.stackedit.io/)
-
-### Build
+docker-compose方式的启动或停止命令
 
 ```bash
-# install dependencies
+# 在 docker-compose.yml 文件目录下 启动命令 
+docker-compose up -d
+# 在 docker-compose.yml 文件目录下 停止命令 
+docker-compose down
+# 更新镜像只需要修改docker-compose.yml中镜像版本执行再停止、启动命令即可
+```
+
+或者可以直接通过Docker命名直接启动，命令如下：
+
+```bash
+docker run -itd --name stackedit \
+  -p 8080:8080 \
+  -e LISTENING_PORT=8080 \
+  -e ROOT_URL=/ \
+  -e USER_BUCKET_NAME=root \
+  -e DROPBOX_APP_KEY=【不需要支持则删掉】 \
+  -e DROPBOX_APP_KEY_FULL=【不需要支持则删掉】 \
+  -e GITHUB_CLIENT_ID=【不需要支持则删掉】 \
+  -e GITHUB_CLIENT_SECRET=【不需要支持则删掉】 \
+  -e GITEE_CLIENT_ID=【不需要支持则删掉】 \
+  -e GITEE_CLIENT_SECRET=【不需要支持则删掉】 \
+  -e GOOGLE_CLIENT_ID=【不需要支持则删掉】 \
+  -e GOOGLE_API_KEY=【不需要支持则删掉】 \
+  -e GITEA_CLIENT_ID=【不需要支持则删掉】 \
+  -e GITEA_CLIENT_SECRET=【不需要支持则删掉】 \
+  -e GITEA_URL=【不需要支持则删掉】 \
+  -e GITLAB_CLIENT_ID=【不需要支持则删掉】 \
+  -e GITLAB_CLIENT_SECRET=【不需要支持则删掉】 \
+  -e GITLAB_URL=【不需要支持则删掉】 \
+  mafgwo/stackedit:【docker中央仓库找到最新版本】
+
+```
+
+## 如何创建三方平台应用
+
+> 部署时，如果需要支持Gitee或GitHub，则需要自行到对应三方平台创建应用，获取到应用ID和秘钥，替换到以上的环境变量中，再启动应用。
+
+- Gitee的环境变量：GITEE_CLIENT_ID、GITEE_CLIENT_SECRET，**[如何创建Gitee应用](./docs/部署之Gitee应用创建.md)**
+- GitHub的环境变量：GITHUB_CLIENT_ID、GITEE_CLIENT_SECRET，**[如何创建GitHub应用](./docs/部署之GitHub应用创建.md)**
+- Gitea可选择性配置环境变量（未配置则在关联时前端指定，有配置则仅允许配置的应用信息）：GITEA_CLIENT_ID、GITEA_CLIENT_SECRET、GITEA_URL，**[如何创建Gitea应用](./docs/部署之Gitea应用创建.md)**
+- Gitlab可选择性配置环境变量（未配置则在关联时前端指定，有配置则仅允许配置的应用信息）：GITLAB_CLIENT_ID、GITLAB_CLIENT_SECRET、GITLAB_URL **如何创建Gitlab应用(待补充文档)**
+
+（特别说明：自建的Gitea、Gitlab要能接入stackedit必须支持跨域）
+
+## 编译与运行
+
+> 编译运行的nodejs版本选择11.15.0版本
+
+```bash
+# 安装依赖
 npm install
 
 # serve with hot reload at localhost:8080
@@ -82,62 +189,3 @@ npm run build
 # build for production and view the bundle analyzer report
 npm run build --report
 ```
-
-### Deploy with Helm
-
-StackEdit Helm chart allows easy StackEdit deployment to any Kubernetes cluster.
-You can use it to configure deployment with your existing ingress controller and cert-manager.
-
-```bash
-# Add the StackEdit Helm repository
-helm repo add stackedit https://benweet.github.io/stackedit-charts/
-
-# Update your local Helm chart repository cache
-helm repo update
-
-# Deploy StackEdit chart to your cluster
-helm install --name stackedit stackedit/stackedit \
-  --set dropboxAppKey=$DROPBOX_API_KEY \
-  --set dropboxAppKeyFull=$DROPBOX_FULL_ACCESS_API_KEY \
-  --set googleClientId=$GOOGLE_CLIENT_ID \
-  --set googleApiKey=$GOOGLE_API_KEY \
-  --set githubClientId=$GITHUB_CLIENT_ID \
-  --set githubClientSecret=$GITHUB_CLIENT_SECRET \
-  --set wordpressClientId=\"$WORDPRESS_CLIENT_ID\" \
-  --set wordpressSecret=$WORDPRESS_CLIENT_SECRET
-```
-
-Later, to upgrade StackEdit to the latest version:
-
-```bash
-helm repo update
-helm upgrade stackedit stackedit/stackedit
-```
-
-If you want to uninstall StackEdit:
-
-```bash
-helm delete --purge stackedit
-```
-
-If you want to use your existing ingress controller and cert-manager issuer:
-
-```bash
-# See https://docs.cert-manager.io/en/latest/tutorials/acme/quick-start/index.html
-helm install --name stackedit stackedit/stackedit \
-  --set dropboxAppKey=$DROPBOX_API_KEY \
-  --set dropboxAppKeyFull=$DROPBOX_FULL_ACCESS_API_KEY \
-  --set googleClientId=$GOOGLE_CLIENT_ID \
-  --set googleApiKey=$GOOGLE_API_KEY \
-  --set githubClientId=$GITHUB_CLIENT_ID \
-  --set githubClientSecret=$GITHUB_CLIENT_SECRET \
-  --set wordpressClientId=\"$WORDPRESS_CLIENT_ID\" \
-  --set wordpressSecret=$WORDPRESS_CLIENT_SECRET \
-  --set ingress.enabled=true \
-  --set ingress.annotations."kubernetes\.io/ingress\.class"=nginx \
-  --set ingress.annotations."cert-manager\.io/cluster-issuer"=letsencrypt-prod \
-  --set ingress.hosts[0].host=stackedit.example.com \
-  --set ingress.hosts[0].paths[0]=/ \
-  --set ingress.tls[0].secretName=stackedit-tls \
-  --set ingress.tls[0].hosts[0]=stackedit.example.com
-```

build.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# 检查参数是否提供版本号
+if [ -z "$1" ]; then
+  echo "请提供版本号作为参数"
+  exit 1
+fi
+
+# 定义版本号变量
+VERSION="$1"
+IMAGE_NAME="mafgwo/stackedit"
+
+# 构建 Docker 镜像
+build_image() {
+  docker build -t "$IMAGE_NAME" .
+}
+
+# 标记 Docker 镜像
+tag_image() {
+  docker tag "$IMAGE_NAME" "$IMAGE_NAME:$VERSION"
+  docker tag "$IMAGE_NAME" "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME:$VERSION"
+}
+
+# 推送 Docker 镜像
+push_image() {
+  docker push "$IMAGE_NAME"
+  docker push "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME"
+  docker push "$IMAGE_NAME:$VERSION"
+  docker push "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME:$VERSION"
+}
+
+# 执行构建、标记和推送
+build_image
+tag_image
+push_image
+
+echo "操作完成"

chart/values.yaml

@@ -15,6 +15,11 @@ wordpressSecret: ""
 paypalReceiverEmail: ""
 awsAccessKeyId: ""
 awsSecretAccessKey: ""
+giteaClientId: ""
+giteaClientSecret: ""
+giteaUrl: ""
+gitlabClientId: ""
+gitlabUrl: ""
 
 replicaCount: 1
 

chrome-app/manifest.json

@@ -1,10 +1,10 @@
 {
     "name": "StackEdit中文版",
     "description": "支持Gitee仓库/粘贴图片自动上传的浏览器内 Markdown 编辑器",
-  "version": "1.0.0",
+    "version": "5.15.17",
     "manifest_version": 2,
-  "container" : "GITEE",
-  "api_console_project_id" : "241271498917",
+    "container": "GITEE",
+    "api_console_project_id": "241271498917",
     "icons": {
         "16": "icon-16.png",
         "32": "icon-32.png",
@@ -15,10 +15,10 @@
     },
     "app": {
         "urls": [
-      "https://stackedit.cn/"
+            "https://md.jonylee.top/"
         ],
         "launch": {
-      "web_url": "https://stackedit.cn/app"
+            "web_url": "https://md.jonylee.top/app"
         }
     },
     "offline_enabled": true,

config/dev.env.js

@@ -9,4 +9,10 @@ module.exports = merge(prodEnv, {
   GITEE_CLIENT_ID: '"925ba7c78b85dec984f7877e4aca5cab10ae333c6d68e761bdb0b9dfb8f55672"',
   GITEE_CLIENT_SECRET: '"f05731066e42d307339dc8ebbb037a103881dafc7207a359a393b87749f1c562"',
   CLIENT_ID: '"thF3qCGLN39OtafjGnqHyj6n02WwE6xD"',
+  // GITEA_CLIENT_ID: '"fe30f8f9-b1e8-4531-8f72-c1a5d3912805"',
+  // GITEA_CLIENT_SECRET: '"lus7oMnb3H6M1hsChndphArE20Txr7erwJLf7SDBQWTw"',
+  // GITEA_URL: '"https://gitea.test.com"',
+  GITLAB_CLIENT_ID: '"074cd5103c62dea0f479dac861039656ac80935e304c8113a02cc64c629496ae"', 
+  GITLAB_CLIENT_SECRET: '"6f406f24216b686d55d28313dec1913c2a8e599afdb08380d5e8ce838e16e41e"',
+  GITLAB_URL: '"http://gitlab.qicoder.com"',
 })

docs/大文档导出PDF方式.md

@@ -0,0 +1,10 @@
+# 大文档导出PDF方式说明
+> 由于大文档导出PDF，需要消费非常多的服务器资源，而且很容易导致导出超时，故导出PDF的MD文档过大时，可以使用 **[wkhtmltopdf](https://wkhtmltopdf.org/downloads.html)** 工具导出。
+
+# 操作步骤
+- 先在 **[StackEdit中文版](https://stackedit.cn/app)** 中使用 `导出为HTML` 功能导出MD文档，导出后可以得到一个HTML文档。
+- 到 **[wkhtmltopdf](https://wkhtmltopdf.org/downloads.html)** 官网下载安装程序。
+- 使用 wkhtmltopdf 的导出PDF的命令 `wkhtmltopdf [GLOBAL OPTION]... [OBJECT]... <output file>` 把HTML导出为PDF，如简单的导出命令：`wkhtmltopdf test.html test.pdf`，具体的 `GLOBAL OPTION` 参数说明可以通过 `wkhtmltopdf -H` 查看帮助文档。
+
+
+

docs/部署之GitHub应用创建.md

@@ -0,0 +1,20 @@
+# GitHub应用配置说明
+
+> StackEdit中文版部署如果需要支持GitHub，则需要到GitHub创建一个应用，并复制其中的clientId和clientSecret填充到环境变量 GITHUB_CLIENT_ID 和 GITHUB_CLIENT_SECRET 中。
+
+
+# 如何创建GitHub应用
+
+按下面图的指示创建
+
+
+![](../images/github/github01.png)
+
+![](../images/github/github02.png)
+
+![](../images/github/github03.png)
+
+![](../images/github/github04.png)
+
+![](../images/github/github05.png)
+

docs/部署之Gitea应用创建.md

@@ -0,0 +1,35 @@
+# Gitea应用配置说明
+
+> StackEdit中文版支持Gitea，则需要到Gitea创建一个应用，在StackEdit中文版绑定Gitea账号的时候填入。
+
+
+# 如何创建Gitea应用
+
+按下面图的指示创建
+
+
+![](../images/gitea/gitea01.png)
+
+![](../images/gitea/gitea02.png)
+
+![](../images/gitea/gitea03.png)
+
+![](../images/gitea/gitea04.png)
+
+创建成功后即可看到应用ID 和 应用秘钥。
+
+# Gitea跨域问题
+
+由于StackEdit中文版是从浏览器直接访问Gitea接口，故个人部署的Gitea需要支持跨域，至于如何支持跨域，请参考官方文档：https://docs.gitea.io/en-us/config-cheat-sheet/#cors-cors (官方跨域的支持好像存在问题，我个人包括很多网友通过这个配置支持跨域都失败了，如果你也失败了，可以试试用nginx代理实现跨域)
+
+nginx配置实现跨域的配置如下：
+
+```
+  add_header                 Access-Control-Allow-Headers *;
+  add_header                 Access-Control-Allow-Origin $http_origin;
+  add_header                 Access-Control-Allow-Methods GET,POST,PUT,DELETE,OPTIONS;
+
+  if ($request_method = 'OPTIONS') {
+    return 204;
+  }
+```

docs/部署之Gitee应用创建.md

@@ -0,0 +1,19 @@
+# Gitee应用配置说明
+
+> StackEdit中文版部署如果需要支持Gitee，则需要到Gitee创建一个应用，并复制其中的clientId和clientSecret填充到环境变量 GITEE_CLIENT_ID 和 GITEE_CLIENT_SECRET 中。
+
+
+# 如何创建Gitee应用
+
+按下面图的指示创建
+
+
+![](../images/gitee/gitee01.png)
+
+![](../images/gitee/gitee02.png)
+
+![](../images/gitee/gitee03.png)
+
+![](../images/gitee/gitee04.png)
+
+创建成功后即可看到client id 和 client secret。

index.html

@@ -1,28 +1,31 @@
 <!DOCTYPE html>
 <html>
-  <head>
+
+<head>
     <meta charset="utf-8">
-    <title>StackEdit中文版</title>
-    <link rel="canonical" href="https://stackedit.cn/app">
-    <meta name="description" content="免费，开源，功能全面的Markdown编辑器。">
+    <title>Markdown编辑器-JonyLee的设计导航</title>
+    <link rel="canonical" href="https://md.jonylee.top">
+    <meta name="description" content="StackEdit中文版，免费，开源，功能全面的Markdown编辑器。">
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script>
-      var _hmt = _hmt || [];
-    </script>
-  </head>
-  <body>
+</head>
+
+<body>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+    <!-- baidu统计 -->
     <script>
+        var _hmt = _hmt || [];
         (function() {
             var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?20a1e7a201b42702c49074c87a1f1035";
+            hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
             var s = document.getElementsByTagName("script")[0];
             s.parentNode.insertBefore(hm, s);
         })();
     </script>
-  </body>
+    <!-- baidu统计结束 -->
+</body>
+
 </html>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "5.15.7",
+  "version": "5.15.21",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -594,7 +594,7 @@
     },
     "@braintree/sanitize-url": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz",
       "integrity": "sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="
     },
     "@mrmlnc/readdir-enhanced": {
@@ -736,7 +736,8 @@
     "abab": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
-      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="
+      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
+      "dev": true
     },
     "abbrev": {
       "version": "1.1.1",
@@ -763,7 +764,8 @@
     "acorn": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
-      "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug=="
+      "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+      "dev": true
     },
     "acorn-dynamic-import": {
       "version": "2.0.2",
@@ -786,6 +788,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz",
       "integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==",
+      "dev": true,
       "requires": {
         "acorn": "^5.0.0"
       }
@@ -1021,7 +1024,8 @@
     "array-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
+      "dev": true
     },
     "array-filter": {
       "version": "0.0.1",
@@ -1237,7 +1241,8 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "dev": true
     },
     "async-settle": {
       "version": "1.0.0",
@@ -1273,38 +1278,6 @@
         "postcss-value-parser": "^3.2.3"
       }
     },
-    "aws-sdk": {
-      "version": "2.317.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.317.0.tgz",
-      "integrity": "sha512-X2Cd1Gb9Cf9WVgGOiBSW4TK6q5Mb6AYiGmEA9XikCgur4H8E4TgmgWbBWJnTzxssugclVLVoWQfw3RshNKJksg==",
-      "requires": {
-        "buffer": "4.9.1",
-        "events": "1.1.1",
-        "ieee754": "1.1.8",
-        "jmespath": "0.15.0",
-        "querystring": "0.2.0",
-        "sax": "1.2.1",
-        "url": "0.10.3",
-        "uuid": "3.1.0",
-        "xml2js": "0.4.19"
-      },
-      "dependencies": {
-        "xml2js": {
-          "version": "0.4.19",
-          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-          "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-          "requires": {
-            "sax": ">=0.6.0",
-            "xmlbuilder": "~9.0.1"
-          }
-        },
-        "xmlbuilder": {
-          "version": "9.0.7",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-          "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-        }
-      }
-    },
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -2346,7 +2319,8 @@
     "base64-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
+      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+      "dev": true
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -2481,7 +2455,8 @@
     "browser-process-hrtime": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz",
-      "integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44="
+      "integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44=",
+      "dev": true
     },
     "browser-resolve": {
       "version": "1.11.3",
@@ -2593,6 +2568,7 @@
       "version": "4.9.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
       "requires": {
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4",
@@ -3904,12 +3880,14 @@
     "cssom": {
       "version": "0.3.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz",
-      "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="
+      "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==",
+      "dev": true
     },
     "cssstyle": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.1.1.tgz",
       "integrity": "sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==",
+      "dev": true,
       "requires": {
         "cssom": "0.3.x"
       }
@@ -4010,7 +3988,7 @@
     },
     "d3-collection": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
+      "resolved": "https://registry.npmmirror.com/d3-collection/-/d3-collection-1.0.7.tgz",
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "d3-color": {
@@ -4188,7 +4166,7 @@
     },
     "d3-voronoi": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
       "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
     },
     "d3-zoom": {
@@ -4205,7 +4183,7 @@
     },
     "dagre": {
       "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz",
+      "resolved": "https://registry.npmmirror.com/dagre/-/dagre-0.8.5.tgz",
       "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==",
       "requires": {
         "graphlib": "^2.1.8",
@@ -4214,14 +4192,14 @@
       "dependencies": {
         "lodash": {
           "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
           "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         }
       }
     },
     "dagre-d3": {
       "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.4.tgz",
+      "resolved": "https://registry.npmmirror.com/dagre-d3/-/dagre-d3-0.6.4.tgz",
       "integrity": "sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==",
       "requires": {
         "d3": "^5.14",
@@ -4232,7 +4210,7 @@
       "dependencies": {
         "lodash": {
           "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
           "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         }
       }
@@ -4249,6 +4227,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.0.1.tgz",
       "integrity": "sha512-0HdcMZzK6ubMUnsMmQmG0AcLQPvbvb47R0+7CCZQCYgcd8OUWG91CG7sM6GoXgjz+WLl4ArFzHtBMy/QqSF4eg==",
+      "dev": true,
       "requires": {
         "abab": "^2.0.0",
         "whatwg-mimetype": "^2.1.0",
@@ -4259,6 +4238,7 @@
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
           "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+          "dev": true,
           "requires": {
             "lodash.sortby": "^4.7.0",
             "tr46": "^1.0.1",
@@ -4317,7 +4297,8 @@
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
     },
     "default-compare": {
       "version": "1.0.0",
@@ -4579,6 +4560,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
       "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "dev": true,
       "requires": {
         "webidl-conversions": "^4.0.2"
       }
@@ -4592,6 +4574,11 @@
         "domelementtype": "1"
       }
     },
+    "domino": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmmirror.com/domino/-/domino-2.1.6.tgz",
+      "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="
+    },
     "domutils": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
@@ -4759,7 +4746,7 @@
     },
     "entity-decode": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/entity-decode/-/entity-decode-2.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/entity-decode/-/entity-decode-2.0.2.tgz",
       "integrity": "sha512-5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg==",
       "requires": {
         "he": "^1.1.1"
@@ -4881,6 +4868,7 @@
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
       "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+      "dev": true,
       "requires": {
         "esprima": "^3.1.3",
         "estraverse": "^4.2.0",
@@ -4892,12 +4880,14 @@
         "esprima": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
           "optional": true
         }
       }
@@ -5349,12 +5339,14 @@
     "estraverse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
     },
     "esutils": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
     },
     "etag": {
       "version": "1.8.1",
@@ -5370,7 +5362,8 @@
     "events": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true
     },
     "eventsource-polyfill": {
       "version": "0.9.6",
@@ -6060,7 +6053,8 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
     },
     "fastparse": {
       "version": "1.1.1",
@@ -8642,16 +8636,6 @@
         "delegate": "^3.1.2"
       }
     },
-    "google-id-token-verifier": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/google-id-token-verifier/-/google-id-token-verifier-0.2.3.tgz",
-      "integrity": "sha1-nmt41FieLQUNqBYT+4kK26MKTqg=",
-      "requires": {
-        "request": "^2.65.0",
-        "rsa-pem-from-mod-exp": "^0.8.4",
-        "underscore": "^1.8.3"
-      }
-    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -8660,7 +8644,7 @@
     },
     "graphlib": {
       "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz",
+      "resolved": "https://registry.npmmirror.com/graphlib/-/graphlib-2.1.8.tgz",
       "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==",
       "requires": {
         "lodash": "^4.17.15"
@@ -8668,7 +8652,7 @@
       "dependencies": {
         "lodash": {
           "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
           "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         }
       }
@@ -9069,6 +9053,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
       "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "dev": true,
       "requires": {
         "whatwg-encoding": "^1.0.1"
       }
@@ -9639,7 +9624,8 @@
     "ieee754": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "dev": true
     },
     "iferr": {
       "version": "0.1.5",
@@ -11238,11 +11224,6 @@
         "url-regex": "^3.0.0"
       }
     },
-    "jmespath": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
-    },
     "jpeg-js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.2.0.tgz",
@@ -11298,6 +11279,7 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
       "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+      "dev": true,
       "requires": {
         "abab": "^2.0.0",
         "acorn": "^5.5.3",
@@ -11330,17 +11312,20 @@
         "acorn": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
-          "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="
+          "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
+          "dev": true
         },
         "sax": {
           "version": "1.2.4",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "dev": true
         },
         "whatwg-url": {
           "version": "6.5.0",
           "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
           "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+          "dev": true,
           "requires": {
             "lodash.sortby": "^4.7.0",
             "tr46": "^1.0.1",
@@ -11351,6 +11336,7 @@
           "version": "5.2.2",
           "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
           "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "dev": true,
           "requires": {
             "async-limiter": "~1.0.0"
           }
@@ -11450,17 +11436,17 @@
       "dev": true
     },
     "katex": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.13.0.tgz",
-      "integrity": "sha512-6cHbzbegYgS9vvVGuH8UA+o97X+ZshtboSqJJCdq7trBYzuD75JNwr7Ef606xkUjecPPhFnyB+afx1dVafielg==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmmirror.com/katex/-/katex-0.16.2.tgz",
+      "integrity": "sha512-70DJdQAyh9EMsthw3AaQlDyFf54X7nWEUIa5W+rq8XOpEk//w5Th7/8SqFqpvi/KZ2t6MHUj4f9wLmztBmAYQA==",
       "requires": {
-        "commander": "^6.0.0"
+        "commander": "^8.0.0"
       },
       "dependencies": {
         "commander": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="
+          "version": "8.3.0",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
         }
       }
     },
@@ -11549,7 +11535,8 @@
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
-      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "dev": true
     },
     "leven": {
       "version": "2.1.0",
@@ -11561,6 +11548,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -12513,7 +12501,7 @@
     },
     "minify": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/minify/-/minify-4.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/minify/-/minify-4.1.3.tgz",
       "integrity": "sha512-ykuscavxivSmVpcCzsXmsVTukWYLUUtPhHj0w2ILvHDGqC+hsuTCihBn9+PJBd58JNvWTNg9132J9nrrI2anzA==",
       "requires": {
         "clean-css": "^4.1.6",
@@ -12527,7 +12515,7 @@
       "dependencies": {
         "commander": {
           "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
           "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
         },
         "debug": {
@@ -12540,12 +12528,12 @@
         },
         "he": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
           "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
         },
         "html-minifier": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/html-minifier/-/html-minifier-4.0.0.tgz",
           "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==",
           "requires": {
             "camel-case": "^3.0.0",
@@ -12559,7 +12547,7 @@
         },
         "ms": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "uglify-js": {
@@ -13342,7 +13330,8 @@
     "nwsapi": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.8.tgz",
-      "integrity": "sha512-7RZ+qbFGiVc6v14Y8DSZjPN1wZPOaMbiiP4tzf5eNuyOITAeOIA3cMhjuKUypVIqBgCSg1KaSyAv8Ocq/0ZJ1A=="
+      "integrity": "sha512-7RZ+qbFGiVc6v14Y8DSZjPN1wZPOaMbiiP4tzf5eNuyOITAeOIA3cMhjuKUypVIqBgCSg1KaSyAv8Ocq/0ZJ1A==",
+      "dev": true
     },
     "oauth-sign": {
       "version": "0.9.0",
@@ -13677,6 +13666,7 @@
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
       "requires": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.4",
@@ -13689,7 +13679,8 @@
         "wordwrap": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+          "dev": true
         }
       }
     },
@@ -14007,7 +13998,8 @@
     "parse5": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "dev": true
     },
     "parseurl": {
       "version": "1.3.2",
@@ -14208,7 +14200,8 @@
     "pn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
+      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
+      "dev": true
     },
     "pngjs": {
       "version": "3.3.3",
@@ -15111,7 +15104,8 @@
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
     },
     "prepend-http": {
       "version": "1.0.4",
@@ -15275,7 +15269,8 @@
     "punycode": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
     },
     "q": {
       "version": "1.5.1",
@@ -15301,7 +15296,8 @@
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
     },
     "querystring-es3": {
       "version": "0.2.1",
@@ -16250,6 +16246,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
       "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+      "dev": true,
       "requires": {
         "lodash": "^4.13.1"
       }
@@ -16258,6 +16255,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz",
       "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=",
+      "dev": true,
       "requires": {
         "request-promise-core": "1.1.1",
         "stealthy-require": "^1.1.0",
@@ -16419,11 +16417,6 @@
         "inherits": "^2.0.1"
       }
     },
-    "rsa-pem-from-mod-exp": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/rsa-pem-from-mod-exp/-/rsa-pem-from-mod-exp-0.8.4.tgz",
-      "integrity": "sha1-NipCxtMEBW1JOz8SvOq7LGV2ptQ="
-    },
     "rsvp": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
@@ -17714,7 +17707,8 @@
     "sax": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=",
+      "dev": true
     },
     "schema-utils": {
       "version": "0.3.0",
@@ -18448,7 +18442,8 @@
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
     },
     "stream-browserify": {
       "version": "2.0.1",
@@ -19607,7 +19602,8 @@
     "symbol-tree": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
+      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
+      "dev": true
     },
     "table": {
       "version": "4.0.2",
@@ -20417,12 +20413,12 @@
     },
     "try-catch": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/try-catch/-/try-catch-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/try-catch/-/try-catch-2.0.1.tgz",
       "integrity": "sha512-LsOrmObN/2WdM+y2xG+t16vhYrQsnV8wftXIcIOWZhQcBJvKGYuamJGwnU98A7Jxs2oZNkJztXlphEOoA0DWqg=="
     },
     "try-to-catch": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/try-to-catch/-/try-to-catch-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/try-to-catch/-/try-to-catch-1.1.1.tgz",
       "integrity": "sha512-ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA=="
     },
     "tryer": {
@@ -20466,11 +20462,11 @@
       }
     },
     "turndown": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/turndown/-/turndown-4.0.2.tgz",
-      "integrity": "sha512-pqZ6WrHFGnxXC9q2xJ3Qa7EoLAwrojgFRajWZjxTKwbz9vnNnyi8lLjiD5h86UTPOcMlEyHjm6NMhjEDdlc25A==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/turndown/-/turndown-7.1.1.tgz",
+      "integrity": "sha512-BEkXaWH7Wh7e9bd2QumhfAXk5g34+6QUmmWx+0q6ThaVOLuLUqsnkq35HQ5SBHSaxjSfSM7US5o4lhJNH7B9MA==",
       "requires": {
-        "jsdom": "^11.9.0"
+        "domino": "^2.1.6"
       }
     },
     "tweetnacl": {
@@ -20489,6 +20485,7 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2"
       }
@@ -20568,7 +20565,8 @@
     "underscore": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
+      "dev": true
     },
     "undertaker": {
       "version": "1.3.0",
@@ -20843,15 +20841,6 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
     "url-loader": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.1.tgz",
@@ -20976,11 +20965,6 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
       "dev": true
     },
-    "uuid": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
-    },
     "v8flags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -21336,6 +21320,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
       "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
+      "dev": true,
       "requires": {
         "browser-process-hrtime": "^0.1.2"
       }
@@ -21757,6 +21742,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.4.tgz",
       "integrity": "sha512-vM9KWN6MP2mIHZ86ytcyIv7e8Cj3KTfO2nd2c8PFDqcI4bxFmQp83ibq4wadq7rL9l9sZV6o9B0LTt8ygGAAXg==",
+      "dev": true,
       "requires": {
         "iconv-lite": "0.4.23"
       },
@@ -21765,6 +21751,7 @@
           "version": "0.4.23",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
           "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "dev": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3"
           }
@@ -21774,7 +21761,8 @@
     "whatwg-mimetype": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz",
-      "integrity": "sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew=="
+      "integrity": "sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew==",
+      "dev": true
     },
     "whatwg-url": {
       "version": "6.4.0",
@@ -21953,7 +21941,8 @@
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
     },
     "xml-parse-from-string": {
       "version": "1.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "5.15.7",
+  "version": "5.15.21",
   "description": "免费, 开源, 功能齐全的 Markdown 编辑器",
   "author": "Benoit Schweblin, 豆萁",
   "license": "Apache-2.0",
@@ -27,7 +27,6 @@
   "dependencies": {
     "@vue/test-utils": "^1.0.0-beta.16",
     "abcjs": "^5.2.0",
-    "aws-sdk": "^2.317.0",
     "babel-runtime": "^6.26.0",
     "bezier-easing": "^1.1.0",
     "body-parser": "^1.18.2",
@@ -35,11 +34,10 @@
     "compression": "^1.7.0",
     "diff-match-patch": "^1.0.0",
     "file-saver": "^1.3.8",
-    "google-id-token-verifier": "^0.2.3",
     "handlebars": "^4.0.10",
     "indexeddbshim": "^3.6.2",
     "js-yaml": "^3.11.0",
-    "katex": "^0.13.0",
+    "katex": "^0.16.2",
     "markdown-it": "^8.4.1",
     "markdown-it-abbr": "^1.0.4",
     "markdown-it-deflist": "^2.0.2",
@@ -57,7 +55,7 @@
     "request": "^2.85.0",
     "serve-static": "^1.13.2",
     "tmp": "^0.0.33",
-    "turndown": "^4.0.2",
+    "turndown": "^7.1.1",
     "vue": "^2.5.16",
     "vuex": "^3.0.1"
   },

server/conf.js

@@ -1,7 +1,5 @@
 const pandocPath = process.env.PANDOC_PATH || 'pandoc';
 const wkhtmltopdfPath = process.env.WKHTMLTOPDF_PATH || 'wkhtmltopdf';
-const userBucketName = process.env.USER_BUCKET_NAME || 'stackedit-users';
-const paypalUri = process.env.PAYPAL_URI || 'https://www.paypal.com/cgi-bin/webscr';
 const paypalReceiverEmail = process.env.PAYPAL_RECEIVER_EMAIL;
 
 const dropboxAppKey = process.env.DROPBOX_APP_KEY;
@@ -13,12 +11,16 @@ const giteeClientSecret = process.env.GITEE_CLIENT_SECRET;
 const googleClientId = process.env.GOOGLE_CLIENT_ID;
 const googleApiKey = process.env.GOOGLE_API_KEY;
 const wordpressClientId = process.env.WORDPRESS_CLIENT_ID;
+const giteaClientId = process.env.GITEA_CLIENT_ID;
+const giteaClientSecret = process.env.GITEA_CLIENT_SECRET;
+const giteaUrl = process.env.GITEA_URL;
+const gitlabClientId = process.env.GITLAB_CLIENT_ID;
+const gitlabClientSecret = process.env.GITLAB_CLIENT_SECRET;
+const gitlabUrl = process.env.GITLAB_URL;
 
 exports.values = {
   pandocPath,
   wkhtmltopdfPath,
-  userBucketName,
-  paypalUri,
   paypalReceiverEmail,
   dropboxAppKey,
   dropboxAppKeyFull,
@@ -29,6 +31,12 @@ exports.values = {
   googleClientId,
   googleApiKey,
   wordpressClientId,
+  giteaClientId,
+  giteaClientSecret,
+  giteaUrl,
+  gitlabClientId,
+  gitlabClientSecret,
+  gitlabUrl,
 };
 
 exports.publicValues = {
@@ -39,4 +47,8 @@ exports.publicValues = {
   googleApiKey,
   wordpressClientId,
   allowSponsorship: !!paypalReceiverEmail,
+  giteaClientId,
+  giteaUrl,
+  gitlabClientId,
+  gitlabUrl,
 };

server/gitea.js

@@ -0,0 +1,40 @@
+const request = require('request');
+const conf = require('./conf');
+
+function giteaToken(queryParam) {
+  return new Promise((resolve, reject) => {
+    request({
+      method: 'POST',
+      url: `${conf.values.giteaUrl}/login/oauth/access_token`,
+      headers: {
+        'content-type': 'application/json',
+      },
+      json: true,
+      body: {
+        ...queryParam,
+        client_id: conf.values.giteaClientId,
+        client_secret: conf.values.giteaClientSecret,
+      },
+    }, (err, res, body) => {
+      if (err) {
+        reject(err);
+      }
+      const token = body.access_token;
+      if (token) {
+        resolve(body);
+      } else {
+        reject(res.statusCode + ',body:' + JSON.stringify(body));
+      }
+    });
+  });
+}
+
+exports.giteaToken = (req, res) => {
+  giteaToken(req.query)
+    .then(
+      tokenBody => res.send(tokenBody),
+      err => res
+        .status(400)
+        .send(err ? err.message || err.toString() : 'bad_code'),
+    );
+};

server/gitlab.js

@@ -0,0 +1,40 @@
+const request = require('request');
+const conf = require('./conf');
+
+function gitlabToken(queryParam) {
+  return new Promise((resolve, reject) => {
+    request({
+      method: 'POST',
+      url: `${conf.values.gitlabUrl}/oauth/token`,
+      headers: {
+        'content-type': 'application/json',
+      },
+      json: true,
+      qs: {
+        ...queryParam,
+        client_id: conf.values.gitlabClientId,
+        client_secret: conf.values.gitlabClientSecret,
+      },
+    }, (err, res, body) => {
+      if (err) {
+        reject(err);
+      }
+      const token = body.access_token;
+      if (token) {
+        resolve(body);
+      } else {
+        reject(res.statusCode + ',body:' + JSON.stringify(body));
+      }
+    });
+  });
+}
+
+exports.gitlabToken = (req, res) => {
+  gitlabToken(req.query)
+    .then(
+      tokenBody => res.send(tokenBody),
+      err => res
+        .status(400)
+        .send(err ? err.message || err.toString() : 'bad_code'),
+    );
+};

server/index.js

@@ -2,9 +2,10 @@ const compression = require('compression');
 const serveStatic = require('serve-static');
 const bodyParser = require('body-parser');
 const path = require('path');
-const user = require('./user');
 const github = require('./github');
 const gitee = require('./gitee');
+const gitea = require('./gitea');
+const gitlab = require('./gitlab');
 const pdf = require('./pdf');
 const pandoc = require('./pandoc');
 const conf = require('./conf');
@@ -27,16 +28,26 @@ module.exports = (app) => {
 
   app.get('/oauth2/githubToken', github.githubToken);
   app.get('/oauth2/giteeToken', gitee.giteeToken);
+  app.get('/oauth2/giteaToken', gitea.giteaToken);
+  app.get('/oauth2/gitlabToken', gitlab.gitlabToken);
   app.get('/conf', (req, res) => res.send(conf.publicValues));
-  app.get('/userInfo', user.userInfo);
   app.post('/pdfExport', pdf.generate);
   app.post('/pandocExport', pandoc.generate);
-  app.post('/paypalIpn', bodyParser.urlencoded({
-    extended: false,
-  }), user.paypalIpn);
   app.get('/giteeClientId', (req, res) => {
     const giteeClientIds = conf.values.giteeClientId.split(',');
-    const clientId = giteeClientIds[Math.floor((giteeClientIds.length * Math.random()))];
+    // 仅一个 则直接返回
+    if (giteeClientIds.length === 1) {
+      res.send(giteeClientIds[0]);
+      return;
+    }
+    // 是否随机一个clientId 默认第一个 如果random 为1 则使用随机 避免单个应用接口次数用满无法自动切换其他应用
+    const random = req.query.random;
+    if (!random) {
+      res.send(giteeClientIds[0]);
+      return;
+    }
+    // 随机一个 排除第一个 因为第一个应用接口次数用完了
+    const clientId = giteeClientIds[Math.floor(((giteeClientIds.length - 1) * Math.random())) + 1];
     res.send(clientId);
   });
   // Serve landing.html
@@ -50,16 +61,23 @@ module.exports = (app) => {
   // Google Drive action receiver
   app.get('/googleDriveAction', (req, res) =>
     res.redirect(`./app#providerId=googleDrive&state=${encodeURIComponent(req.query.state)}`));
-
-  // Serve static resources
-  if (process.env.NODE_ENV === 'production') {
-    // Serve index.html in /app
-    app.get('/app', (req, res) => res.sendFile(resolvePath('dist/index.html')));
+  // Serve the static folder with 30 day max-age
+  app.use('/themes', serveStatic(resolvePath('static/themes'), {
+    maxAge: '5d',
+  }));
 
   // Serve style.css with 1 day max-age
   app.get('/style.css', (req, res) => res.sendFile(resolvePath('dist/style.css'), {
     maxAge: '1d',
   }));
+  // Serve share.html
+  app.get('/share.html', (req, res) => res.sendFile(resolvePath('static/landing/share.html')));
+  app.get('/gistshare.html', (req, res) => res.sendFile(resolvePath('static/landing/gistshare.html')));
+
+  // Serve static resources
+  if (process.env.NODE_ENV === 'production') {
+    // Serve index.html in /app
+    app.get('/app', (req, res) => res.sendFile(resolvePath('dist/index.html')));
 
     // Serve the static folder with 1 year max-age
     app.use('/static', serveStatic(resolvePath('dist/static'), {

server/user.js

@@ -1,116 +0,0 @@
-const request = require('request');
-const AWS = require('aws-sdk');
-const verifier = require('google-id-token-verifier');
-const conf = require('./conf');
-
-const s3Client = new AWS.S3();
-
-const cb = (resolve, reject) => (err, res) => {
-  if (err) {
-    reject(err);
-  } else {
-    resolve(res);
-  }
-};
-
-exports.getUser = id => new Promise((resolve, reject) => {
-  s3Client.getObject({
-    Bucket: conf.values.userBucketName,
-    Key: id,
-  }, cb(resolve, reject));
-})
-  .then(
-    res => JSON.parse(`${res.Body}`),
-    (err) => {
-      if (err.code !== 'NoSuchKey') {
-        throw err;
-      }
-    },
-  );
-
-exports.putUser = (id, user) => new Promise((resolve, reject) => {
-  s3Client.putObject({
-    Bucket: conf.values.userBucketName,
-    Key: id,
-    Body: JSON.stringify(user),
-  }, cb(resolve, reject));
-});
-
-exports.removeUser = id => new Promise((resolve, reject) => {
-  s3Client.deleteObject({
-    Bucket: conf.values.userBucketName,
-    Key: id,
-  }, cb(resolve, reject));
-});
-
-exports.getUserFromToken = idToken => new Promise((resolve, reject) => verifier
-  .verify(idToken, conf.values.googleClientId, cb(resolve, reject)))
-  .then(tokenInfo => exports.getUser(tokenInfo.sub));
-
-exports.userInfo = (req, res) => exports.getUserFromToken(req.query.idToken)
-  .then(
-    user => res.send(Object.assign({
-      sponsorUntil: 0,
-    }, user)),
-    err => res
-      .status(400)
-      .send(err ? err.message || err.toString() : 'invalid_token'),
-  );
-
-exports.paypalIpn = (req, res, next) => Promise.resolve()
-  .then(() => {
-    const userId = req.body.custom;
-    const paypalEmail = req.body.payer_email;
-    const gross = parseFloat(req.body.mc_gross);
-    let sponsorUntil;
-    if (gross === 5) {
-      sponsorUntil = Date.now() + (3 * 31 * 24 * 60 * 60 * 1000); // 3 months
-    } else if (gross === 15) {
-      sponsorUntil = Date.now() + (366 * 24 * 60 * 60 * 1000); // 1 year
-    } else if (gross === 25) {
-      sponsorUntil = Date.now() + (2 * 366 * 24 * 60 * 60 * 1000); // 2 years
-    } else if (gross === 50) {
-      sponsorUntil = Date.now() + (5 * 366 * 24 * 60 * 60 * 1000); // 5 years
-    }
-    if (
-      req.body.receiver_email !== conf.values.paypalReceiverEmail ||
-      req.body.payment_status !== 'Completed' ||
-      req.body.mc_currency !== 'USD' ||
-      (req.body.txn_type !== 'web_accept' && req.body.txn_type !== 'subscr_payment') ||
-      !userId || !sponsorUntil
-    ) {
-      // Ignoring PayPal IPN
-      return res.end();
-    }
-    // Processing PayPal IPN
-    req.body.cmd = '_notify-validate';
-    return new Promise((resolve, reject) => request.post({
-      uri: conf.values.paypalUri,
-      form: req.body,
-    }, (err, response, body) => {
-      if (err) {
-        reject(err);
-      } else if (body !== 'VERIFIED') {
-        reject(new Error('PayPal IPN unverified'));
-      } else {
-        resolve();
-      }
-    }))
-      .then(() => exports.putUser(userId, {
-        paypalEmail,
-        sponsorUntil,
-      }))
-      .then(() => res.end());
-  })
-  .catch(next);
-
-exports.checkSponsor = (idToken) => {
-  if (!conf.publicValues.allowSponsorship) {
-    return Promise.resolve(true);
-  }
-  if (!idToken) {
-    return Promise.resolve(false);
-  }
-  return exports.getUserFromToken(idToken)
-    .then(userInfo => userInfo && userInfo.sponsorUntil > Date.now(), () => false);
-};

src/assets/iconBlogger.svg

@@ -1,10 +1 @@
-
-<svg
-  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 180 180">
-  <g>
-    <path d="M20.512,178.499c-3.359,-0.884 -6.258,-2.184 -8.931,-4.006c-2.257,-1.538 -5.556,-4.717 -6.811,-6.563c-1.532,-2.255 -3.293,-6.117 -4.011,-8.795c-0.732,-2.732 -0.743,-3.82 -0.757,-69.395c-0.013,-65.245 0.002,-66.679 0.72,-69.483c2.537,-9.916 10.395,-17.46 20.529,-19.711c2.914,-0.647 133.08,-0.76 136.223,-0.118c8.509,1.738 15.198,6.846 19.068,14.564c3.078,6.135 2.803,-0.617 2.943,72.231c0.09,46.349 0.007,65.808 -0.288,68.232c-1.386,11.345 -9.211,20.143 -20.471,23.019c-2.88,0.735 -3.882,0.746 -69.275,0.726c-63.227,-0.019 -66.474,-0.052 -68.939,-0.701l0,0Z" style="fill:#f57d00;fill-rule:nonzero;"/>
-    <path d="M115.162,144.835c8.064,-1.1 14.384,-4.333 20.313,-10.39c4.289,-4.382 6.974,-9.125 8.728,-15.419c0.729,-2.615 0.79,-3.888 0.924,-19.242c0.101,-11.588 0.017,-17.015 -0.285,-18.385c-0.437,-1.986 -1.677,-3.83 -3.092,-4.599c-0.435,-0.237 -3.224,-0.538 -6.198,-0.67c-4.982,-0.221 -5.54,-0.318 -7.113,-1.24c-2.494,-1.462 -3.181,-3.041 -3.188,-7.327c-0.013,-8.189 -3.421,-15.792 -10.155,-22.654c-4.797,-4.889 -10.149,-8.198 -16.257,-10.052c-1.462,-0.444 -4.736,-0.595 -15.702,-0.725c-17.207,-0.203 -21.026,0.15 -26.884,2.483c-10.8,4.302 -18.56,13.368 -21.39,24.99c-0.532,2.183 -0.635,5.682 -0.761,25.779c-0.157,25.177 0.016,28.874 1.59,33.864c1.299,4.122 2.611,6.648 5.313,10.234c5.146,6.83 12.86,11.763 20.572,13.156c3.67,0.663 48.948,0.829 53.585,0.197Z" style="fill:#fff;fill-rule:nonzero;"/>
-    <path d="M67.575,75.717c-4.123,-1.136 -5.663,-7.051 -2.633,-10.111c1.937,-1.955 2.472,-2.029 14.595,-2.029c10.883,0 11.249,0.023 12.848,0.831c2.31,1.167 3.314,2.812 3.314,5.432c0,2.367 -0.943,4.025 -3.046,5.357c-1.129,0.716 -1.804,0.76 -12.467,0.823c-6.584,0.039 -11.83,-0.087 -12.611,-0.303l0,0Z" style="fill:#f57d00;fill-rule:nonzero;"/>
-    <path d="M67.058,115.526c-1.769,-0.771 -3.417,-2.913 -3.702,-4.813c-0.272,-1.809 0.638,-4.296 2.032,-5.558c1.757,-1.59 2.528,-1.643 24.134,-1.66c22.227,-0.017 22.111,-0.027 24.219,1.941c2.976,2.78 2.349,7.728 -1.239,9.76l-3.686,0.6l-19.213,0.224c-16.883,0.198 -21.666,-0.111 -22.545,-0.494l0,0Z" style="fill:#f57d00;fill-rule:nonzero;"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 180 180"><path d="M20.512 178.499c-3.359-.884-6.258-2.184-8.931-4.006-2.257-1.538-5.556-4.717-6.811-6.563-1.532-2.255-3.293-6.117-4.011-8.795-.732-2.732-.743-3.82-.757-69.395-.013-65.245.002-66.679.72-69.483C3.259 10.341 11.117 2.797 21.251.546c2.914-.647 133.08-.76 136.223-.118 8.509 1.738 15.198 6.846 19.068 14.564 3.078 6.135 2.803-.617 2.943 72.231.09 46.349.007 65.808-.288 68.232-1.386 11.345-9.211 20.143-20.471 23.019-2.88.735-3.882.746-69.275.726-63.227-.019-66.474-.052-68.939-.701z" fill="#f57d00"/><path d="M115.162 144.835c8.064-1.1 14.384-4.333 20.313-10.39 4.289-4.382 6.974-9.125 8.728-15.419.729-2.615.79-3.888.924-19.242.101-11.588.017-17.015-.285-18.385-.437-1.986-1.677-3.83-3.092-4.599-.435-.237-3.224-.538-6.198-.67-4.982-.221-5.54-.318-7.113-1.24-2.494-1.462-3.181-3.041-3.188-7.327-.013-8.189-3.421-15.792-10.155-22.654-4.797-4.889-10.149-8.198-16.257-10.052-1.462-.444-4.736-.595-15.702-.725-17.207-.203-21.026.15-26.884 2.483-10.8 4.302-18.56 13.368-21.39 24.99-.532 2.183-.635 5.682-.761 25.779-.157 25.177.016 28.874 1.59 33.864 1.299 4.122 2.611 6.648 5.313 10.234 5.146 6.83 12.86 11.763 20.572 13.156 3.67.663 48.948.829 53.585.197z" fill="#fff"/><path d="M67.575 75.717c-4.123-1.136-5.663-7.051-2.633-10.111 1.937-1.955 2.472-2.029 14.595-2.029 10.883 0 11.249.023 12.848.831 2.31 1.167 3.314 2.812 3.314 5.432 0 2.367-.943 4.025-3.046 5.357-1.129.716-1.804.76-12.467.823-6.584.039-11.83-.087-12.611-.303zM67.058 115.526c-1.769-.771-3.417-2.913-3.702-4.813-.272-1.809.638-4.296 2.032-5.558 1.757-1.59 2.528-1.643 24.134-1.66 22.227-.017 22.111-.027 24.219 1.941 2.976 2.78 2.349 7.728-1.239 9.76l-3.686.6-19.213.224c-16.883.198-21.666-.111-22.545-.494z" fill="#f57d00"/></svg>

src/assets/iconGitea.svg

@@ -1,5 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640" xml:space="preserve" width="32" height="32">
-    <path style="fill:#fff" d="m395.9 484.2-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12z"/>
-    <path style="fill:#609926" d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6zM125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1zm300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1z"/>
-    <path style="fill:#609926" d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8-1.9 8 2 16.3 9.1 20 7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3 7.8 4 17.4 1.7 22.5-5.3 5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8l-24.6 50.4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="32" height="32"><path d="M395.9 484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12z" fill="#fff"/><path d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6zM125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1zm300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1z" fill="#609926"/><path d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8-1.9 8 2 16.3 9.1 20 7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3 7.8 4 17.4 1.7 22.5-5.3 5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8l-24.6 50.4z" fill="#609926"/></svg>

src/assets/iconGithub.svg

@@ -1,4 +1,3 @@
-
 <svg
   xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 58">
   <g fill="none" fill-rule="evenodd">

src/assets/iconGithubDark.svg

@@ -0,0 +1,6 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 58">
+  <g fill="none" fill-rule="evenodd">
+    <path d="m1324.62 140c-16.355 0-29.616 13.219-29.616 29.527 0 13.04 8.485 24.11 20.256 28.01 1.482.27 2.02-.642 2.02-1.425 0-.7-.025-2.557-.04-5.02-8.238 1.784-9.976-3.958-9.976-3.958-1.347-3.411-3.289-4.317-3.289-4.317-2.689-1.832.204-1.796.204-1.796 2.973.21 4.536 3.043 4.536 3.043 2.642 4.511 6.931 3.208 8.62 2.454.269-1.909 1.033-3.21 1.88-3.948-6.576-.745-13.491-3.279-13.491-14.592 0-3.223 1.155-5.858 3.049-7.922-.305-.747-1.322-3.748.289-7.814 0 0 2.487-.794 8.145 3.03 2.362-.656 4.896-.982 7.415-.995 2.515.013 5.05.339 7.415.995 5.655-3.821 8.136-3.03 8.136-3.03 1.616 4.065.6 7.07.295 7.814 1.898 2.064 3.045 4.7 3.045 7.922 0 11.343-6.925 13.838-13.524 14.569 1.064.912 2.01 2.713 2.01 5.468 0 3.946-.036 7.13-.036 8.098 0 .79.533 1.709 2.036 1.421 11.758-3.913 20.238-14.971 20.238-28.01 0-16.309-13.262-29.527-29.62-29.527" transform="translate(-1295-140)" fill="#fff"/>
+  </g>
+</svg>

src/assets/iconStackedit.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><path d="M23.997,6.002c0,-3.311 -2.688,-5.999 -5.999,-5.999l-11.999,0c-3.311,0 -5.999,2.688 -5.999,5.999l0,11.999c0,3.311 2.688,5.999 5.999,5.999l11.999,0c3.311,0 5.999,-2.688 5.999,-5.999l0,-11.999Z" style="fill:none;"/><clipPath id="_clip1"><path d="M23.997,6.002c0,-3.311 -2.688,-5.999 -5.999,-5.999l-11.999,0c-3.311,0 -5.999,2.688 -5.999,5.999l0,11.999c0,3.311 2.688,5.999 5.999,5.999l11.999,0c3.311,0 5.999,-2.688 5.999,-5.999l0,-11.999Z"/></clipPath><g clip-path="url(#_clip1)"><path d="M23.997,0.003l-24,0l12,12l12,-12Z" style="fill:#ffd700;"/><path d="M-0.003,0.003l0,24l12,-12l-12,-12Z" style="fill:#a5c700;"/><path d="M-0.003,24.003l24,0l-12,-12l-12,12Z" style="fill:#ff8a00;"/><path d="M23.997,24.003l0,-24l-12,12l12,12Z" style="fill:#66aefd;"/><path d="M22.497,-1.497l-10.5,10.497l3,3.003l10.5,-10.5l-3,-3Z" style="fill:url(#_Linear2);"/><path d="M25.499,22.503l-10.498,-10.5l-3.002,3l10.5,10.5l3,-3Z" style="fill:url(#_Linear3);"/><path d="M1.497,25.501l10.5,-10.497l-3,-3.003l-10.5,10.5l3,3Z" style="fill:url(#_Linear4);"/><path d="M-1.503,1.503l10.498,10.5l3.002,-3l-10.5,-10.5l-3,3Z" style="fill:url(#_Linear5);"/></g><path d="M21.75,5.852c0,-2.195 -1.782,-3.977 -3.977,-3.977l-11.546,0c-2.195,0 -3.977,1.782 -3.977,3.977l0,11.546c0,2.195 1.782,3.977 3.977,3.977l11.546,0c2.195,0 3.977,-1.782 3.977,-3.977l0,-11.546Z" style="fill:#fff;"/><path d="M4.633,6.013l1.37,0l0,-1.828l1.399,0l0,1.828l1.696,0l0,-1.828l1.399,0l0,1.828l1.37,0l0,1.691l-1.37,0l0,1.902l1.37,0l0,1.69l-1.37,0l0,1.829l-1.399,0l0,-1.829l-1.696,0l0,1.829l-1.399,0l0,-1.829l-1.37,0l0,-1.69l1.37,0l0,-1.902l-1.37,0l0,-1.691Zm2.769,1.691l0,1.902l1.696,0l0,-1.902l-1.696,0Z" style="fill:#737373;"/><defs><linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-2.99995,-3,3,-2.99995,23.9974,3.00265)"><stop offset="0" style="stop-color:#66aefd;stop-opacity:1"/><stop offset="1" style="stop-color:#ffd700;stop-opacity:1"/></linearGradient><linearGradient id="_Linear3" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3,-2.99995,2.99995,3,20.9987,24.0027)"><stop offset="0" style="stop-color:#ff8a00;stop-opacity:1"/><stop offset="1" style="stop-color:#66aefd;stop-opacity:1"/></linearGradient><linearGradient id="_Linear4" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.99995,3,-3,2.99995,-0.00255928,21.0013)"><stop offset="0" style="stop-color:#a5c700;stop-opacity:1"/><stop offset="1" style="stop-color:#ff8a00;stop-opacity:1"/></linearGradient><linearGradient id="_Linear5" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-3,2.99995,-2.99995,-3,2.99744,0.00265252)"><stop offset="0" style="stop-color:#ffd700;stop-opacity:1"/><stop offset="1" style="stop-color:#a5c700;stop-opacity:1"/></linearGradient></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill-rule="evenodd" stroke-linejoin="round" clip-rule="evenodd" stroke-miterlimit="1.414"><path d="M 24 6 c 0 -3.3 -2.7 -6 -6 -6 H 6 C 2.7 0 0 2.7 0 6 v 12 c 0 3.3 2.7 6 6 6 h 12 c 3.3 0 6 -2.7 6 -6 V 6 z" fill="none"/><clipPath id="prefix__a"><path d="M 24 6 c 0 -3.3 -2.7 -6 -6 -6 H 6 C 2.7 0 0 2.7 0 6 v 12 c 0 3.3 2.7 6 6 6 h 12 c 3.3 0 6 -2.7 6 -6 V 6 z"/></clipPath><g clip-path="url(#prefix__a)"><path d="M 24 0 H 0 l 12 12 L 24 0 z" fill="gold"/><path d="M 0 0 v 24 l 12 -12 L 0 0 z" fill="#a5c700"/><path d="M 0 24 h 24 L 12 12 L 0 24 z" fill="#ff8a00"/><path d="M 24 24 V 0 L 12 12 l 12 12 z" fill="#66aefd"/><path d="M 22.5 -1.5 L 12 9 l 3 3 L 25.5 1.5 l -3 -3 z" fill="url(#prefix___Linear2)"/><path d="M 25.5 22.5 L 15 12 l -3 3 l 10.5 10.5 l 3 -3 z" fill="url(#prefix___Linear3)"/><path d="M 1.5 25.5 L 12 15 l -3 -3 l -10.5 10.5 l 3 3 z" fill="url(#prefix___Linear4)"/><path d="M -1.5 1.5 L 9 12 l 3 -3 L 1.5 -1.5 l -3 3 z" fill="url(#prefix___Linear5)"/></g><path d="M 21.8 5.9 c 0 -2.2 -1.8 -4 -4 -4 H 6.3 c -2.2 0 -4 1.8 -4 4 v 11.5 c 0 2.2 1.8 4 4 4 h 11.5 c 2.2 0 4 -1.8 4 -4 V 5.9 z" fill="#ffffff"/><path d="M 4.6 6 H 6 V 4.2 h 1.4 V 6 h 1.7 V 4.2 h 1.4 V 6 h 1.4 v 1.7 h -1.4 v 1.9 h 1.4 v 1.7 h -1.4 v 1.8 H 9.1 v -1.8 H 7.4 v 1.8 H 6 v -1.8 H 4.6 V 9.6 H 6 V 7.7 H 4.6 V 6 z m 2.8 1.7 v 1.9 h 1.7 V 7.7 H 7.4 z M 10 14 v 6 h 4 v -2 h -2 v -2 h 2 v -2 H 10 z m 5 0 v 6 h 2 v -3 l 1 3 h 2 v -6 h -2 v 3 l -1 -3 h -2 z M 7 18 l 0 2 l 2 0 l 0 -2 l -2 0 Z" fill="#737373"/><defs><linearGradient id="prefix___Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-2.99995 -3 3 -2.99995 23.997 3.003)"><stop offset="0" stop-color="#66aefd"/><stop offset="1" stop-color="gold"/></linearGradient><linearGradient id="prefix___Linear3" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3 -2.99995 2.99995 3 20.999 24.003)"><stop offset="0" stop-color="#ff8a00"/><stop offset="1" stop-color="#66aefd"/></linearGradient><linearGradient id="prefix___Linear4" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.99995 3 -3 2.99995 -.003 21.001)"><stop offset="0" stop-color="#a5c700"/><stop offset="1" stop-color="#ff8a00"/></linearGradient><linearGradient id="prefix___Linear5" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-3 2.99995 -2.99995 -3 2.997 .003)"><stop offset="0" stop-color="gold"/><stop offset="1" stop-color="#a5c700"/></linearGradient></defs></svg>

src/components/App.vue

@@ -22,6 +22,8 @@ import networkSvc from '../services/networkSvc';
 import tempFileSvc from '../services/tempFileSvc';
 import store from '../store';
 import './common/vueGlobals';
+import utils from '../services/utils';
+import providerRegistry from '../services/providers/common/providerRegistry';
 
 const themeClasses = {
   light: ['app--light'],
@@ -49,11 +51,49 @@ export default {
     close() {
       tempFileSvc.close();
     },
+    // 通过路径查看文件 支持相对路径
+    viewFileByPath(path) {
+      // 如果是md结尾
+      if (!path) {
+        return;
+      }
+      const currDirNode = store.getters['explorer/selectedNodeFolder'];
+      if (path.slice(-3) === '.md') {
+        const rootNode = store.getters['explorer/rootNode'];
+        const node = utils.findNodeByPath(rootNode, currDirNode, path);
+        if (!node) {
+          return;
+        }
+        store.commit('explorer/setSelectedId', node.item.id);
+        // Prevent from freezing the UI while loading the file
+        setTimeout(() => {
+          store.commit('file/setCurrentId', node.item.id);
+        }, 10);
+      } else {
+        const workspace = store.getters['workspace/currentWorkspace'];
+        const provider = providerRegistry.providersById[workspace.providerId];
+        if (provider == null) {
+          return;
+        }
+        const absolutePath = utils.getAbsoluteFilePath(currDirNode, path);
+        const url = provider.getFilePathUrl(absolutePath);
+        if (url) {
+          window.open(url, '_blank');
+        }
+      }
+    },
   },
   async created() {
+    window.viewFileByPath = this.viewFileByPath;
     try {
       await syncSvc.init();
       await networkSvc.init();
+      // store 编辑主题
+      const editTheme = localStorage.getItem('theme/currEditTheme');
+      store.dispatch('theme/setEditTheme', editTheme || 'default');
+      // store 预览主题
+      const previewTheme = localStorage.getItem('theme/currPreviewTheme');
+      store.dispatch('theme/setPreviewTheme', previewTheme || 'default');
       this.ready = true;
       tempFileSvc.setReady();
     } catch (err) {

src/components/CodeEditor.vue

@@ -7,11 +7,12 @@ import Prism from 'prismjs';
 import cledit from '../services/editor/cledit';
 
 export default {
-  props: ['value', 'lang', 'disabled'],
+  props: ['value', 'lang', 'disabled', 'scrollClass'],
   mounted() {
     const preElt = this.$el;
     let scrollElt = preElt;
-    while (scrollElt && !scrollElt.classList.contains('modal')) {
+    const scrollCls = this.scrollClass || 'modal';
+    while (scrollElt && !scrollElt.classList.contains(scrollCls)) {
       scrollElt = scrollElt.parentNode;
     }
     if (scrollElt) {
@@ -43,6 +44,10 @@ export default {
   overflow: auto;
   padding: 0.2em 0.4em;
 
+  .app--dark & {
+    caret-color: $editor-color-dark-low;
+  }
+
   * {
     line-height: $line-height-base;
     font-size: inherit !important;

src/components/Editor.vue

@@ -14,6 +14,8 @@ import CommentList from './gutters/CommentList';
 import EditorNewDiscussionButton from './gutters/EditorNewDiscussionButton';
 import store from '../store';
 import editorSvc from '../services/editorSvc';
+import imageSvc from '../services/imageSvc';
+import utils from '../services/utils';
 
 export default {
   components: {
@@ -32,7 +34,7 @@ export default {
     ]),
   },
   methods: {
-    setImgAndDoClick(items) {
+    async processUpload(items) {
       let file = null;
       if (!items || items.length === 0) {
         return;
@@ -46,8 +48,23 @@ export default {
       if (!file) {
         return;
       }
-      store.dispatch('img/setImg', file);
-      editorSvc.pagedownEditor.uiManager.doClick('image');
+      const imgId = utils.uid();
+      store.dispatch('img/setCurrImgId', imgId);
+      editorSvc.pagedownEditor.uiManager.doClick('imageUploading');
+      try {
+        const { url, error } = await imageSvc.updateImg(file);
+        // 存在错误
+        if (error) {
+          editorSvc.clEditor.replaceAll(`[图片上传中...(image-${imgId})]`, `[图片上传失败...(image-${imgId})]`);
+          store.dispatch('notification/error', error);
+          return;
+        }
+        editorSvc.clEditor.replaceAll(`[图片上传中...(image-${imgId})]`, `![输入图片说明](${url})`);
+      } catch (err) {
+        console.error(err); // eslint-disable-line no-console
+        editorSvc.clEditor.replaceAll(`[图片上传中...(image-${imgId})]`, `[图片上传失败...(image-${imgId})]`);
+        store.dispatch('notification/error', err);
+      }
     },
   },
   mounted() {
@@ -56,6 +73,11 @@ export default {
     if (currImgStorageStr) {
       store.commit('img/changeCheckedStorage', JSON.parse(currImgStorageStr));
     }
+    // 当前本地图片路径配置
+    const workspaceImgPath = localStorage.getItem('img/workspaceImgPath');
+    if (workspaceImgPath) {
+      store.commit('img/setWorkspaceImgPath', JSON.parse(workspaceImgPath));
+    }
     const editorElt = this.$el.querySelector('.editor__inner');
     const onDiscussionEvt = cb => (evt) => {
       let elt = evt.target;
@@ -83,11 +105,11 @@ export default {
 
     editorElt.addEventListener('drop', (event) => {
       const transItems = event.dataTransfer.items;
-      this.setImgAndDoClick(transItems);
+      this.processUpload(transItems);
     });
     editorElt.addEventListener('paste', (event) => {
       const pasteItems = (event.clipboardData || window.clipboardData).items;
-      this.setImgAndDoClick(pasteItems);
+      this.processUpload(pasteItems);
     });
 
     this.$watch(

src/components/EditorInPageButtons.vue

@@ -0,0 +1,197 @@
+<template>
+  <div class="editor-in-page-buttons">
+    <ul>
+      <li :title="`查找 ${mod}+F`">
+        <a @click="showFind"><icon-search></icon-search></a>
+      </li>
+      <li :title="`替换 ${mod}+Alt+F`">
+        <a @click="showFindReplace"><icon-find-replace></icon-find-replace></a>
+      </li>
+      <li title="切换编辑主题">
+        <dropdown-menu :selected="selectedTheme" :options="allThemes" :closeOnItemClick="false" @change="changeTheme">
+          <icon-select-theme></icon-select-theme>
+        </dropdown-menu>
+      </li>
+      <li class="after">
+        <icon-ellipsis></icon-ellipsis>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import store from '../store';
+import editorSvc from '../services/editorSvc';
+import DropdownMenu from './common/DropdownMenu';
+
+const mod = /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'Meta' : 'Ctrl';
+
+export default {
+  components: {
+    DropdownMenu,
+  },
+  data: () => ({
+    mod,
+    allThemes: [{
+      name: '默认主题',
+      value: 'default',
+    }, {
+      name: '天蓝黑',
+      value: 'azure',
+    }, {
+      name: '冰山黑',
+      value: 'iceberg_contrast',
+    }, {
+      name: '黎明白',
+      value: 'dawn',
+    }, {
+      name: '孔雀黑',
+      value: 'peacock',
+    }, {
+      name: '薄荷黑',
+      value: 'mintchoc',
+    }, {
+      name: '薄荷绿',
+      value: 'spearmint',
+    }, {
+      name: '暗蓝黑',
+      value: 'slate',
+    }, {
+      name: '文墨黑',
+      value: 'carbonight',
+    }, {
+      name: '日光白',
+      value: 'solarized_light',
+    }, {
+      name: '咖啡黑',
+      value: 'espresso_libre',
+    }, {
+      name: '薰衣草黑',
+      value: 'lavender',
+    }, {
+      name: '耀斑黑',
+      value: 'solarflare',
+    }, {
+      name: 'Clouds白',
+      value: 'clouds',
+    }, {
+      name: 'Clouds黑',
+      value: 'clouds_midnight',
+    }, {
+      name: 'GitHub白',
+      value: 'github',
+    }, {
+      name: '自定义',
+      value: 'custom',
+    }],
+  }),
+  computed: {
+    ...mapGetters('theme', [
+      'currEditTheme',
+      'customEditThemeStyle',
+    ]),
+    selectedTheme() {
+      return {
+        value: this.currEditTheme || 'default',
+      };
+    },
+  },
+  methods: {
+    ...mapActions('data', [
+      'toggleSideBar',
+    ]),
+    showFind() {
+      store.dispatch('findReplace/open', {
+        type: 'find',
+        findText: editorSvc.clEditor.selectionMgr.hasFocus() &&
+          editorSvc.clEditor.selectionMgr.getSelectedText(),
+      });
+    },
+    showFindReplace() {
+      store.dispatch('findReplace/open', {
+        type: 'replace',
+        findText: editorSvc.clEditor.selectionMgr.hasFocus() &&
+          editorSvc.clEditor.selectionMgr.getSelectedText(),
+      });
+    },
+    async changeTheme(item) {
+      await store.dispatch('theme/setEditTheme', item.value);
+      // 如果自定义主题没内容 则弹出编辑区域
+      if (item.value === 'custom' && !this.customEditThemeStyle) {
+        this.toggleSideBar(true);
+        store.dispatch('data/setSideBarPanel', 'editTheme');
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+@import '../styles/variables.scss';
+
+.editor-in-page-buttons {
+  position: absolute;
+  top: 0;
+  left: -108px;
+  height: 34px;
+  padding: 5px;
+  background-color: rgba(84, 96, 114, 0.4);
+  border-radius: $border-radius-base;
+  transition: 0.5s;
+  display: flex;
+
+  .dropdown-menu {
+    display: none;
+
+    .dropdown-menu-items {
+      right: unset;
+      left: 0;
+    }
+  }
+
+  &:active,
+  &:focus,
+  &:hover {
+    left: 0;
+    transition: 0.5s;
+    background-color: #546072;
+
+    .dropdown-menu {
+      display: block;
+    }
+  }
+
+  ul {
+    padding: 0;
+    margin-left: 10px;
+    line-height: 20px;
+
+    li {
+      width: 16px;
+      display: inline-block;
+      vertical-align: middle;
+      list-style: none;
+      cursor: pointer;
+      font-size: 14px;
+      margin-right: 10px;
+    }
+  }
+
+  .icon {
+    color: #dea731;
+    opacity: 0.7;
+
+    &:active,
+    &:focus,
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  .after {
+    margin-left: 0;
+    margin-right: -6px;
+  }
+}
+</style>

src/components/Explorer.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="explorer flex flex--column">
     <div class="side-title flex flex--row flex--space-between">
-      <div class="flex flex--row">
+      <div class="flex flex--row" v-if="!showSearch">
         <button class="side-title__button side-title__button--new-file button" @click="newItem()" v-title="'创建文件'">
           <icon-file-plus></icon-file-plus>
         </button>
@@ -14,14 +14,36 @@
         <button class="side-title__button side-title__button--rename button" @click="editItem()" v-title="'重命名'">
           <icon-pen></icon-pen>
         </button>
+        <button class="side-title__button side-title__button--search button" @click="toSearch()" v-title="'搜索文件'">
+          <icon-file-search></icon-file-search>
+        </button>
+      </div>
+      <div class="flex flex--row" v-else>
+        <button class="side-title__button button" @click="back()" v-title="'返回资源管理器'">
+          <icon-dots-horizontal></icon-dots-horizontal>
+        </button>
+        <div class="side-title__title">
+          搜索文件
+        </div>
       </div>
       <button class="side-title__button side-title__button--close button" @click="toggleExplorer(false)" v-title="'关闭资源管理器'">
         <icon-close></icon-close>
       </button>
     </div>
-    <div class="explorer__tree" :class="{'explorer__tree--new-item': !newChildNode.isNil}" v-if="!light" tabindex="0" @keydown.delete="deleteItem()">
+    <div class="explorer__tree" :class="{'explorer__tree--new-item': !newChildNode.isNil}" v-if="!light" v-show="!showSearch" tabindex="0" @keydown.delete="deleteItem()">
       <explorer-node :node="rootNode" :depth="0"></explorer-node>
     </div>
+    <div class="explorer__search" tabindex="0" v-if="!light && showSearch">
+      <input type="text" v-model="searchText" class="text-input" placeholder="请输入关键字回车" @keyup.enter="search" />
+      <div class="explorer__search-list">
+        <div class="search-tips" v-if="searching">正在查询中...</div>
+        <a class="menu-entry button flex flex--row flex--align-center" :class="{'search-node--selected': currentFileId === fileItem.id}"
+            v-for="fileItem in searchItems" :key="fileItem.id" @click="clickSearch(fileItem)" href="javascript:void(0)">
+          {{ fileItem.name }}
+        </a>
+        <div class="search-tips">最多返回匹配的50个文档</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -30,11 +52,22 @@ import { mapState, mapGetters, mapActions } from 'vuex';
 import ExplorerNode from './ExplorerNode';
 import explorerSvc from '../services/explorerSvc';
 import store from '../store';
+import MenuEntry from './menus/common/MenuEntry';
+import localDbSvc from '../services/localDbSvc';
+import badgeSvc from '../services/badgeSvc';
 
 export default {
   components: {
     ExplorerNode,
+    MenuEntry,
   },
+  data: () => ({
+    currentFileId: '',
+    showSearch: false,
+    searching: false,
+    searchText: '',
+    searchItems: [],
+  }),
   computed: {
     ...mapState([
       'light',
@@ -46,6 +79,7 @@ export default {
       'rootNode',
       'selectedNode',
     ]),
+    workspaceId: () => store.getters['workspace/currentWorkspace'].id,
   },
   methods: {
     ...mapActions('data', [
@@ -59,11 +93,69 @@ export default {
         store.commit('explorer/setEditingId', node.item.id);
       }
     },
+    back() {
+      this.showSearch = false;
+    },
+    toSearch() {
+      this.showSearch = true;
+    },
+    search() {
+      this.searchItems = [];
+      if (!this.searchText) {
+        return;
+      }
+      this.searching = true;
+      const allFileById = {};
+      const filterIds = [];
+      localDbSvc.getWorkspaceItems(this.workspaceId, (item) => {
+        if (item.type !== 'file' && item.type !== 'content') {
+          return;
+        }
+        if (item.type === 'file') {
+          allFileById[item.id] = item;
+        }
+        if (filterIds.length >= 50) {
+          return;
+        }
+        const fileId = item.id.split('/')[0];
+        // 包含了直接跳过
+        if (filterIds.indexOf(fileId) > -1) {
+          return;
+        }
+        if (item.name && item.name.indexOf(this.searchText) > -1) {
+          filterIds.push(fileId);
+        }
+        if (item.text && item.text.indexOf(this.searchText) > -1) {
+          filterIds.push(fileId);
+        }
+      }, () => {
+        filterIds.forEach((it) => {
+          const file = allFileById[it];
+          if (file) {
+            this.searchItems.push(file);
+          }
+        });
+        this.searching = false;
+        badgeSvc.addBadge('searchFile');
+      });
+    },
+    clickSearch(item) {
+      const node = store.getters['explorer/nodeMap'][item.id];
+      if (!node) {
+        return;
+      }
+      store.commit('explorer/setSelectedId', item.id);
+      // Prevent from freezing the UI while loading the file
+      setTimeout(() => {
+        store.commit('file/setCurrentId', item.id);
+      }, 10);
+    },
   },
   created() {
     this.$watch(
       () => store.getters['file/current'].id,
       (currentFileId) => {
+        this.currentFileId = currentFileId;
         store.commit('explorer/setSelectedId', currentFileId);
         store.dispatch('explorer/openNode', currentFileId);
       }, {
@@ -75,6 +167,8 @@ export default {
 </script>
 
 <style lang="scss">
+@import '../styles/variables.scss';
+
 .explorer,
 .explorer__tree {
   height: 100%;
@@ -89,4 +183,43 @@ export default {
     cursor: auto;
   }
 }
+
+.explorer__search {
+  overflow: auto;
+
+  .explorer__search-list {
+    margin-top: 10px;
+  }
+
+  .menu-entry {
+    font-size: 14px;
+    padding: 5px;
+  }
+
+  .menu-entry__icon {
+    width: 0;
+    margin-left: 0;
+    border-bottom: 1px solid $hr-color;
+  }
+
+  .search-tips {
+    font-size: 10px;
+    background-color: rgba(255, 173, 51, 0.14902);
+    padding: 5px;
+    text-align: center;
+  }
+
+  .search-node--selected {
+    background-color: rgba(0, 0, 0, 0.2);
+
+    .app--dark & {
+      background-color: rgba(0, 0, 0, 0.4);
+    }
+
+    &:focus {
+      background-color: #39f;
+      color: #fff;
+    }
+  }
+}
 </style>

src/components/ExplorerNode.vue

@@ -14,6 +14,7 @@
       </div>
       <explorer-node v-for="node in node.files" :key="node.item.id" :node="node" :depth="depth + 1"></explorer-node>
     </div>
+    <button ref="copyId" v-clipboard="copyPath()" @click="info('路径已复制到剪切板!')" style="display: none;"></button>
   </div>
 </template>
 
@@ -23,6 +24,7 @@ import workspaceSvc from '../services/workspaceSvc';
 import explorerSvc from '../services/explorerSvc';
 import store from '../store';
 import badgeSvc from '../services/badgeSvc';
+import utils from '../services/utils';
 
 export default {
   name: 'explorer-node', // Required for recursivity
@@ -80,6 +82,9 @@ export default {
     ...mapActions('explorer', [
       'setDragTarget',
     ]),
+    ...mapActions('notification', [
+      'info',
+    ]),
     select(id = this.node.item.id, doOpen = true) {
       const node = store.getters['explorer/nodeMap'][id];
       if (!node) {
@@ -144,6 +149,11 @@ export default {
       // See https://stackoverflow.com/a/3977637/1333165
       evt.dataTransfer.setData('Text', '');
     },
+    copyPath() {
+      let path = utils.getAbsoluteDir(this.node).replaceAll(' ', '%20');
+      path = path.indexOf('/') === 0 ? path : `/${path}`;
+      return this.node.isFolder ? path : `${path}.md`;
+    },
     onDrop() {
       const sourceNode = store.getters['explorer/dragSourceNode'];
       const targetNode = store.getters['explorer/dragTargetNodeFolder'];
@@ -169,22 +179,26 @@ export default {
             top: evt.clientY,
           },
           items: [{
-            name: 'New file',
+            name: '新建文件',
             disabled: !this.node.isFolder || this.node.isTrash,
             perform: () => explorerSvc.newItem(false),
           }, {
-            name: 'New folder',
+            name: '新建文件夹',
             disabled: !this.node.isFolder || this.node.isTrash || this.node.isTemp,
             perform: () => explorerSvc.newItem(true),
           }, {
             type: 'separator',
           }, {
-            name: 'Rename',
+            name: '重命名',
             disabled: this.node.isTrash || this.node.isTemp,
             perform: () => this.setEditingId(this.node.item.id),
           }, {
-            name: 'Delete',
+            name: '删除',
             perform: () => explorerSvc.deleteItem(),
+          }, {
+            name: '复制路径',
+            disabled: this.node.isTrash || this.node.isTemp,
+            perform: () => this.$refs.copyId.click(),
           }],
         });
         if (item) {
@@ -215,6 +229,10 @@ $item-font-size: 14px;
   .explorer-node--selected > & {
     background-color: rgba(0, 0, 0, 0.2);
 
+    .app--dark & {
+      background-color: rgba(0, 0, 0, 0.4);
+    }
+
     .explorer__tree:focus & {
       background-color: #39f;
       color: #fff;
@@ -236,6 +254,10 @@ $item-font-size: 14px;
 .explorer-node--trash,
 .explorer-node--temp {
   color: rgba(0, 0, 0, 0.5);
+
+  .app--dark & {
+    color: rgba(255, 255, 255, 0.5);
+  }
 }
 
 .explorer-node--folder > .explorer-node__item,

src/components/FindReplace.vue

@@ -14,8 +14,8 @@
           <button class="find-replace__button find-replace__button--find-option button" :class="{'find-replace__button--on': findUseRegexp}" @click="findUseRegexp = !findUseRegexp" title="Regular expression">.<sup>⁕</sup></button>
         </div>
         <div class="flex flex--row">
-          <button class="find-replace__button button" @click="find('backward')">Previous</button>
-          <button class="find-replace__button button" @click="find('forward')">Next</button>
+          <button class="find-replace__button button" @click="find('backward')">上一个</button>
+          <button class="find-replace__button button" @click="find('forward')">下一个</button>
         </div>
       </div>
     </div>
@@ -24,8 +24,8 @@
         <input type="text" class="find-replace__text-input find-replace__text-input--replace text-input" @keydown.enter="replace" v-model="replaceText">
       </div>
       <div class="find-replace__row flex flex--row flex--end">
-        <button class="find-replace__button button" @click="replace">Replace</button>
-        <button class="find-replace__button button" @click="replaceAll">All</button>
+        <button class="find-replace__button button" @click="replace">替换</button>
+        <button class="find-replace__button button" @click="replaceAll">全部替换</button>
       </div>
     </div>
   </div>
@@ -307,20 +307,36 @@ export default {
   color: rgba(0, 0, 0, 0.25);
   text-transform: none;
 
+  .app--dark & {
+    color: rgba(255, 255, 255, 0.25);
+  }
+
   &:active,
   &:focus,
   &:hover {
     color: rgba(0, 0, 0, 0.25);
+
+    .app--dark & {
+      color: rgba(255, 255, 255, 0.25);
+    }
   }
 }
 
 .find-replace__button--on {
   color: rgba(0, 0, 0, 0.67);
 
+  .app--dark & {
+    color: rgba(255, 255, 255, 0.67);
+  }
+
   &:active,
   &:focus,
   &:hover {
     color: rgba(0, 0, 0, 0.67);
+
+    .app--dark & {
+      color: rgba(255, 255, 255, 0.67);
+    }
   }
 }
 
@@ -343,10 +359,18 @@ export default {
   padding: 2px;
   color: rgba(0, 0, 0, 0.5);
 
+  .app--dark & {
+    color: rgba(255, 255, 255, 0.5);
+  }
+
   &:active,
   &:focus,
   &:hover {
     color: rgba(0, 0, 0, 0.75);
+
+    .app--dark & {
+      color: rgba(255, 255, 255, 0.75);
+    }
   }
 }
 
@@ -359,6 +383,10 @@ export default {
 .find-replace-highlighting {
   background-color: $highlighting-color;
   color: $editor-color-light !important;
+
+  .app--dark & {
+    background-color: $dark-highlighting-color;
+  }
 }
 
 .find-replace-selection {

src/components/Layout.vue

@@ -9,11 +9,12 @@
           <navigation-bar></navigation-bar>
         </div>
         <div class="layout__panel flex flex--row" :style="{height: styles.innerHeight + 'px'}">
-          <div class="layout__panel layout__panel--editor" v-show="styles.showEditor" :style="{width: (styles.editorWidth + styles.editorGutterWidth) + 'px', fontSize: styles.fontSize + 'px'}">
+          <div class="layout__panel layout__panel--editor" :class="editTheme" v-show="styles.showEditor" :style="{width: (styles.editorWidth + styles.editorGutterWidth) + 'px', fontSize: styles.fontSize + 'px'}">
             <div class="gutter" :style="{left: styles.editorGutterLeft + 'px'}">
               <div class="gutter__background" v-if="styles.editorGutterWidth" :style="{width: styles.editorGutterWidth + 'px'}"></div>
             </div>
             <editor></editor>
+            <editor-in-page-buttons v-if="editorShowInPageButtons"></editor-in-page-buttons>
             <div class="gutter" :style="{left: styles.editorGutterLeft + 'px'}">
               <sticky-comment v-if="styles.editorGutterWidth && stickyComment === 'top'"></sticky-comment>
               <current-discussion v-if="styles.editorGutterWidth"></current-discussion>
@@ -27,6 +28,7 @@
               <div class="gutter__background" v-if="styles.previewGutterWidth" :style="{width: styles.previewGutterWidth + 'px'}"></div>
             </div>
             <preview></preview>
+            <preview-in-page-buttons></preview-in-page-buttons>
             <div class="gutter" :style="{left: styles.previewGutterLeft + 'px'}">
               <sticky-comment v-if="styles.previewGutterWidth && stickyComment === 'top'"></sticky-comment>
               <current-discussion v-if="styles.previewGutterWidth"></current-discussion>
@@ -58,6 +60,8 @@ import SideBar from './SideBar';
 import Editor from './Editor';
 import Preview from './Preview';
 import Tour from './Tour';
+import EditorInPageButtons from './EditorInPageButtons';
+import PreviewInPageButtons from './PreviewInPageButtons';
 import StickyComment from './gutters/StickyComment';
 import CurrentDiscussion from './gutters/CurrentDiscussion';
 import FindReplace from './FindReplace';
@@ -75,6 +79,8 @@ export default {
     Editor,
     Preview,
     Tour,
+    EditorInPageButtons,
+    PreviewInPageButtons,
     StickyComment,
     CurrentDiscussion,
     FindReplace,
@@ -96,9 +102,18 @@ export default {
     ...mapGetters('data', [
       'layoutSettings',
     ]),
+    ...mapGetters('theme', [
+      'currEditTheme',
+    ]),
+    editTheme() {
+      return `edit-theme--${this.currEditTheme || 'default'}`;
+    },
     showFindReplace() {
       return !!store.state.findReplace.type;
     },
+    editorShowInPageButtons() {
+      return store.getters['data/computedSettings'].editor.showInPageButtons;
+    },
   },
   methods: {
     ...mapActions('layout', [
@@ -185,7 +200,7 @@ export default {
 }
 
 $preview-background-light: #f3f3f3;
-$preview-background-dark: #252525;
+$preview-background-dark: #444;
 
 .layout__panel--preview,
 .layout__panel--button-bar {
@@ -208,6 +223,10 @@ $preview-background-dark: #252525;
 .layout__panel--explorer,
 .layout__panel--side-bar {
   background-color: #ddd;
+
+  .app--dark & {
+    background-color: #383c4a;
+  }
 }
 
 .layout__panel--find-replace {
@@ -218,5 +237,9 @@ $preview-background-dark: #252525;
   width: 300px;
   height: auto;
   border-top-right-radius: $border-radius-base;
+
+  .app--dark & {
+    background-color: #4d5160;
+  }
 }
 </style>

src/components/Modal.vue

@@ -10,6 +10,7 @@
       <div class="modal__button-bar">
         <button class="button" v-if="simpleModal.rejectText" @click="config.reject()">{{simpleModal.rejectText}}</button>
         <button class="button button--resolve" v-if="simpleModal.resolveText" @click="config.resolve()">{{simpleModal.resolveText}}</button>
+        <button v-for="(item, idx) in (simpleModal.resolveArray || [])" class="button button--resolve"  @click="config.resolve(item.value)">{{item.text}}</button>
       </div>
     </modal-inner>
   </div>
@@ -39,6 +40,9 @@ import WorkspaceManagementModal from './modals/WorkspaceManagementModal';
 import AccountManagementModal from './modals/AccountManagementModal';
 import BadgeManagementModal from './modals/BadgeManagementModal';
 import SponsorModal from './modals/SponsorModal';
+import CommitMessageModal from './modals/CommitMessageModal';
+import WorkspaceImgPathModal from './modals/WorkspaceImgPathModal';
+import ChatGptModal from './modals/ChatGptModal';
 
 // Providers
 import GooglePhotoModal from './modals/providers/GooglePhotoModal';
@@ -62,6 +66,8 @@ import GiteeOpenModal from './modals/providers/GiteeOpenModal';
 import GiteeSaveModal from './modals/providers/GiteeSaveModal';
 import GiteeWorkspaceModal from './modals/providers/GiteeWorkspaceModal';
 import GiteePublishModal from './modals/providers/GiteePublishModal';
+import GiteeGistSyncModal from './modals/providers/GiteeGistSyncModal';
+import GiteeGistPublishModal from './modals/providers/GiteeGistPublishModal';
 import GitlabAccountModal from './modals/providers/GitlabAccountModal';
 import GitlabOpenModal from './modals/providers/GitlabOpenModal';
 import GitlabPublishModal from './modals/providers/GitlabPublishModal';
@@ -105,6 +111,9 @@ export default {
     AccountManagementModal,
     BadgeManagementModal,
     SponsorModal,
+    CommitMessageModal,
+    WorkspaceImgPathModal,
+    ChatGptModal,
     // Providers
     GooglePhotoModal,
     GoogleDriveAccountModal,
@@ -127,6 +136,8 @@ export default {
     GiteeSaveModal,
     GiteeWorkspaceModal,
     GiteePublishModal,
+    GiteeGistSyncModal,
+    GiteeGistPublishModal,
     GitlabAccountModal,
     GitlabOpenModal,
     GitlabPublishModal,
@@ -177,6 +188,7 @@ export default {
           // User has to sign in
           await store.dispatch('modal/open', 'signInForSponsorship');
           await giteeHelper.signin();
+          await syncSvc.afterSignIn();
           syncSvc.requestSync();
         }
         if (!store.getters.isSponsor) {
@@ -273,6 +285,10 @@ export default {
   position: relative;
   overflow: hidden;
 
+  .app--dark & {
+    background-color: #383c4a;
+  }
+
   &::before {
     content: '';
     position: absolute;

src/components/NavigationBar.vue

@@ -7,6 +7,7 @@
     </div>
     <!-- Side bar -->
     <div class="navigation-bar__inner navigation-bar__inner--right navigation-bar__inner--button">
+      <button class="navigation-bar__button navigation-bar__button--theme button" v-title="'切换主题'" tour-step-anchor="theme" @click="switchTheme"><icon-switch-theme></icon-switch-theme></button>
       <a class="navigation-bar__button navigation-bar__button--stackedit button" v-if="light" href="app" target="_blank" v-title="'打开StackEdit'"><icon-provider provider-id="stackedit"></icon-provider></a>
       <button class="navigation-bar__button navigation-bar__button--stackedit button" v-else tour-step-anchor="menu" @click="toggleSideBar()" v-title="'切换侧边栏'"><icon-provider provider-id="stackedit"></icon-provider></button>
     </div>
@@ -113,7 +114,8 @@ export default {
       publishLocations: 'current',
     }),
     pagedownButtons() {
-      return pagedownButtons.map(button => ({
+      const buttonShowObj = store.getters['data/computedSettings'].editor.headButtons;
+      return pagedownButtons.filter(it => buttonShowObj[it.method]).map(button => ({
         ...button,
         titleWithShortcut: `${button.title}${getShortcut(button.method)}`,
         iconClass: `icon-${button.icon}`,
@@ -187,6 +189,9 @@ export default {
         publishSvc.requestPublish();
       }
     },
+    switchTheme() {
+      store.dispatch('data/switchThemeSetting');
+    },
     pagedownClick(name) {
       if (store.getters['content/isCurrentEditable']) {
         const text = editorSvc.clEditor.getContent();
@@ -309,6 +314,18 @@ export default {
     padding: 0 4px;
     width: 38px;
 
+    &.navigation-bar__button--theme {
+      width: 34px;
+      padding: 0 7px;
+      opacity: 0.85;
+
+      &:active,
+      &:focus,
+      &:hover {
+        opacity: 1;
+      }
+    }
+
     &.navigation-bar__button--stackedit {
       opacity: 0.85;
 

src/components/Notification.vue

@@ -10,10 +10,10 @@
         {{item.content}}
       </div>
       <button class="notification__button button" v-if="item.type === 'confirm'" @click="item.reject">
-        No
+        否
       </button>
       <button class="notification__button button" v-if="item.type === 'confirm'" @click="item.resolve">
-        Yes
+        是
       </button>
     </div>
   </div>

src/components/Preview.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="preview">
     <div class="preview__inner-1" @click="onClick" @scroll="onScroll">
-      <div class="preview__inner-2" :style="{padding: styles.previewPadding}">
+      <div class="preview__inner-2" :class="previewTheme" :style="{padding: styles.previewPadding}">
       </div>
       <div class="gutter" :style="{left: styles.previewGutterLeft + 'px'}">
         <comment-list v-if="styles.previewGutterWidth"></comment-list>
@@ -37,9 +37,15 @@ export default {
     ...mapGetters('file', [
       'isCurrentTemp',
     ]),
+    ...mapGetters('theme', [
+      'currPreviewTheme',
+    ]),
     ...mapGetters('layout', [
       'styles',
     ]),
+    previewTheme() {
+      return `preview-theme--${this.currPreviewTheme || 'default'}`;
+    },
   },
   methods: {
     ...mapActions('data', [

src/components/PreviewInPageButtons.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="preview-in-page-buttons">
+    <ul>
+      <li class="before">
+        <icon-ellipsis></icon-ellipsis>
+      </li>
+      <li title="分享">
+        <a href="javascript:void(0)" @click="share"><icon-share></icon-share></a>
+      </li>
+      <li title="切换预览主题">
+        <dropdown-menu :selected="selectedTheme" :options="allThemes" :closeOnItemClick="false" @change="changeTheme">
+          <icon-select-theme></icon-select-theme>
+        </dropdown-menu>
+      </li>
+      <li title="Markdown语法帮助">
+        <a href="javascript:void(0)" @click="showHelp"><icon-help-circle></icon-help-circle></a>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+// import juice from 'juice';
+import store from '../store';
+import DropdownMenu from './common/DropdownMenu';
+import publishSvc from '../services/publishSvc';
+import giteeGistProvider from '../services/providers/giteeGistProvider';
+import gistProvider from '../services/providers/gistProvider';
+
+export default {
+  components: {
+    DropdownMenu,
+  },
+  data: () => ({
+    allThemes: [{
+      name: '默认主题',
+      value: 'default',
+    }, {
+      name: '凝夜紫',
+      value: 'ningyezi',
+    }, {
+      name: '草原绿',
+      value: 'caoyuangreen',
+    }, {
+      name: '雁栖湖',
+      value: 'yanqihu',
+    }, {
+      name: '灵动蓝',
+      value: 'activeblue',
+    }, {
+      name: '极客黑',
+      value: 'jikebrack',
+    }, {
+      name: '极简黑',
+      value: 'simplebrack',
+    }, {
+      name: '全栈蓝',
+      value: 'allblue',
+    }, {
+      name: '自定义',
+      value: 'custom',
+    }],
+    baseCss: '',
+    sharing: false,
+  }),
+  computed: {
+    ...mapGetters('theme', [
+      'currPreviewTheme',
+      'customPreviewThemeStyle',
+    ]),
+    ...mapGetters('publishLocation', {
+      publishLocations: 'current',
+    }),
+    selectedTheme() {
+      return {
+        value: this.currPreviewTheme || 'default',
+      };
+    },
+  },
+  methods: {
+    ...mapActions('data', [
+      'toggleSideBar',
+    ]),
+    async changeTheme(item) {
+      await store.dispatch('theme/setPreviewTheme', item.value);
+      // 如果自定义主题没内容 则弹出编辑区域
+      if (item.value === 'custom' && !this.customPreviewThemeStyle) {
+        this.toggleSideBar(true);
+        store.dispatch('data/setSideBarPanel', 'previewTheme');
+      }
+    },
+    showHelp() {
+      this.toggleSideBar(true);
+      store.dispatch('data/setSideBarPanel', 'help');
+    },
+    async share() {
+      if (this.sharing) {
+        store.dispatch('notification/info', '分享链接创建中...请稍后再试');
+        return;
+      }
+      try {
+        const currentFile = store.getters['file/current'];
+        await store.dispatch('modal/open', { type: 'shareHtmlPre', name: currentFile.name });
+        this.sharing = true;
+        const mainToken = store.getters['workspace/mainWorkspaceToken'];
+        if (!mainToken) {
+          store.dispatch('notification/info', '登录主文档空间之后才可使用分享功能！');
+          return;
+        }
+        let tempGistId = null;
+        const isGithub = mainToken.providerId === 'githubAppData';
+        const gistProviderId = isGithub ? 'gist' : 'giteegist';
+        const filterLocations = this.publishLocations.filter(it => it.providerId === gistProviderId
+                 && it.url && it.gistId);
+        if (filterLocations.length > 0) {
+          tempGistId = filterLocations[0].gistId;
+        }
+        const location = (isGithub ? gistProvider : giteeGistProvider).makeLocation(
+          mainToken,
+          `分享-${currentFile.name}`,
+          true,
+          null,
+        );
+        location.templateId = 'styledHtmlWithTheme';
+        location.fileId = currentFile.id;
+        location.gistId = tempGistId;
+        const { gistId } = await publishSvc.publishLocationAndStore(location);
+        const sharePage = mainToken.providerId === 'githubAppData' ? 'gistshare.html' : 'share.html';
+        const url = `${window.location.protocol}//${window.location.host}/${sharePage}?id=${gistId}`;
+        await store.dispatch('modal/open', { type: 'shareHtml', name: currentFile.name, url });
+      } catch (err) {
+        if (err) {
+          store.dispatch('notification/error', err);
+        }
+      } finally {
+        this.sharing = false;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+@import '../styles/variables.scss';
+
+.preview-in-page-buttons {
+  position: absolute;
+  bottom: 10px;
+  right: -98px;
+  height: 34px;
+  padding: 5px;
+  background-color: rgba(84, 96, 114, 0.4);
+  border-radius: $border-radius-base;
+  transition: 0.5s;
+  display: flex;
+
+  .dropdown-menu {
+    display: none;
+  }
+
+  &:active,
+  &:focus,
+  &:hover {
+    right: 0;
+    transition: 0.5s;
+    background-color: #546072;
+
+    .dropdown-menu {
+      display: block;
+    }
+  }
+
+  .dropdown-menu-items {
+    bottom: 100%;
+    top: unset;
+  }
+
+  ul {
+    padding: 0;
+    margin-left: 10px;
+    line-height: 20px;
+
+    li {
+      line-height: 16px;
+      width: 16px;
+      display: inline-block;
+      vertical-align: middle;
+      list-style: none;
+      cursor: pointer;
+      font-size: 14px;
+      margin-right: 10px;
+
+      .icon {
+        color: #fff;
+        opacity: 0.7;
+
+        &:active,
+        &:focus,
+        &:hover {
+          opacity: 1;
+        }
+      }
+    }
+
+    .before {
+      margin-left: -16px;
+      margin-right: 0;
+    }
+  }
+}
+</style>

src/components/SideBar.vue

@@ -23,6 +23,8 @@
       <div v-else-if="panel === 'help'" class="side-bar__panel side-bar__panel--help">
         <pre class="markdown-highlighting" v-html="markdownSample"></pre>
       </div>
+      <edit-theme-menu v-else-if="panel === 'editTheme'"></edit-theme-menu>
+      <preview-theme-menu v-else-if="panel === 'previewTheme'"></preview-theme-menu>
       <div class="side-bar__panel side-bar__panel--toc" :class="{'side-bar__panel--hidden': panel !== 'toc'}">
         <toc>
         </toc>
@@ -41,6 +43,8 @@ import PublishMenu from './menus/PublishMenu';
 import HistoryMenu from './menus/HistoryMenu';
 import ImportExportMenu from './menus/ImportExportMenu';
 import WorkspaceBackupMenu from './menus/WorkspaceBackupMenu';
+import EditThemeMenu from './menus/EditThemeMenu';
+import PreviewThemeMenu from './menus/PreviewThemeMenu';
 import markdownSample from '../data/markdownSample.md';
 import markdownConversionSvc from '../services/markdownConversionSvc';
 import store from '../store';
@@ -55,6 +59,8 @@ const panelNames = {
   history: '文件历史',
   importExport: '导入/导出',
   workspaceBackups: '文档空间备份',
+  editTheme: '编辑区主题',
+  previewTheme: '预览区主题',
 };
 
 export default {
@@ -67,6 +73,8 @@ export default {
     HistoryMenu,
     ImportExportMenu,
     WorkspaceBackupMenu,
+    EditThemeMenu,
+    PreviewThemeMenu,
   },
   data: () => ({
     markdownSample: markdownConversionSvc.highlight(markdownSample),

src/components/Toc.vue

@@ -99,6 +99,10 @@ export default {
   -ms-user-select: none;
   user-select: none;
 
+  .app--dark & {
+    color: rgba(255, 255, 255, 0.67);
+  }
+
   * {
     font-weight: inherit;
     pointer-events: none;
@@ -150,5 +154,9 @@ export default {
   height: 35px;
   background-color: rgba(255, 255, 255, 0.2);
   pointer-events: none;
+
+  .app--dark & {
+    color: rgba(0, 0, 0, 0.2);
+  }
 }
 </style>

src/components/Tour.vue

@@ -12,7 +12,7 @@
       </div>
       <div class="tour-step__inner" v-else-if="step === 'editor'">
         <h2>您的Markdown编辑器</h2>
-        <p>StackEdit实时将Markdown转换为HTML。</p>
+        <p>StackEdit中文版实时将Markdown转换为HTML。</p>
         <p>点击 <icon-side-preview></icon-side-preview> 切换侧边预览</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">跳过</button>
@@ -21,7 +21,7 @@
       </div>
       <div class="tour-step__inner" v-else-if="step === 'explorer'">
         <h2>文件资源管理器</h2>
-        <p>StackEdit可以管理文档空间中的多个文件和文件夹。</p>
+        <p>StackEdit中文版可以管理文档空间中的多个文件和文件夹。</p>
         <p>点击 <icon-folder></icon-folder> 打开文件资源管理器。</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">跳过</button>
@@ -29,17 +29,26 @@
         </div>
       </div>
       <div class="tour-step__inner" v-else-if="step === 'menu'">
-        <h2>更多！</h2>
-        <p>StackEdit还可以同步和发布文件，管理协作文档空间...</p>
+        <h2>切换侧边栏！</h2>
+        <p>StackEdit中文版还可以同步和发布文件，管理协作文档空间...</p>
         <p>点击 <icon-provider provider-id="stackedit"></icon-provider> 浏览菜单。</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">跳过</button>
           <button class="button button--resolve" @click="next">下一步</button>
         </div>
       </div>
+      <div class="tour-step__inner" v-else-if="step === 'theme'">
+        <h2>切换主题！</h2>
+        <p>StackEdit中文版可以切换亮/暗主题。</p>
+        <p>点击 <icon-switch-theme></icon-switch-theme> 切换主题。</p>
+        <div class="tour-step__button-bar">
+          <button class="button" @click="finish">跳过</button>
+          <button class="button button--resolve" @click="next">下一步</button>
+        </div>
+      </div>
       <div class="tour-step__inner" v-else-if="step === 'end'">
         <h2>Enjoy!</h2>
-        <p>如果您喜欢StackEdit中文版，请在<a href="https://gitee.com/mafgwo/stackedit">Gitee仓库</a>上点一下starred，谢谢！</p>
+        <p>如果您喜欢StackEdit中文版，请在<a href="https://gitee.com/mafgwo/stackedit">Gitee仓库</a>上点一下Star，谢谢！</p>
         <div class="tour-step__button-bar">
           <button class="button button--resolve" @click="finish">确认</button>
         </div>
@@ -57,6 +66,7 @@ const steps = [
   'editor',
   'explorer',
   'menu',
+  'theme',
   'end',
 ];
 
@@ -90,7 +100,8 @@ export default {
               break;
             }
             case 'editor':
-            case 'menu': {
+            case 'menu':
+            case 'theme': {
               style.left = `${anchorRect.left}px`;
               break;
             }
@@ -139,6 +150,7 @@ export default {
 }
 
 $tour-step-background: transparentize(mix(#f3f3f3, $selection-highlighting-color, 75%), 0.025);
+$tour-step-darkbackground: transparentize(mix(#4d4d4d, $selection-highlighting-color, 75%), 0.025);
 $tour-step-width: 240px;
 
 .tour-step__inner {
@@ -151,6 +163,10 @@ $tour-step-width: 240px;
   text-align: center;
   border-radius: $border-radius-base;
 
+  .app--dark & {
+    background-color: $tour-step-darkbackground;
+  }
+
   h2 {
     margin: 0;
 
@@ -183,11 +199,16 @@ $tour-step-width: 240px;
       right: 0;
       border-top: 10px solid $tour-step-background;
       border-left: 10px solid transparent;
+
+      .app--dark & {
+        border-top: 10px solid $tour-step-darkbackground;
+      }
     }
   }
 
   .tour-step--editor &,
-  .tour-step--menu & {
+  .tour-step--menu &,
+  .tour-step--theme & {
     right: 15px;
     border-top-right-radius: 0;
 
@@ -196,6 +217,10 @@ $tour-step-width: 240px;
       right: -10px;
       border-top: 10px solid $tour-step-background;
       border-right: 10px solid transparent;
+
+      .app--dark & {
+        border-top: 10px solid $tour-step-darkbackground;
+      }
     }
   }
 
@@ -208,6 +233,10 @@ $tour-step-width: 240px;
       left: -10px;
       border-top: 10px solid $tour-step-background;
       border-left: 10px solid transparent;
+
+      .app--dark & {
+        border-top: 10px solid $tour-step-darkbackground;
+      }
     }
   }
 }

src/components/common/DropdownMenu.vue

@@ -0,0 +1,137 @@
+<template>
+    <span class="dropdown-menu">
+      <span ref="slotInfo" @click="toggleMenu()" class="dropdown-toggle">
+        <slot></slot>
+      </span>
+      <ul class="dropdown-menu-items" :style="dropdownStyle" v-if="showMenu">
+        <li v-for="(option, idx) in options" :key="idx">
+          <a href="javascript:void(0)" :class="{selected: option.value === selectedOption.value}" @click="updateOption(option)">
+            {{ option.name }}
+          </a>
+        </li>
+      </ul>
+    </span>
+  </template>
+  
+  <script>
+    import store from '../../store';
+
+    export default {
+      data: () => ({
+        selectedOption: {
+          value: '',
+          name: '',
+        },
+        showMenu: false,
+      }),
+      props: {
+        options: {
+          type: [Array, Object],
+        },
+        selected: {},
+        closeOnOutsideClick: {
+          type: [Boolean],
+          default: true,
+        },
+        closeOnItemClick: {
+          type: [Boolean],
+          default: true,
+        },
+      },
+      mounted() {
+        this.selectedOption = this.selected;
+        if (this.closeOnOutsideClick) {
+          document.addEventListener('click', this.clickHandler);
+        }
+      },
+      beforeDestroy() {
+        document.removeEventListener('click', this.clickHandler);
+      },
+      computed: {
+        dropdownStyle() {
+          const height = store.state.layout.bodyHeight;
+          return `max-height: ${height * 0.7}px;`;
+        },
+      },
+      methods: {
+        updateOption(option) {
+          this.selectedOption = option;
+          if (this.closeOnItemClick) {
+            this.showMenu = false;
+          }
+          this.$emit('change', option);
+        },
+        toggleMenu() {
+          this.showMenu = !this.showMenu;
+        },
+        clickHandler(event) {
+          const { target } = event;
+          const { $el } = this;
+          if (!$el.contains(target)) {
+            this.showMenu = false;
+          }
+        },
+      },
+      watch: {
+        selected(val) {
+          this.selectedOption = val;
+        },
+      },
+    };
+  </script>
+  
+<style lang="scss">
+.dropdown-menu {
+  .dropdown-menu-items {
+    position: absolute;
+    top: 100%;
+    right: 0;
+    float: left;
+    min-width: 160px;
+    max-height: 450px;
+    overflow-y: scroll;
+    padding: 5px 0;
+    margin: 0;
+    list-style: none;
+    font-size: 15px;
+    background-color: #666;
+    border: 1px solid #666;
+    border-radius: 4px;
+    -webkit-box-shadow: 0 6px 12px rgb(0, 0, 0 / 18%);
+    box-shadow: 0 6px 12px rgb(0, 0, 0 / 18%);
+    background-clip: padding-box;
+
+    li {
+      width: 100%;
+      display: list-item;
+      margin: 0;
+      text-align: -webkit-match-parent;
+
+      a {
+        display: block;
+        clear: both;
+        font-weight: normal;
+        line-height: 1.45;
+        white-space: nowrap;
+        color: #eee;
+        padding: 5px 20px;
+        border-top: 1px solid transparent;
+        border-bottom: 1px solid transparent;
+        text-decoration: none;
+
+        &:active,
+        &:focus,
+        &:hover {
+          background-color: rgb(82, 82, 82);
+        }
+      }
+
+      a.selected {
+        background: #74b936 !important;
+        color: #fff !important;
+      }
+    }
+  }
+}
+</style>
+  

src/components/gutters/Comment.vue

@@ -16,7 +16,7 @@
       <div class="comment__text-inner" v-html="text"></div>
     </div>
     <div class="comment__buttons flex flex--row flex--end" v-if="showReply">
-      <button class="comment__button button" @click="setIsCommenting(true)">Reply</button>
+      <button class="comment__button button" @click="setIsCommenting(true)">评论</button>
     </div>
   </div>
 </template>

src/components/gutters/CurrentDiscussion.vue

@@ -4,18 +4,18 @@
     <div class="current-discussion__inner">
       <div class="flex flex--row flex--space-between">
         <div class="current-discussion__buttons flex flex--row flex--end">
-          <button class="current-discussion__button button" v-if="showNext" @click="goToDiscussion(previousDiscussionId)" v-title="'上一个讨论'">
+          <button class="current-discussion__button button" v-if="showNext" @click="goToDiscussion(previousDiscussionId)" v-title="'上一个批注'">
             <icon-arrow-left></icon-arrow-left>
           </button>
-          <button class="current-discussion__button current-discussion__button--rotate button" v-if="showNext" @click="goToDiscussion(nextDiscussionId)" v-title="'下一个讨论'">
+          <button class="current-discussion__button current-discussion__button--rotate button" v-if="showNext" @click="goToDiscussion(nextDiscussionId)" v-title="'下一个批注'">
             <icon-arrow-left></icon-arrow-left>
           </button>
         </div>
         <div class="current-discussion__buttons flex flex--row flex--end">
-          <button class="current-discussion__button current-discussion__button--remove button" v-if="showRemove" @click="removeDiscussion" v-title="'删除讨论'">
+          <button class="current-discussion__button current-discussion__button--remove button" v-if="showRemove" @click="removeDiscussion" v-title="'删除批注'">
             <icon-delete></icon-delete>
           </button>
-          <button class="current-discussion__button button" @click="setCurrentDiscussionId()" v-title="'关闭讨论'">
+          <button class="current-discussion__button button" @click="setCurrentDiscussionId()" v-title="'关闭批注'">
             <icon-close></icon-close>
           </button>
         </div>

src/components/gutters/EditorNewDiscussionButton.vue

@@ -1,5 +1,5 @@
 <template>
-  <a class="new-discussion-button" href="javascript:void(0)" v-if="coordinates" :style="{top: coordinates.top + 'px'}" v-title="'开始讨论'" @mousedown.stop.prevent @click="createNewDiscussion(selection)">
+  <a class="new-discussion-button" href="javascript:void(0)" v-if="coordinates" :style="{top: coordinates.top + 'px'}" v-title="'开始批注'" @mousedown.stop.prevent @click="createNewDiscussion(selection)">
     <icon-message></icon-message>
   </a>
 </template>

src/components/gutters/PreviewNewDiscussionButton.vue

@@ -1,5 +1,5 @@
 <template>
-  <a class="new-discussion-button" href="javascript:void(0)" v-if="coordinates" :style="{top: coordinates.top + 'px'}" v-title="'开始讨论'" @mousedown.stop.prevent @click="createNewDiscussion(selection)">
+  <a class="new-discussion-button" href="javascript:void(0)" v-if="coordinates" :style="{top: coordinates.top + 'px'}" v-title="'添加批注'" @mousedown.stop.prevent @click="createNewDiscussion(selection)">
     <icon-message></icon-message>
   </a>
 </template>

src/components/menus/EditThemeMenu.vue

@@ -0,0 +1,116 @@
+<template>
+    <div class="edit-theme side-bar__panel side-bar__panel--menu">
+      <div class="side-bar__info">
+        <div class="menu-entry menu-entry--info flex flex--row flex--align-center">
+          <span v-if="currEditTheme==='custom'">
+            下面的自定义主题样式可编辑，可参考其他主题样式填入自己喜欢的编辑样式。<br>
+            主题class为：edit-theme--custom
+          </span>
+          <span v-else>
+            下面的主题样式不可编辑。
+          </span>
+        </div>
+      </div>
+      <div class="side-bar__content">
+        <template v-if="currEditTheme === 'default'">
+          默认主题无额外样式，请选择其他主题。
+        </template>
+        <template v-else>
+          <code-editor v-for="(value, index) in styleEles" :key="index"
+            v-if="value.id === `edit-theme-${currEditTheme}`" lang="css" :value="value.innerHTML"
+            :disabled="value.id!=='edit-theme-custom'" @changed="changeText" scrollClass="side-bar__inner"></code-editor>
+        </template>
+      </div>
+      <div class="flex flex--row flex--end" v-if="currEditTheme==='custom'">
+        <button class="edit-theme__button button" @click="saveStyleText">保存</button>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  import { mapGetters } from 'vuex';
+  import MenuEntry from './common/MenuEntry';
+  import CodeEditor from '../CodeEditor';
+  import store from '../../store';
+  
+  export default {
+    components: {
+      MenuEntry,
+      CodeEditor,
+    },
+    data: () => ({
+      themeStyleText: '',
+      styleEles: [],
+    }),
+    computed: {
+      ...mapGetters('theme', [
+        'currEditTheme',
+      ]),
+    },
+    methods: {
+      saveStyleText() {
+        const typeEle = this.findByTheme(this.currEditTheme);
+        if (!typeEle || !this.themeStyleText) {
+          return;
+        }
+        typeEle.innerHTML = this.themeStyleText;
+        store.dispatch('theme/setCustomEditThemeStyle', this.themeStyleText);
+        store.dispatch('notification/info', '保存自定义主题样式成功！');
+      },
+      findByTheme(theme) {
+        const findEles = this.styleEles.filter(it => it.id === `edit-theme-${theme}`);
+        return findEles.length ? findEles[0] : null;
+      },
+      changeText(text) {
+        this.themeStyleText = text;
+      },
+      close() {
+        store.dispatch('data/setSideBarPanel', 'menu');
+      },
+      initStyle(theme) {
+        if (theme === 'default') {
+          return;
+        }
+        const value = theme || this.currEditTheme;
+        if (this.findByTheme(value)) {
+          return;
+        }
+        const styleId = `edit-theme-${value}`;
+        const styleEle = document.getElementById(styleId);
+        if (!styleEle) {
+          setTimeout(() => this.initStyle(value), 1000);
+          return;
+        }
+        this.styleEles.push(styleEle);
+      },
+    },
+    watch: {
+      currEditTheme: {
+        immediate: true,
+        handler(val) {
+          this.initStyle(val);
+        },
+      },
+    },
+    created() {
+      this.initStyle();
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  .side-bar__panel--menu {
+    .side-bar__content {
+      .code-editor {
+        min-height: 400px !important;
+        max-height: 100%;
+      }
+    }
+
+    .edit-theme__button {
+      font-size: 14px;
+      margin-top: 0.5em;
+    }
+  }
+  </style>
+  

src/components/menus/HistoryMenu.vue

@@ -8,7 +8,7 @@
           </option>
         </select>
       </p>
-      <p v-if="!historyContext">同步 <b>{{currentFileName}}</b> 以启用修订历史 或者 <a href="javascript:void(0)" @click="signin">登录 Gitee</a> 以同步您的主文档空间。</p>
+      <p v-if="!historyContext">同步 <b>{{currentFileName}}</b> 以启用修订历史 或者 <a href="javascript:void(0)" @click="signin">登录 Gitee</a> 或 <a href="javascript:void(0)" @click="signinWithGithub">登录 GitHub</a> 以同步您的主文档空间。</p>
       <p v-else-if="loading">历史版本加载中…</p>
       <p v-else-if="!revisionsWithSpacer.length"><b>{{currentFileName}}</b> 没有历史版本.</p>
       <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-else>
@@ -33,6 +33,7 @@
           <div class="revision__header flex flex--column">
             <user-name :user-id="revision.sub"></user-name>
             <div class="revision__created">{{revision.created | formatTime}}</div>
+            <div class="revision__msg">{{revision.message}}</div>
           </div>
         </a>
       </div>
@@ -54,6 +55,7 @@ import EditorClassApplier from '../common/EditorClassApplier';
 import PreviewClassApplier from '../common/PreviewClassApplier';
 import utils from '../../services/utils';
 import giteeHelper from '../../services/providers/helpers/giteeHelper';
+import githubHelper from '../../services/providers/helpers/githubHelper';
 import syncSvc from '../../services/syncSvc';
 import store from '../../store';
 import badgeSvc from '../../services/badgeSvc';
@@ -167,6 +169,16 @@ export default {
     async signin() {
       try {
         await giteeHelper.signin();
+        await syncSvc.afterSignIn();
+        syncSvc.requestSync();
+      } catch (e) {
+        // Cancel
+      }
+    },
+    async signinWithGithub() {
+      try {
+        await githubHelper.signin();
+        await syncSvc.afterSignIn();
         syncSvc.requestSync();
       } catch (e) {
         // Cancel
@@ -412,6 +424,14 @@ export default {
   opacity: 0.6;
 }
 
+.revision__msg {
+  font-size: 0.75em;
+  opacity: 0.6;
+  white-space: pre-wrap;
+  word-break: break-word;
+  word-wrap: break-word;
+}
+
 .layout--revision {
   .cledit-section *,
   .cl-preview-section * {

src/components/menus/MainMenu.vue

@@ -14,6 +14,9 @@
         <span v-if="currentWorkspace.providerId === 'giteeAppData'">
           <b>{{currentWorkspace.name}}</b> 与您的 Gitee 默认文档空间仓库同步。
         </span>
+        <span v-else-if="currentWorkspace.providerId === 'githubAppData'">
+          <b>{{currentWorkspace.name}}</b> 与您的 GitHub 默认文档空间仓库同步。
+        </span>
         <span v-else-if="currentWorkspace.providerId === 'googleDriveWorkspace'">
           <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">Google Drive 文件夹</a>同步。
         </span>
@@ -21,10 +24,10 @@
           <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">CouchDB 数据库</a>同步。
         </span>
         <span v-else-if="currentWorkspace.providerId === 'githubWorkspace'">
-          <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">GitHub repo</a> 同步。
+          <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">GitHub 仓库</a> 同步。
         </span>
         <span v-else-if="currentWorkspace.providerId === 'giteeWorkspace'">
-          <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">Gitee repo</a> 同步。
+          <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">Gitee 仓库</a> 同步。
         </span>
         <span v-else-if="currentWorkspace.providerId === 'gitlabWorkspace'">
           <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">GitLab 项目</a>同步。
@@ -45,6 +48,11 @@
       <div>使用 Gitee 登录</div>
       <span>同步您的主文档空间并解锁功能。</span>
     </menu-entry>
+    <menu-entry v-if="!loginToken" @click.native="signinWithGithub">
+      <icon-login slot="icon"></icon-login>
+      <div>使用 GitHub 登录</div>
+      <span>同步您的主文档空间并解锁功能。</span>
+    </menu-entry>
     <menu-entry @click.native="setPanel('workspaces')">
       <icon-database slot="icon"></icon-database>
       <div><div class="menu-entry__label menu-entry__label--count" v-if="workspaceCount">{{workspaceCount}}</div> 文档空间</div>
@@ -105,6 +113,16 @@
       <div><div class="menu-entry__label menu-entry__label--count">{{templateCount}}</div> 模板</div>
       <span>为您的导出配置 Handlebars 模板。</span>
     </menu-entry>
+    <menu-entry @click.native="setPanel('editTheme')">
+      <icon-select-theme slot="icon"></icon-select-theme>
+      编辑区主题
+      <span>编辑区主题样式(自定义主题可编辑)。</span>
+    </menu-entry>
+    <menu-entry @click.native="setPanel('previewTheme')">
+      <icon-select-theme slot="icon"></icon-select-theme>
+      预览区主题
+      <span>预览区主题样式(自定义主题可编辑)。</span>
+    </menu-entry>
     <menu-entry @click.native="settings">
       <icon-settings slot="icon"></icon-settings>
       <div>配置</div>
@@ -132,6 +150,7 @@ import MenuEntry from './common/MenuEntry';
 import providerRegistry from '../../services/providers/common/providerRegistry';
 import UserImage from '../UserImage';
 import giteeHelper from '../../services/providers/helpers/giteeHelper';
+import githubHelper from '../../services/providers/helpers/githubHelper';
 import syncSvc from '../../services/syncSvc';
 import userSvc from '../../services/userSvc';
 import store from '../../store';
@@ -184,6 +203,16 @@ export default {
     async signin() {
       try {
         await giteeHelper.signin();
+        await syncSvc.afterSignIn();
+        syncSvc.requestSync();
+      } catch (e) {
+        // Cancel
+      }
+    },
+    async signinWithGithub() {
+      try {
+        await githubHelper.signin();
+        await syncSvc.afterSignIn();
         syncSvc.requestSync();
       } catch (e) {
         // Cancel

src/components/menus/PreviewThemeMenu.vue

@@ -0,0 +1,116 @@
+<template>
+    <div class="preview-theme side-bar__panel side-bar__panel--menu">
+      <div class="side-bar__info">
+        <div class="menu-entry menu-entry--info flex flex--row flex--align-center">
+          <span v-if="currPreviewTheme==='custom'">
+            下面的自定义主题样式可编辑，可参考其他主题样式填入自己喜欢的预览样式。<br>
+            主题class为：preview-theme--custom
+          </span>
+          <span v-else>
+            下面的主题样式不可编辑。
+          </span>
+        </div>
+      </div>
+      <div class="side-bar__content">
+        <template v-if="currPreviewTheme === 'default'">
+          默认主题无额外样式，请选择其他主题。
+        </template>
+        <template v-else>
+          <code-editor v-for="(value, index) in styleEles" :key="index"
+            v-if="value.id === `preview-theme-${currPreviewTheme}`" lang="css" :value="value.innerHTML"
+            :disabled="value.id!=='preview-theme-custom'" @changed="changeText" scrollClass="side-bar__inner"></code-editor>
+        </template>
+      </div>
+      <div class="flex flex--row flex--end" v-if="currPreviewTheme==='custom'">
+        <button class="preview-theme__button button" @click="saveStyleText">保存</button>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  import { mapGetters } from 'vuex';
+  import MenuEntry from './common/MenuEntry';
+  import CodeEditor from '../CodeEditor';
+  import store from '../../store';
+  
+  export default {
+    components: {
+      MenuEntry,
+      CodeEditor,
+    },
+    data: () => ({
+      themeStyleText: '',
+      styleEles: [],
+    }),
+    computed: {
+      ...mapGetters('theme', [
+        'currPreviewTheme',
+      ]),
+    },
+    methods: {
+      saveStyleText() {
+        const typeEle = this.findByTheme(this.currPreviewTheme);
+        if (!typeEle || !this.themeStyleText) {
+          return;
+        }
+        typeEle.innerHTML = this.themeStyleText;
+        store.dispatch('theme/setCustomPreviewThemeStyle', this.themeStyleText);
+        store.dispatch('notification/info', '保存自定义主题样式成功！');
+      },
+      findByTheme(theme) {
+        const findEles = this.styleEles.filter(it => it.id === `preview-theme-${theme}`);
+        return findEles.length ? findEles[0] : null;
+      },
+      changeText(text) {
+        this.themeStyleText = text;
+      },
+      close() {
+        store.dispatch('data/setSideBarPanel', 'menu');
+      },
+      initStyle(theme) {
+        if (theme === 'default') {
+          return;
+        }
+        const value = theme || this.currPreviewTheme;
+        if (this.findByTheme(value)) {
+          return;
+        }
+        const styleId = `preview-theme-${value}`;
+        const styleEle = document.getElementById(styleId);
+        if (!styleEle) {
+          setTimeout(() => this.initStyle(value), 1000);
+          return;
+        }
+        this.styleEles.push(styleEle);
+      },
+    },
+    watch: {
+      currPreviewTheme: {
+        immediate: true,
+        handler(val) {
+          this.initStyle(val);
+        },
+      },
+    },
+    created() {
+      this.initStyle();
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  .side-bar__panel--menu {
+    .side-bar__content {
+      .code-editor {
+        min-height: 400px !important;
+        max-height: 100%;
+      }
+    }
+
+    .preview-theme__button {
+      font-size: 14px;
+      margin-top: 0.5em;
+    }
+  }
+  </style>
+  

src/components/menus/PublishMenu.vue

@@ -43,7 +43,7 @@
       <div v-for="token in githubTokens" :key="token.sub">
         <menu-entry @click.native="publishGist(token)">
           <icon-provider slot="icon" provider-id="gist"></icon-provider>
-          <div>发布到 Gist</div>
+          <div>发布到 GitHubGist</div>
           <span>{{token.name}}</span>
         </menu-entry>
         <menu-entry @click.native="publishGithub(token)">
@@ -53,6 +53,11 @@
         </menu-entry>
       </div>
       <div v-for="token in giteeTokens" :key="token.sub">
+        <menu-entry @click.native="publishGiteeGist(token)">
+          <icon-provider slot="icon" provider-id="giteegist"></icon-provider>
+          <div>发布到 GiteeGist</div>
+          <span>{{token.name}}</span>
+        </menu-entry>
         <menu-entry @click.native="publishGitee(token)">
           <icon-provider slot="icon" provider-id="gitee"></icon-provider>
           <div>发布到 Gitee</div>
@@ -258,8 +263,8 @@ export default {
     },
     async addGitlabAccount() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
       } catch (e) { /* cancel */ }
     },
     async addGiteaAccount() {
@@ -289,8 +294,9 @@ export default {
     publishBloggerPage: publishModalOpener('bloggerPagePublish', 'publishToBloggerPage'),
     publishDropbox: publishModalOpener('dropboxPublish', 'publishToDropbox'),
     publishGithub: publishModalOpener('githubPublish', 'publishToGithub'),
-    publishGitee: publishModalOpener('giteePublish', 'publishToGitee'),
     publishGist: publishModalOpener('gistPublish', 'publishToGist'),
+    publishGitee: publishModalOpener('giteePublish', 'publishToGitee'),
+    publishGiteeGist: publishModalOpener('giteeGistPublish', 'publishGiteeGist'),
     publishGitlab: publishModalOpener('gitlabPublish', 'publishToGitlab'),
     publishGitea: publishModalOpener('giteaPublish', 'publishToGitea'),
     publishGoogleDrive: publishModalOpener('googleDrivePublish', 'publishToGoogleDrive'),

src/components/menus/SyncMenu.vue

@@ -46,7 +46,7 @@
         </menu-entry>
         <menu-entry @click.native="saveGist(token)">
           <icon-provider slot="icon" provider-id="gist"></icon-provider>
-          <div>在Gist上保存</div>
+          <div>在GitHubGist上保存</div>
           <span>{{token.name}}</span>
         </menu-entry>
       </div>
@@ -61,6 +61,11 @@
           <div>在Gitee上保存</div>
           <span>{{token.name}}</span>
         </menu-entry>
+        <menu-entry @click.native="saveGiteeGist(token)">
+          <icon-provider slot="icon" provider-id="giteegist"></icon-provider>
+          <div>在GiteeGist上保存</div>
+          <span>{{token.name}}</span>
+        </menu-entry>
       </div>
       <div v-for="token in gitlabTokens" :key="token.sub">
         <menu-entry @click.native="openGitlab(token)">
@@ -234,8 +239,8 @@ export default {
     },
     async addGitlabAccount() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
       } catch (e) { /* cancel */ }
     },
     async addGiteaAccount() {
@@ -330,6 +335,12 @@ export default {
         badgeSvc.addBadge('saveOnGist');
       } catch (e) { /* cancel */ }
     },
+    async saveGiteeGist(token) {
+      try {
+        await openSyncModal(token, 'giteeGistSync');
+        badgeSvc.addBadge('saveOnGiteeGist');
+      } catch (e) { /* cancel */ }
+    },
     async openGitlab(token) {
       try {
         const syncLocation = await store.dispatch('modal/open', {

src/components/menus/WorkspacesMenu.vue

@@ -8,7 +8,8 @@
     <hr>
     <div class="workspace" v-for="(workspace, id) in workspacesById" :key="id">
       <menu-entry :href="workspace.url" target="_blank">
-        <icon-provider slot="icon" :provider-id="workspace.providerId"></icon-provider>
+        <icon-provider v-if="id === 'main' && !workspace.sub" slot="icon" :provider-id="'stackedit'"></icon-provider>
+        <icon-provider v-else slot="icon" :provider-id="workspace.providerId"></icon-provider>
         <div class="workspace__name"><div class="menu-entry__label" v-if="currentWorkspace === workspace">当前</div>{{workspace.name}}</div>
       </menu-entry>
     </div>
@@ -85,8 +86,8 @@ export default {
     },
     async addGitlabWorkspace() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        const token = await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        const token = await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
         store.dispatch('modal/open', {
           type: 'gitlabWorkspace',
           token,

src/components/menus/common/MenuEntry.vue

@@ -73,6 +73,10 @@
   background-color: #fff;
   border-radius: 3px;
   opacity: 0.6;
+
+  .app--dark & {
+    background-color: #000;
+  }
 }
 
 .menu-entry__label--warning {

src/components/modals/AccountManagementModal.vue

@@ -248,8 +248,8 @@ export default {
     },
     async addGitlabAccount() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
       } catch (e) { /* cancel */ }
     },
     async addGiteaAccount() {

src/components/modals/ChatGptModal.vue

@@ -0,0 +1,131 @@
+<template>
+  <modal-inner class="modal__inner-1--chatgpt" aria-label="chatgpt">
+    <div class="modal__content">
+      <div class="modal__image">
+        <icon-chat-gpt></icon-chat-gpt>
+      </div>
+      <p><b>ChatGPT内容生成</b><br>生成时长受ChatGPT服务响应与网络响应时长影响，时间可能较长</p>
+      <form-entry label="生成内容要求详细描述" error="content">
+        <textarea slot="field" class="text-input" type="text" placeholder="输入内容(支持换行)" v-model.trim="content" :disabled="generating"></textarea>
+        <div class="form-entry__info">
+          使用 <a href="https://api35.pxj123.cn/" target="_blank">api35.pxj123.cn</a> 的免费接口生成内容，AI模型是：GPT-3.5 Turbo。
+        </div>
+      </form-entry>
+      <div class="modal__result">
+        <pre class="result_pre" v-if="generating && !result">(等待生成中...)</pre>
+        <pre class="result_pre" v-else v-text="result"></pre>
+      </div>
+    </div>
+    <div class="modal__button-bar">
+      <button class="button" @click="reject()">{{ generating ? '停止' : '关闭' }}</button>
+      <button class="button button--resolve" @click="generate" v-if="!generating && !!content">{{ !!result ? '重新生成' : '开始生成' }}</button>
+      <button class="button button--resolve" @click="resolve" v-if="!generating && !!result">确认插入</button>
+    </div>
+  </modal-inner>
+</template>
+
+<script>
+import modalTemplate from './common/modalTemplate';
+import chatGptSvc from '../../services/chatGptSvc';
+import store from '../../store';
+
+export default modalTemplate({
+  data: () => ({
+    generating: false,
+    content: '',
+    result: '',
+    xhr: null,
+  }),
+  methods: {
+    resolve(evt) {
+      evt.preventDefault();
+      const { callback } = this.config;
+      this.config.resolve();
+      callback(this.result);
+    },
+    process({ done, content, error }) {
+      if (done) {
+        this.generating = false;
+        // 已结束
+      } else if (content) {
+        this.result = this.result + content;
+        const container = document.querySelector('.result_pre');
+        container.scrollTo(0, container.scrollHeight); // 滚动到最底部
+      } else if (error) {
+        this.generating = false;
+      }
+    },
+    generate() {
+      this.generating = true;
+      this.result = '';
+      try {
+        this.xhr = chatGptSvc.chat({
+          content: `${this.content}\n(使用Markdown方式输出结果)`,
+        }, this.process);
+      } catch (err) {
+        this.generating = false;
+        store.dispatch('notification/error', err);
+      }
+    },
+    reject() {
+      if (this.generating) {
+        if (this.xhr) {
+          this.xhr.abort();
+          this.generating = false;
+        }
+        return;
+      }
+      const { callback } = this.config;
+      this.config.reject();
+      callback(null);
+    },
+  },
+  mounted() {
+    const script = document.createElement('script');
+    script.src = `https://api35.pxj123.cn/js/chat.js?t=${new Date().getTime()}`;
+    script.onload = () => {
+      /* eslint-disable */
+      console.log('加载外部chatgpt的js成功!');
+    };
+    this.$el.appendChild(script);
+  },
+});
+</script>
+
+<style lang="scss">
+@import '../../styles/variables.scss';
+
+.modal__inner-1.modal__inner-1--chatgpt {
+  max-width: 560px;
+
+  .result_pre {
+    font-size: 0.9em;
+    font-variant-ligatures: no-common-ligatures;
+    line-height: 1.25;
+    white-space: pre-wrap;
+    word-break: break-word;
+    word-wrap: break-word;
+    height: 300px;
+    border: 1px solid rgb(126, 126, 126);
+    border-radius: $border-radius-base;
+    padding: 10px;
+    overflow-y: scroll; /* 开启垂直滚动条 */
+  }
+
+  .result_pre::-webkit-scrollbar {
+    display: none; /* 隐藏滚动条 */
+  }
+
+  .result_pre.scroll-bottom {
+    scroll-behavior: smooth;
+  }
+
+  .config-warning {
+    color: #f00;
+  }
+
+  .text-input {
+    min-height: 60px;
+  }
+}
+</style>

src/components/modals/CommitMessageModal.vue

@@ -0,0 +1,43 @@
+<template>
+  <modal-inner aria-label="提交信息">
+    <p>自定义 <b>{{ config.name }}</b> 提交信息。</p>
+    <div class="modal__content">
+      <div class="form-entry">
+        <label class="form-entry__label">提交信息</label>
+        <div class="form-entry__field">
+          <input slot="field" class="textfield" placeholder="提交信息非必填" type="text" v-model.trim="commitMessage" @keydown.enter="resolve()">
+        </div>
+      </div>
+    </div>
+    <div class="modal__button-bar">
+      <button class="button" @click="config.reject()">取消</button>
+      <button class="button button--resolve" @click="resolve()">确认</button>
+    </div>
+  </modal-inner>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import ModalInner from './common/ModalInner';
+
+export default {
+  components: {
+    ModalInner,
+  },
+  data: () => ({
+    commitMessage: '',
+  }),
+  computed: {
+    ...mapGetters('modal', [
+      'config',
+    ]),
+  },
+  methods: {
+    resolve() {
+      this.config.resolve({
+        commitMessage: this.commitMessage,
+      });
+    },
+  },
+};
+</script>

src/components/modals/ImageModal.vue

@@ -1,18 +1,35 @@
 <template>
   <modal-inner aria-label="插入图像">
     <div class="modal__content">
-      <p v-if="hasFile">
-        <span v-if="uploading">粘贴/拖拽图片上传中...</span>
-        <span v-if="!this.uploading && url">
-          <img :src="url">
-        </span>
-        <span v-if="!this.uploading && !url">图片上传失败，如未添加图床请先添加并选择，之后关闭窗口再重试！</span>
-      </p>
-      <p v-if="!hasFile">请为您的图像提供<b> url </b>。</p>
-      <form-entry v-if="!hasFile" label="URL" error="url">
+      <p>请为您的图像提供<b> url </b>。<span v-if="uploading">(图片上传中...)</span></p>
+      <form-entry label="URL" error="url">
         <input slot="field" class="textfield" type="text" v-model.trim="url" @keydown.enter="resolve">
       </form-entry>
-      <p>添加并选择图床后可实现粘贴/拖拽自动上传图片</p>
+    </div>
+    <div class="modal__button-bar">
+      <input class="hidden-file" id="upload-image-file-input" type="file" accept="image/*" :disabled="uploading" @change="uploadImage">
+      <label for="upload-image-file-input"><a class="button">上传图片</a></label>
+      <button class="button" @click="reject()">取消</button>
+      <button class="button button--resolve" @click="resolve" :disabled="uploading">确认</button>
+    </div>
+    <div>
+      <hr />
+      <p>添加并选择图床后可在编辑区中粘贴/拖拽图片自动上传</p>
+
+      <menu-entry @click.native="checkedImgDest(path)" v-for="path in workspaceImgPath" :key="path">
+        <icon-check-circle v-if="checkedStorage.sub === path" slot="icon"></icon-check-circle>
+        <icon-check-circle-un v-if="checkedStorage.sub !== path" slot="icon"></icon-check-circle-un>
+        <menu-item>
+          <icon-provider slot="icon" :provider-id="currentWorkspace.providerId"></icon-provider>
+          <div>
+            当前文档空间图片路径
+            <button class="menu-item__button button" @click.stop="removeByPath(path)" v-title="'删除'">
+              <icon-delete></icon-delete>
+            </button>
+          </div>
+          <span>路径：{{path}}</span>
+        </menu-item>
+      </menu-entry>
       <menu-entry @click.native="checkedImgDest(token.sub, token.providerId)" v-for="token in imageTokens" :key="token.sub">
         <icon-check-circle v-if="checkedStorage.sub === token.sub" slot="icon"></icon-check-circle>
         <icon-check-circle-un v-if="checkedStorage.sub !== token.sub" slot="icon"></icon-check-circle-un>
@@ -30,9 +47,9 @@
           <span class="line-entry" v-if="token.params">自定义Form参数：{{token.params}}</span>
         </menu-item>
       </menu-entry>
-      <menu-entry @click.native="checkedImgDest(tokenStorage.sid, tokenStorage.providerId)" v-for="tokenStorage in tokensImgStorages" :key="tokenStorage.sid">
-        <icon-check-circle v-if="checkedStorage.sub === tokenStorage.sid" slot="icon"></icon-check-circle>
-        <icon-check-circle-un v-if="checkedStorage.sub !== tokenStorage.sid" slot="icon"></icon-check-circle-un>
+      <menu-entry @click.native="checkedImgDest(tokenStorage.token.sub, tokenStorage.providerId, tokenStorage.sid)" v-for="tokenStorage in tokensImgStorages" :key="tokenStorage.sid">
+        <icon-check-circle v-if="checkedStorage.sid === tokenStorage.sid" slot="icon"></icon-check-circle>
+        <icon-check-circle-un v-if="checkedStorage.sid !== tokenStorage.sid" slot="icon"></icon-check-circle-un>
         <menu-item>
           <icon-provider slot="icon" :provider-id="tokenStorage.providerId"></icon-provider>
           <div>{{tokenStorage.providerName}}
@@ -43,12 +60,10 @@
           <span> {{tokenStorage.uname}}, 仓库URL: {{tokenStorage.repoUrl}}, 路径: {{tokenStorage.path}}, 分支: {{tokenStorage.branch}}</span>
         </menu-item>
       </menu-entry>
-    </div>
-    <div class="modal__button-bar">
-      <button class="button" @click="reject()">取消</button>
-      <button class="button button--resolve" @click="resolve" :disabled="uploading">确认</button>
-    </div>
-    <div>
+      <menu-entry @click.native="addWorkspaceImgPath">
+        <icon-provider slot="icon" :provider-id="currentWorkspace.providerId"></icon-provider>
+        <span>添加当前文档空间图片路径</span>
+      </menu-entry>
       <menu-entry @click.native="addSmmsAccount">
         <icon-provider slot="icon" provider-id="smms"></icon-provider>
         <span>添加SM.MS图床账号</span>
@@ -70,6 +85,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import modalTemplate from './common/modalTemplate';
 import MenuEntry from '../menus/common/MenuEntry';
 import MenuItem from '../menus/common/MenuItem';
@@ -79,6 +95,7 @@ import giteaHelper from '../../services/providers/helpers/giteaHelper';
 import githubHelper from '../../services/providers/helpers/githubHelper';
 import customHelper from '../../services/providers/helpers/customHelper';
 import utils from '../../services/utils';
+import imageSvc from '../../services/imageSvc';
 
 export default modalTemplate({
   components: {
@@ -86,14 +103,24 @@ export default modalTemplate({
     MenuItem,
   },
   data: () => ({
-    hasFile: false,
     uploading: false,
     url: '',
   }),
   computed: {
+    ...mapGetters('workspace', [
+      'currentWorkspace',
+      'currentWorkspaceIsGit',
+    ]),
     checkedStorage() {
       return store.getters['img/getCheckedStorage'];
     },
+    workspaceImgPath() {
+      if (!this.currentWorkspaceIsGit) {
+        return [];
+      }
+      const workspaceImgPath = store.getters['img/getWorkspaceImgPath'];
+      return Object.keys(workspaceImgPath || {});
+    },
     imageTokens() {
       return [
         ...Object.values(store.getters['data/smmsTokensBySub']).map(token => ({
@@ -137,92 +164,12 @@ export default modalTemplate({
             uname: it.token.name,
             providerId: it.providerId,
             providerName: it.providerName,
-            repoUrl: it.providerId === 'gitea' ? `${it.serverUrl}/${storage.repoUri}` : `${storage.owner}/${storage.repo}`,
+            repoUrl: it.providerId === 'gitea' ? `${it.token.serverUrl}/${storage.repoUri}` : `${storage.owner}/${storage.repo}`,
           }));
         });
       return imgStorages;
     },
   },
-  async mounted() {
-    this.hasFile = false;
-    const imgFile = store.getters['img/getImg'];
-    if (imgFile) {
-      this.hasFile = true;
-      this.uploading = true;
-      try {
-        // 操作图片上传
-        // 找到对应的provider 目前仅smms
-        const currStorage = this.checkedStorage;
-        if (!currStorage) {
-          store.dispatch('notification/info', '暂无已选择的图床，未自动上传图片！请选择图床后重新粘贴/拖拽图片！');
-          return;
-        }
-        if (currStorage.provider === 'smms' || currStorage.provider === 'custom') {
-          const filterTokens = this.imageTokens.filter(it => it.sub === currStorage.sub);
-          if (!filterTokens.length) {
-            store.dispatch('notification/info', '图床已失效，未自动上传图片！请选择图床后重新粘贴/拖拽图片！');
-            return;
-          }
-          const token = filterTokens[0];
-          const helper = currStorage.provider === 'smms' ? smmsHelper : customHelper;
-          try {
-            this.url = await helper.uploadFile({
-              token,
-              file: imgFile,
-            });
-          } catch (err) {
-            store.dispatch('notification/error', err);
-          }
-        } else if (currStorage.provider === 'gitea' || currStorage.provider === 'github') {
-          const filterTokenStorages = this.tokensImgStorages
-            .filter(it => it.sid === currStorage.sub);
-          if (!filterTokenStorages.length) {
-            store.dispatch('notification/info', 'Gitea图床已失效，未自动上传图片！请选择图床后重新粘贴/拖拽图片！');
-            return;
-          }
-          const tokenStorage = filterTokenStorages[0];
-          const time = new Date();
-          const date = time.getDate();
-          const month = time.getMonth();
-          const year = time.getFullYear();
-          let path = tokenStorage.path.replace('{YYYY}', year)
-            .replace('{MM}', `0${month}`.slice(-2)).replace('{DD}', `0${date}`.slice(-2));
-          path = `${path}${path.endsWith('/') ? '' : '/'}${utils.uid()}.${imgFile.type.split('/')[1]}`;
-          try {
-            if (currStorage.provider === 'gitea') {
-              const result = await giteaHelper.uploadFile({
-                token: tokenStorage.token,
-                projectId: tokenStorage.repoUri,
-                branch: tokenStorage.branch,
-                path,
-                content: imgFile,
-                isFile: true,
-              });
-              this.url = result.content.download_url;
-            } else if (currStorage.provider === 'github') {
-              const result = await githubHelper.uploadFile({
-                token: tokenStorage.token,
-                owner: tokenStorage.owner,
-                repo: tokenStorage.repo,
-                branch: tokenStorage.branch,
-                path,
-                content: imgFile,
-                isFile: true,
-              });
-              this.url = result.content.download_url;
-            }
-          } catch (err) {
-            store.dispatch('notification/error', err);
-          }
-        } else {
-          store.dispatch('notification/info', '暂无已选择的图床，未自动上传图片！请选择图床后重新粘贴/拖拽图片！');
-        }
-      } finally {
-        store.dispatch('img/clearImg');
-        this.uploading = false;
-      }
-    }
-  },
   methods: {
     resolve(evt) {
       evt.preventDefault(); // Fixes https://github.com/mafgwo/stackedit/issues/1503
@@ -239,6 +186,27 @@ export default modalTemplate({
       this.config.reject();
       callback(null);
     },
+    async uploadImage(evt) {
+      if (!evt.target.files || !evt.target.files.length) {
+        return;
+      }
+      const imgFile = evt.target.files[0];
+      try {
+        this.uploading = true;
+        const { url, error } = await imageSvc.updateImg(imgFile);
+        if (error) {
+          store.dispatch('notification/error', error);
+          return;
+        }
+        this.url = url;
+      } catch (err) {
+        store.dispatch('notification/error', err);
+      } finally {
+        this.uploading = false;
+        // 上传后清空
+        evt.target.value = '';
+      }
+    },
     async remove(proivderId, item) {
       try {
         await store.dispatch('modal/open', 'imgStorageDeletion');
@@ -258,6 +226,13 @@ export default modalTemplate({
         // Cancel
       }
     },
+    async removeByPath(path) {
+      store.dispatch('img/removeWorkspaceImgPath', path);
+    },
+    async addWorkspaceImgPath() {
+      const { path } = await store.dispatch('modal/open', { type: 'workspaceImgPath' });
+      store.dispatch('img/addWorkspaceImgPath', path);
+    },
     async addSmmsAccount() {
       const { proxyUrl, apiSecretToken } = await store.dispatch('modal/open', { type: 'smmsAccount' });
       await smmsHelper.addAccount(proxyUrl, apiSecretToken);
@@ -288,15 +263,19 @@ export default modalTemplate({
         githubHelper.updateToken(token, imgStorageInfo);
       } catch (e) { /* Cancel */ }
     },
-    async checkedImgDest(sub, provider) {
+    async checkedImgDest(sub, provider, sid) {
       let type = 'token';
-      if (provider === 'gitea' || provider === 'github') {
+      // 当前文档空间存储
+      if (!provider) {
+        type = 'workspace';
+      } else if (provider === 'gitea' || provider === 'github') {
         type = 'tokenRepo';
       }
       store.dispatch('img/changeCheckedStorage', {
         type,
         provider,
         sub,
+        sid,
       });
       // const { callback } = this.config;
       // this.config.reject();

src/components/modals/PdfExportModal.vue

@@ -1,7 +1,7 @@
 <template>
   <modal-inner aria-label="导出到PDF">
     <div class="modal__content">
-      <p>请为您的<b> pdf导出</b>选择模板。</p>
+      <p>请为您的<b> pdf导出</b>选择模板。(该导出很消耗服务器资源，文档太大或图片太多可能会导出超时失败！可参考 <a href="https://gitee.com/mafgwo/stackedit/blob/master/docs/大文档导出PDF方式.md" target="_blank">大文档导出PDF方式</a> 自行导出大文档！)</p>
       <form-entry label="模板">
         <select class="textfield" slot="field" v-model="selectedTemplate" @keydown.enter="resolve()">
           <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">

src/components/modals/PublishManagementModal.vue

@@ -4,8 +4,8 @@
       <div class="modal__image">
         <icon-upload></icon-upload>
       </div>
-      <p v-if="publishLocations.length"><b>{{currentFileName}}</b> is published to the following location(s):</p>
-      <p v-else><b>{{currentFileName}}</b> is not published yet.</p>
+      <p v-if="publishLocations.length"><b>{{currentFileName}}</b> 被发布到了以下位置:</p>
+      <p v-else><b>{{currentFileName}}</b> 还没有被发布.</p>
       <div>
         <div class="publish-entry flex flex--column" v-for="location in publishLocations" :key="location.id">
           <div class="publish-entry__header flex flex--row flex--align-center">
@@ -26,7 +26,7 @@
               {{location.url}}
             </div>
             <div class="publish-entry__buttons flex flex--row flex--center" v-if="location.url">
-              <button class="publish-entry__button button" v-clipboard="location.url" @click="info('Location URL copied to clipboard!')" v-title="'复制URL'">
+              <button class="publish-entry__button button" v-clipboard="location.url" @click="info('位置URL已复制到剪贴板!')" v-title="'复制URL'">
                 <icon-content-copy></icon-content-copy>
               </button>
               <a class="publish-entry__button button" v-if="location.url" :href="location.url" target="_blank" v-title="'打开位置'">
@@ -34,6 +34,19 @@
               </a>
             </div>
           </div>
+          <div class="publish-entry__row flex flex--row flex--align-center" v-if="shareUrl(location)">
+            <div class="publish-entry__url">
+              分享链接: {{shareUrl(location)}}
+            </div>
+            <div class="publish-entry__buttons flex flex--row flex--center">
+              <button class="publish-entry__button button" v-clipboard="shareUrl(location)" @click="info('分享URL已复制到剪贴板!')" v-title="'复制分享URL'">
+                <icon-content-copy></icon-content-copy>
+              </button>
+              <a class="publish-entry__button button" :href="shareUrl(location)" target="_blank" v-title="'打开分享'">
+                <icon-open-in-new></icon-open-in-new>
+              </a>
+            </div>
+          </div>
         </div>
       </div>
       <div class="modal__info" v-if="publishLocations.length">
@@ -41,7 +54,7 @@
       </div>
     </div>
     <div class="modal__button-bar">
-      <button class="button button--resolve" @click="config.resolve()">Close</button>
+      <button class="button button--resolve" @click="config.resolve()">关闭</button>
     </div>
   </modal-inner>
 </template>
@@ -75,6 +88,16 @@ export default {
       store.commit('publishLocation/deleteItem', location.id);
       badgeSvc.addBadge('removePublishLocation');
     },
+    shareUrl(location) {
+      if (location.providerId !== 'giteegist' && location.providerId !== 'gist') {
+        return null;
+      }
+      if (!location.url || !location.gistId) {
+        return null;
+      }
+      const sharePage = location.providerId === 'gist' ? 'gistshare.html' : 'share.html';
+      return `${window.location.protocol}//${window.location.host}/${sharePage}?id=${location.gistId}`;
+    },
   },
 };
 </script>

src/components/modals/WorkspaceImgPathModal.vue

@@ -0,0 +1,48 @@
+<template>
+  <modal-inner aria-label="文档空间图片路径">
+    <div class="modal__content">
+      <div class="modal__image">
+        <icon-provider :provider-id="currentWorkspace.providerId"></icon-provider>
+      </div>
+      <p>在当前文档空间增加图片上传路径。</p>
+      <form-entry label="图片上传路径" error="path">
+        <input slot="field" class="textfield" type="text" placeholder="如：/imgs/{YYYY}-{MM}-{DD}" v-model.trim="path" @keydown.enter="resolve()">
+        <div class="form-entry__info">
+          如果不提供，默认为 /imgs/{YYYY}-{MM}-{DD}。<br/>
+          支持相对路径，如 ./imgs、../imgs 或 imgs 都是相对当前编辑中文档的路径。<br/>
+          变量说明：{YYYY}为年变量、{MM}为月变量、{DD}为日变量、{MDNAME}为当前文档名称
+        </div>
+      </form-entry>
+    </div>
+    <div class="modal__button-bar">
+      <button class="button" @click="config.reject()">取消</button>
+      <button class="button button--resolve" @click="resolve()">确认</button>
+    </div>
+  </modal-inner>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import modalTemplate from './common/modalTemplate';
+
+export default modalTemplate({
+  computedLocalSettings: {
+    path: '',
+  },
+  computed: {
+    ...mapGetters('workspace', [
+      'currentWorkspace',
+    ]),
+  },
+  methods: {
+    resolve() {
+      if (!this.path) {
+        this.setError('path');
+      }
+      this.config.resolve({
+        path: this.path || '/imgs/{YYYY}-{MM}-{DD}',
+      });
+    },
+  },
+});
+</script>

src/components/modals/WorkspaceManagementModal.vue

@@ -9,7 +9,8 @@
         <div class="flex flex--column">
           <div class="workspace-entry__header flex flex--row flex--align-center">
             <div class="workspace-entry__icon">
-              <icon-provider :provider-id="workspace.providerId"></icon-provider>
+              <icon-provider v-if="id === 'main' && !workspace.sub" :provider-id="'stackedit'"></icon-provider>
+              <icon-provider v-else :provider-id="workspace.providerId"></icon-provider>
             </div>
             <input class="text-input" type="text" v-if="editedId === id" v-focus @blur="submitEdit()" @keydown.enter="submitEdit()" @keydown.esc.stop="submitEdit(true)" v-model="editingName">
             <div class="workspace-entry__name" v-else>{{workspace.name}}</div>
@@ -17,6 +18,15 @@
               <button class="workspace-entry__button button" @click="edit(id)" v-title="'编辑名称'">
                 <icon-pen></icon-pen>
               </button>
+              <template v-if="workspace.providerId === 'giteeAppData' || workspace.providerId === 'githubAppData' || workspace.providerId === 'githubWorkspace'
+                || workspace.providerId === 'giteeWorkspace' || workspace.providerId === 'gitlabWorkspace' || workspace.providerId === 'giteaWorkspace'">
+                <button class="workspace-entry__button button" @click="stopAutoSync(id)" v-if="workspace.autoSync == undefined || workspace.autoSync" v-title="'关闭自动同步'">
+                  <icon-sync-auto></icon-sync-auto>
+                </button>
+                <button class="workspace-entry__button button" @click="startAutoSync(id)" v-if="workspace.autoSync != undefined && !workspace.autoSync" v-title="'启动自动同步'">
+                  <icon-sync-stop></icon-sync-stop>
+                </button>
+              </template>
               <button class="workspace-entry__button button" @click="remove(id)" v-title="'删除'">
                 <icon-delete></icon-delete>
               </button>
@@ -122,12 +132,53 @@ export default {
         this.info('请先关闭文档空间，然后再将其删除。');
       } else {
         try {
-          await store.dispatch('modal/open', 'removeWorkspace');
+          const workspace = this.workspacesById[id];
+          if (!workspace) {
+            return;
+          }
+          await store.dispatch('modal/open', {
+            type: 'removeWorkspace',
+            name: workspace.name,
+          });
           workspaceSvc.removeWorkspace(id);
           badgeSvc.addBadge('removeWorkspace');
         } catch (e) { /* Cancel */ }
       }
     },
+    async stopAutoSync(id) {
+      const workspace = this.workspacesById[id];
+      if (!workspace) {
+        return;
+      }
+      await store.dispatch('modal/open', {
+        type: 'stopAutoSyncWorkspace',
+        name: workspace.name,
+      });
+      store.dispatch('workspace/patchWorkspacesById', {
+        [id]: {
+          ...workspace,
+          autoSync: false,
+        },
+      });
+      badgeSvc.addBadge('stopAutoSyncWorkspace');
+    },
+    async startAutoSync(id) {
+      const workspace = this.workspacesById[id];
+      if (!workspace) {
+        return;
+      }
+      await store.dispatch('modal/open', {
+        type: 'autoSyncWorkspace',
+        name: workspace.name,
+      });
+      store.dispatch('workspace/patchWorkspacesById', {
+        [id]: {
+          ...workspace,
+          autoSync: true,
+        },
+      });
+      badgeSvc.addBadge('autoSyncWorkspace');
+    },
   },
   created() {
     Object.keys(this.workspacesById).forEach(async (workspaceId) => {

src/components/modals/common/FormEntry.vue

@@ -17,7 +17,7 @@ export default {
     uid: utils.uid(),
   }),
   mounted() {
-    this.$el.querySelector('input,select').id = this.uid;
+    this.$el.querySelector('input,select,textarea').id = this.uid;
   },
 };
 </script>

src/components/modals/providers/DropboxAccountModal.vue

@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="dropbox"></icon-provider>
       </div>
-      <p>将您的<b>Dropbox</b>链接到<b>StackEdit</b>。</p>
+      <p>将您的<b>Dropbox</b>链接到<b>StackEdit中文版</b>。</p>
       <div class="form-entry">
         <div class="form-entry__checkbox">
           <label>

src/components/modals/providers/GistPublishModal.vue

@@ -1,11 +1,11 @@
 <template>
-  <modal-inner aria-label="发布到Gist">
+  <modal-inner aria-label="发布到GitHubGist">
     <div class="modal__content">
       <div class="modal__image">
         <icon-provider provider-id="gist"></icon-provider>
       </div>
-      <p>发布<b> {{CurrentFileName}} </b>到<b>Gist</b>。</p>
-      <form-entry label="Filename" error="filename">
+      <p>发布<b> {{CurrentFileName}} </b>到<b>GitHubGist</b>。</p>
+      <form-entry label="文件名" error="filename">
         <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
       </form-entry>
       <div class="form-entry">
@@ -15,10 +15,10 @@
           </label>
         </div>
       </div>
-      <form-entry label="Existing Gist ID" info="可选的">
+      <form-entry label="存在Gist ID" info="可选的">
         <input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          如果文件存在于Gist中，则将被覆盖。
+          如果文件存在于GitHubGist中，则将被覆盖。
         </div>
       </form-entry>
       <form-entry label="Template">

src/components/modals/providers/GistSyncModal.vue

@@ -1,11 +1,11 @@
 <template>
-  <modal-inner aria-label="与 Gist 同步">
+  <modal-inner aria-label="与 GitHubGist 同步">
     <div class="modal__content">
       <div class="modal__image">
         <icon-provider provider-id="gist"></icon-provider>
       </div>
-      <p>将<b> {{currentFileName}} </b>保存到<b>Gist</b>并保持同步。</p>
-      <form-entry label="Filename" error="filename">
+      <p>将<b> {{currentFileName}} </b>保存到<b>GitHubGist</b>并保持同步。</p>
+      <form-entry label="文件名" error="filename">
         <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
       </form-entry>
       <div class="form-entry">
@@ -15,10 +15,10 @@
           </label>
         </div>
       </div>
-      <form-entry label="Existing Gist ID" info="可选的">
+      <form-entry label="存在Gist ID" info="可选的">
         <input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          如果文件存在于Gist中，则将被覆盖。
+          如果文件存在于GitHubGist中，则将被覆盖。
         </div>
       </form-entry>
     </div>

src/components/modals/providers/GiteaAccountModal.vue

@@ -4,7 +4,8 @@
       <div class="modal__image">
         <icon-provider provider-id="gitea"></icon-provider>
       </div>
-      <p>将您的<b>Gitea</b>链接到<b>StackEdit</b>。</p>
+      <p>将您的<b>Gitea</b>链接到<b>StackEdit中文版</b>。</p>
+      <template v-if="!useServerConf">
         <form-entry label="Gitea URL" error="serverUrl">
           <input v-if="config.forceServerUrl" slot="field" class="textfield" type="text" disabled="disabled" v-model="config.forceServerUrl">
           <input v-else slot="field" class="textfield" type="text" v-model.trim="serverUrl" @keydown.enter="resolve()">
@@ -27,6 +28,7 @@
             <a href="https://docs.gitea.io/en-us/oauth2-provider/" target="_blank">更多信息</a>
           </div>
         </form-entry>
+      </template>
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">取消</button>
@@ -38,6 +40,8 @@
 <script>
 import modalTemplate from '../common/modalTemplate';
 import constants from '../../../data/constants';
+import store from '../../../store';
+import networkSvc from '../../../services/networkSvc';
 
 export default modalTemplate({
   data: () => ({
@@ -55,9 +59,22 @@ export default modalTemplate({
       }
       return null;
     },
+    // 是否使用服务端配置
+    useServerConf() {
+      const confClientId = store.getters['data/serverConf'].giteaClientId;
+      const confServerUrl = store.getters['data/serverConf'].giteaUrl;
+      return !!confClientId && !!confServerUrl;
+    },
+  },
+  mounted() {
+    networkSvc.getServerConf();
   },
   methods: {
     resolve() {
+      if (this.useServerConf) {
+        this.config.resolve({});
+        return;
+      }
       const serverUrl = this.config.forceServerUrl || this.serverUrl;
       if (!serverUrl) {
         this.setError('serverUrl');

src/components/modals/providers/GiteaImgStorageModal.vue

@@ -12,9 +12,10 @@
         </div>
       </form-entry>
       <form-entry label="文件夹路径" info="可选的">
-        <input slot="field" class="textfield" type="text" placeholder="如：imgs/{YYYY}/{MM}" v-model.trim="path" @keydown.enter="resolve()">
+        <input slot="field" class="textfield" type="text" placeholder="如：imgs/{YYYY}-{MM}-{DD}" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          如果不提供，默认为 {YYYY}/{MM}/{DD} ，其中{YYYY}为年变量、{MM}为月变量、{DD}为日变量。
+          如果不提供，默认为 imgs/{YYYY}-{MM}-{DD} 。<br/>
+          变量说明：{YYYY}为年变量、{MM}为月变量、{DD}为日变量、{MDNAME}为当前文档名称。
         </div>
       </form-entry>
       <form-entry label="分支" info="可选的">
@@ -62,7 +63,7 @@ export default modalTemplate({
           const path = this.path && this.path.replace(/^\//, '');
           this.config.resolve({
             repoUri: projectPath,
-            path: path || '{YYYY}/{MM}/{DD}',
+            path: path || 'imgs/{YYYY}-{MM}-{DD}',
             branch: this.branch || 'master',
           });
         } catch (err) {

src/components/modals/providers/GiteaPublishModal.vue

@@ -4,11 +4,11 @@
       <div class="modal__image">
         <icon-provider provider-id="gitea"></icon-provider>
       </div>
-      <p>向您的<b> Gitea </b>项目发布<b> {{CurrentFileName}} </b>。</p>
+      <p>向您的<b> Gitea </b>项目发布<b> {{ currentFileName }} </b>。</p>
       <form-entry label="Project URL" error="projectUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="projectUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          <b>例如:</b> {{config.token.serverUrl}}/path/to/project
+          <b>例如:</b> {{ config.token.serverUrl }}/path/to/project
         </div>
       </form-entry>
       <form-entry label="File path" error="path">

src/components/modals/providers/GiteeGistPublishModal.vue

@@ -0,0 +1,79 @@
+<template>
+  <modal-inner aria-label="发布到GiteeGist">
+    <div class="modal__content">
+      <div class="modal__image">
+        <icon-provider provider-id="giteegist"></icon-provider>
+      </div>
+      <p>发布<b> {{CurrentFileName}} </b>到<b>GiteeGist</b>。</p>
+      <form-entry label="文件名" error="filename">
+        <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
+      </form-entry>
+      <div class="form-entry">
+        <div class="form-entry__checkbox">
+          <label>
+            <input type="checkbox" v-model="isPublic"> 公开的
+          </label>
+        </div>
+      </div>
+      <form-entry label="存在Gist ID" info="可选的">
+        <input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
+        <div class="form-entry__info">
+          如果文件存在于GiteeGist中，则将被覆盖。
+        </div>
+      </form-entry>
+      <form-entry label="Template">
+        <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
+            {{ template.name }}
+          </option>
+        </select>
+        <div class="form-entry__actions">
+          <a href="javascript:void(0)" @click="configureTemplates">配置模板</a>
+        </div>
+      </form-entry>
+      <div class="modal__info">
+        <b>ProTip:</b> You can provide a value for <code>title</code> in the <a href="javascript:void(0)" @click="openFileProperties">file properties</a>.
+      </div>
+    </div>
+    <div class="modal__button-bar">
+      <button class="button" @click="config.reject()">取消</button>
+      <button class="button button--resolve" @click="resolve()">确认</button>
+    </div>
+  </modal-inner>
+</template>
+
+<script>
+import giteeGistProvider from '../../../services/providers/giteeGistProvider';
+import modalTemplate from '../common/modalTemplate';
+
+export default modalTemplate({
+  data: () => ({
+    filename: '',
+    gistId: '',
+  }),
+  computedLocalSettings: {
+    isPublic: 'gistIsPublic',
+    selectedTemplate: 'gistPublishTemplate',
+  },
+  created() {
+    this.filename = `${this.currentFileName}.md`;
+  },
+  methods: {
+    resolve() {
+      if (!this.filename) {
+        this.setError('filename');
+      } else {
+        // Return new location
+        const location = giteeGistProvider.makeLocation(
+          this.config.token,
+          this.filename,
+          this.isPublic,
+          this.gistId,
+        );
+        location.templateId = this.selectedTemplate;
+        this.config.resolve(location);
+      }
+    },
+  },
+});
+</script>