Merge remote-tracking branch 'origin/master'

2021-04-29 10:35:17 +08:00
parent 793cfa4266 7ea6f7b6a0
commit b62adcd9dd
2 changed files with 1013 additions and 1013 deletions
@@ -112,7 +112,7 @@ class Columns extends Component
 	 */
 	public function decode($val, $format = null): mixed
 	{
-		if (empty($format)) {
+		if (empty($format) || $val === null) {
 			return $val;
 		}
 		$format = strtolower($format);