dsh-lark-bot 0.15.6 → 0.15.7

package/dist/cli.js

@@ -3950,7 +3950,19 @@ function renderApprovalCard(input) {
     body: {
       elements: [
         { tag: "markdown", content: markdown2 },
-        { tag: "action", actions }
+        ...actions.length > 0 ? [
+          {
+            tag: "column_set",
+            flex_mode: "none",
+            horizontal_spacing: "default",
+            columns: actions.map((button2) => ({
+              tag: "column",
+              width: "auto",
+              vertical_align: "center",
+              elements: [button2]
+            }))
+          }
+        ] : []
       ]
     }
   };
@@ -3993,15 +4005,18 @@ function renderQuestionCard(input) {
     body: {
       elements: [
         { tag: "markdown", content: `\u2753 ${input.question}` },
-        formElement(input),
         {
-          tag: "action",
-          actions: [
+          tag: "form",
+          name: `form-${input.id}`,
+          elements: [
+            formElement(input),
             {
               tag: "button",
               text: { tag: "plain_text", content: "\u63D0\u4EA4" },
               type: "primary",
-              value: { cmd: "question-submit", id: input.id }
+              value: { cmd: "question-submit", id: input.id },
+              form_action_type: "submit",
+              name: `btn-submit-${input.id}`
             }
           ]
         }
@@ -5249,8 +5264,18 @@ function button(text, value, type = "default") {
     value
   };
 }
-function actionRow(actions) {
-  return { tag: "action", actions };
+function buttonRow(buttons) {
+  return {
+    tag: "column_set",
+    flex_mode: "none",
+    horizontal_spacing: "default",
+    columns: buttons.map((button2) => ({
+      tag: "column",
+      width: "auto",
+      vertical_align: "center",
+      elements: [button2]
+    }))
+  };
 }
 function wizardValue(flow, step, extra) {
   return { cmd: "wizard", flow, step, ...extra };
@@ -5281,22 +5306,22 @@ function renderConfigHubCard(input) {
             `dsh \u9ED8\u8BA4\u6A21\u578B\uFF1A${defaultLine}`
           ].join("\n")
         },
-        actionRow([
+        buttonRow([
           button("\u2795 \u6DFB\u52A0 Provider", { cmd: "cfg", action: "provider-add" }, "primary"),
           button("\u270F\uFE0F \u4FEE\u6539 Provider", { cmd: "cfg", action: "provider-update" }),
           button("\u{1F5D1} \u5220\u9664 Provider", { cmd: "cfg", action: "provider-remove" }, "danger")
         ]),
-        actionRow([
+        buttonRow([
           button("\u{1F9E0} \u6DFB\u52A0\u6A21\u578B", { cmd: "cfg", action: "model-add" }),
           button("\u274C \u5220\u9664\u6A21\u578B", { cmd: "cfg", action: "model-remove" }, "danger"),
           button("\u{1F3AF} \u5207\u6362\u6A21\u578B", { cmd: "cfg", action: "model-use" })
         ]),
-        actionRow([
+        buttonRow([
           button("\u{1F3E0} \u8BBE\u7F6E\u9ED8\u8BA4\u6A21\u578B", { cmd: "cfg", action: "model-default" }),
           button("\u{1F511} \u8BBE\u7F6E\u51ED\u636E", { cmd: "cfg", action: "key-set" }),
           button("\u{1F513} \u5220\u9664\u51ED\u636E", { cmd: "cfg", action: "key-remove" }, "danger")
         ]),
-        actionRow([
+        buttonRow([
           button("\u{1F504} \u5237\u65B0", { cmd: "cfg", action: "refresh" }),
           button("\u2716\uFE0F \u5173\u95ED", { cmd: "cfg", action: "dismiss" })
         ])
@@ -5309,13 +5334,14 @@ function renderWizardOptionsCard(input) {
   const rows = [];
   for (let index = 0; index < input.options.length; index += 3) {
     rows.push(
-      actionRow(
+      buttonRow(
         input.options.slice(index, index + 3).map(
           (option, offset) => button(option.label, wizardValue(input.flow, input.step, { choose: index + offset }))
         )
       )
     );
   }
+  rows.push(buttonRow([cancel]));
   return {
     schema: "2.0",
     config: {
@@ -5328,8 +5354,7 @@ function renderWizardOptionsCard(input) {
           content: [input.question, input.hint ? `
 ${input.hint}` : ""].join("")
         },
-        ...rows,
-        actionRow([cancel])
+        ...rows
       ]
     }
   };
@@ -5348,14 +5373,23 @@ function renderWizardTextStepCard(input) {
 ${input.hint}` : ""].join("")
         },
         {
-          tag: "input",
-          name: "answer",
-          placeholder: { tag: "plain_text", content: input.placeholder ?? "\u8BF7\u8F93\u5165\u2026" }
+          tag: "form",
+          name: `form-${input.flow}-${input.step}`,
+          elements: [
+            {
+              tag: "input",
+              name: "answer",
+              ...input.required === true ? { required: true } : {},
+              placeholder: { tag: "plain_text", content: input.placeholder ?? "\u8BF7\u8F93\u5165\u2026" }
+            },
+            {
+              ...button("\u63D0\u4EA4", wizardValue(input.flow, input.step, { submit: true }), "primary"),
+              form_action_type: "submit",
+              name: `btn-submit-${input.flow}-${input.step}`
+            }
+          ]
         },
-        actionRow([
-          button("\u63D0\u4EA4", wizardValue(input.flow, input.step, { submit: true }), "primary"),
-          button("\u53D6\u6D88", wizardValue(input.flow, input.step, { cancel: true }))
-        ])
+        button("\u53D6\u6D88", wizardValue(input.flow, input.step, { cancel: true }))
       ]
     }
   };
@@ -5374,7 +5408,7 @@ function renderWizardConfirmStepCard(input) {
 
 ${input.summary}`
         },
-        actionRow([
+        buttonRow([
           button(input.confirmLabel ?? "\u2705 \u786E\u8BA4", wizardValue(input.flow, input.step, { confirm: true }), "primary"),
           button("\u53D6\u6D88", wizardValue(input.flow, input.step, { cancel: true }))
         ])
@@ -5991,6 +6025,7 @@ ${labels}
           flow: flow.id,
           step: state.step,
           question: step.question,
+          ...step.optional === true ? {} : { required: true },
           ...step.placeholder === void 0 ? {} : { placeholder: step.placeholder },
           ...step.hint === void 0 ? {} : { hint: step.hint }
         })