提交

ruoyi-ui/src/views/system/news/index.vue

@@ -86,7 +86,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="栏目名称" align="center" prop="columnName" />
       <el-table-column label="文章标题" align="center" prop="newsTitle" />
-      <el-table-column label="文章内容" align="center" prop="newsContent" width="300px"/>
+      <el-table-column label="文章内容" align="center" prop="newsContent" width="300px" :show-overflow-tooltip="true"/>
       <el-table-column label="文章状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.column_news" :value="scope.row.status"/>
@@ -143,26 +143,45 @@
 
     <!-- 添加或修改文章信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="文章标题" prop="newsTitle">
-          <el-input v-model="form.newsTitle" placeholder="请输入文章标题" />
-        </el-form-item>
-          <el-form-item label="选择栏目"  prop="columnId">
-            <treeselect v-model="form.columnId" :options="columnOptions" :normalizer="normalizer" placeholder="选择栏目" />
-          </el-form-item>
-        <el-form-item label="是否头条" prop="isTop">
-          <el-select v-model="form.isTop" placeholder="请选择">
-            <el-option
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="文章内容">
-          <editor v-model="form.newsContent" :min-height="192"/>
-        </el-form-item>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="文章标题" prop="newsTitle">
+              <el-input v-model="form.newsTitle" placeholder="请输入文章标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选择栏目" prop="columnId">
+              <treeselect v-model="form.columnId" :options="columnOptions" :normalizer="normalizer"
+                placeholder="选择栏目" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否头条" prop="isTop">
+              <el-select v-model="form.isTop" placeholder="请选择" style="width: 100%;">
+                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="文章内容" prop="newsContent">
+              <editor v-model="form.newsContent" :min-height="192" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="文章缩略图" prop="newsImage">
+              <!-- <editor v-model="form.newsImage" :min-height="192" /> -->
+              <imageUpload v-model="form.imageContent" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 <!--        <el-form-item label="文章状态">
           <el-radio-group v-model="form.status">
             <el-radio