Merge remote-tracking branch 'origin/main'

src/components/custom/business-rich-text-editor.vue

@@ -4,7 +4,7 @@ import '@wangeditor/editor/dist/css/style.css';
 import { ElImageViewer } from 'element-plus';
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import type { IDomEditor, IEditorConfig, IToolbarConfig } from '@wangeditor/editor';
-import { deleteFile, uploadFile } from '@/service/api/file';
+import { buildFileProxyUrl, deleteFile, uploadFile } from '@/service/api/file';
 
 defineOptions({ name: 'BusinessRichTextEditor' });
 
@@ -198,10 +198,12 @@ const editorConfig: Partial<IEditorConfig> = {
           return;
         }
 
-        const { id, url } = result.data;
+        // 用永久代理路径塞 <img src>，不要用 result.data.url（24h 签名会过期）
+        const { id, configId, path } = result.data;
+        const proxyUrl = buildFileProxyUrl(configId, path);
         // 记录 url -> fileId，后续 commit/rollback 才知道删哪个
-        session.uploadedMap.set(url, id);
-        insertFn(url, file.name, url);
+        session.uploadedMap.set(proxyUrl, id);
+        insertFn(proxyUrl, file.name, proxyUrl);
       }
     }
   }

src/locales/langs/en-us.ts

@@ -216,9 +216,6 @@ const local: App.I18n.Schema = {
     plugin_charts_echarts: 'ECharts',
     plugin_charts_antv: 'AntV',
     plugin_charts_vchart: 'VChart',
-    plugin_editor: 'Editor',
-    plugin_editor_quill: 'Quill',
-    plugin_editor_markdown: 'Markdown',
     plugin_icon: 'Icon',
     plugin_map: 'Map',
     plugin_print: 'Print',

src/locales/langs/zh-cn.ts

@@ -216,9 +216,6 @@ const local: App.I18n.Schema = {
     plugin_charts_echarts: 'ECharts',
     plugin_charts_antv: 'AntV',
     plugin_charts_vchart: 'VChart',
-    plugin_editor: '编辑器',
-    plugin_editor_quill: '富文本编辑器',
-    plugin_editor_markdown: 'MD 编辑器',
     plugin_icon: '图标',
     plugin_map: '地图',
     plugin_print: '打印',

src/router/elegant/imports.ts

@@ -44,8 +44,6 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   plugin_charts_echarts: () => import("@/views/plugin/charts/echarts/index.vue"),
   plugin_charts_vchart: () => import("@/views/plugin/charts/vchart/index.vue"),
   plugin_copy: () => import("@/views/plugin/copy/index.vue"),
-  plugin_editor_markdown: () => import("@/views/plugin/editor/markdown/index.vue"),
-  plugin_editor_quill: () => import("@/views/plugin/editor/quill/index.vue"),
   plugin_excel: () => import("@/views/plugin/excel/index.vue"),
   plugin_gantt_dhtmlx: () => import("@/views/plugin/gantt/dhtmlx/index.vue"),
   plugin_gantt_vtable: () => import("@/views/plugin/gantt/vtable/index.vue"),

src/router/elegant/routes.ts

@@ -425,37 +425,6 @@ export const generatedRoutes: GeneratedRoute[] = [
           icon: 'mdi:clipboard-outline'
         }
       },
-      {
-        name: 'plugin_editor',
-        path: '/plugin/editor',
-        meta: {
-          title: 'plugin_editor',
-          i18nKey: 'route.plugin_editor',
-          icon: 'icon-park-outline:editor'
-        },
-        children: [
-          {
-            name: 'plugin_editor_markdown',
-            path: '/plugin/editor/markdown',
-            component: 'view.plugin_editor_markdown',
-            meta: {
-              title: 'plugin_editor_markdown',
-              i18nKey: 'route.plugin_editor_markdown',
-              icon: 'ri:markdown-line'
-            }
-          },
-          {
-            name: 'plugin_editor_quill',
-            path: '/plugin/editor/quill',
-            component: 'view.plugin_editor_quill',
-            meta: {
-              title: 'plugin_editor_quill',
-              i18nKey: 'route.plugin_editor_quill',
-              icon: 'mdi:file-document-edit-outline'
-            }
-          }
-        ]
-      },
       {
         name: 'plugin_excel',
         path: '/plugin/excel',

src/router/elegant/transform.ts

@@ -203,9 +203,6 @@ const routeMap: RouteMap = {
   "plugin_charts_echarts": "/plugin/charts/echarts",
   "plugin_charts_vchart": "/plugin/charts/vchart",
   "plugin_copy": "/plugin/copy",
-  "plugin_editor": "/plugin/editor",
-  "plugin_editor_markdown": "/plugin/editor/markdown",
-  "plugin_editor_quill": "/plugin/editor/quill",
   "plugin_excel": "/plugin/excel",
   "plugin_gantt": "/plugin/gantt",
   "plugin_gantt_dhtmlx": "/plugin/gantt/dhtmlx",

src/service/api/file.ts

@@ -1,28 +1,61 @@
 import { SYSTEM_SERVICE_PREFIX } from '@/constants/service';
 import { request } from '../request';
+import { type ServiceRequestResult, mapServiceResult } from './shared';
 
 const FILE_PREFIX = `${SYSTEM_SERVICE_PREFIX}/file`;
 
+/**
+ * 拼接文件永久代理路径，用于富文本 <img src>。
+ *
+ * 后端 GET 接口匿名访问、Content-Disposition: inline，私有桶下也不会过期。
+ * 调用方拿到上传响应里的 configId + path 后直接调用本函数得到可写入 HTML 的 url。
+ */
+export function buildFileProxyUrl(configId: string, path: string) {
+  return `${FILE_PREFIX}/${configId}/get/${encodeURI(path)}`;
+}
+
 export interface UploadFileResult {
   /** infra_file.id 的字符串形式（避免 Long 精度丢失） */
   id: string;
-  /** 文件访问 URL：私有桶带签名、公开桶裸 URL */
+  /** 对象存储配置编号（字符串形式），与 path 一起拼接永久代理路径 */
+  configId: string;
+  /** 文件相对路径（含日期目录、文件名），与 configId 一起拼接永久代理路径 */
+  path: string;
+  /**
+   * 文件访问 URL：私有桶带签名（24h 过期）、公开桶裸 URL。
+   * ⚠️ 仅供后端调试 / 历史兼容，禁止写进富文本 <img src> —— 会随签名过期导致回显失效。
+   * 富文本图片请用 buildFileProxyUrl(configId, path) 的返回值。
+   */
   url: string;
 }
 
+type UploadFileResponse = {
+  id: string | number;
+  configId: string | number;
+  path: string;
+  url: string;
+};
+
 /** 上传文件（模式一：后端中转） */
-export function uploadFile(file: File, directory?: string) {
+export async function uploadFile(file: File, directory?: string) {
   const formData = new FormData();
   formData.append('file', file);
   if (directory) {
     formData.append('directory', directory);
   }
 
-  return request<UploadFileResult>({
+  const result = await request<UploadFileResponse>({
     url: `${FILE_PREFIX}/upload`,
     method: 'post',
     data: formData
   });
+
+  return mapServiceResult(result as ServiceRequestResult<UploadFileResponse>, data => ({
+    id: String(data.id),
+    configId: String(data.configId),
+    path: data.path,
+    url: data.url
+  }));
 }
 
 /**

src/typings/elegant-router.d.ts

@@ -57,9 +57,6 @@ declare module "@elegant-router/types" {
     "plugin_charts_echarts": "/plugin/charts/echarts";
     "plugin_charts_vchart": "/plugin/charts/vchart";
     "plugin_copy": "/plugin/copy";
-    "plugin_editor": "/plugin/editor";
-    "plugin_editor_markdown": "/plugin/editor/markdown";
-    "plugin_editor_quill": "/plugin/editor/quill";
     "plugin_excel": "/plugin/excel";
     "plugin_gantt": "/plugin/gantt";
     "plugin_gantt_dhtmlx": "/plugin/gantt/dhtmlx";
@@ -194,8 +191,6 @@ declare module "@elegant-router/types" {
     | "plugin_charts_echarts"
     | "plugin_charts_vchart"
     | "plugin_copy"
-    | "plugin_editor_markdown"
-    | "plugin_editor_quill"
     | "plugin_excel"
     | "plugin_gantt_dhtmlx"
     | "plugin_gantt_vtable"

src/views/plugin/editor/markdown/index.vue

@@ -1,52 +0,0 @@
-<script setup lang="ts">
-import { onMounted, onUnmounted, ref, watch } from 'vue';
-import Vditor from 'vditor';
-import 'vditor/dist/index.css';
-import { useThemeStore } from '@/store/modules/theme';
-
-defineOptions({ name: 'MarkdownPage' });
-
-const theme = useThemeStore();
-
-const vditor = ref<Vditor>();
-const domRef = ref<HTMLElement>();
-
-function renderVditor() {
-  if (!domRef.value) return;
-  vditor.value = new Vditor(domRef.value, {
-    minHeight: 400,
-    theme: theme.darkMode ? 'dark' : 'classic',
-    icon: 'material',
-    cache: { enable: false }
-  });
-}
-
-const stopHandle = watch(
-  () => theme.darkMode,
-  newValue => {
-    const themeMode = newValue ? 'dark' : 'classic';
-    vditor.value?.setTheme(themeMode);
-  }
-);
-
-onMounted(() => {
-  renderVditor();
-});
-
-onUnmounted(() => {
-  stopHandle();
-});
-</script>
-
-<template>
-  <div class="h-full">
-    <ElCard header="markdown插件" class="card-wrapper">
-      <div ref="domRef"></div>
-      <template #footer>
-        <GithubLink link="https://github.com/Vanessa219/vditor" />
-      </template>
-    </ElCard>
-  </div>
-</template>
-
-<style scoped></style>

src/views/plugin/editor/quill/index.vue

@@ -1,19 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue';
-import BusinessRichTextEditor from '@/components/custom/business-rich-text-editor.vue';
-
-defineOptions({ name: 'QuillPage' });
-
-const value = ref('<p>hello&nbsp;<strong>wangEditor v5</strong></p>');
-</script>
-
-<template>
-  <div class="h-full">
-    <ElCard header="富文本插件" class="card-wrapper">
-      <BusinessRichTextEditor v-model="value" :height="360" upload-directory="demo" />
-      <template #footer>
-        <GithubLink link="https://github.com/wangeditor-next/wangEditor-next" />
-      </template>
-    </ElCard>
-  </div>
-</template>