refactor(dialog): 移除对话框点击关闭配置选项

- 移除了 DialogActionPayload 中的 closesDialog 属性
- 移除了 DialogActionSpec 中的 closesDialog 属性
- 移除了 DialogWidgetSpec 中的 closeOnClick 属性
- 更新了 DialogCompiler 中的相关参数传递逻辑
- 修改了 DialogMenuRenderer 中的关闭判断逻辑，改为检查 dialogState
- 更新了默认关闭动作的创建方式，不再设置自动关闭
- 将等待响应状态的对话框动作类型从 WAIT_FOR_RESPONSE 改为 NONE
- 移除了 MenuSerializer 中对 Close-On-Click 和 close-on-click 配置的解析
- 更新了示例菜单配置文件，将原来的关闭行为改为执行 'close' 动作

Author: YsGqHY

api/receptacle/src/main/kotlin/trplugins/menu/api/receptacle/dialog/DialogActionPayload.kt

@@ -4,7 +4,5 @@ data class DialogActionPayload(
     val id: String,
     val label: String,
     val width: Int? = null,
-    val closesDialog: Boolean = true,
-    val nextPage: Int? = null,
     val exitAction: Boolean = false
 )

api/receptacle/src/main/kotlin/trplugins/menu/api/receptacle/dialog/DialogNMSImpl.kt

@@ -107,7 +107,7 @@ class DialogNMSImpl : DialogNMS() {
     private fun buildDialog(payload: DialogPayload): Any {
         val common = buildCommonDialogData(payload)
         val actions = if (payload.actions.isEmpty() && payload.exitAction == null) {
-            listOf(DialogActionPayload("__default_close__", "Close", 120, true, null, false))
+            listOf(DialogActionPayload("__default_close__", "Close", 120, false))
         } else {
             payload.actions
         }
@@ -177,7 +177,7 @@ class DialogNMSImpl : DialogNMS() {
             optionalComponent(payload.externalTitle),
             effectiveAllowEscClose,
             false,
-            dialogAction("WAIT_FOR_RESPONSE"),
+            dialogAction("NONE"),
             body,
             inputs
         )

gradle.properties

@@ -1,2 +1,2 @@
 group=me.arasple.mc.trmenu
-version=3.10.1
+version=3.10.2

plugin/src/main/kotlin/trplugins/menu/module/conf/MenuSerializer.kt

@@ -599,7 +599,6 @@ object MenuSerializer : ISerializer {
             id = section.getString("Id") ?: "action_$index",
             label = section.getString("Label") ?: "Action-$index",
             width = section.getInt("Width").takeIf { it > 0 },
-            closesDialog = section.getBoolean("Close-On-Click", true),
             nextPage = section.getString("Next-Page")?.toIntOrNull() ?: section.getInt("Next-Page").takeIf { section.contains("Next-Page") },
             exitAction = section.getBoolean("Exit", false),
             actions = Reactions.ofReaction(TrMenu.actionHandle, section["Execute"] ?: section["Actions"]),
@@ -641,7 +640,6 @@ object MenuSerializer : ISerializer {
                 max = widget.getString("max")?.toDoubleOrNull(),
                 step = widget.getString("step")?.toDoubleOrNull() ?: 1.0,
                 maxLength = widget.getInt("max-length").takeIf { it > 0 },
-                closeOnClick = widget.getBoolean("close-on-click", true),
                 nextPage = widget.getString("next-page")?.toIntOrNull(),
                 exitAction = widget.getBoolean("exit", false) || widget.getBoolean("exit-action", false),
                 actions = Property.asList(widget["execute"] ?: widget["actions"]),

plugin/src/main/kotlin/trplugins/menu/module/display/dialog/compiler/DialogCompiler.kt

@@ -171,7 +171,6 @@ object DialogCompiler {
                         node.id,
                         node.widget.label ?: node.id,
                         width,
-                        node.widget.closeOnClick,
                         node.widget.nextPage,
                         node.widget.exitAction,
                         Reactions.ofReaction(TrMenu.actionHandle, node.widget.actions)
@@ -220,8 +219,6 @@ object DialogCompiler {
             id = spec.id,
             label = session.parse(spec.label),
             width = spec.width,
-            closesDialog = spec.closesDialog,
-            nextPage = spec.nextPage,
             exitAction = spec.exitAction
         )
     }

plugin/src/main/kotlin/trplugins/menu/module/display/dialog/model/DialogActionSpec.kt

@@ -6,7 +6,6 @@ data class DialogActionSpec(
     val id: String,
     val label: String,
     val width: Int? = null,
-    val closesDialog: Boolean = true,
     val nextPage: Int? = null,
     val exitAction: Boolean = false,
     val actions: Reactions,

plugin/src/main/kotlin/trplugins/menu/module/display/dialog/model/DialogWidgetSpec.kt

@@ -21,7 +21,6 @@ data class DialogWidgetSpec(
     val max: Double? = null,
     val step: Double = 1.0,
     val maxLength: Int? = null,
-    val closeOnClick: Boolean = true,
     val nextPage: Int? = null,
     val exitAction: Boolean = false,
     val actions: List<Any> = emptyList(),

plugin/src/main/kotlin/trplugins/menu/module/display/dialog/runtime/DialogMenuRenderer.kt

@@ -85,10 +85,11 @@ object DialogMenuRenderer {
             page(session, action.nextPage)
             return
         }
-        if (action.closesDialog) {
-            close(session)
+        // If the action execution already closed the dialog (via 'close' action), don't refresh
+        if (session.dialogState == null) {
             return
         }
+        // Otherwise refresh to replace the "waiting for response" screen
         refresh(session)
     }
 

plugin/src/main/resources/menus/Dialog-Confirmation-Example.yml

@@ -45,14 +45,14 @@ Dialog:
         - Id: 'confirm_delete'
           Label: '&c确认删除'
           Width: 160
-          Close-On-Click: true
           Execute:
             - 'set-meta: confirm_reason %trmenu_dialog_input_delete_reason%'
             - 'set-meta: confirm_targets %trmenu_dialog_option_cleanup_targets%'
             - 'tell: &c已确认删除, 范围: %trmenu_dialog_option_cleanup_targets%'
+            - 'close'
         - Id: 'cancel_delete'
           Label: '&a取消操作'
           Width: 160
-          Close-On-Click: true
           Execute:
             - 'tell: &a已取消删除请求'
+            - 'close'

plugin/src/main/resources/menus/Dialog-Example.yml

@@ -60,8 +60,8 @@ Dialog:
         - Id: 'submit_notice'
           Label: '&a提交选择'
           Width: 180
-          Close-On-Click: true
           Execute:
             - 'set-meta: notice_note %trmenu_dialog_input_signup_note%'
             - 'set-meta: notice_packs %trmenu_dialog_option_reward_packs%'
             - 'tell: &aNOTICE 示例已提交, 奖励包: %trmenu_dialog_option_reward_packs%'
+            - 'close'