Merge branch 'b_template_component_bugfixed_20200525' into 'b-template-component'

B template component bugfixed 20200525

See merge request !25

client/components/dialog/items-dialog/items-dialog.acss

@@ -5,7 +5,7 @@
   flex-direction: column;
 }
 .item-goods-wrap .db-dialog-content_inner {
-  max-height: 500px;
+  max-height: 60vh;
   padding: 0 24px 24px;
 }
 

client/utils/validate.js

@@ -28,15 +28,26 @@ export const isNumber = val => {
 * @returns { boolean }
 */
 export const validateRangeNumber = (number, [min, max] = [], fixed = 0) => {
-  const pattern = new RegExp(`^-?[0-9]+(\\.[0-9]{0,${fixed}})?$`);
+  let pattern = new RegExp(`^[0-9]+(\\.[0-9]{1,${fixed}})?$`);
+  // 判断空字符
+  if (typeof number === 'string' && !number.trim()) return false
+
+  if (fixed === 0 || !number.includes('.')) {
+    if (min > 0) {
+      // 校验正整数
+      pattern = /^[1-9]\d*$/
+    } else if (min === 0 ) {
+      // 校验自然数
+      pattern = /^([1-9]\d*|[0]{1,1})$/
+    }
+  }
 
   if (min > max) {
     console.error('数字范围的最小值不能大于最大值');
     return;
   }
-  if (number != 0) {
-    if (!pattern.test(number) || number === '') return false;
-  }
+
+  if (!pattern.test(number)) return false;
 
   if (number < min || number > max) return false;