🎨 修复富文本组件水印功能的bug&分类功能新增文章分类字段
This commit is contained in:
@@ -93,7 +93,7 @@
|
||||
<el-input v-model="formData.keyword" :clearable="true" placeholder="请输入关键词" />
|
||||
</el-form-item>
|
||||
<el-form-item label="内容:" prop="content" >
|
||||
<RichEdit v-model="formData.content"/>
|
||||
<RichEdit v-model="formData.content" :useWatermark="true"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-drawer>
|
||||
|
@@ -18,7 +18,12 @@
|
||||
|
||||
|
||||
<template v-if="showAllQuery">
|
||||
<!-- 将需要控制显示状态的查询条件添加到此范围内 -->
|
||||
<el-form-item label="分类类型">
|
||||
<el-select v-model="searchInfo.isArticle" placeholder="请选择分类类型" clearable style="width: 180px">
|
||||
<el-option label="文章分类" :value="1" />
|
||||
<el-option label="非文章分类" :value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
<el-form-item>
|
||||
@@ -67,9 +72,12 @@
|
||||
<el-table-column align="left" label="是否启用" prop="active" width="120">
|
||||
<template #default="scope">{{ formatBoolean(scope.row.active) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="left" label="首页展示" prop="active" width="120">
|
||||
<el-table-column align="left" label="首页展示" prop="index" width="120">
|
||||
<template #default="scope">{{ formatBoolean(scope.row.index) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="left" label="分类类型" prop="isArticle" width="120">
|
||||
<template #default="scope">{{ scope.row.isArticle === 1 ? '文章分类' : '非文章分类' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="left" label="父ID" prop="parentId" width="120" />
|
||||
<el-table-column align="left" label="操作" fixed="right" :min-width="appStore.operateMinWith">
|
||||
<template #default="scope">
|
||||
@@ -120,6 +128,12 @@
|
||||
<el-form-item label="是否首页展示:" prop="index" >
|
||||
<el-switch v-model="formData.index" active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" clearable ></el-switch>
|
||||
</el-form-item>
|
||||
<el-form-item label="分类类型:" prop="isArticle" >
|
||||
<el-select v-model="formData.isArticle" placeholder="请选择分类类型" style="width: 100%">
|
||||
<el-option label="文章分类" :value="1" />
|
||||
<el-option label="非文章分类" :value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="父ID:" prop="parentId" >
|
||||
<el-input v-model.number="formData.parentId" :clearable="false" placeholder="请输入父ID" />
|
||||
</el-form-item>
|
||||
@@ -150,6 +164,9 @@
|
||||
<el-descriptions-item label="首页展示">
|
||||
{{ detailFrom.index }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="分类类型">
|
||||
{{ detailFrom.isArticle === 1 ? '文章分类' : '非文章分类' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="父ID">
|
||||
{{ detailFrom.parentId }}
|
||||
</el-descriptions-item>
|
||||
@@ -197,7 +214,8 @@ const formData = ref({
|
||||
active: false,
|
||||
parentId: 0,
|
||||
index: 0,
|
||||
icon: ''
|
||||
icon: '',
|
||||
isArticle: 0
|
||||
})
|
||||
|
||||
|
||||
@@ -409,7 +427,8 @@ const closeDialog = () => {
|
||||
active: false,
|
||||
parentId: 0,
|
||||
index: 0,
|
||||
icon: ''
|
||||
icon: '',
|
||||
isArticle: 0
|
||||
}
|
||||
}
|
||||
// 弹窗确定
|
||||
|
@@ -60,18 +60,19 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 文章介绍(放在文章详情上方,使用富文本) -->
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="文章详情" prop="content">
|
||||
<RichEdit style="width: 100%" v-model="formData.content"/>
|
||||
<el-form-item label="文章介绍" prop="desc">
|
||||
<RichEdit style="width: 100%" v-model="formData.desc"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="desc">
|
||||
<el-input type="textarea" v-model="formData.desc" placeholder="请输入文章备注信息" />
|
||||
<el-form-item label="文章详情" prop="content">
|
||||
<RichEdit style="width: 100%" v-model="formData.content"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -140,6 +141,10 @@
|
||||
coverImg: [
|
||||
{ required: true, message: '请上传封面', trigger: 'blur' }
|
||||
],
|
||||
// 文章介绍改为富文本,也做必填校验
|
||||
desc: [
|
||||
{ required: true, message: '请输入文章介绍', trigger: 'blur' }
|
||||
],
|
||||
content: [
|
||||
{ required: true, message: '请输入文章内容', trigger: 'blur' }
|
||||
]
|
||||
|
Reference in New Issue
Block a user