update version

composer.json

@@ -11,19 +11,18 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-pdo": "*",
         "ext-zip": "*",
-        "doctrine/dbal": "^3.4",
+        "guzzlehttp/guzzle": "^7.8.1",
-        "guzzlehttp/guzzle": "^7.2",
+        "laravel/framework": "^v11.0.3",
-        "laravel/framework": "^10.0",
+        "laravel/tinker": "^v2.9.0",
-        "laravel/tinker": "^2.8",
+        "catchadmin/core": "^0.3.2"
-        "catchadmin/core": "^0.2.7"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.9.1",
+        "fakerphp/faker": "^v1.23.1",
-        "mockery/mockery": "^1.4.4",
+        "mockery/mockery": "^1.6.9",
-        "pestphp/pest": "^1.22"
+        "pestphp/pest": "^v2.34.2"
     },
     "autoload": {
         "psr-4": {

modules/Develop/Models/Schemas.php

@@ -92,14 +92,13 @@ class Schemas extends CatchModel
 
         $columns = [];
 
-        foreach (getTableColumns($schema->name) as $columnString) {
+        foreach (\Illuminate\Support\Facades\Schema::getColumns($schema->name) as $column) {
-            $column = DB::connection()->getDoctrineColumn(DB::connection()->getTablePrefix().$schema->name, $columnString);
             $columns[] = [
-                'name' => $column->getName(),
+                'name' => $column['name'],
-                'type' => $column->getType()->getName(),
+                'type' => $column['type_name'],
-                'nullable' => ! $column->getNotnull(),
+                'nullable' => $column['nullable'],
-                'default' => $column->getDefault(),
+                'default' => $column['default'],
-                'comment' => $column->getComment()
+                'comment' => $column['comment'],
             ];
         }
 

modules/Develop/Support/Generate/stubs/vue/form.stub

@@ -13,7 +13,7 @@ import { useShow } from '/admin/composables/curd/useShow'
 import { onMounted } from 'vue'
 
 const props = defineProps({
-  primary: String | Number,
+  primary: [String, Number],
   api: String,
 })
 

modules/User/Models/LogOperate.php

@@ -6,6 +6,7 @@ use Catch\CatchAdmin;
 use Catch\Traits\DB\BaseOperate;
 use Catch\Traits\DB\ScopeTrait;
 use Catch\Traits\DB\Trans;
+use Catch\Traits\DB\WithAttributes;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -16,7 +17,7 @@ use Symfony\Component\HttpFoundation\Response;
 
 class LogOperate extends Model
 {
-    use BaseOperate, Trans, ScopeTrait;
+    use WithAttributes,BaseOperate, Trans, ScopeTrait;
 
     protected $table = 'log_operate';
 

resources/admin/components/admin/dialog/index.vue

@@ -12,7 +12,9 @@
           </div>
         </div>
       </template>
+        <div class="pt-4">
             <slot />
+        </div>
       <template #footer v-if="showFooter">
         <span class="dialog-footer">
           <el-button @click="close">{{ $t('system.cancel') }}</el-button>