5.2.6

laravelwebdev · laravelwebdev · commit dcd8c16d215c · 2025-02-26T16:55:19.000+08:00
diff --git a/composer.json b/composer.json
@@ -162,5 +162,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.2.5"
+  "version": "5.2.6"
 }
diff --git a/public/app.css b/public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,9 +1,9 @@
 {
-    "/app.js": "/app.js?id=b857d5654171bf2bc52af06dc8eb5772",
+    "/app.js": "/app.js?id=05fa52d8f78428018aaa33e41ef722d9",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
-    "/app.css": "/app.css?id=e6e32c23966698900f862c22cfc1651d",
-    "/vendor.js": "/vendor.js?id=555c263ac13aeaaebf547d2e8fe6a894",
+    "/app.css": "/app.css?id=6e65850ccef9787f521955e9d231a2b2",
+    "/vendor.js": "/vendor.js?id=247e20ae42435cf6529d2a857815a05c",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2?id=c8390e146be0a3c8a5498355dec892ae",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2?id=b0735c7dd6126471acbaf9d6e9f5e41a",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty1ciurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty1ciurt9w6fk2a.woff2?id=7c1fb232e3050e36dcc1aee61f1d0c06",
diff --git a/public/vendor.js b/public/vendor.js
diff --git a/resources/js/fields/Form/MorphToField.vue b/resources/js/fields/Form/MorphToField.vue
@@ -311,7 +311,7 @@ export default {
     },
 
     onSyncedField() {
-      if (this.resourceType !== this.currentField.morphToType) {
+      if (this.resourceType !== this.currentField.resourceName) {
         this.refreshResourcesForTypeChange(this.currentField.morphToType)
       }
     },
diff --git a/resources/js/mixins/DependentFormField.js b/resources/js/mixins/DependentFormField.js
@@ -114,7 +114,7 @@ export default {
      */
     fillIfVisible(formData, attribute, value) {
       if (this.currentlyIsVisible) {
-        formData.append(attribute, value)
+        this.fillInto(formData, attribute, value)
       }
     },
 
diff --git a/resources/js/mixins/FormField.js b/resources/js/mixins/FormField.js
@@ -75,6 +75,17 @@ export default {
       this.fillIfVisible(formData, this.fieldAttribute, String(this.value))
     },
 
+    /**
+     * Provide a function to fills FormData when field.
+     *
+     * @param {FormData} formData
+     * @param {string} attribute
+     * @param {any} value
+     */
+    fillInto(formData, attribute, value) {
+      formData.append(attribute, value)
+    },
+
     /**
      * Provide a function to fills FormData when field is visible.
      *
@@ -84,7 +95,7 @@ export default {
      */
     fillIfVisible(formData, attribute, value) {
       if (this.isVisible) {
-        formData.append(attribute, value)
+        this.fillInto(formData, attribute, value)
       }
     },
 
diff --git a/src/Console/asset-stubs/composer.json b/src/Console/asset-stubs/composer.json
@@ -8,11 +8,11 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.5"
+        "laravel/nova-devtool": "^1.6"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/card-stubs/composer.json b/src/Console/card-stubs/composer.json
@@ -8,11 +8,11 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.5"
+        "laravel/nova-devtool": "^1.6"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/field-stubs/composer.json b/src/Console/field-stubs/composer.json
@@ -8,11 +8,11 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.5"
+        "laravel/nova-devtool": "^1.6"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/filter-stubs/composer.json b/src/Console/filter-stubs/composer.json
@@ -8,11 +8,11 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.5"
+        "laravel/nova-devtool": "^1.6"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/resource-tool-stubs/composer.json b/src/Console/resource-tool-stubs/composer.json
@@ -8,11 +8,11 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.5"
+        "laravel/nova-devtool": "^1.6"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/tool-stubs/composer.json b/src/Console/tool-stubs/composer.json
@@ -8,11 +8,11 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.5"
+        "laravel/nova-devtool": "^1.6"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Fields/FieldCollection.php b/src/Fields/FieldCollection.php
@@ -216,14 +216,26 @@ public function filterForIndex(NovaRequest $request, $resource)
         return $this->filter->isShownOnIndex($request, $resource)->values();
     }
 
+    /**
+     * Reject if the field is computed.
+     *
+     * @return static<int, TValue>
+     */
+    public function withoutComputed(NovaRequest $request)
+    {
+        /** @phpstan-ignore return.type */
+        return $this->reject(static fn ($field) => $field->isComputed() || $field->attribute === 'ComputedField');
+    }
+
     /**
      * Reject if the field is readonly.
      *
      * @return static<int, TValue>
      */
     public function withoutReadonly(NovaRequest $request)
     {
-        return $this->reject->isReadonly($request);
+        /** @phpstan-ignore return.type */
+        return $this->reject(static fn ($field) => $field->isReadonly($request));
     }
 
     /**
diff --git a/src/Fields/MorphTo.php b/src/Fields/MorphTo.php
@@ -313,11 +313,15 @@ public function fill(NovaRequest $request, object $model)
 
         $foreignKey = $this->getRelationForeignKeyName($model->{$this->attribute}());
 
+        parent::fillInto($request, $model, $foreignKey);
+
+        if (is_null($model->{$this->attribute.'_type'})) {
+            $model->{$this->attribute.'_id'} = null;
+        }
+
         if ($model->isDirty([$morphType, $foreignKey])) {
             $model->unsetRelation($this->attribute);
         }
-
-        parent::fillInto($request, $model, $foreignKey);
     }
 
     /**
diff --git a/src/FillsFields.php b/src/FillsFields.php
@@ -20,6 +20,7 @@ public static function fill(NovaRequest $request, $model): array
             (new static($model))
                 ->creationFields($request)
                 ->applyDependsOn($request)
+                ->withoutComputed($request)
                 ->withoutReadonly($request)
                 ->withoutUnfillable()
         );
@@ -38,6 +39,7 @@ public static function fillForUpdate(NovaRequest $request, $model): array
             (new static($model))
                 ->updateFields($request)
                 ->applyDependsOn($request)
+                ->withoutComputed($request)
                 ->withoutReadonly($request)
                 ->withoutUnfillable()
         );

Original file line number	Diff line number	Diff line change
`@@ -162,5 +162,5 @@`
`162`	`162`	`},`
`163`	`163`	`"minimum-stability": "dev",`
`164`	`164`	`"prefer-stable": true,`
`165`		`- "version": "5.2.5"`
	`165`	`+ "version": "5.2.6"`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ export default {`
`311`	`311`	`},`
`312`	`312`
`313`	`313`	`onSyncedField() {`
`314`		`- if (this.resourceType !== this.currentField.morphToType) {`
	`314`	`+ if (this.resourceType !== this.currentField.resourceName) {`
`315`	`315`	`this.refreshResourcesForTypeChange(this.currentField.morphToType)`
`316`	`316`	`}`
`317`	`317`	`},`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ export default {`
`114`	`114`	`*/`
`115`	`115`	`fillIfVisible(formData, attribute, value) {`
`116`	`116`	`if (this.currentlyIsVisible) {`
`117`		`- formData.append(attribute, value)`
	`117`	`+ this.fillInto(formData, attribute, value)`
`118`	`118`	`}`
`119`	`119`	`},`
`120`	`120`