From c9fc705aab7fcbdd7e9918b59c973a13947f853d Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Wed, 21 Feb 2024 16:11:19 +0800
Subject: [PATCH] * Adjust the name field after the type field. bug #44607.

---
 module/block/ui/common.ui.php   | 24 +++++++++++++++++++++++-
 module/block/ui/create.html.php | 10 ----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/module/block/ui/common.ui.php b/module/block/ui/common.ui.php
index 9630ac70b8..3b2e95c344 100644
--- a/module/block/ui/common.ui.php
+++ b/module/block/ui/common.ui.php
@@ -13,12 +13,27 @@ namespace zin;
  */
 function buildParamsRows(object $block = null, ?array $params = null, string $module = '', string $code = ''): array
 {
+    global $lang;
+
     if(empty($params)) $params = data('params');
     $rows        = array();
     $isSameBlock = !empty($block) && $block->module == $module && $block->code == $code;
+
+    $nameRow = formRow
+    (
+        formGroup
+        (
+            set::label($lang->block->name),
+            set::name('title'),
+            set::value(data('blockTitle')),
+            set::control('input')
+        )
+    );
+
+    $rows['name'] = $nameRow;
     foreach($params as $key => $row)
     {
-        $rows[] = formRow
+        $rows[$key] = formRow
         (
             formGroup
             (
@@ -34,6 +49,13 @@ function buildParamsRows(object $block = null, ?array $params = null, string $mo
                 set::required($row['control'] === 'picker')
             )
         );
+
+        /* 如果有type字段， name字段放到type字段后面。*/
+        if($key == 'type')
+        {
+            unset($rows['name']);
+            $rows['name'] = $nameRow;
+        }
     }
     return $rows;
 }
diff --git a/module/block/ui/create.html.php b/module/block/ui/create.html.php
index ff9fd9422f..ab056f4fff 100644
--- a/module/block/ui/create.html.php
+++ b/module/block/ui/create.html.php
@@ -75,16 +75,6 @@ row
             (
                 setID('paramsRow'),
                 setClass('space-y-4'),
-                formRow
-                (
-                    formGroup
-                    (
-                        set::label($lang->block->name),
-                        set::name('title'),
-                        set::value($blockTitle),
-                        set::control('input')
-                    )
-                ),
                 buildParamsRows(),
                 formRow
                 (