mooho-base-admin-plus 2.2.9 → 2.2.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/upload/upload-attachment.vue

@@ -9,7 +9,15 @@
       :on-preview="onUploadPreview"
       :on-remove="onUploadRemove"
       :disabled="readonly"
-      :accept="accept"
+      :accept="
+        !!(accept || '').trim()
+          ? accept
+              .split(',')
+              .map(item => '.' + item.replaceAll('.', ''))
+              .join(',')
+          : null
+      "
+      :format="!!(accept || '').trim() ? accept.split(',').map(item => item.replaceAll('.', '')) : null"
       :multiple="true"
       :type="draggable ? 'drag' : 'select'"
     >

package/src/components/upload/upload-image.vue

@@ -16,7 +16,23 @@
           <Icon custom="fa fa-download" @click="downloadImage(item)"></Icon>
         </div>
       </div>
-      <Upload v-if="!readonly" accept="image/*" :action="uploadURL" :headers="uploadHeaders" :show-upload-list="false" :before-upload="beforeUpload" :on-success="onUploadSuccess">
+      <Upload
+        v-if="!readonly"
+        :accept="
+          !!(accept || '').trim()
+            ? accept
+                .split(',')
+                .map(item => '.' + item.replaceAll('.', ''))
+                .join(',')
+            : 'image/*'
+        "
+        :format="!!(accept || '').trim() ? accept.split(',').map(item => item.replaceAll('.', '')) : null"
+        :action="uploadURL"
+        :headers="uploadHeaders"
+        :show-upload-list="false"
+        :before-upload="beforeUpload"
+        :on-success="onUploadSuccess"
+      >
         <div
           class="form-image"
           v-if="fileList.length < maxCount || maxCount == null"
@@ -71,6 +87,12 @@
       // 图片高度
       height: {
         type: Number
+      },
+      /**
+       * 允许的文件类型
+       */
+      accept: {
+        type: String
       }
     },
     computed: {

package/src/components/view/column-edit.vue

@@ -442,7 +442,7 @@
                 <Input type="text" v-model="data.pattern" maxlength="100" />
               </FormItem>
             </Col>
-            <Col v-bind="grid8" v-if="data.controlType == 'Attachment'">
+            <Col v-bind="grid8" v-if="data.controlType == 'Attachment' || data.controlType == 'Image'">
               <FormItem label="接受的文件类型" key="pattern" prop="pattern">
                 <Input type="text" v-model="data.pattern" maxlength="100" />
               </FormItem>

package/src/components/view/view-form.vue

@@ -420,6 +420,7 @@
                   :maxCount="column.maxLength"
                   :height="column.controlHeight"
                   :width="column.controlWidth"
+                  :accept="column.pattern"
                 />
               </template>
               <template v-else-if="column.controlType === 'Slider'">

package/src/components/view/view-table.vue

@@ -17,7 +17,7 @@
       @submit.prevent
     >
       <div ref="filterCommand">
-        <Row :gutter="24" type="flex" justify="end">
+        <Row :gutter="24" type="flex" :justify="getJustify(tableView.filterAlign)">
           <!--
             @slot 筛选栏
             @binding {object} table 表格对象
@@ -2559,6 +2559,18 @@
         } else {
           this.setData(model, expression, null);
         }
+      },
+      // 筛选栏对齐方式
+      getJustify(filterAlign) {
+        if (filterAlign == 'Left') {
+          return 'start';
+        } else if (filterAlign == 'Center') {
+          return 'center';
+        } else if (filterAlign == 'Right') {
+          return 'end';
+        } else {
+          return 'end';
+        }
       }
     }
   };