Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -198,7 +198,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "更新时间"
     }, {
         xtype: 'numberfield',
-        fieldLabel: '采购提前期',
+        fieldLabel: '提前期',
         name: 'pr_leadtime',
         minValue: 0,
         maxLength: 10

frontend/saas-web/overrides/form/field/TrimVtype.js

@@ -8,8 +8,5 @@ Ext.define('saas.override.form.field.TrimVtype', {
     // RegExp for the value to be tested against within the validation function
     trimRe: /^(?! ).*(?<! )$/i,
     // vtype Text property: The error text to display when the validation function returns false
-    trimText: '请不要在内容的开头和结尾添加空格',
-    // vtype Mask property: The keystroke filter mask
-    trimMask: /[\d\s:amp]/i
-
+    trimText: '请不要在内容的开头和结尾添加空格'
 });