add 'type' field for ChatModel, support Chat and Image model

web/src/components/AccountBg.vue

@@ -28,7 +28,7 @@ import FooterBar from "@/components/FooterBar.vue";
   position: relative;
   overflow: hidden;
   z-index: 1;
-  ::v-deep(.foot-container){
+  :deep(.foot-container){
     position: absolute;
     bottom: 20px;
     width: 100%;

web/src/components/ChatPrompt.vue

@@ -17,12 +17,7 @@
               </div>
               <div class="body">
                 <div class="title">
-                  <el-link
-                    :href="file.url"
-                    target="_blank"
-                    style="--el-font-weight-primary: bold"
-                    >{{ file.name }}</el-link
-                  >
+                  <el-link :href="file.url" target="_blank" style="--el-font-weight-primary: bold">{{ file.name }}</el-link>
                 </div>
                 <div class="info">
                   <span>{{ GetFileType(file.ext) }}</span>
@@ -35,8 +30,7 @@
         <div class="content" v-html="content"></div>
         <div class="bar" v-if="data.created_at > 0">
           <span class="bar-item"
-            ><el-icon><Clock /></el-icon>
-            {{ dateFormat(data.created_at) }}</span
+            ><el-icon><Clock /></el-icon> {{ dateFormat(data.created_at) }}</span
           >
           <span class="bar-item">tokens: {{ finalTokens }}</span>
         </div>
@@ -62,12 +56,7 @@
               </div>
               <div class="body">
                 <div class="title">
-                  <el-link
-                    :href="file.url"
-                    target="_blank"
-                    style="--el-font-weight-primary: bold"
-                    >{{ file.name }}</el-link
-                  >
+                  <el-link :href="file.url" target="_blank" style="--el-font-weight-primary: bold">{{ file.name }}</el-link>
                 </div>
                 <div class="info">
                   <span>{{ GetFileType(file.ext) }}</span>
@@ -82,8 +71,7 @@
         </div>
         <div class="bar" v-if="data.created_at > 0">
           <span class="bar-item"
-            ><el-icon><Clock /></el-icon>
-            {{ dateFormat(data.created_at) }}</span
+            ><el-icon><Clock /></el-icon> {{ dateFormat(data.created_at) }}</span
           >
           <!--          <span class="bar-item">tokens: {{ finalTokens }}</span>-->
         </div>
@@ -99,16 +87,17 @@ import { httpPost } from "@/utils/http";
 import hl from "highlight.js";
 import { dateFormat, isImage, processPrompt } from "@/utils/libs";
 import { FormatFileSize, GetFileIcon, GetFileType } from "@/store/system";
+import emoji from "markdown-it-emoji";
+import mathjaxPlugin from "markdown-it-mathjax3";
+import MarkdownIt from "markdown-it";
 
-const mathjaxPlugin = require("markdown-it-mathjax3");
-const md = require("markdown-it")({
+const md = new MarkdownIt({
   breaks: true,
   html: true,
   linkify: true,
   typographer: true,
   highlight: function (str, lang) {
-    const codeIndex =
-      parseInt(Date.now()) + Math.floor(Math.random() * 10000000);
+    const codeIndex = parseInt(Date.now()) + Math.floor(Math.random() * 10000000);
     // 显示复制代码按钮
     const copyBtn = `<span class="copy-code-btn" data-clipboard-action="copy" data-clipboard-target="#copy-target-${codeIndex}">复制</span>
 <textarea style="position: absolute;top: -9999px;left: -9999px;z-index: -9999;" id="copy-target-${codeIndex}">${str.replace(
@@ -127,9 +116,10 @@ const md = require("markdown-it")({
     const preCode = md.utils.escapeHtml(str);
     // 将代码包裹在 pre 中
     return `<pre class="code-container"><code class="language-${lang} hljs">${preCode}</code>${copyBtn}</pre>`;
-  }
+  },
 });
 md.use(mathjaxPlugin);
+md.use(emoji);
 const props = defineProps({
   data: {
     type: Object,
@@ -138,13 +128,13 @@ const props = defineProps({
       created_at: "",
       tokens: 0,
       model: "",
-      icon: ""
-    }
+      icon: "",
+    },
   },
   listStyle: {
     type: String,
-    default: "list"
-  }
+    default: "list",
+  },
 });
 const finalTokens = ref(props.data.tokens);
 const content = ref(processPrompt(props.data.content));

web/src/components/ChatReply.vue

@@ -6,23 +6,14 @@
       </div>
 
       <div class="chat-item">
-        <div
-          class="content"
-          v-html="md.render(processContent(data.content))"
-        ></div>
+        <div class="content" v-html="md.render(processContent(data.content))"></div>
         <div class="bar" v-if="data.created_at">
           <span class="bar-item"
-            ><el-icon><Clock /></el-icon>
-            {{ dateFormat(data.created_at) }}</span
+            ><el-icon><Clock /></el-icon> {{ dateFormat(data.created_at) }}</span
           >
           <span class="bar-item">tokens: {{ data.tokens }}</span>
           <span class="bar-item">
-            <el-tooltip
-              class="box-item"
-              effect="dark"
-              content="复制回答"
-              placement="bottom"
-            >
+            <el-tooltip class="box-item" effect="dark" content="复制回答" placement="bottom">
               <el-icon class="copy-reply" :data-clipboard-text="data.content">
                 <DocumentCopy />
               </el-icon>
@@ -30,23 +21,13 @@
           </span>
           <span v-if="!readOnly">
             <span class="bar-item" @click="reGenerate(data.prompt)">
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                content="重新生成"
-                placement="bottom"
-              >
+              <el-tooltip class="box-item" effect="dark" content="重新生成" placement="bottom">
                 <el-icon><Refresh /></el-icon>
               </el-tooltip>
             </span>
 
             <span class="bar-item" @click="synthesis(data.content)">
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                content="生成语音朗读"
-                placement="bottom"
-              >
+              <el-tooltip class="box-item" effect="dark" content="生成语音朗读" placement="bottom">
                 <i class="iconfont icon-speaker"></i>
               </el-tooltip>
             </span>
@@ -75,24 +56,15 @@
       </div>
       <div class="chat-item">
         <div class="content-wrapper">
-          <div
-            class="content"
-            v-html="md.render(processContent(data.content))"
-          ></div>
+          <div class="content" v-html="md.render(processContent(data.content))"></div>
         </div>
         <div class="bar" v-if="data.created_at">
           <span class="bar-item"
-            ><el-icon><Clock /></el-icon>
-            {{ dateFormat(data.created_at) }}</span
+            ><el-icon><Clock /></el-icon> {{ dateFormat(data.created_at) }}</span
           >
           <!--          <span class="bar-item">tokens: {{ data.tokens }}</span>-->
           <span class="bar-item bg">
-            <el-tooltip
-              class="box-item"
-              effect="dark"
-              content="复制回答"
-              placement="bottom"
-            >
+            <el-tooltip class="box-item" effect="dark" content="复制回答" placement="bottom">
               <el-icon class="copy-reply" :data-clipboard-text="data.content">
                 <DocumentCopy />
               </el-icon>
@@ -100,23 +72,13 @@
           </span>
           <span v-if="!readOnly">
             <span class="bar-item bg" @click="reGenerate(data.prompt)">
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                content="重新生成"
-                placement="bottom"
-              >
+              <el-tooltip class="box-item" effect="dark" content="重新生成" placement="bottom">
                 <el-icon><Refresh /></el-icon>
               </el-tooltip>
             </span>
 
             <span class="bar-item bg" @click="synthesis(data.content)">
-              <el-tooltip
-                class="box-item"
-                effect="dark"
-                content="生成语音朗读"
-                placement="bottom"
-              >
+              <el-tooltip class="box-item" effect="dark" content="生成语音朗读" placement="bottom">
                 <i class="iconfont icon-speaker"></i>
               </el-tooltip>
             </span>
@@ -132,6 +94,10 @@ import { Clock, DocumentCopy, Refresh } from "@element-plus/icons-vue";
 import { ElMessage } from "element-plus";
 import { dateFormat, processContent } from "@/utils/libs";
 import hl from "highlight.js";
+import emoji from "markdown-it-emoji";
+import mathjaxPlugin from "markdown-it-mathjax3";
+import MarkdownIt from "markdown-it";
+
 // eslint-disable-next-line no-undef,no-unused-vars
 const props = defineProps({
   data: {
@@ -140,28 +106,26 @@ const props = defineProps({
       icon: "",
       content: "",
       created_at: "",
-      tokens: 0
-    }
+      tokens: 0,
+    },
   },
   readOnly: {
     type: Boolean,
-    default: false
+    default: false,
   },
   listStyle: {
     type: String,
-    default: "list"
-  }
+    default: "list",
+  },
 });
 
-const mathjaxPlugin = require("markdown-it-mathjax3");
-const md = require("markdown-it")({
+const md = new MarkdownIt({
   breaks: true,
   html: true,
   linkify: true,
   typographer: true,
   highlight: function (str, lang) {
-    const codeIndex =
-      parseInt(Date.now()) + Math.floor(Math.random() * 10000000);
+    const codeIndex = parseInt(Date.now()) + Math.floor(Math.random() * 10000000);
     // 显示复制代码按钮
     const copyBtn = `<span class="copy-code-btn" data-clipboard-action="copy" data-clipboard-target="#copy-target-${codeIndex}">复制</span>
 <textarea style="position: absolute;top: -9999px;left: -9999px;z-index: -9999;" id="copy-target-${codeIndex}">${str.replace(
@@ -171,7 +135,7 @@ const md = require("markdown-it")({
     if (lang && hl.getLanguage(lang)) {
       const langHtml = `<span class="lang-name">${lang}</span>`;
       // 处理代码高亮
-      const preCode = hl.highlight(lang, str, true).value;
+      const preCode = hl.highlight(str, { language: lang }).value;
       // 将代码包裹在 pre 中
       return `<pre class="code-container"><code class="language-${lang} hljs">${preCode}</code>${copyBtn} ${langHtml}</pre>`;
     }
@@ -180,10 +144,10 @@ const md = require("markdown-it")({
     const preCode = md.utils.escapeHtml(str);
     // 将代码包裹在 pre 中
     return `<pre class="code-container"><code class="language-${lang} hljs">${preCode}</code>${copyBtn}</pre>`;
-  }
+  },
 });
 md.use(mathjaxPlugin);
-
+md.use(emoji);
 const emits = defineEmits(["regen"]);
 
 if (!props.data.icon) {
@@ -205,6 +169,9 @@ const reGenerate = (prompt) => {
 <style lang="stylus">
 @import '@/assets/css/markdown/vue.css';
 .chat-page,.chat-export {
+  --font-family: Menlo,"微软雅黑","Roboto Mono","Courier New",Courier,monospace,"Inter",sans-serif;
+  font-family: var(--font-family);
+
   .chat-line-reply-list {
     justify-content: center;
     background-color: var(--chat-list-bg);
@@ -255,12 +222,13 @@ const reGenerate = (prompt) => {
             line-height 1.5
 
             code {
-              // color:var(--theme-text-color-primary);
-              color:#fff
+              color:var(--theme-text-color-primary);
+              font-weight 600
+              // color:#fff
               // background-color var(--el-color-primary-light-3)
-              background-color: var(--el-color-primary);
-              padding 3px 5px;
-              border-radius 5px;
+              // background-color: var(--el-color-primary);
+              // padding 3px 5px;
+              // border-radius 5px;
             }
           }
 
@@ -432,12 +400,12 @@ const reGenerate = (prompt) => {
               line-height 1.5
 
               code {
-                color:#fff;
-                background-color var( --el-color-primary)
-                padding 0 3px;
-                border-radius 5px;
-                font-size: 16px;
-                padding: 5px 7px;
+                color:var(--code-text-color);
+                font-weight bold
+                font-family: var(--font-family);
+                background-color: var(--code-bg-color);
+                border-radius: 4px;
+                padding: .2rem .4rem;
               }
             }
 

web/src/components/TaskList.vue

@@ -1,15 +1,10 @@
 <template>
-  <div class="running-job-list">
+  <div class="running-job-list pt-4 pb-4">
     <div class="running-job-box" v-if="list.length > 0">
       <div class="job-item" v-for="item in list" :key="item.id">
         <div v-if="item.progress > 0" class="job-item-inner">
           <div class="progress" v-if="item.progress > 0">
-            <el-progress
-              type="circle"
-              :percentage="item.progress"
-              :width="100"
-              color="#47fff1"
-            />
+            <el-progress type="circle" :percentage="item.progress" :width="100" color="#47fff1" />
           </div>
         </div>
         <el-image fit="cover" v-else>
@@ -33,8 +28,8 @@ import nodata from "@/assets/img/no-data.png";
 const props = defineProps({
   list: {
     type: Array,
-    default: []
-  }
+    default: [],
+  },
 });
 </script>
 

web/src/components/admin/AdminSidebar.vue

@@ -1,40 +1,36 @@
 <template>
-  <div :class="'sidebar '+theme">
+  <div :class="'sidebar ' + theme">
     <a class="logo w-full" href="/" target="_blank">
-      <el-image :src="logo"/>
+      <el-image :src="logo" />
       <span class="text" v-show="!sidebar.collapse">{{ title }}</span>
     </a>
 
     <el-menu
-        class="sidebar-el-menu"
-        :default-active="onRoutes"
-        :collapse="sidebar.collapse"
-        background-color="#324157"
-        text-color="#bfcbd9"
-        active-text-color="#20a0ff"
-        unique-opened
-        router
+      class="sidebar-el-menu"
+      :default-active="onRoutes"
+      :collapse="sidebar.collapse"
+      background-color="#324157"
+      text-color="#bfcbd9"
+      active-text-color="#20a0ff"
+      unique-opened
+      router
     >
       <template v-for="item in items">
         <template v-if="item.subs">
           <el-sub-menu :index="item.index" :key="item.index">
             <template #title>
-              <i :class="'iconfont icon-'+item.icon"></i>
+              <i :class="'iconfont icon-' + item.icon"></i>
               <span>{{ item.title }}</span>
             </template>
             <template v-for="subItem in item.subs">
-              <el-sub-menu
-                  v-if="subItem.subs"
-                  :index="subItem.index"
-                  :key="subItem.index"
-              >
+              <el-sub-menu v-if="subItem.subs" :index="subItem.index" :key="subItem.index">
                 <template #title>{{ subItem.title }}</template>
                 <el-menu-item v-for="(threeItem, i) in subItem.subs" :key="i" :index="threeItem.index">
                   {{ threeItem.title }}
                 </el-menu-item>
               </el-sub-menu>
               <el-menu-item v-else :index="subItem.index" :key="subItem.index">
-                <i v-if="subItem.icon" :class="'iconfont icon-'+subItem.icon"></i>
+                <i v-if="subItem.icon" :class="'iconfont icon-' + subItem.icon"></i>
                 {{ subItem.title }}
               </el-menu-item>
             </template>
@@ -42,7 +38,7 @@
         </template>
         <template v-else>
           <el-menu-item :index="item.index" :key="item.index">
-            <i :class="'iconfont icon-'+item.icon"></i>
+            <i :class="'iconfont icon-' + item.icon"></i>
             <template #title>{{ item.title }}</template>
           </el-menu-item>
         </template>
@@ -52,120 +48,125 @@
 </template>
 
 <script setup>
-import {computed, ref, watch} from 'vue';
-import {setMenuItems, useSidebarStore} from '@/store/sidebar';
-import {httpGet} from "@/utils/http";
-import {ElMessage} from "element-plus";
-import {useRoute} from "vue-router";
-import {useSharedStore} from "@/store/sharedata";
+import { computed, ref, watch } from "vue";
+import { setMenuItems, useSidebarStore } from "@/store/sidebar";
+import { httpGet } from "@/utils/http";
+import { ElMessage } from "element-plus";
+import { useRoute } from "vue-router";
+import { useSharedStore } from "@/store/sharedata";
 
-const title = ref('')
-const logo = ref('')
+const title = ref("");
+const logo = ref("");
 
 // 加载系统配置
-httpGet('/api/admin/config/get?key=system').then(res => {
-  title.value = res.data.admin_title
-  logo.value = res.data.logo
-}).catch(e => {
-  ElMessage.error("加载系统配置失败: " + e.message)
-})
-const store = useSharedStore()
-const theme = ref(store.theme)
-watch(() => store.theme, (val) => {
-  theme.value = val
-})
+httpGet("/api/admin/config/get?key=system")
+  .then((res) => {
+    title.value = res.data.admin_title;
+    logo.value = res.data.logo;
+  })
+  .catch((e) => {
+    ElMessage.error("加载系统配置失败: " + e.message);
+  });
+const store = useSharedStore();
+const theme = ref(store.theme);
+watch(
+  () => store.theme,
+  (val) => {
+    theme.value = val;
+  }
+);
 const items = [
   {
-    icon: 'home',
-    index: '/admin/dashboard',
-    title: '仪表盘',
+    icon: "home",
+    index: "/admin/dashboard",
+    title: "仪表盘",
   },
 
   {
-    icon: 'user-fill',
-    index: '/admin/user',
-    title: '用户管理',
+    icon: "user-fill",
+    index: "/admin/user",
+    title: "用户管理",
   },
   {
-    icon: 'menu',
-    index: '1',
-    title: '应用管理',
+    icon: "menu",
+    index: "1",
+    title: "应用管理",
     subs: [
       {
-        index: '/admin/app',
-        title: '应用列表',
+        index: "/admin/app",
+        title: "应用列表",
       },
       {
-        index: '/admin/app/type',
-        title: '应用分类',
+        index: "/admin/app/type",
+        title: "应用分类",
       },
     ],
   },
 
   {
-    icon: 'api-key',
-    index: '/admin/apikey',
-    title: 'API-KEY',
+    icon: "api-key",
+    index: "/admin/apikey",
+    title: "API-KEY",
   },
   {
-    icon: 'model',
-    index: '/admin/chat/model',
-    title: '语言模型',
+    icon: "model",
+    index: "/admin/chat/model",
+    title: "模型管理",
   },
   {
-    icon: 'recharge',
-    index: '/admin/product',
-    title: '充值产品',
+    icon: "recharge",
+    index: "/admin/product",
+    title: "充值产品",
   },
   {
-    icon: 'order',
-    index: '/admin/order',
-    title: '充值订单',
+    icon: "order",
+    index: "/admin/order",
+    title: "充值订单",
   },
   {
-    icon: 'reward',
-    index: '/admin/redeem',
-    title: '兑换码',
+    icon: "reward",
+    index: "/admin/redeem",
+    title: "兑换码",
   },
   {
-    icon: 'control',
-    index: '/admin/functions',
-    title: '函数管理',
+    icon: "control",
+    index: "/admin/functions",
+    title: "函数管理",
   },
   {
-    icon: 'prompt',
-    index: '/admin/chats',
-    title: '对话管理',
+    icon: "prompt",
+    index: "/admin/chats",
+    title: "对话管理",
   },
   {
-    icon: 'image',
-    index: '/admin/images',
-    title: '绘图管理',
+    icon: "image",
+    index: "/admin/images",
+    title: "绘图管理",
   },
   {
-    icon: 'mp3',
-    index: '/admin/medias',
-    title: '音视频管理',
+    icon: "mp3",
+    index: "/admin/medias",
+    title: "音视频管理",
   },
   {
-    icon: 'role',
-    index: '/admin/manger',
-    title: '管理员',
+    icon: "role",
+    index: "/admin/manger",
+    title: "管理员",
   },
   {
-    icon: 'config',
-    index: '/admin/system',
-    title: '系统设置',
+    icon: "config",
+    index: "/admin/system",
+    title: "系统设置",
   },
   {
-    icon: 'log',
-    index: '/admin/powerLog',
-    title: '用户算力日志',
+    icon: "log",
+    index: "/admin/powerLog",
+    title: "用户算力日志",
   },
   {
-    icon: 'log',
-    index: '/admin/loginLog',
-    title: '用户登录日志',
+    icon: "log",
+    index: "/admin/loginLog",
+    title: "用户登录日志",
   },
   // {
   //   icon: 'menu',
@@ -198,7 +199,7 @@ const onRoutes = computed(() => {
 });
 
 const sidebar = useSidebarStore();
-setMenuItems(items)
+setMenuItems(items);
 </script>
 
 <style scoped lang="stylus">
@@ -291,5 +292,4 @@ setMenuItems(items)
     border-color var(--el-border-color)
   }
 }
-
 </style>