Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 qwqcode
|
ddef66bba2 | ||
|
qwqcode
|
7c4b40d626 | ||
|
qwqcode
|
35df0c14ae | ||
|
Percy Ma
|
a9e0b1288a | ||
|
qwqcode
|
848d7d4894 | ||
|
qwqcode
|
0d96759e97 | ||
|
qwqcode
|
53d83b5aac | ||
|
qwqcode
|
8cbbd1153c | ||
|
qwqcode
|
f41aecd0eb | ||
|
Percy Ma
|
f21e987ab0 | ||
|
qwqcode
|
a05c31b4de | ||
|
qwqcode
|
f3a0d7c069 | ||
|
Percy Ma
|
7bfe22fe10 | ||
|
qwqcode
|
59ebfd3d6c | ||
|
qwqcode
|
0787595f98 | ||
|
qwqcode
|
bd621067b5 | ||
|
qwqcode
|
01ae389264 | ||
|
qwqcode
|
84700cfc2f | ||
|
qwqcode
|
b68f609a44 | ||
|
qwqcode
|
703e198780 | ||
|
qwqcode
|
4f75ef8709 | ||
|
qwqcode
|
f87b2248b2 | ||
|
qwqcode
|
bf65d419b6 | ||
|
qwqcode
|
267df53691 | ||
|
qwqcode
|
6c38a9048d |
No files matched your search
@@ -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
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
[](https://www.npmjs.com/package/artalk)
|
||||
[](https://www.npmjs.com/package/artalk)
|
||||
[](https://bundlephobia.com/package/artalk)
|
||||
[](https://github.com/ArtalkJS/Artalk/commits/master)
|
||||
[](https://github.com/ArtalkJS/Artalk/issues)
|
||||
[](https://github.com/ArtalkJS/Artalk/pulls)
|
||||
@@ -20,7 +21,7 @@
|
||||
|
||||
---
|
||||
|
||||
- 轻量级 (~30kB gzipped)
|
||||
- 轻量级 (~30kB)
|
||||
- 自托管 (数据安全)
|
||||
- 易上手 (防秃顶)
|
||||
- Golang 后端 (易部署 / 跨平台)
|
||||
@@ -125,8 +126,16 @@ docker-compose up -d
|
||||
## TODOs
|
||||
|
||||
- [x] [Golang 后端](https://github.com/ArtalkJS/ArtalkGo)
|
||||
- [x] 多站点支持
|
||||
- [x] 多数据库支持
|
||||
- [x] SQLite
|
||||
- [x] MySQL
|
||||
- [x] Postgres
|
||||
- [x] SQLServer
|
||||
- [x] 多缓存支持
|
||||
- [x] In-memory (内建缓存)
|
||||
- [x] Redis
|
||||
- [x] Memcache
|
||||
- [x] 多站点支持
|
||||
- [x] 评论获取分页
|
||||
- [x] 评论点赞投票
|
||||
- [x] 浏览量统计
|
||||
@@ -144,15 +153,16 @@ docker-compose up -d
|
||||
- [x] 站点 (增/删/改)
|
||||
- [x] 数据分页
|
||||
- [ ] 配置 (GUI)
|
||||
- [x] 数据导入 ([Artransfer](https://github.com/ArtalkJS/Artransfer))
|
||||
- [x] 数据导入 ([Artransfer](https://artalk.js.org/guide/transfer.html))
|
||||
- [x] Artrans
|
||||
- [x] Artalk v1 (PHP)
|
||||
- [x] WordPress
|
||||
- [x] Typecho
|
||||
- [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] 邮件异步队列发送
|
||||
|
||||
+16
-16
@@ -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"
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
InitSidebar({
|
||||
el: '#ArtalkSidebar',
|
||||
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366/api' : '../api',
|
||||
server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366' : '../',
|
||||
pageKey,
|
||||
site,
|
||||
darkMode,
|
||||
|
||||
@@ -26,14 +26,20 @@ export default class PageList extends Component {
|
||||
initPageList() {
|
||||
this.pages = []
|
||||
|
||||
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 () => {
|
||||
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>
|
||||
</div>`
|
||||
|
||||
const $updateAllTitleBtn = this.$el.querySelector<HTMLElement>('.atk-update-all-title-btn')!
|
||||
const $updateAllTitleIcon = $updateAllTitleBtn.querySelector<HTMLElement>('i')!
|
||||
const $updateAllTitleText = $updateAllTitleBtn.querySelector<HTMLElement>('.atk-text')!
|
||||
|
||||
@@ -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() })
|
||||
|
||||
@@ -92,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
|
||||
@@ -237,7 +237,6 @@ export default class SiteList extends Component {
|
||||
}
|
||||
|
||||
public showAdd(defaultName?: string, defaultUrls?: string) {
|
||||
console.log(defaultName, defaultUrls)
|
||||
this.closeAdd()
|
||||
|
||||
this.$add = Utils.createElement(`
|
||||
|
||||
@@ -5,7 +5,8 @@ import SidebarRoot from './sidebar-root'
|
||||
|
||||
export default async function InitSidebar(conf: ArtalkConfig, user: LocalUser, view?: string) {
|
||||
// 初始化 Artalk 主程序
|
||||
const artalk = new Artalk(conf)
|
||||
conf.useBackendConf = true
|
||||
const artalk = await (new Artalk(conf))
|
||||
artalk.$root.style.display = 'none'
|
||||
|
||||
// 初始化用户数据
|
||||
|
||||
@@ -135,7 +135,7 @@ export default class TransferView extends SidebarView {
|
||||
formData.append('token', this.ctx.user.data.token)
|
||||
|
||||
// 开始上传
|
||||
xhr.open('post', `${this.ctx.conf.server}/admin/import-upload`)
|
||||
xhr.open('post', `${this.ctx.conf.server}/api/admin/import-upload`)
|
||||
xhr.timeout = 2*60*1000 // 2min
|
||||
xhr.send(formData)
|
||||
|
||||
@@ -256,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]) => {
|
||||
|
||||
@@ -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,7 +27,7 @@
|
||||
}
|
||||
.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"
|
||||
@@ -45,11 +46,11 @@
|
||||
<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">
|
||||
@@ -64,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;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "artalk",
|
||||
"version": "2.2.4",
|
||||
"backendMinVersion": "2.1.2",
|
||||
"version": "2.2.8",
|
||||
"backendMinVersion": "2.1.4",
|
||||
"license": "LGPL-3.0",
|
||||
"description": "A Selfhosted Comment System",
|
||||
"keywords": [
|
||||
|
||||
@@ -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
|
||||
@@ -294,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
|
||||
}
|
||||
|
||||
// ============================
|
||||
@@ -318,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)
|
||||
}
|
||||
}
|
||||
@@ -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'
|
||||
@@ -10,9 +11,9 @@ import List from './components/list'
|
||||
import SidebarLayer from './components/sidebar-layer'
|
||||
|
||||
import Layer, { GetLayerWrap } from './components/layer'
|
||||
import { EventPayloadMap, Handler } from '~/types/event'
|
||||
import Api from './api'
|
||||
import * as Utils from './lib/utils'
|
||||
import * as Ui from './lib/ui'
|
||||
|
||||
/**
|
||||
* Artalk
|
||||
@@ -21,34 +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) {
|
||||
// @link http://bl.ocks.org/abernier/3070589
|
||||
this.conf.pageKey = `${window.location.protocol}//${window.location.host}${window.location.pathname}`
|
||||
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 初始化
|
||||
@@ -57,10 +67,25 @@ export default class Artalk {
|
||||
// 界面初始化
|
||||
this.$root.classList.add('artalk')
|
||||
this.$root.innerHTML = ''
|
||||
|
||||
// 初始化组件
|
||||
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
|
||||
|
||||
@@ -93,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() {
|
||||
// 锚点快速跳转评论
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
@@ -205,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) {
|
||||
@@ -398,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 () {
|
||||
@@ -568,5 +583,9 @@ export default class Editor extends Component {
|
||||
// 取消回复
|
||||
if (this.replyComment !== null) this.cancelReply()
|
||||
}
|
||||
|
||||
initRemoteEmoticons () {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 => {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>`)
|
||||
|
||||
@@ -3,11 +3,11 @@ 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'
|
||||
import { SidebarShowPayload } from '~/types/event'
|
||||
|
||||
export default class SidebarLayer extends Component {
|
||||
public layer?: Layer
|
||||
@@ -88,7 +88,7 @@ export default class SidebarLayer extends Component {
|
||||
|
||||
// 准备 Iframe 参数
|
||||
const baseURL = (import.meta.env.MODE === 'development') ? 'http://localhost:23367/'
|
||||
: Utils.getURLBasedOnApi(this.ctx, 'sidebar/')
|
||||
: Utils.getURLBasedOnApi(this.ctx, '/sidebar/')
|
||||
|
||||
const query: any = {
|
||||
pageKey: this.conf.pageKey,
|
||||
|
||||
@@ -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)[] = []
|
||||
}
|
||||
@@ -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?t=${+new Date()}`
|
||||
$iframe.src = `${that.ctx.conf.server}/api/captcha/get?t=${+new Date()}`
|
||||
$iframe.onload = () => {
|
||||
$iframe.style.display = ''
|
||||
Ui.hideLoading($iframeWrap)
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -143,10 +143,10 @@ 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"` : ''} `);
|
||||
}
|
||||
|
||||
@@ -186,8 +186,9 @@ export function initMarked(ctx: Context) {
|
||||
|
||||
/** 解析 markdown */
|
||||
export function marked(ctx: Context, src: string): string {
|
||||
// @link https://github.com/markedjs/marked/discussions/1232
|
||||
// @link https://gist.github.com/lionel-rowe/bb384465ba4e4c81a9c8dada84167225
|
||||
return insane(ctx.markedInstance.parse(src), {
|
||||
let dest = insane(ctx.markedInstance.parse(src), {
|
||||
allowedClasses: {},
|
||||
allowedSchemes: ['http', 'https', 'mailto'],
|
||||
allowedTags: [
|
||||
@@ -198,7 +199,7 @@ export function marked(ctx: Context, src: string): string {
|
||||
],
|
||||
allowedAttributes: {
|
||||
'*': ['title', 'accesskey'],
|
||||
a: ['href', 'name', 'target', 'aria-label'],
|
||||
a: ['href', 'name', 'target', 'aria-label', 'rel'],
|
||||
img: ['src', 'alt', 'title', 'atk-emoticon', 'aria-label'],
|
||||
// for code highlight
|
||||
code: ['class'],
|
||||
@@ -229,28 +230,45 @@ export function marked(ctx: Context, src: string): string {
|
||||
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
|
||||
@@ -268,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,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;
|
||||
|
||||
+4
-1
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
import './main'
|
||||
@@ -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>
|
||||
|
||||
@@ -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,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",
|
||||
|
||||
@@ -18,9 +18,6 @@ export default defineConfig({
|
||||
// 确保外部化处理那些你不想打包进库的依赖
|
||||
external: ['artalk', 'katex'],
|
||||
output: {
|
||||
assetFileNames: assetInfo => {
|
||||
return "[name].[ext]"
|
||||
},
|
||||
// 在 UMD 构建模式下为这些外部化的依赖提供一个全局变量
|
||||
globals: {
|
||||
artalk: 'Artalk',
|
||||
|
||||
Generated
+471
-424
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user