diff --git a/build.gradle b/build.gradle index d31f0ae..332b3e8 100644 --- a/build.gradle +++ b/build.gradle @@ -41,5 +41,5 @@ build { } halo { - version = "2.13.0" + version = "2.14.0" } diff --git a/packages/comment-widget/package.json b/packages/comment-widget/package.json index 09ce2ce..70fa85d 100644 --- a/packages/comment-widget/package.json +++ b/packages/comment-widget/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@emoji-mart/data": "^1.1.2", - "@halo-dev/api-client": "^2.13.0", + "@halo-dev/api-client": "^2.14.0", "@lit/context": "^1.1.0", "dayjs": "^1.11.10", "emoji-mart": "^5.5.2", diff --git a/packages/comment-widget/src/comment-replies.ts b/packages/comment-widget/src/comment-replies.ts index db8b81c..b975551 100644 --- a/packages/comment-widget/src/comment-replies.ts +++ b/packages/comment-widget/src/comment-replies.ts @@ -1,5 +1,5 @@ import { CommentVo, ReplyVo, ReplyVoList } from '@halo-dev/api-client'; -import { LitElement, css, html } from 'lit'; +import { css, html, LitElement } from 'lit'; import { property, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { consume } from '@lit/context'; @@ -50,7 +50,7 @@ export class CommentReplies extends LitElement { toastManager: ToastManager | undefined; override render() { - return html`
+ return html`
${this.replies.length ? html`
@@ -58,7 +58,7 @@ export class CommentReplies extends LitElement { this.replies, (item) => item.metadata.name, (item) => - html` ` : ''} - ${this.loading ? html`` : ''} + ${this.loading ? html` ` : ''} ${this.hasNext && !this.loading - ? html`
+ ? html`
` : ''} @@ -123,7 +123,7 @@ export class CommentReplies extends LitElement { async fetchNext() { this.page++; - this.fetchReplies({ append: true }); + await this.fetchReplies({ append: true }); } override connectedCallback(): void { diff --git a/packages/comment-widget/src/comment-widget.ts b/packages/comment-widget/src/comment-widget.ts index 862930c..66ed188 100644 --- a/packages/comment-widget/src/comment-widget.ts +++ b/packages/comment-widget/src/comment-widget.ts @@ -1,4 +1,4 @@ -import { LitElement, css, html } from 'lit'; +import { css, html, LitElement } from 'lit'; import { property, state } from 'lit/decorators.js'; import { CommentVoList, User } from '@halo-dev/api-client'; import { repeat } from 'lit/directives/repeat.js'; @@ -44,13 +44,19 @@ export class CommentWidget extends LitElement { @property({ type: String }) name = ''; + @property({ type: Number, attribute: 'size' }) + size: number = 20; + + @provide({ context: replySizeContext }) + @property({ type: Number, attribute: 'reply-size' }) + replySize: number = 10; + @provide({ context: withRepliesContext }) @property({ type: Boolean, attribute: 'with-replies' }) withReplies = false; - @provide({ context: replySizeContext }) - @property({ type: Number, attribute: 'reply-size' }) - replySize = 10; + @property({ type: Number, attribute: 'with-reply-size' }) + withReplySize = 10; @provide({ context: emojiDataUrlContext }) @property({ type: String, attribute: 'emoji-data-url' }) @@ -93,12 +99,12 @@ export class CommentWidget extends LitElement { } override render() { - return html`
+ return html`
${this.loading - ? html`` + ? html` ` : html`
@@ -109,7 +115,7 @@ export class CommentWidget extends LitElement { ${repeat( this.comments.items, (item) => item.metadata.name, - (item) => html`` + (item) => html` ` )}
@@ -163,10 +169,10 @@ export class CommentWidget extends LitElement { `kind=${this.kind}`, `name=${this.name}`, `page=${this.comments.page}`, - `size=${this.comments.size}`, + `size=${this.size}`, `version=${this.version}`, `withReplies=${this.withReplies}`, - `replySize=${this.replySize}`, + `replySize=${this.withReplySize}`, ]; const response = await fetch( @@ -177,8 +183,7 @@ export class CommentWidget extends LitElement { throw new Error('评论列表加载失败，请稍后重试'); } - const data = await response.json(); - this.comments = data; + this.comments = await response.json(); } catch (error) { if (error instanceof Error) { this.toastManager?.error(error.message); diff --git a/packages/comment-widget/src/context/index.ts b/packages/comment-widget/src/context/index.ts index e660c92..9006355 100644 --- a/packages/comment-widget/src/context/index.ts +++ b/packages/comment-widget/src/context/index.ts @@ -7,8 +7,8 @@ export const kindContext = createContext(Symbol('kind')); export const groupContext = createContext(Symbol('group')); export const nameContext = createContext(Symbol('name')); export const versionContext = createContext(Symbol('version')); -export const withRepliesContext = createContext(Symbol('withReplies')); export const replySizeContext = createContext(Symbol('replySize')); +export const withRepliesContext = createContext(Symbol('withReplies')); export const allowAnonymousCommentsContext = createContext( Symbol('allowAnonymousComments') diff --git a/packages/widget/src/index.ts b/packages/widget/src/index.ts index 68a0e2c..9551372 100644 --- a/packages/widget/src/index.ts +++ b/packages/widget/src/index.ts @@ -7,8 +7,10 @@ interface Props { group: string; kind: string; name: string; - withReplies?: boolean; + size?: number; replySize?: number; + withReplies?: boolean; + withReplySize?: number; } export function init(el: string, props: Props) { @@ -26,8 +28,10 @@ export function init(el: string, props: Props) { commentWidget.group = props.group; commentWidget.version = 'v1alpha1'; commentWidget.name = props.name; - commentWidget.withReplies = props.withReplies || false; + commentWidget.size = props.size || 20; commentWidget.replySize = props.replySize || 10; + commentWidget.withReplies = props.withReplies || false; + commentWidget.withReplySize = props.withReplySize || 10; commentWidget.emojiDataUrl = '/plugins/PluginCommentWidget/assets/static/emoji/native.json'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f9a63db..283eafd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,8 +48,8 @@ importers: specifier: ^1.1.2 version: 1.1.2 '@halo-dev/api-client': - specifier: ^2.13.0 - version: 2.13.0 + specifier: ^2.14.0 + version: 2.14.0 '@lit/context': specifier: ^1.1.0 version: 1.1.0 @@ -351,8 +351,8 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@halo-dev/api-client@2.13.0: - resolution: {integrity: sha512-BdUvu5IqoUdJ6JemHmp5bYNs8P/zth4oPm3qUy0aelWLh/hi3tHG2EVk0JZlgeamyxMD2SGGyh65ehntmPGVsQ==} + /@halo-dev/api-client@2.14.0: + resolution: {integrity: sha512-koAm1WR37Luy17/tkA0Ly+2QMzN2lrsXWGuMrF+bN48KKftwXp6dFsO2VNP3bqOXxvtOGGyPql8n5RzWP947HQ==} dev: false /@humanwhocodes/config-array@0.11.14: diff --git a/src/main/java/run/halo/comment/widget/DefaultCommentWidget.java b/src/main/java/run/halo/comment/widget/DefaultCommentWidget.java index 762be51..04501e7 100644 --- a/src/main/java/run/halo/comment/widget/DefaultCommentWidget.java +++ b/src/main/java/run/halo/comment/widget/DefaultCommentWidget.java @@ -67,8 +67,10 @@ private String commentHtml(IAttribute groupAttribute, IAttribute kindAttribute, var basicConfig = settingFetcher.fetch(BasicConfig.GROUP, BasicConfig.class) .orElse(new BasicConfig()); // placeholderHelper only support string, so we need to convert boolean to string - properties.setProperty("withReplies", String.valueOf(basicConfig.isWithReplies())); + properties.setProperty("size", String.valueOf(basicConfig.getSize())); properties.setProperty("replySize", String.valueOf(basicConfig.getReplySize())); + properties.setProperty("withReplies", String.valueOf(basicConfig.isWithReplies())); + properties.setProperty("withReplySize", String.valueOf(basicConfig.getWithReplySize())); return PROPERTY_PLACEHOLDER_HELPER.replacePlaceholders("""
@@ -79,8 +81,10 @@ private String commentHtml(IAttribute groupAttribute, IAttribute kindAttribute, group: "${group}", kind: "${kind}", name: "${name}", + size: ${size}, + replySize: ${replySize}, withReplies: ${withReplies}, - replySize: ${replySize} + withReplySize: ${withReplySize} } ); @@ -90,8 +94,10 @@ private String commentHtml(IAttribute groupAttribute, IAttribute kindAttribute, @Data static class BasicConfig { public static final String GROUP = "basic"; - private boolean withReplies; + private int size; private int replySize; + private boolean withReplies; + private int withReplySize; } private String domIdFrom(String group, String kind, String name) { diff --git a/src/main/resources/extensions/settings.yaml b/src/main/resources/extensions/settings.yaml index cec26b0..aa4be7a 100644 --- a/src/main/resources/extensions/settings.yaml +++ b/src/main/resources/extensions/settings.yaml @@ -7,6 +7,16 @@ spec: - group: basic label: 基本设置 formSchema: + - $formkit: number + label: 默认加载评论条数 + name: size + validation: required + value: 20 + - $formkit: number + label: 默认加载回复条数 + name: replySize + validation: required + value: 10 - $formkit: checkbox label: 同时加载评论的回复 name: withReplies @@ -14,9 +24,10 @@ spec: key: withReplies value: false - $formkit: number - label: 默认加载回复条数 - name: replySize - id: replySize - key: replySize + label: 同时加载回复的条数 + if: "$get(withReplies).value === true" + name: withReplySize + id: withReplySize + key: withReplySize validation: required - value: 20 + value: 5