renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test

Browse Source
This commit is contained in:
rd
2025-08-13 17:21:53 +08:00
parent 238c01513a 5bc15d7e05
commit 0bf7f48c18
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/creative-generation-workshop/manuscript-writer/detail/index.vue
View File

@ -165,7 +165,7 @@ export default {
{renderMainImg()} {renderMainImg()}
<div class="w-full"> <div class="w-full">
<p class="cts !color-#211F24 ">{dataSource.value.content}</p> <p class="cts !color-#211F24 whitespace-pre-line">{dataSource.value.content}</p>
</div> </div>
{/* 仅图片类型显示图片列表 */} {/* 仅图片类型显示图片列表 */}

6
src/views/creative-generation-workshop/manuscript/components/edit-form/index.vue
View File

@ -1,13 +1,13 @@
<script lang="jsx"> <script lang="jsx">
import axios from 'axios'; import axios from 'axios';
import { Form, FormItem, Input, Textarea, Upload, Message as AMessage, Button } from '@arco-design/web-vue'; import { Form, FormItem, Input, Textarea, Upload, Message as AMessage, Button } from '@arco-design/web-vue';
import CommonSelect from '@/components/common-select'; // import CommonSelect from '@/components/common-select';
import { VueDraggable } from 'vue-draggable-plus'; // import { VueDraggable } from 'vue-draggable-plus';
import TextOverTips from '@/components/text-over-tips'; import TextOverTips from '@/components/text-over-tips';
import ImgBox from './img-box'; import ImgBox from './img-box';
import { formatFileSize, getVideoInfo, formatDuration, formatUploadSpeed } from '@/utils/tools'; import { formatFileSize, getVideoInfo, formatDuration, formatUploadSpeed } from '@/utils/tools';
import { getProjectList } from '@/api/all/propertyMarketing'; // import { getProjectList } from '@/api/all/propertyMarketing';
import { EnumManuscriptType } from '@/views/creative-generation-workshop/manuscript/list/constants.ts'; import { EnumManuscriptType } from '@/views/creative-generation-workshop/manuscript/list/constants.ts';
import { getImagePreSignedUrl, getVideoPreSignedUrl } from '@/api/all/common'; import { getImagePreSignedUrl, getVideoPreSignedUrl } from '@/api/all/common';

2
src/views/creative-generation-workshop/manuscript/detail/index.vue
View File

@ -164,7 +164,7 @@ export default {
{renderMainImg()} {renderMainImg()}
<div class="w-full"> <div class="w-full">
<p class="cts !color-#211F24 ">{dataSource.value.content}</p> <p class="cts !color-#211F24 whitespace-pre-line">{dataSource.value.content}</p>
</div> </div>
{/* 仅图片类型显示图片列表 */} {/* 仅图片类型显示图片列表 */}