mooho-base-admin-plus 2.4.24 → 2.4.25

package/package.json

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

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

@@ -20,6 +20,7 @@
       :format="!!(accept || '').trim() ? accept.split(',').map(item => item.replaceAll('.', '')) : []"
       :multiple="true"
       :type="draggable ? 'drag' : 'select'"
+      :max-size="maxSize == null ? null : maxSize * 1024"
     >
       <Button v-if="!draggable && !readonly" :size="size" icon="ios-cloud-upload-outline">{{ $t('Front_Btn_Upload') }}</Button>
       <div v-if="draggable && !readonly" style="padding: 20px 0">
@@ -61,6 +62,10 @@
       maxCount: {
         type: Number
       },
+      // 最大上传文件大小(M)
+      maxSize: {
+        type: Number
+      },
       /**
        * 大小
        * @values small, default, large

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

@@ -32,6 +32,7 @@
         :show-upload-list="false"
         :before-upload="beforeUpload"
         :on-success="onUploadSuccess"
+        :max-size="maxSize == null ? null : maxSize * 1024"
       >
         <div
           class="form-image"
@@ -80,6 +81,10 @@
       maxCount: {
         type: Number
       },
+      // 最大上传文件大小(M)
+      maxSize: {
+        type: Number
+      },
       // 图片宽度
       width: {
         type: Number

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

@@ -392,6 +392,11 @@
                 <Input type="number" style="width: 100px" number v-model="data.maxLength" />
               </FormItem>
             </Col>
+            <Col v-bind="grid8" v-if="data.controlType == 'Attachment' || data.controlType == 'Image'">
+              <FormItem label="文件大小限制(M)" key="maxValue" prop="maxValue">
+                <Input type="number" style="width: 100px" number v-model="data.maxValue" />
+              </FormItem>
+            </Col>
             <Col v-bind="grid8" v-if="data.controlType == 'NumberInput' || data.controlType == 'Slider'">
               <FormItem label="输入范围">
                 <Input type="number" style="width: 60px" number v-model="data.minValue" />

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

@@ -417,7 +417,8 @@
                   :ref="'attachment_' + column.code"
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
-                  :maxCount="column.maxLength"
+                  :max-count="column.maxLength"
+                  :max-size="column.maxValue"
                   :accept="column.pattern"
                   :draggable="column.mergeSame"
                 />
@@ -440,7 +441,8 @@
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :readonly="readonly || column.isReadonly"
-                  :maxCount="column.maxLength"
+                  :max-count="column.maxLength"
+                  :max-size="column.maxValue"
                   :height="column.controlHeight"
                   :width="column.controlWidth"
                   :accept="column.pattern"
@@ -923,7 +925,7 @@
           });
         }
 
-        if (column.maxValue != null) {
+        if (column.maxValue != null && (column.controlType == 'NumberInput' || column.controlType == 'Slider')) {
           rules.push({
             type: this.getDataType(column),
             max: column.maxValue,
@@ -932,7 +934,7 @@
           });
         }
 
-        if (column.minValue != null) {
+        if (column.minValue != null && (column.controlType == 'NumberInput' || column.controlType == 'Slider')) {
           rules.push({
             type: this.getDataType(column),
             min: column.minValue,
@@ -941,7 +943,7 @@
           });
         }
 
-        if (column.maxLength != null) {
+        if (column.maxLength != null && (column.controlType == 'TextInput' || column.controlType == 'TextArea')) {
           rules.push({
             type: this.getDataType(column),
             length: column.maxLength,