修改https情况下生成url问题

Author: SmallRuralDog

src/Form.php

@@ -94,8 +94,7 @@ public function __construct($model = null)
     {
         $this->attrs = new FormAttrs();
         $this->model = $model;
-        $this->dataUrl = request()->getUri();
-
+        $this->dataUrl = admin_api_url(request()->path());
         $this->isGetData = request('get_data') == "true";
     }
 

src/Grid.php

@@ -87,14 +87,12 @@ class Grid extends Component
     public function __construct(Eloquent $model = null)
     {
         $this->attributes = new Attributes();
-        $this->dataUrl = request()->getUri();
+        $this->dataUrl = admin_api_url(request()->path());
         $this->model = new Model($model, $this);
         if ($model) {
             $this->keyName = $model->getKeyName();
             $this->defaultSort($model->getKeyName(), "asc");
         }
-
-
         $this->isGetData = request('get_data') == "true";
         $this->toolbars = new Toolbars($this);
         $this->batchActions = new BatchActions();

src/helpers.php

@@ -43,6 +43,30 @@ function admin_base_path($path = '')
     }
 }
 
+if (!function_exists('admin_api_base_path')) {
+    /**
+     * Get admin url.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    function admin_api_base_path($path = '')
+    {
+        $prefix = '/' . trim(config('admin.route.prefix_api'), '/');
+
+        $prefix = ($prefix == '/') ? '' : $prefix;
+
+        $path = trim($path, '/');
+
+        if (is_null($path) || strlen($path) == 0) {
+            return $prefix ?: '/';
+        }
+
+        return $prefix . '/' . $path;
+    }
+}
+
 if (!function_exists('admin_url')) {
     /**
      * Get admin url.
@@ -63,6 +87,26 @@ function admin_url($path = '', $parameters = [], $secure = null)
     }
 }
 
+if (!function_exists('admin_api_url')) {
+    /**
+     * Get admin url.
+     *
+     * @param string $path
+     * @param mixed $parameters
+     * @param bool $secure
+     *
+     * @return string
+     */
+    function admin_api_url($path = '', $parameters = [], $secure = null)
+    {
+        if (\Illuminate\Support\Facades\URL::isValidUrl($path)) {
+            return $path;
+        }
+        $secure = $secure ?: (config('admin.https') || config('admin.secure'));
+        return url(admin_api_base_path($path), $parameters, $secure);
+    }
+}
+
 if (!function_exists('admin_file_url')) {
     function admin_file_url($path)
     {