diff --git a/apps/web-ele/src/api/mp/draft/index.ts b/apps/web-ele/src/api/mp/draft/index.ts
index 70b7c0e83..f05d0117a 100644
--- a/apps/web-ele/src/api/mp/draft/index.ts
+++ b/apps/web-ele/src/api/mp/draft/index.ts
@@ -24,6 +24,49 @@ export namespace MpDraftApi {
articles: Article[];
createTime?: Date;
}
+
+ /** 图文项(包含预览字段) */
+ export interface NewsItem {
+ title: string;
+ thumbMediaId: string;
+ author: string;
+ digest: string;
+ showCoverPic: number;
+ content: string;
+ contentSourceUrl: string;
+ needOpenComment: number;
+ onlyFansCanComment: number;
+ thumbUrl: string;
+ picUrl?: string; // 用于预览封面
+ }
+
+ /** 图文列表 */
+ export interface NewsItemList {
+ newsItem: NewsItem[];
+ }
+
+ /** 草稿文章(用于展示) */
+ export interface DraftArticle {
+ mediaId: string;
+ content: NewsItemList;
+ updateTime: number;
+ }
+}
+
+/** 创建空的图文项 */
+export function createEmptyNewsItem(): MpDraftApi.NewsItem {
+ return {
+ title: '',
+ thumbMediaId: '',
+ author: '',
+ digest: '',
+ showCoverPic: 0,
+ content: '',
+ contentSourceUrl: '',
+ needOpenComment: 0,
+ onlyFansCanComment: 0,
+ thumbUrl: '',
+ };
}
/** 查询草稿列表 */
diff --git a/apps/web-ele/src/api/mp/user/index.ts b/apps/web-ele/src/api/mp/user/index.ts
index e34573a1a..d79e6c6f4 100644
--- a/apps/web-ele/src/api/mp/user/index.ts
+++ b/apps/web-ele/src/api/mp/user/index.ts
@@ -21,13 +21,6 @@ export namespace MpUserApi {
tagIds?: number[];
createTime?: Date;
}
-
- /** 用户分页查询参数 */
- export interface UserPageQuery extends PageParam {
- accountId?: number;
- nickname?: string;
- tagId?: number;
- }
}
/** 更新公众号粉丝 */
@@ -43,7 +36,7 @@ export function getUser(id: number) {
}
/** 获取公众号粉丝分页 */
-export function getUserPage(params: MpUserApi.UserPageQuery) {
+export function getUserPage(params: PageParam) {
return requestClient.get
>('/mp/user/page', {
params,
});
diff --git a/apps/web-ele/src/views/mp/draft/data.ts b/apps/web-ele/src/views/mp/draft/data.ts
index f1f3bc451..7f9344275 100644
--- a/apps/web-ele/src/views/mp/draft/data.ts
+++ b/apps/web-ele/src/views/mp/draft/data.ts
@@ -1,5 +1,6 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+
/** 获取表格列配置 */
export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
diff --git a/apps/web-ele/src/views/mp/draft/index.vue b/apps/web-ele/src/views/mp/draft/index.vue
index 47eaea2a0..f27e2771f 100644
--- a/apps/web-ele/src/views/mp/draft/index.vue
+++ b/apps/web-ele/src/views/mp/draft/index.vue
@@ -35,6 +35,8 @@ function handleAccountChange(accountId: number) {
gridApi.formApi.submitForm();
}
+// TODO @hw:代码风格,要和对应的 antd index.vue 一致,类似方法的顺序,注释等。原因是,这样后续两端迭代,会方便很多。
+
const [Grid, gridApi] = useVbenVxeGrid({
formOptions: {
schema: useGridFormSchema(),
@@ -189,7 +191,7 @@ async function handleDelete(row: Article) {
+
+
diff --git a/apps/web-ele/src/views/mp/user/modules/form.vue b/apps/web-ele/src/views/mp/user/modules/form.vue
index da5a96de6..dc1c6874c 100644
--- a/apps/web-ele/src/views/mp/user/modules/form.vue
+++ b/apps/web-ele/src/views/mp/user/modules/form.vue
@@ -39,11 +39,11 @@ const [Modal, modalApi] = useVbenModal({
return;
}
modalApi.lock();
- /** 提交表单 */
+ // 提交表单
const values = (await formApi.getValues()) as MpUserApi.User;
try {
await updateUser({ ...formData.value, ...values });
- /** 关闭并提示 */
+ // 关闭并提示
await modalApi.close();
emit('success');
ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -56,7 +56,7 @@ const [Modal, modalApi] = useVbenModal({
formData.value = undefined;
return;
}
- /** 加载数据 */
+ // 加载数据
const data = modalApi.getData<{ id: number }>();
if (!data || !data.id) {
return;
@@ -64,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
modalApi.lock();
try {
formData.value = await getUser(data.id);
- /** 设置到 values */
+ // 设置到 values
await formApi.setValues(formData.value);
} finally {
modalApi.unlock();