Browse Source

+ 页面配置功能

chen.cheng 11 months ago
parent
commit
2b28e24d29

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -2,7 +2,7 @@ package com.ruoyi.common.utils.file;
 
 /**
  * 媒体类型工具类
- * 
+ *
  * @author ruoyi
  */
 public class MimeTypeUtils
@@ -16,7 +16,7 @@ public class MimeTypeUtils
     public static final String IMAGE_BMP = "image/bmp";
 
     public static final String IMAGE_GIF = "image/gif";
-    
+
     public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
 
     public static final String[] FLASH_EXTENSION = { "swf", "flv" };
@@ -28,7 +28,7 @@ public class MimeTypeUtils
 
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
+            "bmp", "gif", "jpg", "jpeg", "png", "svg",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件

+ 11 - 2
ruoyi-ui/src/views/cp/viewcfg/index.vue

@@ -134,7 +134,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -147,7 +147,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="icon" prop="iconUri">
-          <image-upload v-model="form.iconUri"/>
+          <image-upload v-model="form.iconUri" :file-type="['png', 'jpg', 'jpeg','svg']"/>
         </el-form-item>
         <el-form-item label="名称" prop="labelTxt">
           <el-input v-model="form.labelTxt" placeholder="请输入名称" />
@@ -219,6 +219,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        iconUri: [
+          { required: true, message: "icon不能为空", trigger: "blur" }
+        ],
+        labelTxt: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],
+        compCode: [
+          { required: true, message: "组件编码不能为空", trigger: "change" }
+        ],
       }
     };
   },

File diff suppressed because it is too large
+ 1 - 1011
ruoyi-ui/src/views/index.vue


+ 1 - 1
ruoyi-ui/vue.config.js

@@ -31,7 +31,7 @@ module.exports = {
   devServer: {
     host: '0.0.0.0',
     port: port,
-    open: true,
+    open: false,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {

Some files were not shown because too many files changed in this diff