From fc93239542ef6715a2b554c48ae19f8d63cb1918 Mon Sep 17 00:00:00 2001
From: cyw <1764887758@qq.com>
Date: Fri, 27 Oct 2023 17:50:21 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Http/Controllers/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
index 7a100d935..e0af38487 100644
--- a/src/Http/Controllers/UserController.php
+++ b/src/Http/Controllers/UserController.php
@@ -173,7 +173,7 @@ public function form()
                 $form->disableDeleteButton();
             }
         })->saving(function (Form $form) {
-            if ($form->password && $form->model()->get('password') != $form->password) {
+            if ($form->password && $form->model()->password != $form->password) {
                 $form->password = bcrypt($form->password);
             }
 

From 112edf7ef89b4bd95b7b929b33f5559b5865952e Mon Sep 17 00:00:00 2001
From: zhushaolong <15210900722@163.com>
Date: Mon, 4 Mar 2024 00:21:05 +0800
Subject: [PATCH 2/4] Update VersionManager.php

Solve the problem of unable to install extensions
---
 src/Extend/VersionManager.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Extend/VersionManager.php b/src/Extend/VersionManager.php
index ec4f21b3f..bcaa56628 100644
--- a/src/Extend/VersionManager.php
+++ b/src/Extend/VersionManager.php
@@ -204,7 +204,11 @@ public function getNewFileVersions($name, $version = null)
 
         $position = array_search($version, array_keys($versions));
 
-        return array_slice($versions, ++$position);
+        if ($position === false) {
+            return $versions;
+        }
+
+        return array_slice($versions, $position++);
     }
 
     public function getFileVersions($name)

From fc66b3af0d738ae5bdbd4da91b3409d1269c6e4b Mon Sep 17 00:00:00 2001
From: cyw <1764887758@qq.com>
Date: Wed, 23 Oct 2024 16:01:24 +0000
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0laravel11=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 30d9fe52e..e378ab68d 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,14 @@
     "name": "dcat/laravel-admin",
     "description": "dcat admin",
     "type": "library",
-    "keywords": ["dcat", "laravel", "admin", "grid", "form", "laravel admin"],
+    "keywords": [
+        "dcat",
+        "laravel",
+        "admin",
+        "grid",
+        "form",
+        "laravel admin"
+    ],
     "homepage": "https://github.com/jqhph/dcat-admin",
     "license": "MIT",
     "authors": [
@@ -13,16 +20,17 @@
     ],
     "require": {
         "php": ">=7.1.0",
-        "laravel/framework": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0",
+        "laravel/framework": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
         "spatie/eloquent-sortable": "3.*|4.*",
-        "doctrine/dbal": "^2.6|^3.0"
+        "doctrine/dbal": "^2.6|^3.0|^4.0",
+        "dcat/easy-excel": "*"
     },
     "require-dev": {
-        "laravel/dusk": "~5.9|~6",
-        "phpstan/phpstan": "^0.12.0",
-        "phpunit/phpunit": "^7.5|~9",
-        "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0"
+        "laravel/dusk": "~5.9|~6|~7.0|~8.0",
+        "phpstan/phpstan": "^0.12.0|~1.0",
+        "phpunit/phpunit": "^7.5|~9|~10|~11",
+        "fakerphp/faker": "^1.23",
+        "mockery/mockery": "^1.6"
     },
     "autoload": {
         "psr-4": {

From 179977d58ac4fb68b7fba9bf1367ffb994f2c43e Mon Sep 17 00:00:00 2001
From: cyw <1764887758@qq.com>
Date: Thu, 24 Oct 2024 10:24:19 +0000
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djson()=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E7=9A=84xss=E6=94=BB?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Show/Field.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Show/Field.php b/src/Show/Field.php
index 77c2a3c34..6ff26c6c7 100755
--- a/src/Show/Field.php
+++ b/src/Show/Field.php
@@ -408,7 +408,13 @@ public function json()
 
         return $this->unescape()->as(function ($value) use ($field) {
             $content = is_string($value) ? json_decode($value, true) : $value;
-
+            if (is_array($content)) {
+                array_walk($content, function (&$v, $k) {
+                    $v = htmlspecialchars($v);
+                });
+            } else {
+                $content = htmlspecialchars($content);
+            }
             $field->wrap(false);
 
             return Dump::make($content);