Merge branch '2.0' into gitee2

resources/assets/dcat/extra/Upload/AddFile.js

@@ -219,11 +219,11 @@ export default class AddFile {
                     }
 
                     // 删除请求
-                    uploader.request.delete(file, function () {
+                    parent.request.delete(file, function () {
                         // 删除成功回调
                         parent.input.delete(file.serverId);
 
-                        uploader.uploader.removeFile(file);
+                        uploader.removeFile(file);
                     });
 
                     break;

resources/assets/dcat/plugins/number-input/bootstrap-number-input.js

@@ -52,6 +52,7 @@
                 }
 
                 clone.focus().val(n);
+                clone.trigger('change');
                 return true;
             }
 
@@ -89,8 +90,13 @@
             });
 
             clone.prop('type', 'text').blur(function (e) {
-                var c = String.fromCharCode(e.which);
+                var c = parseInt(String.fromCharCode(e.which));
+                if (isNaN(c)) {
+                    c = 0;
+                }
+
                 var n = getVal() + c;
+
                 if ((min && n < min)) {
                     setText(min);
                 }

resources/dist/dcat/plugins/number-input/bootstrap-number-input.js

@@ -52,6 +52,7 @@
                 }
 
                 clone.focus().val(n);
+                clone.trigger('change');
                 return true;
             }
 
@@ -89,8 +90,13 @@
             });
 
             clone.prop('type', 'text').blur(function (e) {
-                var c = String.fromCharCode(e.which);
+                var c = parseInt(String.fromCharCode(e.which));
+                if (isNaN(c)) {
+                    c = 0;
+                }
+
                 var n = getVal() + c;
+
                 if ((min && n < min)) {
                     setText(min);
                 }

resources/views/partials/navbar.blade.php

@@ -1,4 +1,6 @@
 
+{!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_BEFORE']) !!}
+
 <nav class="header-navbar navbar-expand-lg navbar
     navbar-with-menu {{ $configData['navbar_class'] }}
     {{ $configData['navbar_color'] }}
@@ -24,7 +26,7 @@
                 </div>
 
                 @if($configData['horizontal_menu'])
-                <div class="d-md-block horizontal-navbar-brand">
+                <div class="d-md-block horizontal-navbar-brand justify-content-center text-center">
                     <ul class="nav navbar-nav flex-row">
                         <li class="nav-item mr-auto">
                             <a href="{{ admin_url('/') }}" class="waves-effect waves-light">
@@ -50,16 +52,4 @@
     </div>
 </nav>
 
-{{-- Search Start Here --}}
-<ul class="main-search-list-defaultlist d-none">
-
-</ul>
-<ul class="main-search-list-defaultlist-other-list d-none">
-    <li class="auto-suggestion d-flex align-items-center justify-content-between cursor-pointer">
-        <a class="d-flex align-items-center justify-content-between w-100 py-50">
-            <div class="d-flex justify-content-start"><span class="mr-75 feather icon-alert-circle"></span><span>No
-results found.</span></div>
-        </a>
-    </li>
-</ul>
-
+{!! admin_section(Dcat\Admin\Admin::SECTION['NAVBAR_AFTER']) !!}

src/Admin.php

@@ -47,6 +47,10 @@ class Admin
         // 顶部导航栏用户面板
         'NAVBAR_USER_PANEL' => 'ADMIN_NAVBAR_USER_PANEL',
         'NAVBAR_AFTER_USER_PANEL' => 'ADMIN_NAVBAR_AFTER_USER_PANEL',
+        // 顶部导航栏之前
+        'NAVBAR_BEFORE' => 'ADMIN_NAVBAR_BEFORE',
+        // 顶部导航栏底下
+        'NAVBAR_AFTER' => 'ADMIN_NAVBAR_AFTER',
 
         // 侧边栏顶部用户信息面板
         'LEFT_SIDEBAR_USER_PANEL' => 'ADMIN_LEFT_SIDEBAR_USER_PANEL',