laravel-admin 2.0适配

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=7.0.0",
-        "encore/laravel-admin": "*"
+        "encore/laravel-admin": "~2.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0"

resources/views/artisan.blade.php

@@ -1,6 +1,4 @@
-<script>
-$(function () {
-
+<script require="slimscroll">
     var storageKey = function () {
         var connection = $('#connections').val();
         return 'la-'+connection+'-history'
@@ -67,14 +65,13 @@ function History () {
             method: 'post',
             data: {
                 c: $input.val(),
-                _token: LA.token
             },
             success: function (response) {
 
                 history.push($input.val());
 
                 $('#terminal-box')
-                    .append('<div class="item"><small class="label label-default"> > artisan '+$input.val()+'<\/small><\/div>')
+                    .append('<div class="item"><small class="badge badge-secondary"> > artisan '+$input.val()+'<\/small><\/div>')
                     .append('<div class="item">'+response+'<\/div>')
                     .slimScroll({ scrollTo: $("#terminal-box")[0].scrollHeight });
 
@@ -114,20 +111,19 @@ function History () {
         send();
     });
 
-});
 </script>
 <!-- Chat box -->
-<div class="box box-primary">
-    <div class="box-header with-border">
+<div class="card card-@color card-outline">
+    <div class="card-header with-border">
         <i class="fa fa-terminal"></i>
     </div>
-    <div class="box-body chat" id="terminal-box">
+    <div class="card-body chat" id="terminal-box">
         <!-- chat item -->
 
         <!-- /.item -->
     </div>
     <!-- /.chat -->
-    <div class="box-footer with-border">
+    <div class="card-footer with-border">
 
         <div style="margin-bottom: 10px;">
 
@@ -140,7 +136,7 @@ function History () {
                 </button>
                 <ul class="dropdown-menu" role="menu">
                     @foreach($command as $item)
-                    <li><a href="#" class="loaded-command">{{$item}}</a></li>
+                    <a href="#" class="loaded-command dropdown-item">{{$item}}</a>
                     @endforeach
                 </ul>
             </div>
@@ -154,20 +150,25 @@ function History () {
                 </button>
                 <ul class="dropdown-menu" role="menu">
                     @foreach($commands['others'] as $item)
-                    <li><a href="#" class="loaded-command">{{$item}}</a></li>
+                    <a href="#" class="loaded-command dropdown-item">{{$item}}</a>
                     @endforeach
                 </ul>
             </div>
 
-            <button type="button" class="btn btn-success" id="terminal-send"><i class="fa fa-paper-plane"></i> send</button>
 
-            <button type="button" class="btn btn-warning" id="terminal-clear"><i class="fa fa-refresh"></i> clear</button>
         </div>
 
         <div class="input-group">
-            <span class="input-group-addon" style="font-size: 18px; line-height: 1.3333333;">artisan</span>
-            <input class="form-control input-lg" id="terminal-query" placeholder="command" style="border-left: 0px;padding-left: 0px;">
+            <div class="input-group-prepend">
+                <span class="input-group-text" >artisan</span>
+            </div>
+            <input class="form-control input-lg" id="terminal-query" placeholder="command">
+            <div class="input-group-append">
+                <button type="button" class="btn btn-success" id="terminal-send"><i class="fas fa-paper-plane"></i> send</button>
+
+                <button type="button" class="btn btn-warning" id="terminal-clear"><i class="fas fa-sync"></i> clear</button>
+            </div>
         </div>
     </div>
 </div>
-<!-- /.box (chat box) -->
+<!-- /.card (chat card) -->

resources/views/database.blade.php

@@ -1,7 +1,5 @@
 <script> Sfdump = window.Sfdump || (function (doc) { var refStyle = doc.createElement('style'), rxEsc = /([.*+?^${}()|\[\]\/\\])/g, idRx = /\bsf-dump-\d+-ref[012]\w+\b/, keyHint = 0 <= navigator.platform.toUpperCase().indexOf('MAC') ? 'Cmd' : 'Ctrl', addEventListener = function (e, n, cb) { e.addEventListener(n, cb, false); }; (doc.documentElement.firstElementChild || doc.documentElement.children[0]).appendChild(refStyle); if (!doc.addEventListener) { addEventListener = function (element, eventName, callback) { element.attachEvent('on' + eventName, function (e) { e.preventDefault = function () {e.returnValue = false;}; e.target = e.srcElement; callback(e); }); }; } function toggle(a, recursive) { var s = a.nextSibling || {}, oldClass = s.className, arrow, newClass; if ('sf-dump-compact' == oldClass) { arrow = '&#9660;'; newClass = 'sf-dump-expanded'; } else if ('sf-dump-expanded' == oldClass) { arrow = '&#9654;'; newClass = 'sf-dump-compact'; } else { return false; } a.lastChild.innerHTML = arrow; s.className = newClass; if (recursive) { try { a = s.querySelectorAll('.'+oldClass); for (s = 0; s < a.length; ++s) { if (a[s].className !== newClass) { a[s].className = newClass; a[s].previousSibling.lastChild.innerHTML = arrow; } } } catch (e) { } } return true; }; return function (root) { root = doc.getElementById(root); function a(e, f) { addEventListener(root, e, function (e) { if ('A' == e.target.tagName) { f(e.target, e); } else if ('A' == e.target.parentNode.tagName) { f(e.target.parentNode, e); } }); }; function isCtrlKey(e) { return e.ctrlKey || e.metaKey; } addEventListener(root, 'mouseover', function (e) { if ('' != refStyle.innerHTML) { refStyle.innerHTML = ''; } }); a('mouseover', function (a) { if (a = idRx.exec(a.className)) { try { refStyle.innerHTML = 'pre.sf-dump .'+a[0]+'{background-color: #B729D9; color: #FFF !important; border-radius: 2px}'; } catch (e) { } } }); a('click', function (a, e) { if (/\bsf-dump-toggle\b/.test(a.className)) { e.preventDefault(); if (!toggle(a, isCtrlKey(e))) { var r = doc.getElementById(a.getAttribute('href').substr(1)), s = r.previousSibling, f = r.parentNode, t = a.parentNode; t.replaceChild(r, a); f.replaceChild(a, s); t.insertBefore(s, r); f = f.firstChild.nodeValue.match(indentRx); t = t.firstChild.nodeValue.match(indentRx); if (f && t && f[0] !== t[0]) { r.innerHTML = r.innerHTML.replace(new RegExp('^'+f[0].replace(rxEsc, '\\$1'), 'mg'), t[0]); } if ('sf-dump-compact' == r.className) { toggle(s, isCtrlKey(e)); } } if (doc.getSelection) { try { doc.getSelection().removeAllRanges(); } catch (e) { doc.getSelection().empty(); } } else { doc.selection.empty(); } } }); var indentRx = new RegExp('^('+(root.getAttribute('data-indent-pad') || ' ').replace(rxEsc, '\\$1')+')+', 'm'), elt = root.getElementsByTagName('A'), len = elt.length, i = 0, t = []; while (i < len) t.push(elt[i++]); elt = root.getElementsByTagName('SAMP'); len = elt.length; i = 0; while (i < len) t.push(elt[i++]); root = t; len = t.length; i = t = 0; while (i < len) { elt = root[i]; if ("SAMP" == elt.tagName) { elt.className = "sf-dump-expanded"; a = elt.previousSibling || {}; if ('A' != a.tagName) { a = doc.createElement('A'); a.className = 'sf-dump-ref'; elt.parentNode.insertBefore(a, elt); } else { a.innerHTML += ' '; } a.title = (a.title ? a.title+'\n[' : '[')+keyHint+'+click] Expand all children'; a.innerHTML += '<span>&#9660;</span>'; a.className += ' sf-dump-toggle'; if ('sf-dump' != elt.parentNode.className) { toggle(a); } } else if ("sf-dump-ref" == elt.className && (a = elt.getAttribute('href'))) { a = a.substr(1); elt.className += ' '+a; if (/[\[{]$/.test(elt.previousSibling.nodeValue)) { a = a != elt.nextSibling.id && doc.getElementById(a); try { t = a.nextSibling; elt.appendChild(a); t.parentNode.insertBefore(a, t); if (/^[@#]/.test(elt.innerHTML)) { elt.innerHTML += ' <span>&#9654;</span>'; } else { elt.innerHTML = '<span>&#9654;</span>'; elt.className = 'sf-dump-ref'; } elt.className += ' sf-dump-toggle'; } catch (e) { if ('&' == elt.innerHTML.charAt(0)) { elt.innerHTML = '&hellip;'; elt.className = 'sf-dump-ref'; } } } } ++i; } }; })(document); </script><style> pre.sf-dump { display: block; white-space: pre; padding: 5px; } pre.sf-dump span { display: inline; } pre.sf-dump .sf-dump-compact { display: none; } pre.sf-dump abbr { text-decoration: none; border: none; cursor: help; } pre.sf-dump a { text-decoration: none; cursor: pointer; border: 0; outline: none; }pre.sf-dump{ color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; word-break: normal}pre.sf-dump .sf-dump-num{font-weight:bold; color:#1299DA}pre.sf-dump .sf-dump-const{font-weight:bold}pre.sf-dump .sf-dump-str{font-weight:bold; color:#56DB3A}pre.sf-dump .sf-dump-note{color:#1299DA}pre.sf-dump .sf-dump-ref{color:#A0A0A0}pre.sf-dump .sf-dump-public{color:#FFFFFF}pre.sf-dump .sf-dump-protected{color:#FFFFFF}pre.sf-dump .sf-dump-private{color:#FFFFFF}pre.sf-dump .sf-dump-meta{color:#B729D9}pre.sf-dump .sf-dump-key{color:#56DB3A}pre.sf-dump .sf-dump-index{color:#1299DA}</style>
-<script>
-$(function () {
-
+<script require="slimscroll">
     var storageKey = function () {
         var connection = $('#connections').val();
         return 'la-'+connection+'-history'
@@ -22,7 +20,7 @@ function History () {
         } else {
             history = JSON.parse(history);
         }
-        return history;
+        return history;ScaffoldController.php
     };
 
     History.prototype.push = function (record) {
@@ -69,14 +67,13 @@ function History () {
             data: {
                 c: $('#connections').val(),
                 q: $input.val(),
-            _token: LA.token
-    },
+            },
         success: function (response) {
 
             history.push($input.val());
 
             $('#terminal-box')
-                .append('<div class="item"><small class="label label-default">'+$('#connections').val()+'> '+$input.val()+'<\/small><\/div>')
+                .append('<div class="item"><small class="badge badge-secondary">'+$('#connections').val()+'> '+$input.val()+'<\/small><\/div>')
                 .append('<div class="item">'+response+'<\/div>')
                 .slimScroll({ scrollTo: $("#terminal-box")[0].scrollHeight });
 
@@ -108,14 +105,13 @@ function History () {
         //history.clear();
     });
 
-});
 </script>
 <!-- Chat box -->
-<div class="box box-primary">
-    <div class="box-header with-border">
+<div class="card card-@color card-outline">
+    <div class="card-header with-border">
         <i class="fa fa-terminal"></i>
 
-        <div class="box-tools pull-right" data-toggle="tooltip" title="Status">
+        <div class="card-tools pull-right" data-toggle="tooltip" title="Status">
 
             <div class="input-group input-group-sm" style="width: 150px;">
 
@@ -142,13 +138,13 @@ function History () {
 
         </div>
     </div>
-    <div class="box-body chat" id="terminal-box">
+    <div class="card-body chat" id="terminal-box">
         <!-- chat item -->
 
         <!-- /.item -->
     </div>
     <!-- /.chat -->
-    <div class="box-footer with-border">
+    <div class="card-footer with-border">
         <div class="input-group">
 
             <input class="form-control input-lg" id="terminal-query" placeholder="Type query...">
@@ -163,4 +159,4 @@ function History () {
         </div>
     </div>
 </div>
-<!-- /.box (chat box) -->
+<!-- /.card (chat card) -->