diff --git a/.gitignore b/.gitignore
index a35571b2..4031f8b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ pnpm-debug.log*
 *.sw?
 
 .history
+
+# 默认的上传文件夹
+userUpload
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 34854cdf..30e5d7fc 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -51,6 +51,12 @@ http {
     location /api {
       proxy_pass http://127.0.0.1:3000;
     }
+
+    # 静态文件的默认存储文件夹
+    # 文件夹的配置在  server/src/modules/file/config/index.ts SERVER_LOCAL_CONFIG.FILE_KEY_PREFIX
+    location /userUpload {
+      proxy_pass http://127.0.0.1:3000;
+    }
     
     error_page 500 502 503 504 /500.html;
     client_max_body_size 20M;
diff --git a/web/src/common/Editor/RichEditor.vue b/web/src/common/Editor/RichEditor.vue
index d15b810a..c0357453 100644
--- a/web/src/common/Editor/RichEditor.vue
+++ b/web/src/common/Editor/RichEditor.vue
@@ -1,24 +1,9 @@
 <template>
   <div class="editor-wrapper border">
-    <Toolbar
-      :class="['toolbar', props.staticToolBar ? 'static-toolbar' : 'dynamic-toolbar']"
-      ref="toolbar"
-      v-show="showToolbar"
-      :editor="editorRef"
-      :defaultConfig="toolbarConfig"
-      :mode="mode"
-    />
-    <Editor
-      class="editor"
-      ref="editor"
-      :modelValue="curValue"
-      :defaultConfig="editorConfig"
-      @onCreated="onCreated"
-      @onChange="onChange"
-      @onBlur="onBlur"
-      @onFocus="onFocus"
-      :mode="mode"
-    />
+    <Toolbar :class="['toolbar', props.staticToolBar ? 'static-toolbar' : 'dynamic-toolbar']" ref="toolbar"
+      v-show="showToolbar" :editor="editorRef" :defaultConfig="toolbarConfig" :mode="mode" />
+    <Editor class="editor" ref="editor" :modelValue="curValue" :defaultConfig="editorConfig" @onCreated="onCreated"
+      @onChange="onChange" @onBlur="onBlur" @onFocus="onFocus" :mode="mode" />
   </div>
 </template>
 
@@ -26,28 +11,62 @@
 import '@wangeditor/editor/dist/css/style.css'
 import './styles/reset-wangeditor.scss'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { ref, shallowRef, onBeforeMount, watch } from 'vue'
+import { ref, shallowRef, onBeforeMount, watch, computed } from 'vue'
+import { useStore } from 'vuex'
+import { get as _get } from 'lodash-es'
 
 const emit = defineEmits(['input', 'onFocus', 'change', 'blur', 'created'])
 const model = defineModel()
-const props = defineProps(['staticToolBar'])
+const props = defineProps({
+  staticToolBar: { default: false, required: false },
+  needUploadImage: { default: false, required: false }
+})
 
 const curValue = ref('')
 const editorRef = shallowRef()
-const showToolbar = ref(props.staticToolBar || false)
+const showToolbar = ref(props.staticToolBar)
 
 const mode = 'simple'
 
-const toolbarConfig = {
-  toolbarKeys: [
-    'color', // 字体色
-    'bgColor', // 背景色
-    'bold',
-    'insertLink' // 链接
-  ]
+const toolbarConfig = computed(() => {
+  const config = {
+    toolbarKeys: [
+      'color', // 字体色
+      'bgColor', // 背景色
+      'bold',
+      'insertLink', // 链接
+    ]
+  }
+  if (props.needUploadImage) {
+    config.toolbarKeys.push('uploadImage')
+  }
+
+  return config
+})
+
+const editorConfig = {
+  MENU_CONF: {}
 }
 
-const editorConfig = {}
+const store = useStore()
+const token = _get(store, 'state.user.userInfo.token')
+
+editorConfig.MENU_CONF['uploadImage'] = {
+  allowedFileTypes: ['image/jpeg', 'image/png'],
+  server: '/api/file/upload',
+  fieldName: 'file',
+  meta: {
+    //! 此处的channel需要跟上传接口内配置的channel一致
+    channel: 'upload' 
+  },
+  headers: {
+    Authorization: `Bearer ${token}`
+  },
+  customInsert(res, insertFn) {
+    const url = res.data.url
+    insertFn(url, '', '')
+  },
+}
 
 const setHtml = (newHtml) => {
   const editor = editorRef.value
@@ -114,6 +133,7 @@ onBeforeMount(() => {
 .static-toolbar {
   border-bottom: 1px solid #dedede;
 }
+
 .dynamic-toolbar {
   position: absolute;
   left: 0;
diff --git a/web/src/common/xss.js b/web/src/common/xss.js
index e12e20ff..d4d71e8b 100644
--- a/web/src/common/xss.js
+++ b/web/src/common/xss.js
@@ -27,6 +27,16 @@ const isVideo = (html) => {
   return html.indexOf('<video') > -1
 }
 
+export const cleanRichTextWithMediaTag = (text) => {
+  if (!text) {
+    return text === 0 ? 0 : ''
+  }
+  const html = transformHtmlTag(text).replace(/<img([\w\W]+?)\/>/g,'[图片]').replace(/<video.*\/video>/g,'[视频]')
+  const content = html.replace(/<[^<>]+>/g, '').replace(/&nbsp;/g, '')
+
+  return content
+}
+
 export const cleanRichText = (text) => {
   if (!text) {
     return text === 0 ? 0 : ''
diff --git a/web/src/management/App.vue b/web/src/management/App.vue
index 545876c4..cc283ad9 100644
--- a/web/src/management/App.vue
+++ b/web/src/management/App.vue
@@ -1,7 +1,5 @@
 <template>
-  <div id="app">
-    <router-view></router-view>
-  </div>
+  <router-view></router-view>
 </template>
 
 <script>
@@ -14,6 +12,7 @@ export default {
 @import url('./styles/icon.scss');
 @import url('../materials/questions/common/css/icon.scss');
 @import url('./styles/reset.scss');
+@import url('./styles/common.scss');
 
 html {
   font-size: 50px;
diff --git a/web/src/management/pages/analysis/components/DataTable.vue b/web/src/management/pages/analysis/components/DataTable.vue
index d5df1d29..9bf607a8 100644
--- a/web/src/management/pages/analysis/components/DataTable.vue
+++ b/web/src/management/pages/analysis/components/DataTable.vue
@@ -13,28 +13,30 @@
         v-for="item in props.tableData.listHead"
         :key="item.field"
         :prop="item.field"
-        :label="cleanRichText(item.title)"
+        :label="item.title"
         minWidth="200"
       >
+
         <template #header="scope">
-          <div
-            class="table-row-cell"
-            @mouseover="onPopoverRefOver(scope, 'head')"
-            :ref="(el) => (popoverRefMap[scope.column.id] = el)"
-          >
-            <span>
-              {{ scope.column.label.replace(/&nbsp;/g, '') }}
+          <div class="table-row-cell">
+            <span
+              class="table-row-head"
+              @mouseover="onPopoverRefOver(scope, 'head')"
+              :ref="(el) => (popoverRefMap[scope.column.id] = el)"
+              v-html="item.title"
+            >
             </span>
           </div>
         </template>
         <template #default="scope">
-          <div
-            class="table-row-cell"
-            @mouseover="onPopoverRefOver(scope, 'content')"
-            :ref="(el) => (popoverRefMap[scope.$index + scope.column.property] = el)"
-          >
-            <span>
-              {{ getContent(scope.row[scope.column.property]) }}
+          <div>
+            <span
+              class="table-row-cell"
+              @mouseover="onPopoverRefOver(scope, 'content')"
+              @click="onPreviewImage"
+              :ref="(el) => (popoverRefMap[scope.$index + scope.column.property] = el)"
+              v-html="getContent(scope.row[scope.column.property])"
+            >
             </span>
           </div>
         </template>
@@ -48,15 +50,18 @@
       width="400"
       trigger="hover"
       virtual-triggering
-      :content="popoverContent"
     >
+      <div v-html="popoverContent"></div>
     </el-popover>
+
+    <ImagePreview :url="previewImageUrl" v-model:visible="showPreviewImage"/>
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue'
 import { cleanRichText } from '@/common/xss'
+import ImagePreview from './ImagePreview.vue'
 
 const props = defineProps({
   tableData: {
@@ -74,8 +79,8 @@ const popoverRefMap = ref({})
 const popoverVirtualRef = ref()
 const popoverContent = ref('')
 
-const getContent = (value) => {
-  const content = cleanRichText(value)
+const getContent = (content) => {
+  // const content = cleanRichText(value)
   return content === 0 ? 0 : content || '未知'
 }
 const setPopoverContent = (content) => {
@@ -93,6 +98,16 @@ const onPopoverRefOver = (scope, type) => {
   }
   setPopoverContent(popoverContent)
 }
+
+const previewImageUrl = ref('')
+const showPreviewImage = ref(false)
+const onPreviewImage = (e) => {
+  if (e.target.tagName === 'IMG') {
+    previewImageUrl.value = e.target.src
+    showPreviewImage.value = true
+  }
+  console.log(e.target.src)
+}
 </script>
 
 <style lang="scss" scoped>
@@ -121,17 +136,25 @@ const onPopoverRefOver = (scope, type) => {
   }
 
   .table-row-cell {
-    max-width: 100%;
-    display: inline-block;
-    white-space: nowrap;
-    /* 禁止自动换行 */
-    overflow: hidden;
-    /* 超出部分隐藏 */
-    text-overflow: ellipsis;
-    /* 显示省略号 */
+    white-space: nowrap; /* 禁止自动换行 */
+    overflow: hidden; /* 超出部分隐藏 */
+    text-overflow: ellipsis; /* 显示省略号 */
+    :deep(img) {
+      height: 23px;
+      width: auto;
+    }
+    :deep(p) {
+        display: flex;
+        align-items: center;
+    }
   }
 }
 :deep(.el-table td.el-table__cell div) {
   font-size: 13px;
 }
 </style>
+<style>
+.el-popover p image {
+  max-width: 100%;
+}
+</style>
diff --git a/web/src/management/pages/analysis/components/ImagePreview.vue b/web/src/management/pages/analysis/components/ImagePreview.vue
new file mode 100644
index 00000000..5b160210
--- /dev/null
+++ b/web/src/management/pages/analysis/components/ImagePreview.vue
@@ -0,0 +1,72 @@
+<template>
+    <Teleport to="body">
+        <Transition>
+            <div class="image-preview" v-show="visible">
+                <div class="close-btn" @click="visible = false"> <i-ep-close /> </div>
+                <div class="image-con">
+                    <img :src="props.url" class="image-item" />
+                </div>
+            </div>
+        </Transition>
+    </Teleport>
+</template>
+<script setup lang="ts">
+const props = defineProps<{
+    url: string
+}>()
+
+const visible = defineModel('visible')
+
+</script>
+<style lang="scss" scoped>
+.v-enter-active,
+.v-leave-active {
+    transition: opacity 0.2s ease-out;
+}
+
+.v-enter-from,
+.v-leave-to {
+    opacity: 0;
+}
+
+.image-preview {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba($color: #000000, $alpha: .4);
+    z-index: 2024;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .image-con {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .image-item {
+            max-width: 80%;
+            max-height: 70%;
+        }
+    }
+
+
+    .close-btn {
+        position: absolute;
+        right: 20px;
+        top: 20px;
+        width: 30px;
+        height: 30px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+        border-radius: 50%;
+        background-color: #d0d0d0;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/web/src/management/pages/edit/components/MaterialGroup.vue b/web/src/management/pages/edit/components/MaterialGroup.vue
index f59932ab..fe6f2886 100644
--- a/web/src/management/pages/edit/components/MaterialGroup.vue
+++ b/web/src/management/pages/edit/components/MaterialGroup.vue
@@ -3,6 +3,7 @@
     v-model="renderData"
     handle=".question-wrapper.isSelected"
     filter=".question-wrapper.isSelected .question.isSelected"
+    :preventOnFilter="false"
     :group="DND_GROUP"
     :onEnd="checkEnd"
     :move="checkMove"
diff --git a/web/src/management/pages/edit/modules/logicModule/components/ConditionView.vue b/web/src/management/pages/edit/modules/logicModule/components/ConditionView.vue
index 01065654..ae98af75 100644
--- a/web/src/management/pages/edit/modules/logicModule/components/ConditionView.vue
+++ b/web/src/management/pages/edit/modules/logicModule/components/ConditionView.vue
@@ -57,7 +57,7 @@
 import { computed, inject, ref, type ComputedRef } from 'vue'
 import { ConditionNode, RuleNode } from '@/common/logicEngine/RuleBuild'
 import { CHOICES } from '@/common/typeEnum'
-import { cleanRichText } from '@/common/xss'
+import { cleanRichTextWithMediaTag } from '@/common/xss'
 const renderData = inject<ComputedRef<Array<any>>>('renderData') || ref([])
 const props = defineProps({
   index: {
@@ -88,7 +88,7 @@ const fieldList = computed(() => {
     .filter((question: any) => CHOICES.includes(question.type))
     .map((item: any) => {
       return {
-        label: `${item.showIndex ? item.indexNumber + '.' : ''} ${cleanRichText(item.title)}`,
+        label: `${item.showIndex ? item.indexNumber + '.' : ''} ${cleanRichTextWithMediaTag(item.title)}`,
         value: item.field
       }
     })
@@ -102,7 +102,7 @@ const getRelyOptions = computed(() => {
   return (
     currentQuestion?.options.map((item: any) => {
       return {
-        label: cleanRichText(item.text),
+        label: cleanRichTextWithMediaTag(item.text),
         value: item.hash
       }
     }) || []
diff --git a/web/src/management/styles/common.scss b/web/src/management/styles/common.scss
new file mode 100644
index 00000000..1ad8d701
--- /dev/null
+++ b/web/src/management/styles/common.scss
@@ -0,0 +1,8 @@
+// 富文本标题、选项中的预览弹窗的图片宽度
+.el-popover {
+    p {
+      img {
+        max-width: 100%;
+      }
+    }
+  }
\ No newline at end of file
diff --git a/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue b/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue
index 8025a528..0fa44cf9 100644
--- a/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue
+++ b/web/src/materials/questions/widgets/EditOptions/Options/OptionEdit.vue
@@ -12,6 +12,7 @@
           <span class="drag-handle qicon qicon-tuodong"></span>
           <div class="input-box">
             <RichEditor
+              :needUploadImage="true"
               :modelValue="element.text"
               @change="(value) => handleChange(index, value)"
             />
diff --git a/web/src/materials/questions/widgets/TitleModules/EditTitle/index.jsx b/web/src/materials/questions/widgets/TitleModules/EditTitle/index.jsx
index 598c9b00..dd4ecf5a 100644
--- a/web/src/materials/questions/widgets/TitleModules/EditTitle/index.jsx
+++ b/web/src/materials/questions/widgets/TitleModules/EditTitle/index.jsx
@@ -69,6 +69,7 @@ export default defineComponent({
               <RichEditor
                 class="rich-editor"
                 modelValue={filterXSS(this.title)}
+                needUploadImage={true}
                 onChange={this.handleChange}
                 onCreated={(editor) => {
                   editor?.focus()
diff --git a/web/src/render/App.vue b/web/src/render/App.vue
index c4f914ea..acafc152 100644
--- a/web/src/render/App.vue
+++ b/web/src/render/App.vue
@@ -1,7 +1,5 @@
 <template>
-  <div id="app">
-    <router-view></router-view>
-  </div>
+  <router-view></router-view>
 </template>
 <script setup lang="ts">
 import { computed, watch } from 'vue'
diff --git a/web/vite.config.ts b/web/vite.config.ts
index f8527f21..3ed48e61 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -114,6 +114,11 @@ export default defineConfig({
       '/api': {
         target: 'http://127.0.0.1:3000',
         changeOrigin: true
+      },
+      // 静态文件的默认存储文件夹
+      '/userUpload': {
+        target: 'http://127.0.0.1:3000',
+        changeOrigin: true
       }
     }
   },