@shwfed/nuxt 0.10.12 → 0.10.13

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.10.12",
+  "version": "0.10.13",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/ui/button-configurator/ButtonConfiguratorDialog.vue

@@ -108,13 +108,19 @@ const canAddGroup = computed(() => selectedItemId.value === "general");
 const canAddGroupButton = computed(() => selectedNode.value?.item.type === "group");
 const canAddGroupDropdown = computed(() => selectedNode.value?.item.type === "group");
 const canAddDropdownChildButton = computed(() => selectedNode.value?.item.type === "dropdown");
-const flattenedItems = computed(() => flattenButtonConfiguratorTree(draftTree.value).map((item) => ({
-  itemId: item.itemId,
-  depth: item.depth,
-  label: getNodeLabel(item.item),
-  type: item.item.type,
-  id: item.item.id
-})));
+const flattenedItems = computed(() => flattenButtonConfiguratorTree(draftTree.value).flatMap((item) => {
+  const node = getButtonConfiguratorNode(draftTree.value, item.itemId);
+  if (!node) {
+    return [];
+  }
+  return [{
+    itemId: item.itemId,
+    depth: item.depth,
+    label: getNodeLabel(node),
+    type: item.item.type,
+    id: item.item.id
+  }];
+}));
 const filteredItems = computed(() => {
   if (!normalizedSearch.value) {
     return flattenedItems.value;
@@ -128,7 +134,7 @@ const selectedItemLabel = computed(() => {
   if (!selectedNode.value) {
     return generalItem.value.label;
   }
-  return getNodeLabel(selectedNode.value.item);
+  return getNodeLabel(selectedNode.value);
 });
 const selectedContainerItemIds = computed(() => {
   if (selectedItemId.value === "general") {
@@ -158,7 +164,7 @@ const childItems = computed(() => selectedContainerItemIds.value.flatMap((itemId
   }
   return [{
     itemId: node.itemId,
-    label: getNodeLabel(node.item),
+    label: getNodeLabel(node),
     type: node.item.type,
     id: node.item.id
   }];
@@ -168,7 +174,7 @@ const buttonParentOptions = computed(() => draftTree.value.nodes.flatMap((node)
     return [{
       id: node.item.id,
       itemId: node.itemId,
-      label: getNodeLabel(node.item),
+      label: getNodeLabel(node),
       type: "group"
     }];
   }
@@ -176,7 +182,7 @@ const buttonParentOptions = computed(() => draftTree.value.nodes.flatMap((node)
     return [{
       id: node.item.id,
       itemId: node.itemId,
-      label: getNodeLabel(node.item),
+      label: getNodeLabel(node),
       type: "dropdown"
     }];
   }
@@ -185,7 +191,7 @@ const buttonParentOptions = computed(() => draftTree.value.nodes.flatMap((node)
 const dropdownParentOptions = computed(() => draftTree.value.nodes.flatMap((node) => node.item.type === "group" ? [{
   id: node.item.id,
   itemId: node.itemId,
-  label: getNodeLabel(node.item)
+  label: getNodeLabel(node)
 }] : []));
 watch(() => props.config, (config) => {
   applyDraftConfig(config);
@@ -239,11 +245,21 @@ function isCopyableNode(node) {
   }
   return node.item.type === "button" || node.item.type === "dropdown";
 }
-function getNodeLabel(item) {
-  if (item.type === "group") {
+function getNodeLabel(node) {
+  if (node.item.type === "group") {
+    const childLabels = node.childItemIds.flatMap((itemId) => {
+      const childNode = getButtonConfiguratorNode(draftTree.value, itemId);
+      if (!childNode || childNode.item.type === "group") {
+        return [];
+      }
+      return [getNodeLabel(childNode)];
+    });
+    if (childLabels.length > 0) {
+      return childLabels.join("\u3001");
+    }
     return t("group-label");
   }
-  return getZhText(item.title) ?? t(item.type === "button" ? "untitled-button" : "untitled-dropdown");
+  return getZhText(node.item.title) ?? t(node.item.type === "button" ? "untitled-button" : "untitled-dropdown");
 }
 function applyDraftConfig(config) {
   draftGap.value = config.gap ?? 4;

package/package.json

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