Przeglądaj źródła

修复部分bug

Yue 2 lat temu
rodzic
commit
85ca468468

+ 11 - 3
SourceCode/Src/VberAdmin.Web.Mvc/Views/Account/Login.cshtml

@@ -46,13 +46,21 @@
                 if (!_$form.valid()) {
                     return;
                 }
-
-                abp.ui.setBusy($('body'), abp.ajax({
+                abp.ui.setBusy($('body'), {
+                    message:"正在登录,请稍后...",
+                    css: { 
+                        backgroundColor: 'rgba(0,0,0,0)',
+                        border:"none",
+                        color: '#fff',
+                        fontSize:"18px"
+                    }
+                });
+                abp.ajax({
                         contentType: 'application/x-www-form-urlencoded',
                         url: _$form.attr('action'),
                         data: _$form.serialize()
                     })
-                );
+             
             });
         })();
     </script>

+ 1 - 1
SourceCode/Src/VberAdmin.Web.Mvc/Views/Bs/SysRole.cshtml

@@ -17,7 +17,7 @@
 {
         new VmSearchItem("name", L("roleName")),
         new VmSearchItem("displayName", L("roleDisplayName")),
-        new VmSearchItem("roleType", L("roleType"), FType.I, EType.Equal).WithSelect(roleTypeSelect, true),
+        new VmSearchItem("userType", L("roleType"), FType.I, EType.Equal).WithSelect(roleTypeSelect, true),
     };
     if (accountType == VzDefinition.AccountType.System)
     {

+ 6 - 1
SourceCode/Src/VberAdmin.Web.Mvc/wwwroot/js/vber.base.js

@@ -666,6 +666,7 @@ $.ajaxSetup({
             let _proto = Table.prototype, dt, _selectedIdArray = [], treeGridRows = {};
             _proto._init = function () {
                 let _this = this, _config = _this._config, _el = _this._element;
+                $.fn.dataTable.ext.errMode = "none "
                 let htmlOptions = _this._getHtmlOption();
                 if (window.lang && window.lang != "en") {
                     htmlOptions.language = { url: `/libs-ext/dataTable/language_${window.lang}.json` };
@@ -703,6 +704,11 @@ $.ajaxSetup({
                             return _config.responseHandler && typeof _config.responseHandler == 'function'
                                 ? _config.responseHandler.call(_this, data)
                                 : _this._responseHandler(data);
+                        },
+                        error: function () {
+                            console.error(`Table[${$(_this._element).attr('id')}] load failed`);
+                            $('#table_processing').fadeOut();
+                            abp.message.error("加载出错!");
                         }
                     };
                 }
@@ -1032,7 +1038,6 @@ $.ajaxSetup({
                 }
                 return treeData;
             }
-
             _proto._rowCallback = function (row, data) {
                 let _this = this, _config = _this._config;
                 if (_config.multipleSelect && _config.clickToSelect) {