@shwfed/nuxt 0.11.45 → 0.11.47

package/dist/runtime/components/ui/fields-configurator/FieldsConfiguratorDialog.vue

@@ -13,6 +13,7 @@ import {
   FieldsBodyC,
   FieldsConfigC,
   FieldsStyleC,
+  MarkdownBodyFieldC,
   MarkdownFieldC,
   NumberFieldC,
   RadioGroupFieldC,
@@ -72,6 +73,7 @@ const fieldTypeOptions = computed(() => [
   { type: "textarea", label: t("field-type-textarea") },
   { type: "number", label: t("field-type-number") },
   { type: "markdown", label: t("field-type-markdown") },
+  { type: "markdown-body", label: t("field-type-markdown-body") },
   { type: "select", label: t("field-type-select") },
   { type: "radio", label: t("field-type-radio") },
   { type: "calendar", label: t("field-type-calendar") },
@@ -167,8 +169,20 @@ function isPassiveField(field) {
 function isMarkdownField(field) {
   return field.type === "markdown";
 }
+function isMarkdownBodyField(field) {
+  return field.type === "markdown-body";
+}
+function isMarkdownContentField(field) {
+  return isMarkdownField(field) || isMarkdownBodyField(field);
+}
+function hasFieldLabel(field) {
+  return !isPassiveField(field) && !isMarkdownBodyField(field);
+}
+function supportsFieldCellStyles(field) {
+  return !isPassiveField(field) && !isMarkdownBodyField(field);
+}
 function isPathlessField(field) {
-  return isPassiveField(field) || isMarkdownField(field);
+  return isPassiveField(field) || isMarkdownContentField(field);
 }
 function isInteractiveField(field) {
   return !isPathlessField(field);
@@ -185,7 +199,7 @@ function getUnnamedFieldLabel(field) {
   });
 }
 function getFieldChineseTitle(field) {
-  if (isPassiveField(field)) {
+  if (!hasFieldLabel(field)) {
     return void 0;
   }
   const zhTitle = field.title.find((item) => item.locale === "zh");
@@ -347,6 +361,13 @@ function normalizeField(field) {
         contentStyle: normalizeOptionalString(field.contentStyle ?? ""),
         hidden: normalizeOptionalString(field.hidden ?? "")
       };
+    case "markdown-body":
+      return {
+        ...field,
+        style: normalizeOptionalString(field.style ?? ""),
+        hidden: normalizeOptionalString(field.hidden ?? ""),
+        inline: field.inline ? true : void 0
+      };
     case "number":
       return {
         ...field,
@@ -464,6 +485,12 @@ function createField(type) {
         title,
         locale: createDefaultLocaleValue()
       };
+    case "markdown-body":
+      return {
+        id,
+        type,
+        locale: createDefaultLocaleValue()
+      };
     case "select":
     case "radio":
       return {
@@ -963,7 +990,7 @@ function handleAddItem(type) {
   addField(type);
 }
 function isFieldLabelConfigurable(field) {
-  return !isPassiveField(field);
+  return hasFieldLabel(field);
 }
 function getFieldHideLabelValue(field) {
   if (!isFieldLabelConfigurable(field)) {
@@ -973,14 +1000,14 @@ function getFieldHideLabelValue(field) {
 }
 function updateSelectedFieldTitle(value) {
   const selected = selectedField.value;
-  if (!selected) {
+  if (!selected || !hasFieldLabel(selected.field)) {
     return;
   }
   clearFieldError(selected.draftId, "title");
-  updateDraftField(selected.draftId, (field) => ({
+  updateDraftField(selected.draftId, (field) => hasFieldLabel(field) ? {
     ...field,
     title: value
-  }));
+  } : field);
 }
 function updateSelectedFieldHideLabel(value) {
   const selected = selectedField.value;
@@ -999,15 +1026,25 @@ function updateSelectedFieldHideLabel(value) {
 }
 function updateSelectedMarkdownLocale(value) {
   const selected = selectedField.value;
-  if (!selected || selected.field.type !== "markdown") {
+  if (!selected || !isMarkdownContentField(selected.field)) {
     return;
   }
   clearFieldError(selected.draftId, "locale");
-  updateDraftField(selected.draftId, (field) => field.type === "markdown" ? {
+  updateDraftField(selected.draftId, (field) => isMarkdownContentField(field) ? {
     ...field,
     locale: value
   } : field);
 }
+function updateSelectedMarkdownInline(value) {
+  const selected = selectedField.value;
+  if (!selected || !isMarkdownBodyField(selected.field)) {
+    return;
+  }
+  updateDraftField(selected.draftId, (field) => isMarkdownBodyField(field) ? {
+    ...field,
+    inline: value ? true : void 0
+  } : field);
+}
 function updateSelectedFieldId(value) {
   const selected = selectedField.value;
   if (!selected || selected.field.type !== "slot") {
@@ -1053,25 +1090,25 @@ function updateSelectedFieldStyle(value) {
 }
 function updateSelectedFieldLabelStyle(value) {
   const selected = selectedField.value;
-  if (!selected || isPassiveField(selected.field)) {
+  if (!selected || !supportsFieldCellStyles(selected.field)) {
     return;
   }
   clearFieldError(selected.draftId, "labelStyle");
-  updateDraftField(selected.draftId, (field) => isPassiveField(field) ? field : {
+  updateDraftField(selected.draftId, (field) => supportsFieldCellStyles(field) ? {
     ...field,
     labelStyle: normalizeOptionalString(String(value))
-  });
+  } : field);
 }
 function updateSelectedFieldContentStyle(value) {
   const selected = selectedField.value;
-  if (!selected || isPassiveField(selected.field)) {
+  if (!selected || !supportsFieldCellStyles(selected.field)) {
     return;
   }
   clearFieldError(selected.draftId, "contentStyle");
-  updateDraftField(selected.draftId, (field) => isPassiveField(field) ? field : {
+  updateDraftField(selected.draftId, (field) => supportsFieldCellStyles(field) ? {
     ...field,
     contentStyle: normalizeOptionalString(String(value))
-  });
+  } : field);
 }
 function updateSelectedFieldHidden(value) {
   const selected = selectedField.value;
@@ -1566,6 +1603,10 @@ function getSchemaIssues(field) {
       const result = MarkdownFieldC.safeParse(field);
       return result.success ? [] : result.error.issues;
     }
+    case "markdown-body": {
+      const result = MarkdownBodyFieldC.safeParse(field);
+      return result.success ? [] : result.error.issues;
+    }
     case "select": {
       const result = SelectFieldC.safeParse(field);
       return result.success ? [] : result.error.issues;
@@ -1825,13 +1866,14 @@ function buildDslGuideMarkdown() {
     "### 3. \u5B57\u6BB5\u7C7B\u578B\u7EA6\u675F",
     "- \u9876\u5C42\u914D\u7F6E\u53EF\u4EE5\u76F4\u63A5\u4F7F\u7528 `fields` \u653E\u6839\u7EA7\u5B57\u6BB5\uFF0C\u4E5F\u53EF\u4EE5\u4F7F\u7528 `groups` \u653E\u5206\u7EC4\u5B57\u6BB5\uFF0C\u4E24\u8005\u53EF\u4EE5\u540C\u65F6\u5B58\u5728\u3002",
     "- \u6BCF\u4E2A\u5B57\u6BB5\u7EC4\u90FD\u5FC5\u987B\u5305\u542B\u552F\u4E00\u4E14\u5408\u6CD5\u7684 UUID `id`\u3002",
-    "- \u5B57\u6BB5\u7EC4\u53EA\u8D1F\u8D23\u7ED3\u6784\u4E0E\u6837\u5F0F\uFF0C\u4E0D\u63D0\u4F9B\u6807\u9898\uFF1B\u5206\u7EC4\u8BF4\u660E\u8BF7\u4F7F\u7528 `markdown` \u5B57\u6BB5\u3002",
+    "- \u5B57\u6BB5\u7EC4\u53EA\u8D1F\u8D23\u7ED3\u6784\u4E0E\u6837\u5F0F\uFF0C\u4E0D\u63D0\u4F9B\u6807\u9898\uFF1B\u5206\u7EC4\u8BF4\u660E\u4F18\u5148\u4F7F\u7528 `markdown-body` \u5B57\u6BB5\uFF0C\u82E5\u9700\u8981\u6807\u7B7E\u884C\u518D\u4F7F\u7528 `markdown` \u5B57\u6BB5\u3002",
     "- \u4EE3\u7801\u91CC\u5E94\u5148\u751F\u6210\u5E76\u4F7F\u7528 UUID\uFF0C\u518D\u628A\u540C\u4E00\u4E2A `id` \u7C98\u8D34\u56DE\u5B57\u6BB5\u914D\u7F6E\u3002",
     "- \u6240\u6709\u5B57\u6BB5\u90FD\u5FC5\u987B\u5305\u542B\u552F\u4E00\u4E14\u5408\u6CD5\u7684 UUID `id`\u3002",
     "- \u53EA\u6709\u53EF\u7ED1\u5B9A\u503C\u7684\u5B57\u6BB5\u53EF\u4EE5\u914D\u7F6E `path`\uFF0C\u5E76\u53C2\u4E0E\u8868\u5355\u503C\u8BFB\u5199\u3002",
     "- `slot` \u548C `empty` \u5B57\u6BB5\u90FD\u4E0D\u4F1A\u7ED1\u5B9A\u6A21\u578B\u503C\uFF0C\u53EA\u5141\u8BB8 `id`\u3001`type` \u548C\u53EF\u9009\u7684 `style`\u3002",
     "- `markdown` \u5B57\u6BB5\u4F7F\u7528 `title` \u4E0E `locale` \u5C55\u793A\u5E26\u6807\u7B7E\u7684 Markdown \u5185\u5BB9\uFF0C\u4E0D\u7ED1\u5B9A `path`\u3002",
-    "- \u9664 `slot` \u4E0E `empty` \u5916\uFF0C\u5176\u5B83\u5E26\u6807\u7B7E\u5B57\u6BB5\u90FD\u53EF\u4EE5\u8BBE\u7F6E `hideLabel` \u9690\u85CF\u6807\u7B7E\u3002",
+    "- `markdown-body` \u5B57\u6BB5\u4F7F\u7528 `locale` \u5C55\u793A\u65E0\u6807\u7B7E\u7684\u7EAF Markdown \u5185\u5BB9\uFF0C\u53EF\u9009 `inline` \u63A7\u5236\u5185\u8054\u6E32\u67D3\uFF0C\u4E0D\u7ED1\u5B9A `path`\u3002",
+    "- \u9664 `slot`\u3001`empty` \u4E0E `markdown-body` \u5916\uFF0C\u5176\u5B83\u5E26\u6807\u7B7E\u5B57\u6BB5\u90FD\u53EF\u4EE5\u8BBE\u7F6E `hideLabel` \u9690\u85CF\u6807\u7B7E\u3002",
     "- \u666E\u901A\u5B57\u6BB5\u53EF\u989D\u5916\u4F7F\u7528 `labelStyle` \u4E0E `contentStyle`\uFF0C\u7528\u4E8E contents \u5E03\u5C40\u6A21\u5F0F\u4E0B\u5206\u522B\u63A7\u5236\u6807\u7B7E\u4E0E\u5185\u5BB9\u5355\u5143\u683C\u3002"
   ].join("\n");
 }
@@ -1842,10 +1884,11 @@ function buildMarkdownNotes() {
     "- \u5148\u5728\u4EE3\u7801\u91CC\u751F\u6210\u5E76\u4F7F\u7528 UUID\uFF0C\u518D\u628A\u540C\u4E00\u4E2A `id` \u7C98\u8D34\u5230\u5B57\u6BB5\u914D\u7F6E\u4E2D\u3002",
     "- \u6240\u6709\u5B57\u6BB5\u7EC4 `id` \u90FD\u5FC5\u987B\u552F\u4E00\u4E14\u7B26\u5408 UUID \u683C\u5F0F\u3002",
     "- \u6240\u6709\u5B57\u6BB5 `id` \u90FD\u5FC5\u987B\u552F\u4E00\u4E14\u7B26\u5408 UUID \u683C\u5F0F\u3002",
-    "- \u5B57\u6BB5\u7EC4\u6CA1\u6709\u6807\u9898\uFF1B\u5982\u679C\u9700\u8981\u5206\u6BB5\u6807\u9898\u6216\u8BF4\u660E\uFF0C\u8BF7\u63D2\u5165 `markdown` \u5B57\u6BB5\u3002",
+    "- \u5B57\u6BB5\u7EC4\u6CA1\u6709\u6807\u9898\uFF1B\u5982\u679C\u9700\u8981\u5206\u6BB5\u6807\u9898\u6216\u8BF4\u660E\uFF0C\u4F18\u5148\u63D2\u5165 `markdown-body` \u5B57\u6BB5\uFF1B\u9700\u8981\u6807\u7B7E\u884C\u65F6\u518D\u4F7F\u7528 `markdown` \u5B57\u6BB5\u3002",
     "- `slot` \u4E0E `empty` \u5B57\u6BB5\u53EA\u80FD\u4F7F\u7528 `id`\u3001`type` \u548C\u53EF\u9009\u7684 `style`\u3002",
-    "- `markdown` \u5B57\u6BB5\u4E0D\u4F7F\u7528 `path`\uFF0C\u5185\u5BB9\u6765\u81EA `locale` \u672C\u5730\u5316 Markdown\u3002",
-    "- \u9664 `slot` \u4E0E `empty` \u5916\uFF0C\u5176\u5B83\u5E26\u6807\u7B7E\u5B57\u6BB5\u90FD\u53EF\u4EE5\u8BBE\u7F6E `hideLabel`\u3002",
+    "- `markdown` \u5B57\u6BB5\u4E0D\u4F7F\u7528 `path`\uFF0C\u5185\u5BB9\u6765\u81EA `title` \u4E0E `locale` \u672C\u5730\u5316 Markdown\u3002",
+    "- `markdown-body` \u5B57\u6BB5\u4E0D\u4F7F\u7528 `path`\uFF0C\u5185\u5BB9\u6765\u81EA `locale` \u672C\u5730\u5316 Markdown\uFF0C\u53EF\u9009 `inline` \u63A7\u5236\u6E32\u67D3\u65B9\u5F0F\u3002",
+    "- \u9664 `slot`\u3001`empty` \u4E0E `markdown-body` \u5916\uFF0C\u5176\u5B83\u5E26\u6807\u7B7E\u5B57\u6BB5\u90FD\u53EF\u4EE5\u8BBE\u7F6E `hideLabel`\u3002",
     "- \u666E\u901A\u5B57\u6BB5\u5728 contents \u5E03\u5C40\u6A21\u5F0F\u4E0B\u53EF\u989D\u5916\u4F7F\u7528 `labelStyle` \u4E0E `contentStyle`\u3002",
     "- \u53EA\u6709\u5E26 `path` \u7684\u5B57\u6BB5\u624D\u8981\u6C42 `path` \u552F\u4E00\u4E14\u4E0D\u80FD\u4E3A\u7A7A\u3002",
     "- \u8868\u8FBE\u5F0F\u5B57\u6BB5\u5FC5\u987B\u4E25\u683C\u9075\u5B88 schema \u7EA6\u675F\uFF1B\u5982\u679C schema \u4E0D\u652F\u6301\uFF0C\u5C31\u76F4\u63A5\u8BF4\u660E\u9650\u5236\u3002"
@@ -2514,7 +2557,7 @@ function confirmChanges() {
             </section>
 
             <section
-              v-if="!isPassiveField(selectedField.field)"
+              v-if="hasFieldLabel(selectedField.field)"
               data-slot="fields-configurator-field-label-section"
               class="flex flex-col gap-2"
             >
@@ -2538,7 +2581,7 @@ function confirmChanges() {
             </section>
 
             <section
-              v-if="selectedField.field.type === 'markdown'"
+              v-if="isMarkdownContentField(selectedField.field)"
               data-slot="fields-configurator-field-markdown-section"
               class="flex flex-col gap-2"
             >
@@ -2565,6 +2608,21 @@ function confirmChanges() {
               >
                 {{ validationErrors[getFieldErrorKey(selectedField.draftId, "locale")] }}
               </p>
+
+              <label
+                v-if="isMarkdownBodyField(selectedField.field)"
+                class="flex items-center justify-between gap-3 rounded-md border border-zinc-200 px-3 py-2"
+              >
+                <div class="flex flex-col gap-1">
+                  <span class="text-sm font-medium text-zinc-800">{{ t("field-markdown-inline") }}</span>
+                  <span class="text-xs text-zinc-500">{{ t("field-markdown-inline-description") }}</span>
+                </div>
+                <Switch
+                  data-slot="fields-configurator-field-markdown-inline-switch"
+                  :model-value="selectedField.field.inline ?? false"
+                  @update:model-value="updateSelectedMarkdownInline"
+                />
+              </label>
             </section>
 
             <section
@@ -2629,7 +2687,7 @@ function confirmChanges() {
               </label>
 
               <label
-                v-if="!usesContentsOrientation"
+                v-if="!usesContentsOrientation || isMarkdownBodyField(selectedField.field)"
                 class="flex flex-col gap-2"
               >
                 <span class="text-xs font-medium text-zinc-500">
@@ -2652,7 +2710,7 @@ function confirmChanges() {
               </label>
 
               <label
-                v-else
+                v-else-if="supportsFieldCellStyles(selectedField.field)"
                 class="flex flex-col gap-2"
               >
                 <span class="text-xs font-medium text-zinc-500">
@@ -2675,7 +2733,7 @@ function confirmChanges() {
               </label>
 
               <label
-                v-if="usesContentsOrientation"
+                v-if="usesContentsOrientation && supportsFieldCellStyles(selectedField.field)"
                 class="flex flex-col gap-2"
               >
                 <span class="text-xs font-medium text-zinc-500">
@@ -3358,6 +3416,7 @@ function confirmChanges() {
     "field-type-textarea": "多行文本",
     "field-type-number": "数字",
     "field-type-markdown": "Markdown",
+    "field-type-markdown-body": "纯 Markdown",
     "field-type-select": "选择",
     "field-type-radio": "单选按钮组",
     "field-type-calendar": "日期",
@@ -3385,6 +3444,8 @@ function confirmChanges() {
     "group-style-invalid": "分组样式表达式无效",
     "field-markdown-content": "Markdown 内容",
     "field-markdown-content-description": "支持 Markdown 编辑，并支持双花括号表达式求值。",
+    "field-markdown-inline": "内联渲染",
+    "field-markdown-inline-description": "开启后使用内联 Markdown 渲染；关闭时按块级 Markdown 渲染。",
     "field-required": "显示必填提示",
     "field-required-description": "开启后仅在标签后显示红色星号，不会自动添加校验规则。",
     "field-hide-label": "隐藏标签",
@@ -3493,6 +3554,7 @@ function confirmChanges() {
     "field-type-textarea": "複数行テキスト",
     "field-type-number": "数値",
     "field-type-markdown": "Markdown",
+    "field-type-markdown-body": "プレーン Markdown",
     "field-type-select": "選択",
     "field-type-radio": "ラジオグループ",
     "field-type-calendar": "日付",
@@ -3520,6 +3582,8 @@ function confirmChanges() {
     "group-style-invalid": "グループスタイル式が無効です",
     "field-markdown-content": "Markdown 内容",
     "field-markdown-content-description": "Markdown で編集でき、二重波括弧式も利用できます。",
+    "field-markdown-inline": "インライン描画",
+    "field-markdown-inline-description": "有効にするとインライン Markdown として描画し、無効ならブロック Markdown として描画します。",
     "field-required": "必須ヒントを表示",
     "field-required-description": "有効にするとラベルの後ろに赤い星印だけを表示し、検証ルールは自動追加しません。",
     "field-hide-label": "ラベルを非表示",
@@ -3628,6 +3692,7 @@ function confirmChanges() {
     "field-type-textarea": "Textarea",
     "field-type-number": "Number",
     "field-type-markdown": "Markdown",
+    "field-type-markdown-body": "Plain Markdown",
     "field-type-select": "Select",
     "field-type-radio": "Radio Group",
     "field-type-calendar": "Date",
@@ -3655,6 +3720,8 @@ function confirmChanges() {
     "group-style-invalid": "The group style expression is invalid",
     "field-markdown-content": "Markdown content",
     "field-markdown-content-description": "Supports Markdown and can evaluate double-curly expressions.",
+    "field-markdown-inline": "Inline rendering",
+    "field-markdown-inline-description": "When enabled, render as inline Markdown. Otherwise render as block Markdown.",
     "field-required": "Show required hint",
     "field-required-description": "When enabled, only a red asterisk is shown after the label. No validation rule is added automatically.",
     "field-hide-label": "Hide label",

package/dist/runtime/components/ui/fields-configurator/FieldsConfiguratorDialog.vue.d.ts

@@ -95,6 +95,16 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
             style?: string | undefined;
             hidden?: string | undefined;
             hideLabel?: boolean | undefined;
+        } | {
+            id: string;
+            type: "markdown-body";
+            locale: readonly {
+                locale: "en" | "ja" | "ko" | "zh";
+                message: string;
+            }[];
+            inline?: boolean | undefined;
+            style?: string | undefined;
+            hidden?: string | undefined;
         } | {
             options: string;
             label: string;
@@ -299,6 +309,16 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
                 style?: string | undefined;
                 hidden?: string | undefined;
                 hideLabel?: boolean | undefined;
+            } | {
+                id: string;
+                type: "markdown-body";
+                locale: readonly {
+                    locale: "en" | "ja" | "ko" | "zh";
+                    message: string;
+                }[];
+                inline?: boolean | undefined;
+                style?: string | undefined;
+                hidden?: string | undefined;
             } | {
                 options: string;
                 label: string;
@@ -512,6 +532,16 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
             style?: string | undefined;
             hidden?: string | undefined;
             hideLabel?: boolean | undefined;
+        } | {
+            id: string;
+            type: "markdown-body";
+            locale: readonly {
+                locale: "en" | "ja" | "ko" | "zh";
+                message: string;
+            }[];
+            inline?: boolean | undefined;
+            style?: string | undefined;
+            hidden?: string | undefined;
         } | {
             options: string;
             label: string;
@@ -716,6 +746,16 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
                 style?: string | undefined;
                 hidden?: string | undefined;
                 hideLabel?: boolean | undefined;
+            } | {
+                id: string;
+                type: "markdown-body";
+                locale: readonly {
+                    locale: "en" | "ja" | "ko" | "zh";
+                    message: string;
+                }[];
+                inline?: boolean | undefined;
+                style?: string | undefined;
+                hidden?: string | undefined;
             } | {
                 options: string;
                 label: string;

package/dist/runtime/composables/useNavigationTabs.js

@@ -1,6 +1,6 @@
 import { useRoute, useRouter } from "#app";
 import { useSessionStorage } from "@vueuse/core";
-import { computed, toValue, onMounted } from "vue";
+import { computed, toValue, watch } from "vue";
 export function useNavigationTabs(navigations) {
   const tabs = useSessionStorage("navigation-tabs", /* @__PURE__ */ new Set(), {
     writeDefaults: false
@@ -11,11 +11,31 @@ export function useNavigationTabs(navigations) {
   const clean = (path) => path.replace(/\/$/g, "");
   const route = useRoute();
   const router = useRouter();
-  onMounted(() => {
-    const path = clean(route.path);
+  const matchedRoute = computed(() => {
+    const currentPath = clean(route.path);
+    for (const group of toValue(navigations)) {
+      if ("children" in group) {
+        for (const item of group.children) {
+          if (clean(item.route) === currentPath) {
+            return currentPath;
+          }
+        }
+      } else {
+        if (clean(group.route) === currentPath) {
+          return currentPath;
+        }
+      }
+    }
+  });
+  watch(matchedRoute, (path) => {
+    if (!path) {
+      return;
+    }
     if (!tabs.value.has(path))
       tabs.value.add(path);
     active.value = path;
+  }, {
+    immediate: true
   });
   return {
     tabs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/nuxt",
-  "version": "0.11.45",
+  "version": "0.11.47",
   "description": "",
   "license": "MIT",
   "type": "module",