Procházet zdrojové kódy

修改版本获取方式

dongasai před 2 roky
rodič
revize
3ff076229c
3 změnil soubory, kde provedl 53 přidání a 49 odebrání
  1. 46 46
      resources/views/layouts/container.blade.php
  2. 6 2
      src/Admin.php
  3. 1 1
      src/Layout/Asset.php

+ 46 - 46
resources/views/layouts/container.blade.php

@@ -1,46 +1,46 @@
-<body
-        class="dcat-admin-body sidebar-mini layout-fixed {{ $configData['body_class']}} {{ $configData['sidebar_class'] }}
-        {{ $configData['navbar_class'] === 'fixed-top' ? 'navbar-fixed-top' : '' }} " >
-
-<script>
-    var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});
-</script>
-
-{!! admin_section(Dcat\Admin\Admin::SECTION['BODY_INNER_BEFORE']) !!}
-
-<div class="wrapper">
-    @include('admin::partials.sidebar')
-
-    @include('admin::partials.navbar')
-
-    <div class="app-content content">
-        <div class="content-wrapper" id="{{ $pjaxContainerId }}" style="top: 0;min-height: 900px;">
-            @yield('app')
-        </div>
-    </div>
-</div>
-
-<footer class="main-footer pt-1">
-    <p class="clearfix blue-grey lighten-2 mb-0 text-center">
-            <span class="text-center d-block d-md-inline-block mt-25">
-                Powered by
-                <a target="_blank" href="https://github.com/jqhph/dcat-admin">Dcat Admin</a>
-                <span>&nbsp;·&nbsp;</span>
-                v{{ Dcat\Admin\Admin::VERSION }}
-            </span>
-
-        <button class="btn btn-primary btn-icon scroll-top pull-right" style="position: fixed;bottom: 2%; right: 10px;display: none">
-            <i class="feather icon-arrow-up"></i>
-        </button>
-    </p>
-</footer>
-
-{!! admin_section(Dcat\Admin\Admin::SECTION['BODY_INNER_AFTER']) !!}
-
-{!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
-
-<script>Dcat.boot();</script>
-
-</body>
-
-</html>
+<body
+        class="dcat-admin-body sidebar-mini layout-fixed {{ $configData['body_class']}} {{ $configData['sidebar_class'] }}
+        {{ $configData['navbar_class'] === 'fixed-top' ? 'navbar-fixed-top' : '' }} " >
+
+<script>
+    var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});
+</script>
+
+{!! admin_section(Dcat\Admin\Admin::SECTION['BODY_INNER_BEFORE']) !!}
+
+<div class="wrapper">
+    @include('admin::partials.sidebar')
+
+    @include('admin::partials.navbar')
+
+    <div class="app-content content">
+        <div class="content-wrapper" id="{{ $pjaxContainerId }}" style="top: 0;min-height: 900px;">
+            @yield('app')
+        </div>
+    </div>
+</div>
+
+<footer class="main-footer pt-1">
+    <p class="clearfix blue-grey lighten-2 mb-0 text-center">
+            <span class="text-center d-block d-md-inline-block mt-25">
+                Powered by
+                <a target="_blank" href="https://github.com/jqhph/dcat-admin">Dcat Admin</a>
+                <span>&nbsp;·&nbsp;</span>
+                v{{ Dcat\Admin\Admin::getVersion() }}
+            </span>
+
+        <button class="btn btn-primary btn-icon scroll-top pull-right" style="position: fixed;bottom: 2%; right: 10px;display: none">
+            <i class="feather icon-arrow-up"></i>
+        </button>
+    </p>
+</footer>
+
+{!! admin_section(Dcat\Admin\Admin::SECTION['BODY_INNER_AFTER']) !!}
+
+{!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
+
+<script>Dcat.boot();</script>
+
+</body>
+
+</html>

+ 6 - 2
src/Admin.php

@@ -31,7 +31,6 @@ class Admin
     use HasAssets;
     use HasHtml;
 
-    const VERSION = '2.2.2-beta';
 
     const SECTION = [
         // 往 <head> 标签内输入内容
@@ -72,7 +71,7 @@ class Admin
      */
     public static function longVersion()
     {
-        return sprintf('Dcat Admin <comment>version</comment> <info>%s</info>', static::VERSION);
+        return sprintf('Dcat Admin <comment>version</comment> <info>%s</info>', static::getVersion());
     }
 
     /**
@@ -657,4 +656,9 @@ class Admin
             $router->get('helpers/icons', 'Dcat\Admin\Http\Controllers\IconController@index');
         });
     }
+
+    static public function getVersion(){
+        return Composer::getVersion('dcat/laravel-admin');
+    }
+
 }

+ 1 - 1
src/Layout/Asset.php

@@ -685,7 +685,7 @@ class Asset
             $url .= '?';
         }
 
-        $ver = 'v'.Admin::VERSION;
+        $ver = 'v'.Admin::getVersion();
 
         return Str::endsWith($url, '?') ? $url.$ver : $url.'&'.$ver;
     }