Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/components/Editor/index.vue

@@ -176,7 +176,7 @@ export default {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(length, "image",  res.url);
         // 调整光标到最后
         quill.setSelection(length + 1);
       } else {

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

@@ -99,8 +99,8 @@
     />
 
     <!-- 添加或修改栏目导航对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级栏目" prop="parentId">
@@ -114,9 +114,46 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" style="width: 100%;" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="底部导航" prop="isBottom">
+              <el-select v-model="form.isBottom" placeholder="请选择底部导航" clearable  style="width: 100%;">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否是标题" prop="isTitle">
+              <el-select v-model="form.isTitle" placeholder="请选择是否是标题" clearable  style="width: 100%;">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="导航栏" prop="isNavigationBar">
+              <el-select v-model="form.isNavigationBar" placeholder="请选择导航栏" clearable style="width: 100%;">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item label="栏目状态">
               <el-radio-group v-model="form.status">
@@ -145,7 +182,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Column",
-  dicts: ['sys_normal_disable'],
+  dicts: ['sys_normal_disable',"sys_yes_no"],
   components: { Treeselect },
   data() {
     return {
@@ -181,6 +218,15 @@ export default {
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
+        ],
+        isTitle: [
+          { required: true, message: "请选择是否是标题", trigger: "blur" }
+        ],
+        isBottom: [
+          { required: true, message: "请选择是否是底部导航", trigger: "blur" }
+        ],
+        isNavigationBar: [
+          { required: true, message: "请选择是否是导航栏", trigger: "blur" }
         ]
       }
     };