Compare commits

...
44 Commits
Author SHA1 Message Date
qwqcode ddef66bba2 v2.2.8
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-25 19:04:51 +08:00
qwqcode 7c4b40d626 feat(conf): Support control Frontend Conf by Backend.
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-25 14:31:37 +08:00
qwqcode 35df0c14ae chore(docs): Add Artransfer-CLI in README.md
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-24 22:07:43 +08:00
Percy Ma a9e0b1288a perf(a11y): improve color contrast and add aria-label 2022-04-24 00:55:04 +08:00
qwqcode 848d7d4894 Merge pull request #121 from ArtalkJS/docs/readme
docs(readme): add live minzipped size badge
2022-04-24 00:45:34 +08:00
qwqcode 0d96759e97 docs(readme): Add some words
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-24 00:44:09 +08:00
qwqcode 53d83b5aac chore(docs): Update README.md
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-24 00:29:15 +08:00
qwqcode 8cbbd1153c v2.2.7
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-24 00:26:54 +08:00
qwqcode f41aecd0eb feat(sidebar): Add cache handle btn
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-23 23:57:10 +08:00
Percy Ma f21e987ab0 docs(readme): add live minzipped size badge 2022-04-23 21:34:39 +08:00
qwqcode a05c31b4de chore(docs): Update README.md
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-23 16:34:04 +08:00
qwqcode f3a0d7c069 Merge pull request #116 from ArtalkJS/chore/deps
chore: update deps
2022-04-22 00:42:09 +08:00
Percy Ma 7bfe22fe10 chore: update deps 2022-04-21 23:48:52 +08:00
qwqcode 59ebfd3d6c chore(plugin-katex): simplify the code
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-21 19:17:29 +08:00
qwqcode 0787595f98 fix(conf): conf.noComment not working
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-21 12:13:16 +08:00
qwqcode bd621067b5 v2.2.6
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-20 19:40:53 +08:00
qwqcode 01ae389264 chore(devops): Update Artalk latest version in docs
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-20 19:34:45 +08:00
qwqcode 84700cfc2f feat(conf): Allow HTMLElement type vaule as conf.el
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-20 18:12:15 +08:00
qwqcode b68f609a44 feat(conf): Remove server /api by default
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-20 16:38:23 +08:00
qwqcode 703e198780 feat(conf): pageTitle default value
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-20 15:25:50 +08:00
qwqcode 4f75ef8709 feat: Remove conf.server /api suffix path & Use relative path as default
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-19 23:23:09 +08:00
qwqcode f87b2248b2 v2.2.5
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-19 20:30:40 +08:00
qwqcode bf65d419b6 fix(katex-plug): Render latext under using marked + insane
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-19 20:26:58 +08:00
qwqcode 267df53691 feat(emoticons): Preload emoticons list
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-19 16:19:16 +08:00
qwqcode 6c38a9048d fix(UA): User-Agent patch ChromeEdge & macOS BigSur+ & iPadOS
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-19 14:11:26 +08:00
qwqcode 7ec7098849 v2.2.4
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-19 00:21:15 +08:00
qwqcode 040ea45b88 feat(sidebar): Page upload btn show status
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-19 00:19:10 +08:00
qwqcode 583750fc35 fix(sidebar): Delay import upload & fix file empty detect
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 23:33:35 +08:00
qwqcode bb6f7c4913 fix: Always record pv
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 22:33:12 +08:00
qwqcode c9c6ab4d58 feat(sidebar): Fix site switch bug & automatic create site form while not exist
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 22:19:03 +08:00
qwqcode 7f726f48eb fix(img-upload): Fix img file select bug on iOS safari
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 19:53:23 +08:00
qwqcode 7c9b52d4a6 fix(scroll-hidden): Body scroll hidden & improve sidebar admin check
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 19:38:34 +08:00
qwqcode 7577374e4b fix(url): Sidebar relative link redirect issue.
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 18:23:47 +08:00
qwqcode c07a56dee3 feat: Admin update all title of pages.
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 17:22:43 +08:00
qwqcode f61be573e6 fix(css): Modify some style details.
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 13:02:31 +08:00
qwqcode e44d367ee7 v2.2.3
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 12:46:52 +08:00
qwqcode 6dd9ac452c fix(render): Markdown with raw html render issue & support hljs.
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-18 12:42:57 +08:00
qwqcode 349584eb16 docs: Update README.md
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-17 21:15:47 +08:00
qwqcode ae8fb326a9 v2.2.2
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-17 19:54:11 +08:00
qwqcode 599579ff59 fix(comment): getIsRoot wrong in some cases.
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-17 19:34:47 +08:00
qwqcode 022684b8dd fix: Add fadeIn animation while editor travelling
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-17 18:39:17 +08:00
qwqcode 3410480b67 chore: Modify artalk-sidebar vite config
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-17 18:06:36 +08:00
qwqcode 3087f133a5 feat(sidebar): Importer upload before import & fix some bugs.
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-17 17:21:50 +08:00
qwqcode 01a115c3d0 docs: Update README.md
Signed-off-by: qwqcode <qwqcode@gmail.com>
2022-04-17 02:21:01 +08:00
58 changed files with 1937 additions and 1209 deletions

No files matched your search

+1
View File
@@ -14,6 +14,7 @@ module.exports = {
],
plugins: ['@typescript-eslint', 'import'],
rules: {
'no-alert': 'off',
'no-unused-vars': 'off',
'no-plusplus': 0,
'no-param-reassign': 0,
+1
View File
@@ -66,6 +66,7 @@ jobs:
- name: Update CDN links
run: |
sed -i 's#artalk@.[^/]*#artalk@${{ steps.get_version.outputs.VERSION }}#g' docs/code/ArtalkCDN.json
perl -pi -e 's#"Artalk"(\W+)?:(\W+)?".*?"#"Artalk": "${{ steps.get_version.outputs.VERSION }}"#g' docs/code/ArtalkVersion.json
sed -i 's#artalk@.[^/]*#artalk@${{ steps.get_version.outputs.VERSION }}#g' docs/code/quick-start/cdn.html
- uses: stefanzweifel/git-auto-commit-action@v4
+147 -8
View File
@@ -6,6 +6,7 @@
[![](https://img.shields.io/npm/v/artalk.svg?style=flat-square)](https://www.npmjs.com/package/artalk)
[![](https://img.shields.io/npm/dt/artalk.svg?style=flat-square)](https://www.npmjs.com/package/artalk)
[![](https://badgen.net/bundlephobia/minzip/artalk?style=flat-square)](https://bundlephobia.com/package/artalk)
[![](https://img.shields.io/github/last-commit/ArtalkJS/Artalk/master.svg?style=flat-square)](https://github.com/ArtalkJS/Artalk/commits/master)
[![](https://img.shields.io/github/issues-raw/ArtalkJS/Artalk.svg?style=flat-square)](https://github.com/ArtalkJS/Artalk/issues)
[![](https://img.shields.io/github/issues-pr-raw/ArtalkJS/Artalk.svg?style=flat-square)](https://github.com/ArtalkJS/Artalk/pulls)
@@ -14,11 +15,13 @@
> 🌌 一款简洁的自托管评论系统 | A Selfhosted Comment System.
前往:[“**官方文档**”](https://artalk.js.org)
可参考:[“官方文档”](https://artalk.js.org)
最新版:[“Releases”](https://github.com/ArtalkJS/ArtalkGo/releases)
---
- 轻量级 (~30kB gzipped)
- 轻量级 (~30kB)
- 自托管 (数据安全)
- 易上手 (防秃顶)
- Golang 后端 (易部署 / 跨平台)
@@ -52,8 +55,8 @@
- 数据备份:防止评论数据丢失
- 数据迁移:在不同评论系统之间来回切换
- 一页多评:一页多个评论区(似乎没啥用
- Markdown 语法默认支持
- 支持 Latex:需引入 Artalk 的 Katex 插件
- Markdown:语法默认支持
- 支持 Latex:引入 Artalk 的 Katex 插件
- [Vite](https://github.com/vitejs/vite):开发者的极致体验
## 食用方针
@@ -69,13 +72,149 @@ import Artalk from 'artalk'
new Artalk({
el: '#Comments',
pageKey: '<页面链接>',
pageTitle: '<页面标题>',
server: '<后端地址>',
site: '<站点名称>',
pageKey: 'http://your_domain/post/1', // 页面链接
pageTitle: '关于如何引入 Artalk 这档子事', // 页面标题
server: 'http://localhost:8080/api', // 后端地址
site: 'Artalk 的博客 (你的站点名)',
})
```
### Docker
```sh
# 为 Artalk 创建一个目录
mkdir Artalk
cd Artalk
# 下载配置文件模版
curl -L https://raw.githubusercontent.com/ArtalkJS/ArtalkGo/master/artalk-go.example.yml > conf.yml
docker run -d \
--name artalk \
-p 0.0.0.0:8080:23366 \
-v $(pwd)/conf.yml:/conf.yml \
-v $(pwd)/data:/data \
artalk/artalk-go
```
### Docker Compose
```sh
mkdir Artalk
cd Artalk
vim docker-compose.yaml
```
```yaml
version: "3.5"
services:
artalk:
container_name: artalk
image: artalk/artalk-go
ports:
- 8080:23366
volumes:
- ./conf.yml:/conf.yml
- ./data:/data
```
```sh
docker-compose up -d
```
## TODOs
- [x] [Golang 后端](https://github.com/ArtalkJS/ArtalkGo)
- [x] 多数据库支持
- [x] SQLite
- [x] MySQL
- [x] Postgres
- [x] SQLServer
- [x] 多缓存支持
- [x] In-memory (内建缓存)
- [x] Redis
- [x] Memcache
- [x] 多站点支持
- [x] 评论获取分页
- [x] 评论点赞投票
- [x] 浏览量统计
- [x] 评论分页加载
- [x] 评论置顶 / 精华
- [x] 评论排序 (热度 / 时间)
- [x] 通知中心
- [x] 提及
- [x] 全部
- [x] 我的
- [x] 待审
- [x] 管理员控制台
- [x] 评论 (增/删/改)
- [x] 页面 (增/删/改)
- [x] 站点 (增/删/改)
- [x] 数据分页
- [ ] 配置 (GUI)
- [x] 数据导入 ([Artransfer](https://artalk.js.org/guide/transfer.html))
- [x] Artrans
- [x] WordPress
- [x] Typecho ([插件](https://github.com/ArtalkJS/Artrans-Typecho) / [Artransfer-CLI](https://github.com/ArtalkJS/Artransfer-CLI))
- [x] Valine
- [x] Disqus
- [x] Commento
- [x] Waline ([Artransfer-CLI](https://github.com/ArtalkJS/Artransfer-CLI))
- [x] Twikoo
- [x] Artalk v1 (PHP)
- [x] 数据导出
- [ ] 数据备份同步
- [x] 邮件异步队列发送
- [ ] 邮件队列持久化
- [x] 邮件多种发送方式
- [x] SMTP
- [x] 阿里云邮件
- [x] 系统调用 sendmail
- [x] 邮件多模板自定义
- [x] 用户已读标记
- [x] 验证码
- [x] 图片验证码
- [x] [极验](https://www.geetest.com/)滑动验证码
- [x] 反垃圾
- [x] [Akismet](https://akismet.com/)
- [x] [阿里云内容安全](https://help.aliyun.com/document_detail/28417.html)
- [x] [腾讯云内容安全](https://cloud.tencent.com/document/product/1124/64508)
- [x] 关键字过滤
- [x] 评论通知管理员 ([notify](https://github.com/nikoksr/notify))
- [x] Telegram Bot
- [x] 飞书 WebHook Bot
- [x] 钉钉
- [x] Bark
- [x] Slack
- [x] LINE
- [ ] 自定义 HTTP 回调
- [ ] 命令行管理
- [ ] 博客邮件订阅
- [x] 用户鉴权机制
- [x] 跨域非法请求阻止
- [x] 全局验证码操作次数限制
- [x] JWT 登陆状态验证
- [x] 时区自定义
- [x] 只看作者功能
- [ ] AT 提及 (@)
- [ ] 评论提及 (#)
- [ ] 表情包统一管理
- [ ] 导入表情包
- [ ] 表情包图片地址控制
- [x] 图片上传
- [x] 图片上传到图床 ([upgit](https://github.com/pluveto/upgit))
- [ ] 图片管理
- [ ] 附件上传 / 管理
- [ ] 评论标签分类系统
- [ ] 主题样式更换
- [ ] 规范化 API
- [ ] 扩展中心
- [ ] 开放用户注册
- [ ] 接入第三方登录
- [ ] 国际化 (i18n)
- [x] 一键升级
## 特别致谢
感谢社区提供的帮助与反馈,若有好的建议与意见欢迎前往 [ISSUES](https://github.com/ArtalkJS/Artalk/issues) 随时告知。
+16 -16
View File
@@ -10,23 +10,23 @@
"build:all": "pnpm build && pnpm build:sidebar"
},
"devDependencies": {
"@rollup/plugin-dynamic-import-vars": "^1.4.1",
"@types/node": "^16.11.7",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"autoprefixer": "^10.4.0",
"eslint": "^8.2.0",
"@rollup/plugin-dynamic-import-vars": "^1.4.3",
"@types/node": "^16.11.27",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"autoprefixer": "^10.4.4",
"eslint": "^8.13.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-airbnb-typescript": "^16.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "^2.25.2",
"eslint-config-airbnb-typescript": "^16.2.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"less": "^4.1.2",
"postcss": "^8.1.0",
"prettier": "^2.4.1",
"rollup": "^2.59.0",
"typescript": "^4.5.2",
"vite": "^2.6.14",
"vite-tsconfig-paths": "^3.3.17"
"postcss": "^8.4.12",
"prettier": "^2.6.2",
"rollup": "^2.70.2",
"typescript": "^4.6.3",
"vite": "^2.9.5",
"vite-tsconfig-paths": "^3.4.1"
}
}
+18 -1
View File
@@ -9,6 +9,23 @@
<body>
<div id="ArtalkSidebar"></div>
<script type="module" src="./src/index.ts"></script>
<script type="module">
import InitSidebar from './src/main'
const p = new URLSearchParams(document.location.search)
const pageKey = p.get('pageKey') || ''
const site = p.get('site') || ''
const user = JSON.parse(p.get('user') || '{}')
const view = p.get('view') || ''
const darkMode = p.get('darkMode') === '1'
InitSidebar({
el: '#ArtalkSidebar',
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366' : '../',
pageKey,
site,
darkMode,
}, user, view)
</script>
</body>
</html>
+1 -6
View File
@@ -1,6 +1,6 @@
{
"name": "@artalkjs/artalk-sidebar",
"version": "0.1.0",
"version": "0.1.1",
"license": "LGPL-3.0",
"description": "The sidebar of artalk",
"repository": {
@@ -10,11 +10,6 @@
},
"homepage": "https://artalk.js.org",
"bugs": "https://github.com/ArtalkJS/Artalk/issue",
"main": "./dist/ArtalkSidebar.js",
"unpkg": "./dist/ArtalkSidebar.iife.js",
"jsdelivr": "./dist/ArtalkSidebar.iife.js",
"module": "./dist/ArtalkSidebar.es.js",
"types": "./types/index.d.ts",
"scripts": {
"dev": "vite --port 23367",
"build": "pnpm -F artalk build && pnpm lint && vite build",
+81 -8
View File
@@ -1,13 +1,14 @@
import '../style/page-list.less'
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import * as Ui from 'artalk/src/lib/ui'
import { PageData } from 'artalk/types/artalk-data'
import Api from 'artalk/src/api'
import ActionBtn from 'artalk/src/components/action-btn'
import ItemTextEditor from '../item-text-editor'
import Component from '../sidebar-component'
import { SidebarCtx } from '../main'
import ItemTextEditor from '../lib/item-text-editor'
export default class PageList extends Component {
$editor?: HTMLElement
@@ -15,16 +16,85 @@ export default class PageList extends Component {
pages: PageData[] = []
constructor(ctx: Context) {
super(ctx)
constructor(ctx: Context, sidebar: SidebarCtx) {
super(ctx, sidebar)
this.$el = Utils.createElement(`<div class="atk-page-list"></div>`)
}
/** 清空所有 Pages */
clearAll() {
/** 初始化 PageList (清空列表) */
initPageList() {
this.pages = []
this.$el.innerHTML = ''
this.$el.innerHTML = `<div class="atk-header-action-bar">
<span class="atk-update-all-title-btn"><i class="atk-icon atk-icon-sync"></i> <span class="atk-text">更新标题</span></span>
<span class="atk-cache-flush-all-btn"><span class="atk-text">缓存清除</span></span>
<span class="atk-cache-warm-up-btn"><span class="atk-text">缓存预热</span></span>
</div>`
// 缓存操作按钮
const $cacheFlushBtn = this.$el.querySelector<HTMLElement>('.atk-cache-flush-all-btn')!
$cacheFlushBtn.onclick = () => { new Api(this.ctx).cacheFlushAll().then((d: any) => alert(d.msg)).catch(() => alert('操作失败')) }
const $cacheWarmBtn = this.$el.querySelector<HTMLElement>('.atk-cache-warm-up-btn')!
$cacheWarmBtn.onclick = () => { new Api(this.ctx).cacheWarmUp().then((d: any) => alert(d.msg)).catch(() => alert('操作失败')) }
// 更新全部页面标题按钮
;(async () => {
const $updateAllTitleBtn = this.$el.querySelector<HTMLElement>('.atk-update-all-title-btn')!
const $updateAllTitleIcon = $updateAllTitleBtn.querySelector<HTMLElement>('i')!
const $updateAllTitleText = $updateAllTitleBtn.querySelector<HTMLElement>('.atk-text')!
const btnTextOrg = $updateAllTitleText.innerText
const done = () => {
$updateAllTitleText.innerText = '更新完毕'
$updateAllTitleIcon.classList.remove('atk-rotate')
window.setTimeout(() => {
$updateAllTitleText.innerText = btnTextOrg
}, 1500)
}
const checkStatus = async () => {
const status = await new Api(this.ctx).pageFetch(undefined, undefined, true)
return status
}
const startWatchdog = () => {
$updateAllTitleIcon.classList.add('atk-rotate')
// 不完美的轮询更新状态
const timerID = window.setInterval(async () => {
const d = await new Api(this.ctx).pageFetch(undefined, undefined, true)
if (d.is_progress === false) {
clearInterval(timerID)
done()
return
}
$updateAllTitleText.innerText = d.msg
}, 1000)
}
// 图标恢复
const status = await checkStatus()
if (status.is_progress === true) {
startWatchdog()
$updateAllTitleText.innerText = status.msg
}
// 点击发起任务
$updateAllTitleBtn.onclick = async () => {
if ($updateAllTitleIcon.classList.contains('atk-rotate')) return
startWatchdog()
$updateAllTitleText.innerText = '开始更新...'
// 发起任务
try {
await new Api(this.ctx).pageFetch(undefined, this.sidebar.curtSite)
} catch (err: any) {
alert(err.msg)
done()
}
}
})()
}
/** 导入 Page 数据 */
@@ -61,6 +131,9 @@ export default class PageList extends Component {
$sub.innerText = page.url || page.key
$editBtn.onclick = () => this.showEditor(page, $page)
$title.onclick = () => { if (page.url) window.open(page.url) }
$sub.onclick = () => { if (page.url) window.open(page.url) }
return $page
}
@@ -157,7 +230,7 @@ export default class PageList extends Component {
showLoading()
let p: PageData
try {
p = await new Api(this.ctx).pageFetch(page.id)
p = (await new Api(this.ctx).pageFetch(page.id)).page
} catch (err: any) {
showError(`同步失败:${err.msg || '未知错误'}`)
console.log(err)
@@ -52,7 +52,7 @@ export default class SiteListFloater {
const sites = await new Api(this.ctx).siteGet()
sites.forEach((site) => {
renderSiteItem(site.name, site.name.substr(0, 1))
renderSiteItem(site.name, site.name.substring(0, 1))
})
renderSiteItem('站点管理', '+', '', () => { this.conf.onClickSitesViewBtn();this.hide() })
+15 -6
View File
@@ -1,12 +1,13 @@
import '../style/site-list.less'
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import * as Ui from 'artalk/src/lib/ui'
import { SiteData } from 'artalk/types/artalk-data'
import Api from 'artalk/src/api'
import ItemTextEditor from '../item-text-editor'
import Component from '../sidebar-component'
import { SidebarCtx } from '../main'
import ItemTextEditor from '../lib/item-text-editor'
export default class SiteList extends Component {
sites: SiteData[] = []
@@ -21,8 +22,8 @@ export default class SiteList extends Component {
$add?: HTMLElement
constructor(ctx: Context) {
super(ctx)
constructor(ctx: Context, sidebar: SidebarCtx) {
super(ctx, sidebar)
this.$el = Utils.createElement(
`<div class="atk-site-list">
@@ -49,6 +50,11 @@ export default class SiteList extends Component {
this.closeEditor()
this.showAdd()
}
// TODO 这个太 magic 了
this.ctx.on('sidebar-sites-create-form', (p: any) => {
this.showAdd(p.create_name, p.create_urls)
})
}
public loadSites(sites: SiteData[]) {
@@ -86,7 +92,7 @@ export default class SiteList extends Component {
const $siteName = $site.querySelector<HTMLElement>('.atk-site-name')!
const setActive = () => { $site.classList.add('atk-active') }
$siteLogo.innerText = site.name.substr(0, 1)
$siteLogo.innerText = site.name.substring(0, 1)
$siteName.innerText = site.name
// click
@@ -230,7 +236,7 @@ export default class SiteList extends Component {
this.activeSite = ''
}
public showAdd() {
public showAdd(defaultName?: string, defaultUrls?: string) {
this.closeAdd()
this.$add = Utils.createElement(`
@@ -256,6 +262,9 @@ export default class SiteList extends Component {
const $siteUrls = this.$add.querySelector<HTMLInputElement>('[name="AtkSiteUrls"]')!
const $submitBtn = this.$add.querySelector<HTMLButtonElement>('[name="AtkSubmit"]')!
if (defaultName) $siteName.value = defaultName
if (defaultUrls) $siteUrls.value = defaultUrls
$submitBtn.onclick = async () => {
const siteName = $siteName.value.trim()
const siteUrls = $siteUrls.value.trim()
@@ -1,31 +0,0 @@
import Artalk from 'artalk'
import ArtalkConfig, { LocalUser } from 'artalk/types/artalk-config'
import 'artalk/dist/Artalk.css'
import Sidebar from './sidebar'
class ArtalkSidebar extends Artalk {
constructor(customConf: ArtalkConfig, user: LocalUser) {
super(customConf)
this.$root.style.display = 'none'
user = user || {}
this.ctx.user.data = {
...this.ctx.user.data,
...user
}
this.ctx.user.save()
const sidebar = new Sidebar(this.ctx)
document.body.appendChild(sidebar.$el)
if (customConf.darkMode) {
sidebar.$el.classList.add('atk-dark-mode')
}
sidebar.show()
console.log('hello artalk-sidebar')
}
}
export default ArtalkSidebar
-16
View File
@@ -1,16 +0,0 @@
import ArtalkSidebar from './artalk-sidebar'
const searchParams = new URLSearchParams(document.location.search)
const pageKey = searchParams.get('pageKey') || ''
const site = searchParams.get('site') || ''
const user = JSON.parse(searchParams.get('user') || '{}')
const darkMode = searchParams.get('darkMode') === '1'
;(window as any).referer = searchParams.get('referer')
const artalkSidebar = new ArtalkSidebar({
el: '#ArtalkSidebar',
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366/api' : '../api',
pageKey,
site,
darkMode,
}, user)
@@ -1,4 +1,4 @@
import './style/item-text-editor.less'
import '../style/item-text-editor.less'
import * as Utils from 'artalk/src/lib/utils'
+57
View File
@@ -0,0 +1,57 @@
import Artalk from 'artalk'
import ArtalkConfig, { LocalUser } from 'artalk/types/artalk-config'
import 'artalk/dist/Artalk.css'
import SidebarRoot from './sidebar-root'
export default async function InitSidebar(conf: ArtalkConfig, user: LocalUser, view?: string) {
// 初始化 Artalk 主程序
conf.useBackendConf = true
const artalk = await (new Artalk(conf))
artalk.$root.style.display = 'none'
// 初始化用户数据
user = user || {}
artalk.ctx.user.data = {
...artalk.ctx.user.data,
...user
}
artalk.ctx.user.save()
// 初始化 Sidebar
const sidebarCtx = new SidebarCtx()
sidebarCtx.curtSite = conf.site!
const sidebar = new SidebarRoot(artalk.ctx, sidebarCtx)
// 装载元素
document.body.appendChild(sidebar.$el)
// 暗黑模式
if (conf.darkMode) sidebar.$el.classList.add('atk-dark-mode')
// 初始化侧边栏
await sidebar.init()
// 打开 View
let viewName = SidebarRoot.DEFAULT_VIEW
let viewParams = {}
if (view) {
const splitted = view.split('|')
if (splitted[0]) viewName = splitted[0]
if (splitted[1]) viewParams = JSON.parse(splitted[1])
}
sidebar.switchView(viewName)
if (viewName === 'sites') {
// TODO 炮打翻山...
artalk.ctx.trigger('sidebar-sites-create-form', viewParams)
}
console.log('hello artalk-sidebar')
}
export class SidebarCtx {
reload!: () => void
curtSite!: string
}
@@ -0,0 +1,13 @@
import ArtalkComponent from 'artalk/src/lib/component'
import Context from 'artalk/src/context'
import { SidebarCtx } from './main'
export default class Component extends ArtalkComponent {
sidebar: SidebarCtx
constructor(ctx: Context, sidebar: SidebarCtx) {
super(ctx)
this.sidebar = sidebar
}
}
@@ -1,13 +1,14 @@
import './style/sidebar.less'
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import * as Ui from 'artalk/src/lib/ui'
import Comment from 'artalk/src/components/comment'
import { SiteData } from 'artalk/types/artalk-data'
import Api from 'artalk/src/api'
import Component from './sidebar-component'
import { SidebarCtx } from './main'
import SidebarHTML from './sidebar.html?raw'
import SidebarView from './sidebar-view'
@@ -20,18 +21,18 @@ import SettingView from './sidebar-views/setting-view'
import MD5 from './lib/md5'
const DEFAULT_VIEW = 'comments'
const REGISTER_VIEWS: (typeof SidebarView)[] = [
CommentsView, PagesView, SitesView, TransferView, // SettingView
]
export default class Sidebar extends Component {
export default class SidebarRoot extends Component {
public static DEFAULT_VIEW = 'comments'
public $header: HTMLElement
public $headerMenu: HTMLElement
public $title: HTMLElement
public $avatar: HTMLElement
public $siteLogo?: HTMLElement
public $closeBtn: HTMLElement
public $nav: HTMLElement
public $curtViewBtn: HTMLElement
public $curtViewBtnIcon: HTMLElement
@@ -42,8 +43,7 @@ export default class Sidebar extends Component {
public siteSwitcher?: SiteListFloater
private get isAdmin() { return this.ctx.user.data.isAdmin }
public curtSite?: string
public curtView: string = DEFAULT_VIEW
public curtView?: string
public get curtViewInstance() {
return this.curtView ? this.viewInstances[this.curtView] : undefined
}
@@ -53,8 +53,8 @@ export default class Sidebar extends Component {
private viewSwitcherShow = false
constructor(ctx: Context) {
super(ctx)
constructor(ctx: Context, sidebar: SidebarCtx) {
super(ctx, sidebar)
// initial elements
this.$el = Utils.createElement(SidebarHTML)
@@ -62,7 +62,6 @@ export default class Sidebar extends Component {
this.$headerMenu = this.$header.querySelector('.atk-menu')!
this.$title = this.$header.querySelector('.atk-sidebar-title')!
this.$avatar = this.$header.querySelector('.atk-avatar')!
this.$closeBtn = this.$header.querySelector('.atk-sidebar-close')!
this.$nav = this.$el.querySelector('.atk-sidebar-nav')!
this.$curtViewBtn = this.$nav.querySelector('.akt-curt-view-btn')!
@@ -76,14 +75,10 @@ export default class Sidebar extends Component {
// init UI
this.initViewSwitcher()
this.$closeBtn.onclick = () => {
this.hide()
// 重载操作
this.sidebar.reload = () => {
this.init()
}
// event
this.ctx.on('sidebar-show', () => (this.show()))
this.ctx.on('sidebar-hide', () => (this.hide()))
this.ctx.on('user-changed', () => { this.firstShow = true })
}
/** 初始化 view 切换器 */
@@ -130,89 +125,89 @@ export default class Sidebar extends Component {
this.viewSwitcherShow = !this.viewSwitcherShow
}
private firstShow = true
/** 显示 */
public async show() {
// 第一次加载
if (this.firstShow) {
///////////////////
//// IMPORTANT ////
///////////////////
// 用户权限检测
if (this.isAdmin) {
// 是管理员
this.$title.innerText = '控制中心'
this.$curtViewBtn.style.display = ''
if (!this.siteSwitcher) {
// 初始化站点切换器
this.siteSwitcher = new SiteListFloater(this.ctx, {
onSwitchSite: (siteName) => { this.switchSite(siteName) },
onClickSitesViewBtn: () => { this.switchView('sites') }
})
this.$viewWrap.before(this.siteSwitcher.$el)
this.$avatar.onclick = (evt) => {
if (!this.isAdmin) return
this.siteSwitcher?.show(evt.target as any)
}
/** 初始化 */
public async init() {
// 用户权限检测
if (this.isAdmin) {
// 是管理员
this.$title.innerText = '控制中心'
this.$curtViewBtn.style.display = ''
if (!this.siteSwitcher) {
// 初始化站点切换器
this.siteSwitcher = new SiteListFloater(this.ctx, {
onSwitchSite: (siteName) => {
this.switchSite(siteName)
},
onClickSitesViewBtn: () => {
this.switchView('sites')
},
})
this.$viewWrap.before(this.siteSwitcher.$el)
this.$avatar.onclick = (evt) => {
if (!this.isAdmin) return
this.siteSwitcher?.show(evt.target as any)
}
this.curtSite = this.conf.site
Ui.showLoading(this.$el)
try {
await this.siteSwitcher!.load(this.curtSite)
} catch (err: any) {
const $err = Utils.createElement(`<span>加载失败:${err.msg || '网络错误'}<br/></span>`)
const $retryBtn = Utils.createElement('<span style="cursor:pointer;">点击重新获取</span>')
$err.appendChild($retryBtn)
$retryBtn.onclick = () => { Ui.setError(this.$el, null); this.show() }
Ui.setError(this.$el, $err)
return
} finally { Ui.hideLoading(this.$el) }
// 站点图像
this.$avatar.innerHTML = ''
this.$siteLogo = Utils.createElement('<div class="atk-site-logo"></div>')
this.$siteLogo.innerText = (this.curtSite || '').substr(0, 1)
this.$avatar.append(this.$siteLogo)
} else {
// 不是管理员
this.$title.innerText = '通知中心'
this.$curtViewBtn.style.display = 'none' // 隐藏 view 切换器
this.curtSite = this.conf.site // 第一次 show 使用当前站点数据
// 头像
const $avatarImg = document.createElement('img') as HTMLImageElement
$avatarImg.src = Utils.getGravatarURL(this.ctx, MD5(this.ctx.user.data.email.toLowerCase()))
this.$avatar.innerHTML = ''
this.$avatar.append($avatarImg)
}
this.switchView(DEFAULT_VIEW) // 打开默认 view
this.firstShow = false
}
}
Ui.showLoading(this.$el)
try {
await this.siteSwitcher!.load(this.sidebar.curtSite)
} catch (err: any) {
const $err = Utils.createElement(
`<span>加载失败:${err.msg || '网络错误'}<br/></span>`
)
const $retryBtn = Utils.createElement(
'<span style="cursor:pointer;">点击重新获取</span>'
)
$err.appendChild($retryBtn)
$retryBtn.onclick = () => {
Ui.setError(this.$el, null)
this.init()
}
Ui.setError(this.$el, $err)
return
} finally {
Ui.hideLoading(this.$el)
}
public async hide() {
console.log("hide")
// 站点图像
this.$avatar.innerHTML = ''
this.$siteLogo = Utils.createElement('<div class="atk-site-logo"></div>')
this.$siteLogo.innerText = (this.sidebar.curtSite || '').substring(0, 1)
this.$avatar.append(this.$siteLogo)
} else {
// 不是管理员
this.$title.innerText = '通知中心'
this.$curtViewBtn.style.display = 'none' // 隐藏 view 切换器
this.sidebar.curtSite = this.conf.site // 第一次 show 使用当前站点数据
// 头像
const $avatarImg = document.createElement('img') as HTMLImageElement
$avatarImg.src = Utils.getGravatarURL(
this.ctx,
MD5(this.ctx.user.data.email.toLowerCase())
)
this.$avatar.innerHTML = ''
this.$avatar.append($avatarImg)
}
}
/** 切换 View */
public switchView(viewName: string) {
if (!REGISTER_VIEWS.find(o => o.viewName === viewName))
throw new Error(`Sidebar View "${viewName}" not found`)
let view = this.viewInstances[viewName]
if (!view) {
// 初始化 View
const View = REGISTER_VIEWS.find(o => o.viewName === viewName)!
view = new View(this.ctx, this.$viewWrap)
view = new View(this.ctx, this.sidebar, this.$viewWrap)
this.viewInstances[viewName] = view
}
// init view
view.mount(this.curtSite!)
view.mount()
this.curtView = viewName
this.curtTab = view.viewActiveTab
@@ -250,7 +245,7 @@ export default class Sidebar extends Component {
// 切换 tab
$tab.onclick = () => {
if (view.switchTab(tabName, this.curtSite!) === false) { return }
if (view.switchTab(tabName) === false) { return }
this.$navTabs.querySelectorAll('.atk-active').forEach(e => e.classList.remove('atk-active'))
$tab.classList.add('atk-active')
this.curtTab = tabName
@@ -260,9 +255,9 @@ export default class Sidebar extends Component {
/** 切换站点 */
private switchSite(siteName: string) {
this.curtSite = siteName
this.sidebar.curtSite = siteName
const curtView = this.curtViewInstance
curtView?.switchTab(this.curtTab!, siteName)
if (this.$siteLogo) this.$siteLogo.innerText = this.curtSite.substr(0, 1)
curtView?.switchTab(this.curtTab!)
if (this.$siteLogo) this.$siteLogo.innerText = this.sidebar.curtSite.substring(0, 1)
}
}
+6 -5
View File
@@ -1,7 +1,8 @@
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import Comment from 'artalk/src/components/comment'
import Component from './sidebar-component'
import { SidebarCtx } from './main'
export default class SidebarView extends Component {
static viewName = ''
@@ -13,14 +14,14 @@ export default class SidebarView extends Component {
protected $parent: HTMLElement
constructor(ctx: Context, $parent: HTMLElement) {
super(ctx)
constructor(ctx: Context, sidebar: SidebarCtx, $parent: HTMLElement) {
super(ctx, sidebar)
this.$parent = $parent
this.$el = Utils.createElement(`<div class="atk-sidebar-view"></div>`)
}
mount(siteName: string) {}
mount() {}
switchTab(tab: string, siteName: string): boolean|void {}
switchTab(tab: string): boolean|void {}
}
@@ -13,7 +13,7 @@ export default class MessageView extends SidebarView {
list!: ListLite
mount(siteName: string) {
mount() {
// tabs
if (this.ctx.user.data.isAdmin) {
this.viewTabs = {
@@ -39,9 +39,8 @@ export default class MessageView extends SidebarView {
this.list.pageMode = 'pagination'
this.list.noCommentText = '<div class="atk-sidebar-no-content">无内容</div>'
this.list.renderComment = (comment) => {
let pageKey = comment.data.page_key
if (!Utils.isValidURL(pageKey)) pageKey = Utils.getURLBasedOn((window as any).referer || '', pageKey)
comment.setOpenURL(`${pageKey}#atk-comment-${comment.data.id}`)
const pageURL = comment.data.page_url
comment.setOpenURL(`${pageURL}#atk-comment-${comment.data.id}`)
comment.onReplyBtnClick = () => {
if (this.ctx.conf.editorTravel === true) {
this.ctx.trigger('editor-reply', {data: comment.data, $el: comment.$el, scroll: false})
@@ -52,21 +51,21 @@ export default class MessageView extends SidebarView {
}
}
this.list.paramsEditor = (params) => {
params.site_name = siteName
params.site_name = this.sidebar.curtSite
}
this.$el.innerHTML = ''
this.$el.append(this.list.$el)
this.switchTab(this.viewActiveTab, siteName)
this.switchTab(this.viewActiveTab)
}
switchTab(tab: string, siteName: string): boolean|void {
switchTab(tab: string): boolean|void {
//console.log(tab, siteName)
this.viewActiveTab = tab
this.list.paramsEditor = (params) => {
params.type = tab as any
params.site_name = siteName
params.site_name = this.sidebar.curtSite
}
this.list.fetchComments(0)
@@ -1,13 +1,12 @@
import Api from 'artalk/src/api'
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import * as Ui from 'artalk/src/lib/ui'
import Comment from 'artalk/src/components/comment'
import Pagination, { PaginationConf } from 'artalk/src/components/pagination'
import PageList from '../admin/page-list'
import SidebarView from '../sidebar-view'
import PageList from '../admin/page-list'
const PAGE_SIZE = 20
@@ -22,26 +21,26 @@ export default class PagesView extends SidebarView {
pageList!: PageList
pagination!: Pagination
mount(siteName: string) {
mount() {
if (!this.pageList) {
this.pageList = new PageList(this.ctx)
this.pageList = new PageList(this.ctx, this.sidebar)
this.$el.append(this.pageList.$el)
}
this.switchTab(this.viewActiveTab, siteName)
this.switchTab(this.viewActiveTab)
}
switchTab(tab: string, siteName: string): boolean|void {
this.reqPages(siteName, 0)
switchTab(tab: string): boolean|void {
this.reqPages(0)
}
async reqPages(siteName: string, offset: number) {
this.pageList.clearAll()
async reqPages(offset: number) {
this.pageList.initPageList()
;(this.$el.parentNode as any)?.scrollTo(0, 0)
Ui.showLoading(this.$el)
const data = await new Api(this.ctx).pageGet(siteName, offset, PAGE_SIZE)
const data = await new Api(this.ctx).pageGet(this.sidebar.curtSite, offset, PAGE_SIZE)
this.pageList.importPages(data.pages || [])
Ui.hideLoading(this.$el)
@@ -50,7 +49,7 @@ export default class PagesView extends SidebarView {
this.pagination = new Pagination(data.total, {
pageSize: PAGE_SIZE,
onChange: (o: number) => {
this.reqPages(siteName, o)
this.reqPages(o)
}
})
@@ -1,6 +1,5 @@
import Api from 'artalk/src/api'
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import Comment from 'artalk/src/components/comment'
@@ -15,8 +14,8 @@ export default class SettingView extends SidebarView {
viewTabs = {}
viewActiveTab = ''
mount(siteName: string) {
mount() {
}
switchTab(tab: string, siteName: string) {}
switchTab(tab: string) {}
}
@@ -1,6 +1,5 @@
import Api from 'artalk/src/api'
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import Comment from 'artalk/src/components/comment'
@@ -17,16 +16,16 @@ export default class SitesView extends SidebarView {
siteList!: SiteList
mount(siteName: string) {
mount() {
if (!this.siteList) {
this.siteList = new SiteList(this.ctx)
this.siteList = new SiteList(this.ctx, this.sidebar)
this.$el.append(this.siteList.$el)
}
this.reqSites()
}
switchTab(tab: string, siteName: string) {
switchTab(tab: string) {
this.reqSites()
}
@@ -1,6 +1,5 @@
import Api from 'artalk/src/api'
import Context from 'artalk/src/context'
import Component from 'artalk/src/lib/component'
import * as Utils from 'artalk/src/lib/utils'
import * as Ui from 'artalk/src/lib/ui'
import Comment from 'artalk/src/components/comment'
@@ -8,7 +7,7 @@ import Comment from 'artalk/src/components/comment'
import SiteList from '../admin/site-list'
import SidebarView from '../sidebar-view'
export default class TransferView extends SidebarView {ß
export default class TransferView extends SidebarView {
static viewName = 'transfer'
static viewTitle = '迁移'
static viewAdminOnly = true
@@ -19,11 +18,11 @@ export default class TransferView extends SidebarView {ß
}
viewActiveTab = 'import'
mount(siteName: string) {
this.switchTab('import', siteName)
mount() {
this.switchTab('import')
}
switchTab(tab: string, siteName: string) {
switchTab(tab: string) {
if (tab === 'import') {
this.initImport()
} else if (tab === 'export') {
@@ -42,8 +41,18 @@ export default class TransferView extends SidebarView {ß
</div>
<div class="atk-form">
<div class="atk-label atk-data-file-label">Artrans 数据文件</div>
<input type="file" name="AtkDataFile" accept="text/plain,.json,.artrans">
<span class="atk-desc">使用「<a href="https://artalk.js.org/guide/transfer.html" target="_blank">转换工具</a>」将评论数据转为 Artrans 格式</span>
<div class="atk-file-upload-group">
<div class="atk-file-input-wrap atk-fade-in">
<input type="file" name="AtkDataFile" accept=".artrans">
<span class="atk-desc">使用「<a href="https://artalk.js.org/guide/transfer.html" target="_blank">转换工具</a>」将评论数据转为 Artrans 格式</span>
</div>
<div class="atk-uploading-wrap atk-fade-in">
<div class="atk-progress">
<div class="atk-bar"></div>
</div>
<div class="atk-status">上传中 <span class="atk-curt">0%</span>... <span class="atk-abort">取消</span></div>
</div>
</div>
<div class="atk-label">目标站点名</div>
<input type="text" name="AtkSiteName" placeholder="输入内容..." autocomplete="off">
<div class="atk-label">目标站点 URL</div>
@@ -55,16 +64,139 @@ export default class TransferView extends SidebarView {ß
</div>`
const $form = this.$el.querySelector<HTMLSelectElement>('.atk-form')!
const $dataFile = $form.querySelector<HTMLInputElement>('[name="AtkDataFile"]')!
const $dataFileLabel = $form.querySelector<HTMLInputElement>('.atk-data-file-label')!
const $fileWrap = $form.querySelector<HTMLElement>('.atk-file-input-wrap')!
const $file = $fileWrap.querySelector<HTMLInputElement>('[name="AtkDataFile"]')!
const $fileDesc = $fileWrap.querySelector<HTMLElement>('.atk-desc')!
const fileDescOrgHTML = $fileDesc.innerHTML
const restoreFileInput = () => {
$fileDesc.innerHTML = fileDescOrgHTML
$file.value = ''
}
// 文件上传
const $uploadingWrap = $form.querySelector<HTMLElement>('.atk-uploading-wrap')!
const $uploadProgress = $uploadingWrap.querySelector<HTMLElement>('.atk-progress')!
const $uploadProgressBar = $uploadProgress.querySelector<HTMLElement>('.atk-bar')!
const $uploadStatus = $uploadingWrap.querySelector<HTMLElement>('.atk-status')!
const $uploadStatusCurt = $uploadStatus.querySelector<HTMLElement>('.atk-curt')!
const $uploadAbortBtn = $uploadStatus.querySelector<HTMLElement>('.atk-abort')!
const $siteName = $form.querySelector<HTMLInputElement>('[name="AtkSiteName"]')!
const $siteURL = $form.querySelector<HTMLInputElement>('[name="AtkSiteURL"]')!
const $payload = $form.querySelector<HTMLTextAreaElement>('[name="AtkPayload"]')!
const $submitBtn = $form.querySelector<HTMLButtonElement>('[name="AtkSubmit"]')!
const setError = (msg: string) => window.alert(msg)
const showUploading = () => {
$fileWrap.style.display = 'none'
$uploadingWrap.style.display = ''
setUploading(0)
}
const hideUploading = () => {
$fileWrap.style.display = ''
$uploadingWrap.style.display = 'none'
}
const setUploading = (progress: number) => {
$uploadProgressBar.style.width = `${progress}%`
$uploadStatusCurt.innerText = `${progress}%`
}
let UploadedFilename: string = ''
hideUploading()
const startUploadFile = async () => {
UploadedFilename = ''
const xhr = new XMLHttpRequest()
// 进度条
xhr.upload.addEventListener('progress', (evt) => {
if (evt.loaded === evt.total) {
// 上传完毕
setUploading(100)
return
}
const fileSize = $file.files![0].size
if (evt.loaded <= fileSize) {
// 正在上传
const percent = Math.round(evt.loaded / fileSize * 100)
setUploading(percent)
}
})
// 创建上传参数
const formData = new FormData()
formData.append('file', $file.files![0])
formData.append('token', this.ctx.user.data.token)
// 开始上传
xhr.open('post', `${this.ctx.conf.server}/api/admin/import-upload`)
xhr.timeout = 2*60*1000 // 2min
xhr.send(formData)
// 上传成功事件
xhr.onload = () => {
const setErr = (msg: string): void => {
restoreFileInput()
hideUploading()
alert(`文件上传失败,${msg}`)
}
if (xhr.status !== 200) {
setErr(`响应状态码:${xhr.status}`)
return
}
let json: any
try {
json = JSON.parse(xhr.response)
} catch (err) {
console.error(err)
setErr(`JSON 解析失败:${err}`)
return
}
if (!json.success || !json.data.filename) {
setErr(`响应:${xhr.response}`)
return
}
$fileDesc.innerHTML = '文件已成功上传,可以开始导入'
UploadedFilename = json.data.filename
hideUploading()
}
// 中止上传
$uploadAbortBtn.onclick = () => {
xhr.abort()
restoreFileInput()
hideUploading()
}
}
// 文件上传操作
$file.onchange = () => {
if (!$file.files || $file.files.length === 0) return
showUploading()
setTimeout(async () => {
await startUploadFile()
hideUploading()
}, 80)
}
// 开始导入按钮
$submitBtn.onclick = () => {
const dataType = 'artrans'
if (!UploadedFilename) {
setError(`请先上传 Artrans 数据文件`)
return
}
const siteName = $siteName.value.trim()
const siteURL = $siteURL.value.trim()
const payload = $payload.value.trim()
@@ -80,7 +212,7 @@ export default class TransferView extends SidebarView {ß
return
}
if (rData !instanceof Object) {
if (typeof rData !== 'object' || Array.isArray(rData)) {
setError(`Payload 需为 JSON 对象`)
return
}
@@ -89,7 +221,7 @@ export default class TransferView extends SidebarView {ß
if (siteURL) rData.t_url = siteURL
// 创建导入会话
const createSession = (dataStr?: string) => {
const createSession = (filename?: string) => {
const $logWrap = this.$el.querySelector<HTMLElement>('.atk-log-wrap')!
const $log = $logWrap.querySelector<HTMLElement>('.atk-log')!
const $backBtn = this.$el.querySelector<HTMLElement>('.atk-log-back-btn')!
@@ -100,9 +232,12 @@ export default class TransferView extends SidebarView {ß
$backBtn.onclick = () => {
$logWrap.style.display = 'none'
$form.style.display = ''
restoreFileInput()
UploadedFilename = ''
this.sidebar.reload()
}
if (dataStr) rData.json_data = dataStr
if (filename) rData.json_file = filename
// 创建 iframe
const frameName = `f_${+new Date()}`
@@ -113,7 +248,6 @@ export default class TransferView extends SidebarView {ß
$log.append($frame)
const formParams: {[k: string]: string} = {
type: dataType,
payload: JSON.stringify(rData),
token: this.ctx.user.data.token || '',
}
@@ -122,7 +256,7 @@ export default class TransferView extends SidebarView {ß
const $formTmp = document.createElement('form')
$formTmp.style.display = 'none'
$formTmp.setAttribute('method', 'post')
$formTmp.setAttribute('action', `${this.ctx.conf.server}/admin/import`)
$formTmp.setAttribute('action', `${this.ctx.conf.server}/api/admin/import`)
$formTmp.setAttribute("target", frameName)
Object.entries(formParams).forEach(([key, val]) => {
@@ -138,20 +272,8 @@ export default class TransferView extends SidebarView {ß
$formTmp.remove()
}
const reader = new FileReader()
reader.onload = () => {
const data = String(reader.result)
createSession(data)
}
// 是否已选择文件
if ($dataFile.files?.length) {
// 先读取文件
reader.readAsText($dataFile.files[0])
} else {
// 直接开始会话
createSession()
}
// 直接开始会话
createSession(UploadedFilename)
}
}
@@ -160,7 +282,7 @@ export default class TransferView extends SidebarView {ß
try {
const d = await new Api(this.ctx).export()
this.download(`artrans-${this.getYmdHisFilename()}.json`, d)
this.download(`backup-${this.getYmdHisFilename()}.artrans`, d)
} catch (err: any) {
console.log(err)
window.alert(`${String(err)}`)
@@ -21,11 +21,13 @@
color: var(--at-color-font);
font-size: 21px;
margin-bottom: 10px;
cursor: pointer;
}
.atk-sub {
color: var(--at-color-sub);
font-size: 14px;
cursor: pointer;
}
}
@@ -33,6 +35,32 @@
.atk-list-text-actions();
}
.atk-header-action-bar {
display: block;
overflow: hidden;
padding: 10px 15px 0 15px;
& > span {
display: inline-block;
padding: 2px 10px;
cursor: pointer;
font-size: 13px;
i {
display: inline-block;
width: 16px;
height: 16px;
vertical-align: middle;
background-color: var(--at-color-meta);
margin-right: 4px;
}
&:hover {
background: var(--at-color-bg-grey);
}
}
}
.atk-page-actions {
.atk-list-btn-actions();
}
+56 -5
View File
@@ -317,13 +317,14 @@
}
&[type="file"] {
border-radius: 2px;
background: transparent;
border: 2px solid var(--at-color-border);
cursor: pointer;
position: relative;
padding: 0 15px;
margin-bottom: 20px;
padding: 6px 15px;
line-height: 0;
margin-bottom: 17px;
border-radius: 50px;
&:hover {
background: var(--at-color-bg-light);
@@ -336,11 +337,16 @@
color: #000;
border: 0;
border-right: 2px solid #eee;
padding: 0 20px 0 5px;
border-left: 0;
border-top: 0;
border-bottom: 0;
padding: 0 20px 0 10px;
line-height: 25px;
margin-right: 15px;
cursor: pointer;
transition: .2s ease;
-webkit-appearance: none;
border-radius: 0;
}
}
@@ -380,14 +386,59 @@
cursor: pointer;
outline: none;
padding: 0 20px;
border-radius: 4px;
border-radius: 50px;
margin: 0 5px;
width: 100%;
user-select: none;
}
input, select, button {
font-size: 15px;
}
.atk-file-upload-group {
height: 100px;
overflow: hidden;
}
.atk-uploading-wrap {
.atk-progress {
width: 100%;
height: 12px;
display: block;
overflow: hidden;
background: #eee;
border-radius: 100px;
margin-bottom: 7px;
margin-top: 20px;
.atk-bar {
transition: 0.5s cubic-bezier(0.075, 0.82, 0.165, 1);
background: var(--at-color-main);
height: 100%;
width: 0%;
opacity: 0.7;
}
}
.atk-status {
color: var(--at-color-meta);
font-size: 14px;
.atk-curt {
color: var(--at-color-main)
}
.atk-abort {
cursor: pointer;
float: right;
&:hover {
color: var(--at-color-main);
}
}
}
}
}
.atk-log-wrap {
@@ -111,6 +111,7 @@
display: inline-block;
font-size: 23px;
position: relative;
line-height: 1.6em;
&:after {
content: ' ';
@@ -130,6 +131,7 @@
margin-top: 6px;
flex-wrap: wrap;
min-height: 23px;
margin-bottom: 15px;
.atk-url-item {
background: var(--at-color-bg-grey);
@@ -165,7 +167,7 @@
position: relative;
display: flex;
flex-direction: row;
padding: 20px 30px 6px 35px;
padding: 0 30px 6px 35px;
padding-bottom: 10px;
.atk-site-text-actions {
+1 -1
View File
@@ -1,3 +1,3 @@
import ArtalkSidebar from '../src/artalk-sidebar'
import ArtalkSidebar from '../src/main'
export default ArtalkSidebar
+1 -23
View File
@@ -13,29 +13,7 @@ export default defineConfig({
build: {
target: 'es2015',
outDir: resolve(__dirname, "dist"),
minify: 'terser',
// lib: {
// entry: resolve(__dirname, 'src/main.ts'),
// name: 'ArtalkSidebar',
// fileName: (format) => ((format == "umd") ? 'ArtalkSidebar.js' : `ArtalkSidebar.${format}.js`),
// formats: ["es", "umd", "iife"]
// },
rollupOptions: {
// 确保外部化处理那些你不想打包进库的依赖
// external: ['artalk'],
output: {
assetFileNames: assetInfo => {
if (/\.css$/.test(assetInfo.name)) {
return 'ArtalkSidebar.css'
}
return "[name].[ext]"
},
// 在 UMD 构建模式下为这些外部化的依赖提供一个全局变量
globals: {
artalk: 'Artalk'
}
}
}
minify: 'terser'
},
plugins: [tsconfigPaths()],
css: {
+21 -9
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8">
<title>Artalk DEMO</title>
@@ -16,7 +16,8 @@
.title > a:hover { margin-left:0 }
.title > a > span { opacity:0 }
.title > a:hover>span { opacity:1 }
.desc { font-size:12px;color:#757e91 }
.desc { font-size:12px;color:#697182 }
body.dark-mode .desc { color:#848da3 }
.social { margin-top:20px }
.social > a:not(:last-child) { margin-right:2px }
@media only screen and (max-width: 768px) {
@@ -26,20 +27,30 @@
}
.float-btn { user-select: none;bottom: 25px;display: block;cursor: pointer;text-align: center;width: 60px;height: 37px;line-height: 37px;font-size: 13px;color: #757e91;background: #fff;opacity: 0.8;border-radius: 4px;border: 1px solid #eceff2;position: fixed; }
.to-night { z-index: 99999;left: 25px;background: #1e2223;color: #fff; }
body.dark-mode .to-night { background: #fff;border: 1px solid #2d3235;color: #0083ff; }
body.dark-mode .to-night { background: #006fd9;border: 1px solid #2d3235;color: #fff; }
.to-top { right: 25px; }
</style>
<!--<link rel="stylesheet"
href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.5.1/styles/arta.min.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.5.1/highlight.min.js"></script>-->
<!-- For mobile testing -->
<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
<script>
// VConsole will be exported to `window.VConsole` by default.
var vConsole = new window.VConsole();
</script>
</head>
<body>
<div class="card billboard atk-fade-in">
<div class="title"><a href="https://github.com/ArtalkJS/Artalk" target="_blank"><span>『 </span>Artalk<span> 』</span></a></div>
<div class="desc">一款简洁的自托管评论系统 <span id="ArtalkPV"></span></div>
<div class="social">
<a href="https://www.npmjs.com/package/artalk" target="_blank"><img src="https://img.shields.io/npm/v/artalk.svg?style=flat-square"></a>
<a href="https://www.npmjs.com/package/artalk" target="_blank"><img src="https://img.shields.io/npm/dt/artalk.svg?style=flat-square"></a>
<a href="https://github.com/ArtalkJS/Artalk/commits/master" target="_blank"><img src="https://img.shields.io/github/last-commit/ArtalkJS/Artalk?style=flat-square"></a>
<a href="https://github.com/ArtalkJS/Artalk/blob/master/LICENSE" target="_blank"><img src="https://img.shields.io/github/license/ArtalkJS/Artalk.svg?style=flat-square"></a>
<a href="https://github.com/ArtalkJS/Artalk" target="_blank"><img src="https://img.shields.io/github/stars/ArtalkJS/Artalk?style=flat-square"></a>
<a href="https://www.npmjs.com/package/artalk" aria-label="npm package version" target="_blank"><img src="https://img.shields.io/npm/v/artalk.svg?style=flat-square"></a>
<a href="https://www.npmjs.com/package/artalk" aria-label="npm package download number" target="_blank"><img src="https://img.shields.io/npm/dt/artalk.svg?style=flat-square"></a>
<a href="https://github.com/ArtalkJS/Artalk/commits/master" aria-label="last commit" target="_blank"><img src="https://img.shields.io/github/last-commit/ArtalkJS/Artalk?style=flat-square"></a>
<a href="https://github.com/ArtalkJS/Artalk/blob/master/LICENSE" aria-label="open source license" target="_blank"><img src="https://img.shields.io/github/license/ArtalkJS/Artalk.svg?style=flat-square"></a>
<a href="https://github.com/ArtalkJS/Artalk" aria-label="GitHub star number" target="_blank"><img src="https://img.shields.io/github/stars/ArtalkJS/Artalk?style=flat-square"></a>
</div>
</div>
<div class="card atk-fade-in">
@@ -54,8 +65,9 @@
el: '#comments',
pageKey: 'https://artalk.js.org/',
pageTitle: 'Artalk Home',
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366/api' : 'https://artalk.qwqaq.com/api',
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366' : 'https://artalk.qwqaq.com',
site: 'ArtalkDemo',
//useBackendConf: true,
});
window.artalk = artalk;
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "artalk",
"version": "2.2.1",
"backendMinVersion": "2.1.1",
"version": "2.2.8",
"backendMinVersion": "2.1.4",
"license": "LGPL-3.0",
"description": "A Selfhosted Comment System",
"keywords": [
+46 -10
View File
@@ -1,5 +1,6 @@
import Context from '../context'
import { CommentData, ListData, UserData, PageData, SiteData, NotifyData } from '~/types/artalk-data'
import ArtalkConfig from '~/types/artalk-config'
import Context from '../context'
import { Fetch, ToFormData, POST, GET } from './request'
import * as Utils from '../lib/utils'
@@ -9,7 +10,7 @@ export default class Api {
constructor (ctx: Context) {
this.ctx = ctx
this.baseURL = ctx.conf.server
this.baseURL = `${ctx.conf.server}/api`
}
// ============================
@@ -45,7 +46,7 @@ export default class Api {
content: comment.content,
rid: comment.rid,
page_key: comment.page_key,
ua: await Utils.getCorrectUserAgent(), // 需要后端支持,获取修正后的 UA (针对 Win11)
ua: await Utils.getCorrectUserAgent(), // 需要后端支持,获取修正后的 UA
}
if (comment.page_title) params.page_title = comment.page_title
@@ -119,8 +120,11 @@ export default class Api {
/** 用户 · 登录状态 */
public async loginStatus() {
const data = await POST<any>(this.ctx, `${this.baseURL}/login-status`)
return (data || { is_login: false }) as { is_login: boolean }
const data = await POST<any>(this.ctx, `${this.baseURL}/login-status`, {
name: this.ctx.user.data.nick,
email: this.ctx.user.data.email
})
return (data || { is_login: false, is_admin: false }) as { is_login: boolean, is_admin: boolean }
}
// ============================
@@ -164,13 +168,14 @@ export default class Api {
}
/** 页面 · 数据更新 */
public async pageFetch(id: number) {
const params: any = {
id,
}
public async pageFetch(id?: number, siteName?: string, getStatus?: boolean) {
const params: any = {}
if (id) params.id = id
if (siteName) params.site_name = siteName
if (getStatus) params.get_status = getStatus
const d = await POST<any>(this.ctx, `${this.baseURL}/admin/page-fetch`, params)
return (d.page as PageData)
return (d as any)
}
// ============================
@@ -290,7 +295,22 @@ export default class Api {
const json = await Fetch(this.ctx, `${this.baseURL}/img-upload`, init)
return ((json.data || {}) as any) as { img_file: string, img_url: string }
}
/** 获取配置 */
public async conf() {
const data = await POST<any>(this.ctx, `${this.baseURL}/conf`)
const conf = (data.frontend_conf || {}) as ArtalkConfig
// Patch: `emoticons` config string to json
if (conf.emoticons && typeof conf.emoticons === "string") {
conf.emoticons = conf.emoticons.trim()
if (conf.emoticons.startsWith("[") || conf.emoticons.startsWith("{")) {
conf.emoticons = JSON.parse(conf.emoticons) // pase json
}
}
return conf
}
// ============================
@@ -314,4 +334,20 @@ export default class Api {
const data = await POST<any>(this.ctx, `${this.baseURL}/captcha/status`)
return (data || { is_pass: false }) as { is_pass: boolean }
}
// ============================
// 管理员缓存操作
// ============================
/** 缓存清除 */
public cacheFlushAll() {
const params: any = { flush_all: true }
return POST(this.ctx, `${this.baseURL}/admin/cache-flush`, params)
}
/** 缓存预热 */
public cacheWarmUp() {
const params: any = {}
return POST(this.ctx, `${this.baseURL}/admin/cache-warm`, params)
}
}
+70 -24
View File
@@ -1,7 +1,8 @@
import './style/main.less'
import Context from './context'
import ArtalkConfig from '~/types/artalk-config'
import { EventPayloadMap, Handler } from '~/types/event'
import Context from './context'
import defaults from './defaults'
import CheckerLauncher from './lib/checker'
@@ -9,10 +10,10 @@ import Editor from './components/editor'
import List from './components/list'
import SidebarLayer from './components/sidebar-layer'
import { GetLayerWrap } from './components/layer'
import { EventPayloadMap, Handler } from '~/types/event'
import Layer, { GetLayerWrap } from './components/layer'
import Api from './api'
import * as Utils from './lib/utils'
import * as Ui from './lib/ui'
/**
* Artalk
@@ -21,33 +22,43 @@ import * as Utils from './lib/utils'
export default class Artalk {
public static readonly defaults: ArtalkConfig = defaults
public ctx: Context
public conf: ArtalkConfig
public $root: HTMLElement
public ctx!: Context
public conf!: ArtalkConfig
public $root!: HTMLElement
public checkerLauncher: CheckerLauncher
public editor: Editor
public list: List
public sidebarLayer: SidebarLayer
public checkerLauncher!: CheckerLauncher
public editor!: Editor
public list!: List
public sidebarLayer!: SidebarLayer
constructor (customConf: ArtalkConfig) {
// 配置
this.conf = { ...Artalk.defaults, ...customConf }
this.conf.server = this.conf.server.replace(/\/$/, '')
this.conf = Utils.mergeDeep(Artalk.defaults, customConf)
this.conf.server = this.conf.server.replace(/\/$/, '').replace(/\/api\/?$/, '')
// 默认 pageKey
if (!this.conf.pageKey) {
this.conf.pageKey = `${window.location.protocol}//${window.location.host}${window.location.pathname}`
// @link http://bl.ocks.org/abernier/3070589
this.conf.pageKey = `${window.location.pathname}`
}
// 默认 pageTitle
if (!this.conf.pageTitle) {
this.conf.pageTitle = `${document.title}`
}
// 装载元素
try {
const $root = document.querySelector<HTMLElement>(this.conf.el)
if (!$root) throw Error(`Sorry, target element "${this.conf.el}" was not found.`)
this.$root = $root
} catch (e) {
console.error(e)
throw new Error('Please check your Artalk `el` config.')
if (!!this.conf.el && this.conf.el instanceof HTMLElement) {
this.$root = this.conf.el
} else {
try {
const $root = document.querySelector<HTMLElement>(this.conf.el)
if (!$root) throw Error(`Sorry, target element "${this.conf.el}" was not found.`)
this.$root = $root
} catch (e) {
console.error(e)
throw new Error('Please check your Artalk `el` config.')
}
}
// Context 初始化
@@ -56,9 +67,25 @@ export default class Artalk {
// 界面初始化
this.$root.classList.add('artalk')
this.$root.innerHTML = ''
this.initDarkMode()
// 初始化组件
if (this.conf.useBackendConf) {
// 复用后端的配置
// @ts-ignore
return (async () => {
await this.loadConfRemote()
this.initCore()
return this // Promise<Artalk>
})()
}
this.initCore()
}
private initCore() {
// 组件初始化
this.initLayer()
this.initDarkMode()
this.checkerLauncher = new CheckerLauncher(this.ctx)
Utils.initMarked(this.ctx) // 初始化 marked
@@ -91,6 +118,17 @@ export default class Artalk {
})
}
/** 获取远程配置 */
private async loadConfRemote() {
Ui.showLoading(this.$root)
let backendConf = {}
try {
backendConf = await (new Api(this.ctx)).conf()
} catch (err) { console.error("配置远程获取失败", err) }
this.ctx.conf = Utils.mergeDeep(this.ctx.conf, backendConf)
Ui.hideLoading(this.$root)
}
/** 事件绑定 · 初始化 */
private initEventBind() {
// 锚点快速跳转评论
@@ -133,6 +171,13 @@ export default class Artalk {
this.list.fetchComments(0)
}
/** Layer 初始化 */
initLayer() {
// 记录页面原始 Styles
Layer.BodyOrgOverflow = document.body.style.overflow
Layer.BodyOrgPaddingRight = document.body.style.paddingRight
}
/** 暗黑模式 · 初始化 */
public initDarkMode() {
const darkModeClassName = 'atk-dark-mode'
@@ -163,14 +208,15 @@ export default class Artalk {
/** PV */
public async initPV() {
const pvNum = await new Api(this.ctx).pv()
if (Number.isNaN(Number(pvNum)))
return
if (!this.conf.pvEl || !document.querySelector(this.conf.pvEl))
return
const $pv = document.querySelector<HTMLElement>(this.conf.pvEl)!
// $pv.innerText = '-' // 默认占位符
const pvNum = await new Api(this.ctx).pv()
if (Number.isNaN(Number(pvNum)))
return
$pv.innerText = String(pvNum)
}
+2 -2
View File
@@ -1,11 +1,11 @@
import '../style/comment.less'
import { CommentData } from '~/types/artalk-data'
import Context from '../context'
import Component from '../lib/component'
import * as Utils from '../lib/utils'
import * as Ui from '../lib/ui'
import UADetect from '../lib/detect'
import { CommentData } from '~/types/artalk-data'
import CommentHTML from './html/comment.html?raw'
import Api from '../api'
import ActionBtn from './action-btn'
@@ -317,7 +317,7 @@ export default class Comment extends Component {
}
getIsRoot() {
return this.parent === null
return this.data.rid === 0
}
getChildren() {
@@ -1,10 +1,10 @@
import './emoticons-plug.less'
import Editor from '../editor'
import EditorPlug from './editor-plug'
import * as Utils from '~/src/lib/utils'
import * as Ui from '~/src/lib/ui'
import { EmoticonListData, EmoticonGrpData } from '~/types/artalk-data'
import EditorPlug from './editor-plug'
import Editor from '../editor'
type OwOFormatType = {
[key: string] : {
@@ -20,22 +20,33 @@ export default class EmoticonsPlug extends EditorPlug {
public $grpWrap!: HTMLElement
public $grpSwitcher!: HTMLElement
public loadingTask: Promise<void>|null = null
constructor (public editor: Editor) {
super(editor)
this.$el = Utils.createElement(`<div class="atk-editor-plug-emoticons"></div>`)
this.init()
}
async init() {
// 数据处理
Ui.showLoading(this.$el)
this.emoticons = await this.handleData(this.ctx.conf.emoticons)
Ui.hideLoading(this.$el)
isListLoaded = false
isImgLoaded = false
// 初始化元素
this.initEmoticonsList()
async loadEmoticonsData() {
if (this.isListLoaded) return
if (this.loadingTask !== null) {
await this.loadingTask
return
}
// 数据处理
this.loadingTask = (async () => {
Ui.showLoading(this.$el)
this.emoticons = await this.handleData(this.ctx.conf.emoticons)
Ui.hideLoading(this.$el)
this.loadingTask = null
this.isListLoaded = true
})()
await this.loadingTask
}
async handleData(data: any): Promise<any[]> {
@@ -85,7 +96,7 @@ export default class EmoticonsPlug extends EditorPlug {
// 剔除非法数据
data = data.filter((item: any) => (typeof item === 'object' && !Array.isArray(item) && !!item && !!item.name))
console.log(data)
// console.log(data)
this.solveNullKey(data)
this.solveSameKey(data)
@@ -243,10 +254,20 @@ export default class EmoticonsPlug extends EditorPlug {
}
onShow () {
// 延迟执行,防止无法读取高度
setTimeout(() => {
this.changeListHeight()
}, 30)
;(async () => {
await this.loadEmoticonsData()
// 初始化元素
if (!this.isImgLoaded) {
this.initEmoticonsList()
this.isImgLoaded = true
}
// 延迟执行,防止无法读取高度
setTimeout(() => {
this.changeListHeight()
}, 30)
})()
}
onHide () {
@@ -1,8 +1,8 @@
import './preview-plug.less'
import * as Utils from '~/src/lib/utils'
import Editor from '../editor'
import EditorPlug from './editor-plug'
import * as Utils from '~/src/lib/utils'
export default class PreviewPlug extends EditorPlug {
$el!: HTMLElement
+32 -6
View File
@@ -1,5 +1,6 @@
import '../style/editor.less'
import { CommentData } from '~/types/artalk-data'
import Context from '../context'
import Component from '../lib/component'
import * as Utils from '../lib/utils'
@@ -8,7 +9,6 @@ import EditorHTML from './html/editor.html?raw'
import EmoticonsPlug from './editor-plugs/emoticons-plug'
import PreviewPlug from './editor-plugs/preview-plug'
import { CommentData } from '~/types/artalk-data'
import Api from '../api'
export default class Editor extends Component {
@@ -22,6 +22,7 @@ export default class Editor extends Component {
public $bottom: HTMLElement
public $plugBtnWrap: HTMLElement
public $imgUploadBtn?: HTMLElement
public $imgUploadInput?: HTMLInputElement
public $submitBtn: HTMLButtonElement
public $notifyWrap: HTMLElement
@@ -204,6 +205,17 @@ export default class Editor extends Component {
// 切换按钮
const btnElem = Utils.createElement(`<span class="atk-plug-btn" data-plug-name="${PlugObj.Name}">${PlugObj.BtnHTML}</span>`)
this.$plugBtnWrap.appendChild(btnElem)
// 表情包插件预加载
if (PlugObj.Name === 'emoticons') {
const emoPlug = new PlugObj(this) as EmoticonsPlug
this.plugList[PlugObj.Name] = emoPlug
window.setTimeout(() => {
emoPlug.loadEmoticonsData()
}, 1000) // 延迟 1s 加载
}
btnElem.addEventListener('click', () => {
let plug = this.plugList[PlugObj.Name]
if (!plug) {
@@ -265,12 +277,16 @@ export default class Editor extends Component {
this.$imgUploadBtn = Utils.createElement(`<span class="atk-plug-btn">图片</span>`)
this.$plugBtnWrap.querySelector('[data-plug-name="preview"]')!.before(this.$imgUploadBtn) // 显示在预览图标之前
this.$imgUploadInput = document.createElement('input')
this.$imgUploadInput.type = 'file'
this.$imgUploadInput.style.display = 'none'
this.$imgUploadInput.accept = this.allowImgExts.map(o => `.${o}`).join(',')
this.$imgUploadBtn.after(this.$imgUploadInput)
// 按钮点击
this.$imgUploadBtn.onclick = () => {
// 选择图片
const $input = document.createElement('input')
$input.type = 'file'
$input.accept = this.allowImgExts.map(o => `.${o}`).join(',')
const $input = this.$imgUploadInput!
$input.onchange = () => {
(async () => { // 解决阻塞 UI 问题
if (!$input.files || $input.files.length === 0) return
@@ -393,7 +409,11 @@ export default class Editor extends Component {
if (!!this.plugList && !!this.plugList.preview) {
this.plugList.preview.updateContent()
}
this.adjustTextareaHeight()
// 延迟执行防止无效
window.setTimeout(() => {
this.adjustTextareaHeight()
}, 80)
}
clearEditor () {
@@ -501,7 +521,7 @@ export default class Editor extends Component {
// 回复不同页面的评论
if (this.replyComment !== null && this.replyComment.page_key !== this.ctx.conf.pageKey) {
window.open(`${this.replyComment.page_key}#atk-comment-${nComment.id}`)
window.open(`${this.replyComment.page_url}#atk-comment-${nComment.id}`)
}
this.ctx.trigger('list-insert', nComment)
@@ -551,6 +571,8 @@ export default class Editor extends Component {
const $travelPlace = Utils.createElement('<div></div>')
$afterEl.after($travelPlace)
$travelPlace.replaceWith(this.$el)
this.$el.classList.add('atk-fade-in') // 添加渐入动画
}
travelBack () {
@@ -561,5 +583,9 @@ export default class Editor extends Component {
// 取消回复
if (this.replyComment !== null) this.cancelReply()
}
initRemoteEmoticons () {
}
}
+7 -9
View File
@@ -10,8 +10,8 @@ export default class Layer extends Component {
private maskClickHideEnable: boolean = true
private bodyStyleOrgOverflow = ''
private bodyStyleOrgPaddingRight = ''
public static BodyOrgOverflow: string
public static BodyOrgPaddingRight: string
public afterHide?: Function
@@ -73,10 +73,11 @@ export default class Layer extends Component {
this.$wrap.classList.add('atk-fade-out')
this.$el.style.display = 'none'
// body style 禁止滚动解除
this.pageBodyScrollBarShow()
this.newActionTimer(() => {
this.$wrap.style.display = 'none'
// body style 禁止滚动解除
this.pageBodyScrollBarShow()
this.checkCleanLayer()
}, 450)
this.newActionTimer(() => {
@@ -91,8 +92,6 @@ export default class Layer extends Component {
// 页面滚动条隐藏
pageBodyScrollBarHide() {
this.bodyStyleOrgOverflow = document.body.style.overflow
this.bodyStyleOrgPaddingRight = document.body.style.paddingRight
document.body.style.overflow = 'hidden'
const bpr = parseInt(window.getComputedStyle(document.body, null).getPropertyValue('padding-right'), 10)
@@ -101,8 +100,8 @@ export default class Layer extends Component {
// 页面滚动条显示
pageBodyScrollBarShow() {
document.body.style.overflow = this.bodyStyleOrgOverflow
document.body.style.paddingRight = this.bodyStyleOrgPaddingRight
document.body.style.overflow = Layer.BodyOrgOverflow
document.body.style.paddingRight = Layer.BodyOrgPaddingRight
}
// Timers
@@ -128,7 +127,6 @@ export default class Layer extends Component {
/** 销毁 - 无动画 */
disposeNow () {
document.body.style.overflow = ''
this.$el.remove()
this.pageBodyScrollBarShow()
// this.$el dispose
+23 -5
View File
@@ -1,10 +1,10 @@
import { ListData, CommentData, NotifyData, ApiVersionData } from '~/types/artalk-data'
import Context from '../context'
import Component from '../lib/component'
import * as Utils from '../lib/utils'
import * as Ui from '../lib/ui'
import Api from '../api'
import Comment from './comment'
import { ListData, CommentData, NotifyData, ApiVersionData } from '~/types/artalk-data'
import Pagination from './pagination'
import ReadMoreBtn from './read-more-btn'
import { backendMinVersion } from '../../package.json'
@@ -49,6 +49,9 @@ export default class ListLite extends Component {
</div>`)
this.$commentsWrap = this.$el.querySelector('.atk-list-comments-wrap')!
// 评论为空时显示字符
if (ctx.conf.noComment) this.noCommentText = ctx.conf.noComment
// 评论时间自动更新
window.setInterval(() => {
this.$el.querySelectorAll<HTMLElement>('[data-atk-comment-date]').forEach(el => {
@@ -91,7 +94,7 @@ export default class ListLite extends Component {
try {
listData = await new Api(this.ctx).get(offset, this.pageSize, this.flatMode, this.paramsEditor)
} catch (e: any) {
this.onError(e.msg || String(e), offset)
this.onError(e.msg || String(e), offset, e.data)
throw e
} finally {
hideLoading()
@@ -219,7 +222,7 @@ export default class ListLite extends Component {
}
/** 错误处理 */
protected onError(msg: any, offset: number) {
protected onError(msg: any, offset: number, errData?: any) {
msg = String(msg)
console.error(msg)
@@ -237,9 +240,24 @@ export default class ListLite extends Component {
$err.appendChild($retryBtn)
const adminBtn = Utils.createElement('<span atk-only-admin-show> | <span style="cursor:pointer;">打开控制台</span></span>')
adminBtn.onclick = () => (this.ctx.trigger('sidebar-show'))
if (!this.ctx.user.data.isAdmin) adminBtn.classList.add('atk-hide')
$err.appendChild(adminBtn)
if (!this.ctx.user.data.isAdmin) adminBtn.classList.add('atk-hide')
let sidebarView = ''
// 找不到站点错误,打开侧边栏并填入创建站点表单
if (errData?.err_no_site) {
const viewLoadParam = {
create_name: this.ctx.conf.site,
create_urls: `${window.location.protocol}//${window.location.host}`
}
// TODO 真的是飞鸽传书啊
sidebarView = `sites|${JSON.stringify(viewLoadParam)}`
}
adminBtn.onclick = () => (this.ctx.trigger('sidebar-show', {
view: sidebarView
}))
Ui.setError(this.$el, $err)
}
+1 -1
View File
@@ -1,12 +1,12 @@
import '../style/list.less'
import { ListData } from '~/types/artalk-data'
import Context from '../context'
import * as Utils from '../lib/utils'
import * as Ui from '../lib/ui'
import Api from '../api'
import ListHTML from './html/list.html?raw'
import ListLite from './list-lite'
import { ListData } from '~/types/artalk-data'
export default class List extends ListLite {
private $closeCommentBtn!: HTMLElement
+1 -1
View File
@@ -38,7 +38,7 @@ export default class Pagination {
`<div class="atk-pagination-wrap">
<div class="atk-pagination">
<div class="atk-btn atk-btn-prev">Prev</div>
<input type="text" class="atk-input" />
<input type="text" class="atk-input" aria-label="Enter the number of page" />
<div class="atk-btn atk-btn-next">Next</div>
</div>
</div>`)
+45 -37
View File
@@ -3,8 +3,9 @@ import '../style/sidebar-layer.less'
import Context from '@/context'
import Component from '@/lib/component'
import * as Utils from '@/lib/utils'
import SidebarHTML from './html/sidebar-layer.html?raw'
import * as Ui from '@/lib/ui'
import { SidebarShowPayload } from '~/types/event'
import SidebarHTML from './html/sidebar-layer.html?raw'
import Layer from './layer'
import Api from '../api'
@@ -28,7 +29,7 @@ export default class SidebarLayer extends Component {
}
// event
this.ctx.on('sidebar-show', () => (this.show()))
this.ctx.on('sidebar-show', (conf) => (this.show(conf || {})))
this.ctx.on('sidebar-hide', () => (this.hide()))
this.ctx.on('user-changed', () => { this.firstShow = true })
}
@@ -36,7 +37,7 @@ export default class SidebarLayer extends Component {
private firstShow = true
/** 显示 */
public async show() {
public async show(conf: SidebarShowPayload) {
this.$el.style.transform = '' // 动画清除,防止二次打开失效
// 获取 Layer
@@ -59,53 +60,60 @@ export default class SidebarLayer extends Component {
this.$el.style.transform = 'translate(0, 0)'
}, 20)
// 管理员身份验证 (若身份失效,弹出验证窗口)
;(async () => {
const resp = await new Api(this.ctx).loginStatus()
if (resp.is_admin && !resp.is_login) {
this.layer?.hide()
this.firstShow = true
this.ctx.trigger('checker-admin', {
onSuccess: () => {
setTimeout(() => {
this.show(conf)
}, 500)
},
onCancel: () => {}
})
}
})()
// 清空 unread
this.ctx.trigger('unread-update', { notifies: [] })
// 第一次加载
if (this.firstShow) {
// 管理员身份验证
if (this.ctx.user.data.isAdmin) {
const resp = await new Api(this.ctx).loginStatus()
if (!resp.is_login) {
await (new Promise<any>((resolve, reject) => {
this.ctx.trigger('checker-admin', {
onSuccess: () => {
resolve(null)
setTimeout(() => {
this.show()
}, 500)
},
onCancel: () => {
this.layer?.hide()
}
})
}))
}
}
this.$iframeWrap.innerHTML = ''
this.$iframe = Utils.createElement<HTMLIFrameElement>('<iframe></iframe>')
// 准备 Iframe 参数
const baseURL = (import.meta.env.MODE === 'development') ? 'http://localhost:23367/'
: Utils.getURLBasedOnApi(this.ctx, 'sidebar/')
const userData = encodeURIComponent(JSON.stringify(this.ctx.user.data))
: Utils.getURLBasedOnApi(this.ctx, '/sidebar/')
const location = window.location
this.iframeLoad(`${baseURL}`
+ `?pageKey=${encodeURIComponent(this.conf.pageKey)}`
+ `&site=${encodeURIComponent(this.conf.site || '')}`
+ `&user=${userData}`
+ `&referer=${encodeURIComponent(`${location.protocol}//${location.host}${location.pathname}`)}`
+ `${((this.conf.darkMode) ? `&darkMode=1` : ``)}`)
const query: any = {
pageKey: this.conf.pageKey,
site: this.conf.site || '',
user: JSON.stringify(this.ctx.user.data),
time: +new Date()
}
if (conf.view) query.view = conf.view
if (this.conf.darkMode) query.darkMode = '1'
const urlParams = new URLSearchParams(query);
this.iframeLoad(`${baseURL}?${urlParams.toString()}`)
this.$iframeWrap.append(this.$iframe)
this.firstShow = false
} else {
// 暗黑模式
if (this.conf.darkMode && !this.$iframe!.src.match(/darkMode=1$/)) {
const isIframeSrcDarkMode = this.$iframe!.src.includes('darkMode=1')
if (this.conf.darkMode && !isIframeSrcDarkMode)
this.iframeLoad(`${this.$iframe!.src}&darkMode=1`)
}
if (!this.conf.darkMode && this.$iframe!.src.match(/darkMode=1$/)) {
this.iframeLoad(this.$iframe!.src.replace(/&darkMode=1$/, ''))
}
if (!this.conf.darkMode && isIframeSrcDarkMode)
this.iframeLoad(this.$iframe!.src.replace('&darkMode=1', ''))
}
}
+2 -1
View File
@@ -1,7 +1,7 @@
import { marked as libMarked } from 'marked'
import User from './lib/user'
import ArtalkConfig from '~/types/artalk-config'
import { EventPayloadMap, Event, EventScopeType, Handler } from '~/types/event'
import User from './lib/user'
/**
* Artalk Context
@@ -42,4 +42,5 @@ export default class Context {
}
public markedInstance!: typeof libMarked
public markedReplacers: ((raw: string) => string)[] = []
}
+1
View File
@@ -40,6 +40,7 @@ const defaults: ArtalkConfig = {
imgUpload: true,
reqTimeout: 15000,
versionCheck: true,
useBackendConf: false,
}
export default defaults
@@ -15,7 +15,7 @@ const CaptchaChecker: Checker = {
const $iframe = Utils.createElement<HTMLIFrameElement>(`<iframe class="atk-fade-in"></iframe>`)
$iframe.style.display = 'none'
Ui.showLoading($iframeWrap, { transparentBg: true })
$iframe.src = `${that.ctx.conf.server}/captcha/get`
$iframe.src = `${that.ctx.conf.server}/api/captcha/get?t=${+new Date()}`
$iframe.onload = () => {
$iframe.style.display = ''
Ui.hideLoading($iframeWrap)
+1 -1
View File
@@ -1,9 +1,9 @@
import Context from '@/context'
import Layer from '@/components/layer'
import Dialog from '@/components/dialog'
import { CheckerPayload } from '~/types/event'
import * as Utils from '../utils'
import * as Ui from '../ui'
import { CheckerPayload } from '~/types/event'
import CaptchaChecker from './captcha-checker'
import AdminChecker from './admin-checker'
-263
View File
@@ -1,263 +0,0 @@
/* eslint-disable */
var win = window || {}
var nav = navigator || {}
function Detect (userAgent) {
var u = userAgent || nav.userAgent
var _this = this
var match = {
// 内核
Trident: u.indexOf('Trident') > -1 || u.indexOf('NET CLR') > -1,
Presto: u.indexOf('Presto') > -1,
WebKit: u.indexOf('AppleWebKit') > -1,
Gecko: u.indexOf('Gecko/') > -1,
// 浏览器
Safari: u.indexOf('Safari') > -1,
Chrome: u.indexOf('Chrome') > -1 || u.indexOf('CriOS') > -1,
IE: u.indexOf('MSIE') > -1 || u.indexOf('Trident') > -1,
Edge: u.indexOf('Edge') > -1,
Firefox: u.indexOf('Firefox') > -1 || u.indexOf('FxiOS') > -1,
'Firefox Focus': u.indexOf('Focus') > -1,
Chromium: u.indexOf('Chromium') > -1,
Opera: u.indexOf('Opera') > -1 || u.indexOf('OPR') > -1,
Vivaldi: u.indexOf('Vivaldi') > -1,
Yandex: u.indexOf('YaBrowser') > -1,
Kindle: u.indexOf('Kindle') > -1 || u.indexOf('Silk/') > -1,
360: u.indexOf('360EE') > -1 || u.indexOf('360SE') > -1,
UC: u.indexOf('UC') > -1 || u.indexOf(' UBrowser') > -1,
QQBrowser: u.indexOf('QQBrowser') > -1,
QQ: u.indexOf('QQ/') > -1,
Baidu: u.indexOf('Baidu') > -1 || u.indexOf('BIDUBrowser') > -1,
Maxthon: u.indexOf('Maxthon') > -1,
Sogou: u.indexOf('MetaSr') > -1 || u.indexOf('Sogou') > -1,
LBBROWSER: u.indexOf('LBBROWSER') > -1,
'2345Explorer': u.indexOf('2345Explorer') > -1,
TheWorld: u.indexOf('TheWorld') > -1,
XiaoMi: u.indexOf('MiuiBrowser') > -1,
Quark: u.indexOf('Quark') > -1,
Qiyu: u.indexOf('Qiyu') > -1,
Wechat: u.indexOf('MicroMessenger') > -1,
Taobao: u.indexOf('AliApp(TB') > -1,
Alipay: u.indexOf('AliApp(AP') > -1,
Weibo: u.indexOf('Weibo') > -1,
Douban: u.indexOf('com.douban.frodo') > -1,
Suning: u.indexOf('SNEBUY-APP') > -1,
iQiYi: u.indexOf('IqiyiApp') > -1,
// 系统或平台
Windows: u.indexOf('Windows') > -1,
Linux: u.indexOf('Linux') > -1 || u.indexOf('X11') > -1,
'Mac OS': u.indexOf('Macintosh') > -1,
Android: u.indexOf('Android') > -1 || u.indexOf('Adr') > -1,
Ubuntu: u.indexOf('Ubuntu') > -1,
FreeBSD: u.indexOf('FreeBSD') > -1,
Debian: u.indexOf('Debian') > -1,
'Windows Phone': u.indexOf('IEMobile') > -1 || u.indexOf('Windows Phone') > -1,
BlackBerry: u.indexOf('BlackBerry') > -1 || u.indexOf('RIM') > -1,
MeeGo: u.indexOf('MeeGo') > -1,
Symbian: u.indexOf('Symbian') > -1,
iOS: u.indexOf('like Mac OS X') > -1,
'Chrome OS': u.indexOf('CrOS') > -1,
WebOS: u.indexOf('hpwOS') > -1,
// 设备
Mobile: u.indexOf('Mobi') > -1 || u.indexOf('iPh') > -1 || u.indexOf('480') > -1,
Tablet: u.indexOf('Tablet') > -1 || u.indexOf('Pad') > -1 || u.indexOf('Nexus 7') > -1
}
// 修正
if (match.Mobile) {
match.Mobile = !(u.indexOf('iPad') > -1)
} else if (win.showModalDialog && win.chrome) {
match['360'] = true
}
// 基本信息
var hash = {
engine: ['WebKit', 'Trident', 'Gecko', 'Presto'],
browser: ['Safari', 'Chrome', 'Edge', 'IE', 'Firefox', 'Firefox Focus', 'Chromium', 'Opera', 'Vivaldi', 'Yandex', 'Kindle', '360', 'UC', 'QQBrowser', 'QQ', 'Baidu', 'Maxthon', 'Sogou', 'LBBROWSER', '2345Explorer', 'TheWorld', 'XiaoMi', 'Quark', 'Qiyu', 'Wechat', 'Taobao', 'Alipay', 'Weibo', 'Douban', 'Suning', 'iQiYi'],
os: ['Windows', 'Linux', 'Mac OS', 'Android', 'Ubuntu', 'FreeBSD', 'Debian', 'iOS', 'Windows Phone', 'BlackBerry', 'MeeGo', 'Symbian', 'Chrome OS', 'WebOS'],
device: ['Mobile', 'Tablet']
}
_this.device = 'PC'
_this.language = (function () {
var g = (nav.browserLanguage || nav.language)
var arr = g.split('-')
if (arr[1]) {
arr[1] = arr[1].toUpperCase()
}
return arr.join('_')
})()
for (var s in hash) {
for (var i = 0; i < hash[s].length; i++) {
var value = hash[s][i]
if (match[value]) {
_this[s] = value
}
}
}
// 系统版本信息
var osVersion = {
Windows: function () {
var v = u.replace(/^.*Windows NT ([\d.]+);.*$/, '$1')
var hash = {
6.4: '10',
6.3: '8.1',
6.2: '8',
6.1: '7',
'6.0': 'Vista',
5.2: 'XP',
5.1: 'XP',
'5.0': '2000',
'10.0': '10',
'11.0': '11' // 自定的,不是微软官方的判断方法
}
return hash[v] || v
},
Android: function () {
return u.replace(/^.*Android ([\d.]+);.*$/, '$1')
},
iOS: function () {
return u.replace(/^.*OS ([\d_]+) like.*$/, '$1').replace(/_/g, '.')
},
Debian: function () {
return u.replace(/^.*Debian\/([\d.]+).*$/, '$1')
},
'Windows Phone': function () {
return u.replace(/^.*Windows Phone( OS)? ([\d.]+);.*$/, '$2')
},
'Mac OS': function () {
return u.replace(/^.*Mac OS X ([\d_]+).*$/, '$1').replace(/_/g, '.')
},
WebOS: function () {
return u.replace(/^.*hpwOS\/([\d.]+);.*$/, '$1')
}
}
_this.osVersion = ''
if (osVersion[_this.os]) {
_this.osVersion = osVersion[_this.os]()
if (_this.osVersion === u) {
_this.osVersion = ''
}
}
// 浏览器版本信息
var version = {
Safari: function () {
return u.replace(/^.*Version\/([\d.]+).*$/, '$1')
},
Chrome: function () {
return u.replace(/^.*Chrome\/([\d.]+).*$/, '$1').replace(/^.*CriOS\/([\d.]+).*$/, '$1')
},
IE: function () {
return u.replace(/^.*MSIE ([\d.]+).*$/, '$1').replace(/^.*rv:([\d.]+).*$/, '$1')
},
Edge: function () {
return u.replace(/^.*Edge\/([\d.]+).*$/, '$1')
},
Firefox: function () {
return u.replace(/^.*Firefox\/([\d.]+).*$/, '$1').replace(/^.*FxiOS\/([\d.]+).*$/, '$1')
},
'Firefox Focus': function () {
return u.replace(/^.*Focus\/([\d.]+).*$/, '$1')
},
Chromium: function () {
return u.replace(/^.*Chromium\/([\d.]+).*$/, '$1')
},
Opera: function () {
return u.replace(/^.*Opera\/([\d.]+).*$/, '$1').replace(/^.*OPR\/([\d.]+).*$/, '$1')
},
Vivaldi: function () {
return u.replace(/^.*Vivaldi\/([\d.]+).*$/, '$1')
},
Yandex: function () {
return u.replace(/^.*YaBrowser\/([\d.]+).*$/, '$1')
},
Kindle: function () {
return u.replace(/^.*Version\/([\d.]+).*$/, '$1')
},
Maxthon: function () {
return u.replace(/^.*Maxthon\/([\d.]+).*$/, '$1')
},
QQBrowser: function () {
return u.replace(/^.*QQBrowser\/([\d.]+).*$/, '$1')
},
QQ: function () {
return u.replace(/^.*QQ\/([\d.]+).*$/, '$1')
},
Baidu: function () {
return u.replace(/^.*BIDUBrowser[\s/]([\d.]+).*$/, '$1')
},
UC: function () {
return u.replace(/^.*UC?Browser\/([\d.]+).*$/, '$1')
},
Sogou: function () {
return u.replace(/^.*SE ([\d.X]+).*$/, '$1').replace(/^.*SogouMobileBrowser\/([\d.]+).*$/, '$1')
},
'2345Explorer': function () {
return u.replace(/^.*2345Explorer\/([\d.]+).*$/, '$1')
},
TheWorld: function () {
return u.replace(/^.*TheWorld ([\d.]+).*$/, '$1')
},
XiaoMi: function () {
return u.replace(/^.*MiuiBrowser\/([\d.]+).*$/, '$1')
},
Quark: function () {
return u.replace(/^.*Quark\/([\d.]+).*$/, '$1')
},
Qiyu: function () {
return u.replace(/^.*Qiyu\/([\d.]+).*$/, '$1')
},
Wechat: function () {
return u.replace(/^.*MicroMessenger\/([\d.]+).*$/, '$1')
},
Taobao: function () {
return u.replace(/^.*AliApp\(TB\/([\d.]+).*$/, '$1')
},
Alipay: function () {
return u.replace(/^.*AliApp\(AP\/([\d.]+).*$/, '$1')
},
Weibo: function () {
return u.replace(/^.*weibo__([\d.]+).*$/, '$1')
},
Douban: function () {
return u.replace(/^.*com.douban.frodo\/([\d.]+).*$/, '$1')
},
Suning: function () {
return u.replace(/^.*SNEBUY-APP([\d.]+).*$/, '$1')
},
iQiYi: function () {
return u.replace(/^.*IqiyiVersion\/([\d.]+).*$/, '$1')
}
}
_this.version = ''
if (version[_this.browser]) {
_this.version = version[_this.browser]()
if (_this.version === u) {
_this.version = ''
}
}
// 简化版本号
/* if (_this.osVersion.indexOf('.')) {
_this.osVersion = _this.osVersion.substring(0, _this.osVersion.indexOf('.'))
} */
if (_this.version.indexOf('.')) {
_this.version = _this.version.substring(0, _this.version.indexOf('.'))
}
// 修正
if (_this.browser === 'Edge') {
_this.engine = 'EdgeHTML'
} else if (_this.browser === 'Chrome' && parseInt(_this.version) > 27) {
_this.engine = 'Blink'
} else if (_this.browser === 'Opera' && parseInt(_this.version) > 12) {
_this.engine = 'Blink'
} else if (_this.browser === 'Yandex') {
_this.engine = 'Blink'
} else if (_this.browser === undefined) {
_this.browser = 'Unknow App'
}
};
function detectFactory (u) {
return new Detect(u)
}
export default detectFactory
+222
View File
@@ -0,0 +1,222 @@
const win = (window as any) || {}
const nav = navigator || {}
function Detect (userAgent?: string) {
const u = String(userAgent || nav.userAgent)
const dest = {
os: '',
osVersion: '',
engine: '',
browser: '',
device: '',
language: '',
version: ''
}
// 内核
const engineMatch = {
Trident: u.includes('Trident') || u.includes('NET CLR'),
Presto: u.includes('Presto'),
WebKit: u.includes('AppleWebKit'),
Gecko: u.includes('Gecko/')
}
// 浏览器
const browserMatch = {
Safari: u.includes('Safari'),
Chrome: u.includes('Chrome') || u.includes('CriOS'),
IE: u.includes('MSIE') || u.includes('Trident'),
Edge: u.includes('Edge') || u.includes('Edg'),
Firefox: u.includes('Firefox') || u.includes('FxiOS'),
'Firefox Focus': u.includes('Focus'),
Chromium: u.includes('Chromium'),
Opera: u.includes('Opera') || u.includes('OPR'),
Vivaldi: u.includes('Vivaldi'),
Yandex: u.includes('YaBrowser'),
Kindle: u.includes('Kindle') || u.includes('Silk/'),
360: u.includes('360EE') || u.includes('360SE'),
UC: u.includes('UC') || u.includes(' UBrowser'),
QQBrowser: u.includes('QQBrowser'),
QQ: u.includes('QQ/'),
Baidu: u.includes('Baidu') || u.includes('BIDUBrowser'),
Maxthon: u.includes('Maxthon'),
Sogou: u.includes('MetaSr') || u.includes('Sogou'),
LBBROWSER: u.includes('LBBROWSER'),
'2345Explorer': u.includes('2345Explorer'),
TheWorld: u.includes('TheWorld'),
MIUI: u.includes('MiuiBrowser'),
Quark: u.includes('Quark'),
Qiyu: u.includes('Qiyu'),
Wechat: u.includes('MicroMessenger'),
Taobao: u.includes('AliApp(TB'),
Alipay: u.includes('AliApp(AP'),
Weibo: u.includes('Weibo'),
Douban: u.includes('com.douban.frodo'),
Suning: u.includes('SNEBUY-APP'),
iQiYi: u.includes('IqiyiApp'),
}
// 系统或平台
const osMatch = {
Windows: u.includes('Windows'),
Linux: u.includes('Linux') || u.includes('X11'),
'macOS': u.includes('Macintosh'),
Android: u.includes('Android') || u.includes('Adr'),
Ubuntu: u.includes('Ubuntu'),
FreeBSD: u.includes('FreeBSD'),
Debian: u.includes('Debian'),
'Windows Phone': u.includes('IEMobile') || u.includes('Windows Phone'),
BlackBerry: u.includes('BlackBerry') || u.includes('RIM'),
MeeGo: u.includes('MeeGo'),
Symbian: u.includes('Symbian'),
iOS: u.includes('like Mac OS X'),
'Chrome OS': u.includes('CrOS'),
WebOS: u.includes('hpwOS'),
}
// 设备
const deviceMatch = {
Mobile: u.includes('Mobi') || u.includes('iPh') || u.includes('480'),
Tablet: u.includes('Tablet') || u.includes('Pad') || u.includes('Nexus 7')
}
// 修正
if (deviceMatch.Mobile) {
deviceMatch.Mobile = !(u.includes('iPad'))
} else if (browserMatch.Chrome && u.includes('Edg')) {
// Chrome 内核的 Edge
browserMatch.Chrome = false
browserMatch.Edge = true
} else if (win.showModalDialog && win.chrome) {
browserMatch.Chrome = false
browserMatch['360'] = true
}
// 默认设备
dest.device = 'PC'
// 语言
dest.language = (() => {
const g = ((nav as any).browserLanguage || nav.language)
const arr = g.split('-')
if (arr[1]) arr[1] = arr[1].toUpperCase()
return arr.join('_')
})()
// 应用判断数据
const hash = {
engine: engineMatch,
browser: browserMatch,
os: osMatch,
device: deviceMatch,
}
Object.entries(hash).forEach(([type, match]) => {
Object.entries(match).forEach(([name, result]) => {
if (result === true) dest[type] = name
})
})
// 系统版本信息
const osVersion = {
Windows: () => {
const v = u.replace(/^.*Windows NT ([\d.]+);.*$/, '$1')
const wvHash = {
'6.4': '10',
'6.3': '8.1',
'6.2': '8',
'6.1': '7',
'6.0': 'Vista',
'5.2': 'XP',
'5.1': 'XP',
'5.0': '2000',
'10.0': '10',
'11.0': '11' // 自定的,不是微软官方的判断方法
}
return wvHash[v] || v
},
Android: () => u.replace(/^.*Android ([\d.]+);.*$/, '$1'),
iOS: () => u.replace(/^.*OS ([\d_]+) like.*$/, '$1').replace(/_/g, '.'),
Debian: () => u.replace(/^.*Debian\/([\d.]+).*$/, '$1'),
'Windows Phone': () => u.replace(/^.*Windows Phone( OS)? ([\d.]+);.*$/, '$2'),
'macOS': () => u.replace(/^.*Mac OS X ([\d_]+).*$/, '$1').replace(/_/g, '.'),
WebOS: () => u.replace(/^.*hpwOS\/([\d.]+);.*$/, '$1')
}
dest.osVersion = ''
if (osVersion[dest.os]) {
dest.osVersion = osVersion[dest.os]()
if (dest.osVersion === u) {
dest.osVersion = ''
}
}
// 浏览器版本信息
const version = {
Safari: () => u.replace(/^.*Version\/([\d.]+).*$/, '$1'),
Chrome: () => u.replace(/^.*Chrome\/([\d.]+).*$/, '$1').replace(/^.*CriOS\/([\d.]+).*$/, '$1'),
IE: () => u.replace(/^.*MSIE ([\d.]+).*$/, '$1').replace(/^.*rv:([\d.]+).*$/, '$1'),
Edge: () => u.replace(/^.*(Edge|Edg|Edg[A-Z]{1})\/([\d.]+).*$/, '$2'),
Firefox: () => u.replace(/^.*Firefox\/([\d.]+).*$/, '$1').replace(/^.*FxiOS\/([\d.]+).*$/, '$1'),
'Firefox Focus': () => u.replace(/^.*Focus\/([\d.]+).*$/, '$1'),
Chromium: () => u.replace(/^.*Chromium\/([\d.]+).*$/, '$1'),
Opera: () => u.replace(/^.*Opera\/([\d.]+).*$/, '$1').replace(/^.*OPR\/([\d.]+).*$/, '$1'),
Vivaldi: () => u.replace(/^.*Vivaldi\/([\d.]+).*$/, '$1'),
Yandex: () => u.replace(/^.*YaBrowser\/([\d.]+).*$/, '$1'),
Kindle: () => u.replace(/^.*Version\/([\d.]+).*$/, '$1'),
Maxthon: () => u.replace(/^.*Maxthon\/([\d.]+).*$/, '$1'),
QQBrowser: () => u.replace(/^.*QQBrowser\/([\d.]+).*$/, '$1'),
QQ: () => u.replace(/^.*QQ\/([\d.]+).*$/, '$1'),
Baidu: () => u.replace(/^.*BIDUBrowser[\s/]([\d.]+).*$/, '$1'),
UC: () => u.replace(/^.*UC?Browser\/([\d.]+).*$/, '$1'),
Sogou: () => u.replace(/^.*SE ([\d.X]+).*$/, '$1').replace(/^.*SogouMobileBrowser\/([\d.]+).*$/, '$1'),
'2345Explorer': () => u.replace(/^.*2345Explorer\/([\d.]+).*$/, '$1'),
TheWorld: () => u.replace(/^.*TheWorld ([\d.]+).*$/, '$1'),
MIUI: () => u.replace(/^.*MiuiBrowser\/([\d.]+).*$/, '$1'),
Quark: () => u.replace(/^.*Quark\/([\d.]+).*$/, '$1'),
Qiyu: () => u.replace(/^.*Qiyu\/([\d.]+).*$/, '$1'),
Wechat: () => u.replace(/^.*MicroMessenger\/([\d.]+).*$/, '$1'),
Taobao: () => u.replace(/^.*AliApp\(TB\/([\d.]+).*$/, '$1'),
Alipay: () => u.replace(/^.*AliApp\(AP\/([\d.]+).*$/, '$1'),
Weibo: () => u.replace(/^.*weibo__([\d.]+).*$/, '$1'),
Douban: () => u.replace(/^.*com.douban.frodo\/([\d.]+).*$/, '$1'),
Suning: () => u.replace(/^.*SNEBUY-APP([\d.]+).*$/, '$1'),
iQiYi: () => u.replace(/^.*IqiyiVersion\/([\d.]+).*$/, '$1'),
}
dest.version = ''
if (version[dest.browser]) {
dest.version = version[dest.browser]()
if (dest.version === u) {
dest.version = ''
}
}
// 简化版本号
/* if (_this.osVersion.indexOf('.')) {
_this.osVersion = _this.osVersion.substring(0, _this.osVersion.indexOf('.'))
} */
if (dest.version.indexOf('.')) {
dest.version = dest.version.substring(0, dest.version.indexOf('.'))
}
// 修正
if (dest.os === 'iOS' && u.includes('iPad')) {
dest.os = 'iPadOS'
} else if (dest.browser === 'Edge' && !u.includes('Edg')) {
dest.engine = 'EdgeHTML'
} else if (dest.browser === 'MIUI') {
dest.os = 'Android'
} else if (dest.browser === 'Chrome' && Number(dest.version) > 27) {
dest.engine = 'Blink'
} else if (dest.browser === 'Opera' && Number(dest.version) > 12) {
dest.engine = 'Blink'
} else if (dest.browser === 'Yandex') {
dest.engine = 'Blink'
} else if (dest.browser === undefined) {
dest.browser = 'Unknow App'
}
return dest
}
export default Detect
+121 -22
View File
@@ -143,32 +143,41 @@ export function versionCompare(a: string, b: string) {
/** 初始化 marked */
export function initMarked(ctx: Context) {
const renderer = new libMarked.Renderer()
const linkRenderer = renderer.link
const orgLinkRenderer = renderer.link
renderer.link = (href, title, text) => {
const localLink = href?.startsWith(`${window.location.protocol}//${window.location.hostname}`);
const html = linkRenderer.call(renderer as any, href, title, text);
const html = orgLinkRenderer.call(renderer as any, href, title, text);
return html.replace(/^<a /, `<a target="_blank" ${!localLink ? `rel="noreferrer noopener nofollow"` : ''} `);
}
renderer.code = (block, lang) => {
// Colorize the block only if the language is known to highlight.js
const realLang = (!lang ? 'plaintext' : lang)
let colorized = block
if ((window as any).hljs) {
if (realLang && (window as any).hljs.getLanguage(realLang)) {
colorized = (window as any).hljs.highlight(realLang, block).value
}
} else {
colorized = hanabi(block)
}
return `<pre rel="${realLang}">\n`
+ `<code class="hljs language-${realLang}">${colorized.replace(/&amp;/g, '&')}</code>\n`
+ `</pre>`
}
// @see https://github.com/markedjs/marked/blob/4afb228d956a415624c4e5554bb8f25d047676fe/src/Tokenizer.js#L329
const nMarked = libMarked
libMarked.setOptions({
renderer,
highlight: (code) => hanabi(code),
pedantic: false,
gfm: true,
breaks: true,
smartLists: true,
smartypants: true,
xhtml: false,
sanitize: true,
sanitizer: (html) => insane(html, {
...insane.defaults,
allowedAttributes: {
...insane.defaults.allowedAttributes,
img: ['src', 'atk-emoticon']
},
}),
sanitize: false,
silent: true,
})
@@ -177,29 +186,89 @@ export function initMarked(ctx: Context) {
/** 解析 markdown */
export function marked(ctx: Context, src: string): string {
return ctx.markedInstance.parse(src)
// @link https://github.com/markedjs/marked/discussions/1232
// @link https://gist.github.com/lionel-rowe/bb384465ba4e4c81a9c8dada84167225
let dest = insane(ctx.markedInstance.parse(src), {
allowedClasses: {},
allowedSchemes: ['http', 'https', 'mailto'],
allowedTags: [
'a', 'abbr', 'article', 'b', 'blockquote', 'br', 'caption', 'code', 'del', 'details', 'div', 'em',
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'main', 'mark',
'ol', 'p', 'pre', 'section', 'span', 'strike', 'strong', 'sub', 'summary', 'sup', 'table',
'tbody', 'td', 'th', 'thead', 'tr', 'u', 'ul'
],
allowedAttributes: {
'*': ['title', 'accesskey'],
a: ['href', 'name', 'target', 'aria-label', 'rel'],
img: ['src', 'alt', 'title', 'atk-emoticon', 'aria-label'],
// for code highlight
code: ['class'],
span: ['class', 'style'],
},
filter: node => {
// allow hljs style
const allowed = [
[ 'code', /^hljs\W+language-(.*)$/ ],
[ 'span', /^(hljs-.*)$/ ]
]
allowed.forEach(([ tag, reg ]) => {
if (
node.tag === tag
&& !!node.attrs.class
&& !(reg as RegExp).test(node.attrs.class)
) {
delete node.attrs.class
}
})
// allow <span> set color sty
if (node.tag === 'span' && !!node.attrs.style
&& !/^color:(\W+)?#[0-9a-f]{3,6};?$/i.test(node.attrs.style)) {
delete node.attrs.style
}
return true
}
})
// 内容替换器
ctx.markedReplacers.forEach((replacer) => {
if (typeof replacer === 'function') dest = replacer(dest)
})
return dest
}
/** 获取修正后的 UserAgent */
export async function getCorrectUserAgent() {
const uaRaw = navigator.userAgent
const uaData = (navigator as any).userAgentData // @link https://web.dev/migrate-to-ua-ch/
if (!uaData || !uaData.getHighEntropyValues) {
if (!(navigator as any).userAgentData || !(navigator as any).userAgentData.getHighEntropyValues) {
return uaRaw
}
// microsoft f******k you!!!!!
// @link https://docs.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11
// @link https://web.dev/migrate-to-ua-ch/
// @link https://web.dev/user-agent-client-hints/
const uaData = (navigator as any).userAgentData
let uaGot: any = null
try {
uaGot = await uaData.getHighEntropyValues(["platformVersion"])
} catch (err) { console.error(err); return uaRaw }
if (uaData.platform !== "Windows") { return uaRaw }
const majorPlatformVersion = Number(uaGot.platformVersion.split('.')[0])
if (majorPlatformVersion >= 13) {
// Win11 样本:"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36"
return uaRaw.replace(/Windows\W+NT\W+10.0/, 'Windows NT 11.0')
if (uaData.platform === "Windows") {
if (majorPlatformVersion >= 13) { // @link https://docs.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11
// @date 2022-4-29
// Win 11 样本:"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36"
return uaRaw.replace(/Windows NT 10.0/, 'Windows NT 11.0')
}
}
if (uaData.platform === "macOS") {
if (majorPlatformVersion >= 11) { // 11 => BigSur
// @date 2022-4-29
// (Intel Chip) macOS 12.3 样本:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36"
// (Arm Chip) macOS 样本:"Mozilla/5.0 (Macintosh; ARM Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15"
return uaRaw.replace(/(Mac OS X \d+_\d+_\d+|Mac OS X)/, `Mac OS X ${uaGot.platformVersion.replace(/\./g, '_')}`)
}
}
return uaRaw
@@ -217,10 +286,40 @@ export function isValidURL(urlRaw: string) {
/** 获取基于 conf.server 的 URL */
export function getURLBasedOnApi(ctx: Context, path: string) {
return `${ctx.conf.server.replace(/\/api\/?$/, '')}/${path.replace(/^\//, '')}`
return getURLBasedOn(ctx.conf.server, path)
}
/** 获取基于某个 baseURL 的 URL */
export function getURLBasedOn(baseURL: string, path: string) {
return `${baseURL.replace(/\/$/, '')}/${path.replace(/^\//, '')}`
}
/**
* Performs a deep merge of `source` into `target`.
* Mutates `target` only but not its objects and arrays.
*
* @author inspired by [jhildenbiddle](https://stackoverflow.com/a/48218209).
* @link https://gist.github.com/ahtcx/0cd94e62691f539160b32ecda18af3d6
*/
export function mergeDeep(target: any, source: any) {
const isObject = (obj: any) => obj && typeof obj === 'object'
if (!isObject(target) || !isObject(source)) {
return source
}
Object.keys(source).forEach(key => {
const targetValue = target[key]
const sourceValue = source[key]
if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
target[key] = targetValue.concat(sourceValue)
} else if (isObject(targetValue) && isObject(sourceValue)) {
target[key] = mergeDeep({ ...targetValue}, sourceValue)
} else {
target[key] = sourceValue
}
})
return target
}
+2 -2
View File
@@ -2,8 +2,8 @@
--at-color-font: #2a2e2e;
--at-color-deep: #2a2e2e;
--at-color-sub: #757575;
--at-color-grey: #999;
--at-color-meta: #757e91;
--at-color-grey: #747474;
--at-color-meta: #697182;
--at-color-border: #eceff2;
--at-color-light: #4285f4;
--at-color-bg: #FFF;
+1
View File
@@ -167,6 +167,7 @@
border-left: 3px solid #eee;
margin-bottom: 10px;
position: relative;
margin-top: 10px;
.atk-meta {
font-size: 15px;
+63 -12
View File
@@ -7,28 +7,48 @@
}
.artalk, .atk-layer-wrap {
line-height: @line-height;
color: var(--at-color-font);
font-family: @font-family;
word-wrap: break-word;
word-break: break-all;
* {
box-sizing: border-box;
line-height: @line-height;
}
input, textarea, button, optgroup, select {
font-family: inherit;
color: inherit;
font-size: inherit;
}
@codeFont: source code pro, Consolas, Monaco, Menlo, sans-serif;
code {
font-family: @codeFont;
margin: 0 .3em;
padding: .1em .2em;
background-color: var(--at-color-bg-grey);
color: var(--at-color-font);
font-family: @font-family;
word-wrap: break-word;
word-break: break-all;
border-radius: @block-radius;
}
pre {
padding: 10px;
margin: 10px 0 0 0;
padding: 0;
line-height: 0;
}
pre code {
* { font-family: @codeFont; }
line-height: @line-height;
display: block;
padding: 10px 15px;
white-space: pre-wrap;
background-color: var(--at-color-bg-grey);
color: var(--at-color-font);
padding: 10px 15px;
border-radius: @block-radius;
margin: 0;
font-family: Source Code Pro,courier new,Input Mono,PT Mono,SFMono-Regular,Consolas,Monaco,Menlo,PingFang SC,Liberation Mono,Microsoft YaHei,Courier,monospace;
code {
white-space: pre-wrap;
}
}
a {
@@ -55,6 +75,28 @@
img {
max-width: 100%;
}
table {
width: 100%;
border-collapse: collapse;
border-spacing: 0;
margin-bottom: 1.5em;
font-size: .96em
}
td, th {
text-align: left;
padding: 4px 8px 4px 10px;
border: 1px solid var(--at-color-border)
}
td {
vertical-align: top
}
tr:nth-child(even) {
background-color: var(--at-color-bg-grey);
}
}
.atk-hide {
@@ -156,6 +198,9 @@
.atk-fade-out {
animation: atkFadeOut both .2s;
}
.atk-rotate {
animation: atkRotate 2s linear infinite;
}
@keyframes atkFadeIn {
0% { opacity: 0 }
@@ -167,6 +212,11 @@
0% {}
}
@keyframes atkRotate {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}
i.atk-icon {
width: 20px;
height: 20px;
@@ -175,6 +225,7 @@ i.atk-icon {
background-repeat: no-repeat;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
}
.atk-icon-sync {
+4 -1
View File
@@ -1,6 +1,6 @@
export default interface ArtalkConfig {
/** 装载元素 */
el: string
el: string|HTMLElement
/** 页面唯一标识(完整 URL) */
pageKey: string
@@ -88,6 +88,9 @@ export default interface ArtalkConfig {
/** 版本检测 */
versionCheck?: boolean
/** 复用后端配置 */
useBackendConf?: boolean
}
export interface LocalUser {
+5 -1
View File
@@ -19,7 +19,7 @@ export interface EventPayloadMap {
'list-refresh-ui': undefined // 刷新 List UI
// Sidebar
'sidebar-show': undefined // 侧边栏显示
'sidebar-show': SidebarShowPayload // 侧边栏显示
'sidebar-hide': undefined // 侧边栏隐藏
// Editor
@@ -70,6 +70,10 @@ export interface EditorReplyPayload {
scroll?: boolean
}
export interface SidebarShowPayload {
view?: 'comments'|'sites'|'pages'|'transfer'|string
}
// ============================================
export interface Handler<P> {
(payload: P): void
+1 -39
View File
@@ -1,41 +1,3 @@
# @artalkjs/plugin-katex
食用方法
```html
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<!-- 引入 katex -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.css">
<script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.js"></script>
<!-- 引入 Artalk -->
<link href="https://cdn.jsdelivr.net/npm/artalk/dist/Artalk.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/artalk/dist/Artalk.js"></script>
<!-- 引入 @artalkjs/plugin-katex -->
<script defer src="https://cdn.jsdelivr.net/npm/@artalkjs/plugin-katex/dist/artalk-plugin-katex.js"></script>
</head>
<body>
<!-- Artalk -->
<div id="Comments"></div>
<script>
new Artalk({
el: '#Comments',
pageKey: '<页面链接>',
pageTitle: '<页面标题>',
server: '<后端地址>',
site: '<站点名称>',
})
</script>
</body>
</html>
```
食用方法参考:[官方文档](https://artalk.js.org/guide/frontend/latex.html)
-1
View File
@@ -1 +0,0 @@
import './main'
+1 -1
View File
@@ -20,7 +20,7 @@
el: '#comments',
pageKey: 'https://artalk.js.org/',
pageTitle: 'Artalk Home',
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366/api' : 'https://artalk.qwqaq.com/api',
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366' : 'https://artalk.qwqaq.com',
site: 'ArtalkDemo',
});
</script>
+50 -41
View File
@@ -3,52 +3,61 @@
import Artalk from 'artalk'
import katex from 'katex'
// @link https://github.com/markedjs/marked/issues/1538#issuecomment-575838181
Artalk.Use((ctx) => {
const renderer: any = {}
let i = 0
const nextID = () => `__atk_katext_id_${i++}__`
const mathExpressions: { [key: string]: { type: 'block' | 'inline', expression: string } } = {}
function renderMathsExpression(expr) {
if (expr[0] === '$' && expr[expr.length - 1] === '$') {
let displayStyle = false
expr = expr.substr(1, expr.length - 2)
if (expr[0] === '$' && expr[expr.length - 1] === '$') {
displayStyle = true
expr = expr.substr(1, expr.length - 2)
}
let html: any = null
try {
html = katex.renderToString(expr)
} catch (e) {
console.error(e)
}
if (displayStyle && html) {
html = html.replace(/class="katex"/g, 'class="katex katex-block" style="display: block;"')
}
return html
}
function replaceMathWithIds(text: string) {
// Allowing newlines inside of `$$...$$`
text = text.replace(/\$\$([\s\S]+?)\$\$/g, (_match, expression) => {
const id = nextID()
mathExpressions[id] = { type: 'block', expression }
return id
})
return null
}
renderer.paragraph = (text) => {
const blockRegex = /\$\$[^$]*\$\$/g
const inlineRegex = /\$[^$]*\$/g
const blockExprArray = text.match(blockRegex)
const inlineExprArray = text.match(inlineRegex)
for (const i in blockExprArray) {
const expr = blockExprArray[i]
const result = renderMathsExpression(expr)
text = text.replace(expr, result)
}
for (const i in inlineExprArray) {
const expr = inlineExprArray[i]
const result = renderMathsExpression(expr)
text = text.replace(expr, result)
}
// Not allowing newlines or space inside of `$...$`
text = text.replace(/\$([^\n]+?)\$/g, (_match, expression) => {
const id = nextID()
mathExpressions[id] = { type: 'inline', expression }
return id
})
return text
}
ctx.markedInstance.use({ renderer });
// Marked render
const renderer = new ctx.markedInstance.Renderer() as any
const orgListitem = renderer.listitem
const orgParagraph = renderer.paragraph
const orgTablecell = renderer.tablecell
const orgCodespan = renderer.codespan
const orgText = renderer.text
renderer.listitem = (text: string, task: boolean, checked: boolean) => orgListitem(replaceMathWithIds(text), task, checked)
renderer.paragraph = (text: string) => orgParagraph(replaceMathWithIds(text))
renderer.tablecell = (content: string, flags: any) => orgTablecell(replaceMathWithIds(content), flags)
renderer.codespan = (code: string) => orgCodespan(replaceMathWithIds(code))
renderer.text = (text: string) => orgText(replaceMathWithIds(text)) // Inline level, maybe unneded
ctx.markedReplacers.push((text) => {
text = text.replace(/(__atk_katext_id_\d+__)/g, (_match, capture) => {
const v = mathExpressions[capture]
const type = v.type
let expression = v.expression
// replace <br/> tag to \n
expression = expression.replace(/<br\s*\/?>/mg, "\n")
return katex.renderToString(expression, { displayMode: type === 'block' })
})
return text
})
ctx.markedInstance.use({
renderer
})
})
+1 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@artalkjs/plugin-katex",
"version": "0.1.0",
"version": "0.1.2",
"license": "LGPL-3.0",
"description": "The katex plugin of artalk",
"repository": {
@@ -14,7 +14,6 @@
"unpkg": "./dist/artalk-plugin-katex.iife.js",
"jsdelivr": "./dist/artalk-plugin-katex.iife.js",
"module": "./dist/artalk-plugin-katex.es.js",
"types": "./index.d.ts",
"scripts": {
"dev": "vite",
"build": "vite build",
-3
View File
@@ -18,9 +18,6 @@ export default defineConfig({
// 确保外部化处理那些你不想打包进库的依赖
external: ['artalk', 'katex'],
output: {
assetFileNames: assetInfo => {
return "[name].[ext]"
},
// 在 UMD 构建模式下为这些外部化的依赖提供一个全局变量
globals: {
artalk: 'Artalk',
+471 -424
View File
File diff suppressed because it is too large. Load diff