From df70aab3a147e0f1de0b41f2e9d473f9b915122d Mon Sep 17 00:00:00 2001
From: Seven <qiqiwatermelon@gmail.com>
Date: Tue, 20 Jan 2026 01:47:02 +0700
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?API=E5=9C=B0=E5=9D=80=E5=92=8C=E5=A2=9E=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod                          |   2 +-
 package.json                       |   2 +-
 pnpm-lock.yaml                     |  12 +--
 src/views/news/components/add.vue  |   6 +-
 src/views/news/components/edit.vue | 144 +++++++++++++++++++++++++++++
 src/views/news/index.vue           | 124 ++++++++++++++++++++++---
 6 files changed, 268 insertions(+), 22 deletions(-)
 create mode 100644 src/views/news/components/edit.vue

diff --git a/.env.prod b/.env.prod
index 0fa5f78..4ee7664 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,5 +1,5 @@
 # backend service base url, prod environment
-VITE_SERVICE_BASE_URL=https://riwa-api.riwsan1.com
+VITE_SERVICE_BASE_URL=http://192.168.1.2:9537
 
 # other backend service base url, prod environment
 VITE_OTHER_SERVICE_BASE_URL= `{}`
diff --git a/package.json b/package.json
index 2abaa0d..0a1f41a 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@better-scroll/core": "2.5.1",
     "@elysiajs/eden": "^1.4.5",
     "@iconify/vue": "5.0.0",
-    "@riwa/api-types": "http://192.168.1.2:9538/api/capp-eden-0.0.29.tgz",
+    "@riwa/api-types": "http://192.168.1.2:9538/api/capp-eden-0.0.30.tgz",
     "@sa/axios": "workspace:*",
     "@sa/color": "workspace:*",
     "@sa/hooks": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index edde59c..4c8127b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
         specifier: 5.0.0
         version: 5.0.0(vue@3.5.25(typescript@5.9.3))
       '@riwa/api-types':
-        specifier: http://192.168.1.2:9538/api/capp-eden-0.0.27.tgz
-        version: '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.27.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))'
+        specifier: http://192.168.1.2:9538/api/capp-eden-0.0.30.tgz
+        version: '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.30.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))'
       '@sa/axios':
         specifier: workspace:*
         version: link:packages/axios
@@ -496,9 +496,9 @@ packages:
   '@borewit/text-codec@0.1.1':
     resolution: {integrity: sha512-5L/uBxmjaCIX5h8Z+uu+kA9BQLkc/Wl06UGR5ajNRxu+/XjonB5i8JpgFMrPj3LXTCPA0pv8yxUvbUi+QthGGA==}
 
-  '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.27.tgz':
-    resolution: {tarball: http://192.168.1.2:9538/api/capp-eden-0.0.27.tgz}
-    version: 0.0.27
+  '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.30.tgz':
+    resolution: {tarball: http://192.168.1.2:9538/api/capp-eden-0.0.30.tgz}
+    version: 0.0.30
     peerDependencies:
       '@elysiajs/eden': ^1.4.6
 
@@ -4871,7 +4871,7 @@ snapshots:
 
   '@borewit/text-codec@0.1.1': {}
 
-  '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.27.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))':
+  '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.30.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))':
     dependencies:
       '@elysiajs/eden': 1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3))
 
diff --git a/src/views/news/components/add.vue b/src/views/news/components/add.vue
index 4847681..d635be2 100644
--- a/src/views/news/components/add.vue
+++ b/src/views/news/components/add.vue
@@ -99,7 +99,11 @@ function resetForm() {
         <MarkdownEditor v-model:value="formModel.content" placeholder="请输入新闻内容" :preview="false" />
       </NFormItem>
 
-      <NGrid cols="2" x-gap="16px">
+      <NGrid cols="3" x-gap="16px">
+        <NFormItemGi label="是否有视频" path="hasVideo">
+          <NSwitch v-model:value="formModel.hasVideo" />
+        </NFormItemGi>
+
         <NFormItemGi label="是否热门" path="isHot">
           <NSwitch v-model:value="formModel.isHot" />
         </NFormItemGi>
diff --git a/src/views/news/components/edit.vue b/src/views/news/components/edit.vue
new file mode 100644
index 0000000..8b2507a
--- /dev/null
+++ b/src/views/news/components/edit.vue
@@ -0,0 +1,144 @@
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue';
+import type { FormInst, FormRules } from 'naive-ui';
+import { client, safeClient } from '@/service/api';
+import UploadS3 from '@/components/upload/index.vue';
+
+defineOptions({
+  name: 'NewsEdit'
+});
+
+interface Props {
+  data: any;
+}
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+  (e: 'close'): void;
+}>();
+
+type NewsItem = Treaty.Body<typeof client.api.admin.news.post>;
+
+const formRef = ref<FormInst | null>(null);
+const loading = ref(false);
+
+const formModel = ref<NewsItem>({
+  title: '',
+  summary: '',
+  content: '',
+  hasVideo: false,
+  isHot: false,
+  isPinned: false,
+  thumbnailId: null,
+  attachmentIds: [],
+  sortOrder: 0
+});
+
+const rules: FormRules = {
+  title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
+  summary: [{ required: true, message: '请输入摘要', trigger: 'blur' }],
+  content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
+};
+
+async function handleSubmit() {
+  await formRef.value?.validate();
+  loading.value = true;
+
+  try {
+    const result = await safeClient(() =>
+      client.api.admin.news({ id: props.data.id }).patch({
+        ...formModel.value
+      })
+    );
+
+    if (result.data) {
+      window.$message?.success('更新成功');
+      emit('close');
+    }
+  } finally {
+    loading.value = false;
+  }
+}
+
+onMounted(() => {
+  formModel.value = {
+    title: props.data.title || '',
+    summary: props.data.summary || '',
+    content: props.data.content || '',
+    hasVideo: props.data.hasVideo ?? false,
+    isHot: props.data.isHot ?? false,
+    isPinned: props.data.isPinned ?? false,
+    thumbnailId: props.data.thumbnailId || null,
+    attachmentIds: props.data.attachmentIds || [],
+    sortOrder: props.data.sortOrder || 0
+  };
+});
+</script>
+
+<template>
+  <div>
+    <NForm ref="formRef" :model="formModel" :rules="rules" label-placement="left" :label-width="100">
+      <NFormItem label="缩略图" path="thumbnailId">
+        <UploadS3
+          :model-value="formModel.thumbnailId ? [formModel.thumbnailId] : undefined"
+          :max-size="20"
+          :max-files="1"
+          accept="image/*"
+          placeholder="上传图片"
+          :fetch-options="{ businessType: 'news_attachment' }"
+          @update:model-value="evt => (formModel.thumbnailId = evt.length > 0 ? evt[0] : undefined)"
+        />
+      </NFormItem>
+      <NGrid cols="2" x-gap="16px">
+        <NFormItemGi label="标题" path="title">
+          <NInput v-model:value="formModel.title" placeholder="请输入标题" />
+        </NFormItemGi>
+
+        <NFormItemGi label="摘要" path="summary">
+          <NInput v-model:value="formModel.summary" placeholder="请输入摘要" />
+        </NFormItemGi>
+      </NGrid>
+
+      <NFormItem label="内容" path="content">
+        <MarkdownEditor v-model:value="formModel.content" placeholder="请输入新闻内容" :preview="false" />
+      </NFormItem>
+
+      <NGrid cols="3" x-gap="16px">
+        <NFormItemGi label="是否有视频" path="hasVideo">
+          <NSwitch v-model:value="formModel.hasVideo" />
+        </NFormItemGi>
+
+        <NFormItemGi label="是否热门" path="isHot">
+          <NSwitch v-model:value="formModel.isHot" />
+        </NFormItemGi>
+
+        <NFormItemGi label="是否置顶" path="isPinned">
+          <NSwitch v-model:value="formModel.isPinned" />
+        </NFormItemGi>
+      </NGrid>
+
+      <NFormItem label="排序值" path="sortOrder">
+        <NInputNumber v-model:value="formModel.sortOrder" placeholder="请输入排序值" class="w-full" />
+      </NFormItem>
+
+      <NFormItem label="附件文件" path="attachmentIds">
+        <UploadS3
+          :model-value="formModel.attachmentIds || []"
+          :max-size="20"
+          :max-files="3"
+          placeholder="上传附件"
+          :fetch-options="{ businessType: 'news_attachment' }"
+          @update:model-value="evt => (formModel.attachmentIds = evt.length > 0 ? evt : undefined)"
+        />
+      </NFormItem>
+    </NForm>
+
+    <div class="mt-16px flex justify-end gap-12px">
+      <NButton @click="emit('close')">取消</NButton>
+      <NButton type="primary" :loading="loading" @click="handleSubmit">确定</NButton>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/news/index.vue b/src/views/news/index.vue
index b49b5c5..81e4364 100644
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
 import { h, useTemplateRef } from 'vue';
-import { useDialog } from 'naive-ui';
+import { NTag, useDialog } from 'naive-ui';
 import dayjs from 'dayjs';
 import { client, safeClient } from '@/service/api';
 import type { TableBaseColumns, TableFetchData, TableInst } from '@/components/table';
 import Add from './components/add.vue';
+import Edit from './components/edit.vue';
 
 defineOptions({
   name: 'NewsManagement'
@@ -20,67 +21,164 @@ const fetchData: TableFetchData = ({ pagination, filter }) => {
 const columns: TableBaseColumns = [
   {
     key: 'title',
-    title: '标题'
+    title: '标题',
+    fixed: 'left'
   },
   {
     key: 'summary',
     title: '摘要'
   },
+  {
+    key: 'content',
+    title: '内容'
+  },
   {
     key: 'hasVideo',
-    title: '是否有视频'
+    title: '是否有视频',
+    width: 100,
+    render(row) {
+      return row.hasVideo ? h(NTag, { type: 'primary' }, '是') : h(NTag, { type: 'error' }, '否');
+    }
   },
   {
     key: 'isHot',
-    title: '是否热门'
+    title: '是否热门',
+    width: 100,
+    render(row) {
+      return row.isHot ? h(NTag, { type: 'primary' }, '是') : h(NTag, { type: 'error' }, '否');
+    }
   },
   {
     key: 'isPinned',
-    title: '是否置顶'
+    title: '是否置顶',
+    width: 100,
+    render(row) {
+      return row.isPinned ? h(NTag, { type: 'primary' }, '是') : h(NTag, { type: 'error' }, '否');
+    }
   },
   {
     key: 'attachmentIds',
     title: '附件文件个数',
+    width: 120,
     render: (row: any) => {
       return row.attachmentIds ? row.attachmentIds.length : 0;
     }
   },
   {
     key: 'sortOrder',
-    title: '排序值'
+    title: '排序值',
+    width: 100
   },
   {
-    key: 'publishedAt',
-    title: '发布时间',
+    key: 'createdAt',
+    title: '创建时间',
     render: (row: any) => {
-      return dayjs(row.publishedAt).format('YYYY-MM-DD HH:mm');
+      return dayjs(row.createdAt).format('YYYY-MM-DD HH:mm');
     }
   },
   {
     key: 'operations',
     title: '操作',
-    width: 150,
+    width: 330,
     fixed: 'right',
     operations: (row: any) => [
       {
         contentText: '编辑',
         size: 'small',
         onClick: () => {
-          // 编辑操作
+          handleEdit(row);
+        }
+      },
+      {
+        contentText: '删除',
+        size: 'small',
+        type: 'error',
+        ghost: true,
+        onClick: () => {
+          dialog.warning({
+            title: '删除确认',
+            content: '确定要删除该新闻吗？此操作不可撤销。',
+            positiveText: '删除',
+            negativeText: '取消',
+            onPositiveClick: async () => {
+              await safeClient(() => client.api.admin.news({ id: row.id }).delete());
+              window.$message?.success('删除成功');
+              tableInst.value?.reload();
+            }
+          });
+        }
+      },
+      {
+        contentText: row.isPinned ? '取消置顶' : '置顶',
+        size: 'small',
+        onClick: () => {
+          dialog.warning({
+            title: '置顶确认',
+            content: '确定要置顶该新闻吗？',
+            positiveText: row.isPinned ? '取消置顶' : '置顶',
+            negativeText: '取消',
+            onPositiveClick: async () => {
+              if (row.isPinned) {
+                await safeClient(() => client.api.admin.news({ id: row.id }).pin.post({ isPinned: false }));
+              } else {
+                await safeClient(() => client.api.admin.news({ id: row.id }).pin.post({ isPinned: true }));
+              }
+              window.$message?.success(row.isPinned ? '取消置顶成功' : '置顶成功');
+              tableInst.value?.reload();
+            }
+          });
+        }
+      },
+      {
+        contentText: row.isHot ? '取消热门' : '设为热门',
+        size: 'small',
+        onClick: () => {
+          dialog.warning({
+            title: '热门确认',
+            content: '确定要设置该新闻为热门吗？',
+            positiveText: row.isHot ? '取消热门' : '设为热门',
+            negativeText: '取消',
+            onPositiveClick: async () => {
+              if (row.isHot) {
+                await safeClient(() => client.api.admin.news({ id: row.id }).hot.post({ isHot: false }));
+              } else {
+                await safeClient(() => client.api.admin.news({ id: row.id }).hot.post({ isHot: true }));
+              }
+              window.$message?.success(row.isHot ? '取消热门成功' : '设为热门成功');
+              tableInst.value?.reload();
+            }
+          });
         }
       }
     ]
   }
 ];
 
+function handleEdit(row: any) {
+  const d = dialog.create({
+    title: '编辑新闻',
+    showIcon: false,
+    style: { width: '1000px' },
+    content: () =>
+      h(Edit, {
+        data: row,
+        onClose: () => {
+          d.destroy();
+          tableInst.value?.reload();
+        }
+      })
+  });
+}
+
 function handleAdd() {
-  dialog.create({
+  const d = dialog.create({
     title: '添加新闻',
     showIcon: false,
     style: { width: '1000px' },
     content: () =>
       h(Add, {
         onClose: () => {
+          d.destroy();
           tableInst.value?.reload();
         }
       })
@@ -89,7 +187,7 @@ function handleAdd() {
 </script>
 
 <template>
-  <TableBase ref="tableInst" :fetch-data="fetchData" :columns="columns" @add="handleAdd" />
+  <TableBase ref="tableInst" :fetch-data="fetchData" :scroll-x="1600" :columns="columns" @add="handleAdd" />
 </template>
 
 <style lang="css" scoped></style>