Merge branch 'dev' of https://gitee.com/JavaLionLi/plus-ui into dev

src/assets/styles/ruoyi.scss

@@ -197,8 +197,6 @@ h6 {
 }
 
 .card-box {
-  padding-right: 15px;
-  padding-left: 15px;
   margin-bottom: 10px;
 }
 

src/components/FileUpload/index.vue

@@ -7,6 +7,7 @@
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
       :limit="limit"
+      :accept="fileAccept"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
@@ -79,6 +80,9 @@ const showTip = computed(() => props.isShowTip && (props.fileType || props.fileS
 
 const fileUploadRef = ref<ElUploadInstance>();
 
+// 监听 fileType 变化，更新 fileAccept
+const fileAccept = computed(() => props.fileType.map((type) => `.${type}`).join(','));
+
 watch(
   () => props.modelValue,
   async (val) => {

src/components/ImageUpload/index.vue

@@ -8,6 +8,7 @@
       :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
       :limit="limit"
+      :accept="fileAccept"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :before-remove="handleDelete"
@@ -87,6 +88,9 @@ const showTip = computed(() => props.isShowTip && (props.fileType || props.fileS
 
 const imageUploadRef = ref<ElUploadInstance>();
 
+// 监听 fileType 变化，更新 fileAccept
+const fileAccept = computed(() => props.fileType.map((type) => `.${type}`).join(','));
+
 watch(
   () => props.modelValue,
   async (val: string) => {

src/views/monitor/cache/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="p-2">
-    <el-row>
+    <el-row :gutter="10">
       <el-col :span="24" class="card-box">
         <el-card shadow="hover">
           <template #header>