mooho-base-admin-plus 2.8.3 → 2.8.5

package/package.json

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

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

@@ -183,6 +183,8 @@
                 :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :placeholder="column.description"
+                :max="column.maxValue"
+                :min="column.minValue"
                 @on-change="onDataChange(rowData(row, index), column)"
                 @on-blur="onBlur(rowData(row, index), column)"
               />
@@ -1609,6 +1611,7 @@
 
           for (let j = 0; j < this.columns.length; j++) {
             let column = this.columns[j];
+            let value = this.parseData(row, column.code);
 
             // 不显示的不验证
             if (row._isShow && row._isShow[column.code] == false) {
@@ -1628,14 +1631,34 @@
               }
             }
 
-            if (isRequired) {
-              let value = this.parseData(row, column.code);
+            let name = column.name.replaceAll(' <font color="red">*</font>', '');
 
+            if (isRequired) {
               if (value == null || !(String(value) || '').trim()) {
-                this.error('Front_Msg_Row_Column_Required|' + (i + 1) + '|' + column.name);
+                this.error('Front_Msg_Row_Column_Required|' + (i + 1) + '|' + name);
                 return false;
               }
             }
+
+            // if (column.maxLength != null && value != null && String(value).length > column.maxLength) {
+            //   this.error('Front_Msg_Row_Validation_Max_Length|' + (i + 1) + '|' + column.name + '|' + column.maxLength.toString());
+            //   return false;
+            // }
+
+            if (column.maxValue != null && !isNaN(value) && value > column.maxValue) {
+              this.error('Front_Msg_Row_Validation_Max_Value|' + (i + 1) + '|' + name + '|' + column.maxValue.toString());
+              return false;
+            }
+
+            if (column.minValue != null && !isNaN(value) && value < column.minValue) {
+              this.error('Front_Msg_Row_Validation_Min_Value|' + (i + 1) + '|' + name + '|' + column.minValue.toString());
+              return false;
+            }
+
+            if (!!(column.pattern || '').trim() && value != null && new RegExp(column.pattern).test(value) == false) {
+              this.error('Front_Msg_Row_Validation_Pattern|' + (i + 1) + '|' + name + '|' + column.pattern);
+              return false;
+            }
           }
         }