Merge pull request 'master' (#926) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/926
This commit is contained in:
2024-12-13 04:42:16 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -27,8 +27,7 @@
</el-col>
<el-col :span="24" style="margin-left: 10px">
<el-form-item label="文章内容" prop="articleContent">
<!-- axupimgs-->
<Tinymce v-model:value="formData.articleContent" imageUrl="/workflow/process/file/upload" :height="500" v-if="showTinymce" :toolbar="['undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image ']" />
<Tinymce v-model:value="formData.articleContent" imageUrl="/workflow/process/file/upload" :height="500" v-if="showTinymce" :toolbar="['undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image axupimgs']" />
</el-form-item>
</el-col>

View File

@@ -74,6 +74,7 @@ const download = (row) => {
a.href = url;
a.download = row.fileName;
a.click();
window.open(row.url,'_blank')
};
x.send();
}