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

frontend/saas-web/app/util/BaseUtil.js

@@ -54,8 +54,8 @@ Ext.define('saas.util.BaseUtil', {
          * @param title: 标题
          * 
          */
-        showSuccessToast: function (content, title) {
-            Ext.toast({
+        showSuccessToast: function (content, title, configs) {
+            Ext.toast(Ext.Object.merge({
                 cls:'x-toast-success',
                 html: content,
                 title: title,
@@ -64,11 +64,11 @@ Ext.define('saas.util.BaseUtil', {
                 autoCloseDelay:3000,
                 autoClose:true,
                 maxWidth: 400
-            });
+            }, configs));
         },
 
-        showErrorToast: function (content, title) {
-            Ext.toast({
+        showErrorToast: function (content, title, configs) {
+            Ext.toast(Ext.Object.merge({
                 cls:'x-toast-error',
                 html: content,
                 title: title,
@@ -77,7 +77,7 @@ Ext.define('saas.util.BaseUtil', {
                 autoCloseDelay:3000,
                 autoClose:true,
                 maxWidth: 400
-            });
+            }, configs));
         },
 
         /**