From adfb39d75374fcb479b564f23b501d4ed87fd31a Mon Sep 17 00:00:00 2001
From: sulmo <sulmo@megazone.com>
Date: Mon, 16 Dec 2024 17:32:01 +0900
Subject: [PATCH 1/3] docs: update dynamic layout documentation

- Corrected the table entry for `fields` to reflect accurate options
- Added detailed explanation and example for item type using `p-definition-table` component

Signed-off-by: sulmo <sulmo@megazone.com>
---
 .../dynamic/dynamic-layout/PDynamicLayout.mdx       |  4 ++--
 .../dynamic/dynamic-layout/templates/item/item.mdx  | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/mirinae/src/data-display/dynamic/dynamic-layout/PDynamicLayout.mdx b/packages/mirinae/src/data-display/dynamic/dynamic-layout/PDynamicLayout.mdx
index 126f880dab..600a0dd625 100644
--- a/packages/mirinae/src/data-display/dynamic/dynamic-layout/PDynamicLayout.mdx
+++ b/packages/mirinae/src/data-display/dynamic/dynamic-layout/PDynamicLayout.mdx
@@ -56,7 +56,7 @@ So, `options` is fixed, and `type-options` can be changed by the user's behavior
 |----------------|------|--------------|-------|-----------|--------------------|-----|----------|------|-------|------|
 | root_path      | O    | O            | O     | O         | O                  | O   | O        | O    | O     | O    |
 | translation_id | O    | O            | O     | O         | O                  | O   | O        | O    | O     | O    |
-| fields         | X    | O            | O     | X         | O                  | X   | X        | X    | X     | X    |
+| fields         | O    | O            | O     | X         | O                  | X   | X        | X    | X     | X    |
 | markdown       | X    | X            | X     | X         | X                  | X   | O        | X    | X     | X    |
 | layouts        | X    | X            | X     | X         | X                  | X   | X        | X    | X     | O    |
 | search         | X    | X            | X     | X         | O                  | X   | X        | X    | X     | X    |
@@ -246,4 +246,4 @@ interface DynamicLayoutEventListeners {
 
 
 <br/>
-<br/>
\ No newline at end of file
+<br/>
diff --git a/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/item.mdx b/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/item.mdx
index 7d3494dd28..63deb746b5 100644
--- a/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/item.mdx
+++ b/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/item.mdx
@@ -7,6 +7,19 @@ import * as itemStories from './item.stories';
 <Meta of={itemStories} />
 
 # Item Type
+ This is an item type implemented with the `p-definition-table` component. The layout is dynamically generated according to the `options.fields` defined in the schema. For the options of `options.fields`, please refer to the `Dynamic Field` component.
+
+If `options.fields` is not provided, the layout is generated as a key-value pair of 1 depth by default. Therefore, it can be used when the data is in the following code.
+
+```json
+{
+  "key1": "value1",
+  "key2": "value2",
+  "key3": "value3"
+}
+```
+
+
 <br/>
 <br/>
 

From ea582e9cddfe7c8a764c9146d034df11b2d5d5ab Mon Sep 17 00:00:00 2001
From: sulmo <sulmo@megazone.com>
Date: Tue, 17 Dec 2024 21:03:32 +0900
Subject: [PATCH 2/3] refactor: update to setup script

Signed-off-by: sulmo <sulmo@megazone.com>
---
 .../dynamic-layout/templates/item/index.vue   | 216 ++++++++----------
 .../dynamic/dynamic-layout/type/index.ts      |  12 +-
 2 files changed, 104 insertions(+), 124 deletions(-)

diff --git a/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue b/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue
index 5c7ab878fb..8753c151c7 100644
--- a/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue
+++ b/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue
@@ -1,15 +1,105 @@
+<script lang="ts" setup>
+import {
+    computed, reactive,
+} from 'vue';
+
+import PDynamicField from '@/data-display/dynamic/dynamic-field/PDynamicField.vue';
+import type { DynamicFieldProps } from '@/data-display/dynamic/dynamic-field/type';
+import type { DynamicField } from '@/data-display/dynamic/dynamic-field/type/field-schema';
+import type { DynamicLayoutBaseProps, DynamicLayoutFieldHandler, DynamicLayoutTypeOptions } from '@/data-display/dynamic/dynamic-layout/type';
+import type { ItemOptions, DynamicLayoutType } from '@/data-display/dynamic/dynamic-layout/type/layout-schema';
+import { getValueByPath } from '@/data-display/dynamic/helper';
+import PHeading from '@/data-display/heading/PHeading.vue';
+import { DEFINITION_TABLE_STYLE_TYPE } from '@/data-display/tables/definition-table/config';
+import PDefinitionTable from '@/data-display/tables/definition-table/PDefinitionTable.vue';
+import type { DefinitionData, DefinitionField } from '@/data-display/tables/definition-table/type';
+import { I18nConnector } from '@/translations';
+
+// NOTE: Due to the vue version issue of mirinae, it is not possible to define a type with generics using defineProps.
+interface Props extends DynamicLayoutBaseProps {
+    name: string;
+    type: DynamicLayoutType;
+    options: ItemOptions;
+    data?: any;
+    typeOptions?: DynamicLayoutTypeOptions;
+    fieldHandler?: DynamicLayoutFieldHandler;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    options: () => ({}) as ItemOptions,
+    data: () => ({}),
+    typeOptions: () => ({}),
+    fieldHandler: undefined,
+});
+
+const state = reactive({
+    layoutName: computed(() => (props.options.translation_id ? I18nConnector.i18n.t(props.options.translation_id) : props.name)),
+    fields: computed<DefinitionField[]>(() => {
+        if (!props.options.fields) return [];
+        const locale = I18nConnector.i18n.locale;
+        return props.options.fields.map((d) => ({
+            label: d.options?.translation_id ? I18nConnector.i18n.t(d.options.translation_id as string, locale) : d.name,
+            name: d.key,
+            disableCopy: !!d.options?.disable_copy,
+        } as DefinitionField));
+    }),
+    rootData: computed<DefinitionData>(() => {
+        if (props.options.root_path) {
+            return getValueByPath(props.data, props.options.root_path) ?? {};
+        }
+        if (Array.isArray(props.data) || typeof props.data === 'string') return {};
+        return props.data;
+    }),
+    loading: computed<boolean|undefined>(() => (props.typeOptions === undefined ? undefined : props.typeOptions.loading)),
+    timezone: computed<string>(() => props.typeOptions?.timezone || 'UTC'),
+});
+
+const getFieldData = (rootData, dataPath: string, type?: string): any => {
+    if (type === 'more') {
+        return rootData;
+    }
+    return getValueByPath(rootData, dataPath);
+};
+
+const dynamicFieldSlots = computed<Record<string, DynamicFieldProps>>(() => {
+    const res = {};
+    if (!props.options.fields) return res;
+
+    props.options.fields.forEach((ds: DynamicField, i) => {
+        const item: DynamicFieldProps = {
+            type: ds.type || 'text',
+            options: { ...ds.options },
+            extraData: { ...ds, index: i },
+            data: getFieldData(state.rootData, ds.key, ds.type),
+        };
+
+        if (item.options.translation_id) delete item.options.translation_id;
+
+        if (ds.type === 'datetime') {
+            item.typeOptions = { timezone: state.timezone };
+        } else if (ds.type === 'more') {
+            item.typeOptions = { displayKey: ds.key };
+        }
+
+        res[`data-${i}`] = item;
+    });
+
+    return res;
+});
+
+</script>
 <template>
     <div>
-        <p-heading v-if="layoutName"
+        <p-heading v-if="state.layoutName"
                    class="pt-8 px-4 pb-4"
                    heading-type="sub"
         >
-            {{ layoutName }}
+            {{ state.layoutName }}
         </p-heading>
-        <p-definition-table :fields="fields"
-                            :data="rootData"
-                            :style-type="options.styleType"
-                            :loading="loading"
+        <p-definition-table :fields="state.fields"
+                            :data="state.rootData"
+                            :style-type="options.styleType ?? DEFINITION_TABLE_STYLE_TYPE.primary"
+                            :loading="state.loading"
                             v-on="$listeners"
         >
             <template v-for="(item, slotName) of dynamicFieldSlots"
@@ -32,117 +122,3 @@
         </p-definition-table>
     </div>
 </template>
-
-<script lang="ts">
-import {
-    computed, getCurrentInstance, reactive, toRefs,
-} from 'vue';
-import type { Vue } from 'vue/types/vue';
-
-import PDynamicField from '@/data-display/dynamic/dynamic-field/PDynamicField.vue';
-import type { DynamicFieldProps } from '@/data-display/dynamic/dynamic-field/type';
-import type { DynamicField } from '@/data-display/dynamic/dynamic-field/type/field-schema';
-import type { ItemDynamicLayoutProps } from '@/data-display/dynamic/dynamic-layout/templates/item/type';
-import { getValueByPath } from '@/data-display/dynamic/helper';
-import PHeading from '@/data-display/heading/PHeading.vue';
-import PDefinitionTable from '@/data-display/tables/definition-table/PDefinitionTable.vue';
-import type { DefinitionData, DefinitionField } from '@/data-display/tables/definition-table/type';
-
-export default {
-    name: 'PDynamicLayoutItem',
-    components: {
-        PDynamicField,
-        PHeading,
-        PDefinitionTable,
-    },
-    props: {
-        name: {
-            type: String,
-            required: true,
-        },
-        options: {
-            type: Object,
-            default: () => ({}),
-        },
-        data: {
-            type: [Object, Array, String],
-            default: undefined,
-        },
-        fetchOptions: {
-            type: Object,
-            default: undefined,
-        },
-        typeOptions: {
-            type: Object,
-            default: undefined,
-        },
-        fieldHandler: {
-            type: Function,
-            default: undefined,
-        },
-    },
-    setup(props: ItemDynamicLayoutProps) {
-        const vm = getCurrentInstance()?.proxy as Vue;
-
-        const state = reactive({
-            layoutName: computed(() => (props.options.translation_id ? vm.$t(props.options.translation_id) : props.name)),
-            fields: computed<DefinitionField[]>(() => {
-                if (!props.options.fields) return [];
-                const locale = vm.$i18n.locale;
-                return props.options.fields.map((d) => ({
-                    label: d.options?.translation_id ? vm.$t(d.options.translation_id as string, locale) : d.name,
-                    name: d.key,
-                    disableCopy: !!d.options?.disable_copy,
-                } as DefinitionField));
-            }),
-            rootData: computed<DefinitionData>(() => {
-                if (props.options.root_path) {
-                    return getValueByPath(props.data, props.options.root_path) ?? {};
-                }
-                if (Array.isArray(props.data) || typeof props.data === 'string') return {};
-                return props.data;
-            }),
-            loading: computed<boolean|undefined>(() => (props.typeOptions === undefined ? undefined : props.typeOptions.loading)),
-            timezone: computed<string>(() => props.typeOptions?.timezone || 'UTC'),
-        });
-
-        const getFieldData = (rootData, dataPath: string, type?: string): any => {
-            if (type === 'more') {
-                return rootData;
-            }
-            return getValueByPath(rootData, dataPath);
-        };
-
-        const dynamicFieldSlots = computed(() => {
-            const res = {};
-            if (!props.options.fields) return res;
-
-            props.options.fields.forEach((ds: DynamicField, i) => {
-                const item: DynamicFieldProps = {
-                    type: ds.type || 'text',
-                    options: { ...ds.options },
-                    extraData: { ...ds, index: i },
-                    data: getFieldData(state.rootData, ds.key, ds.type),
-                };
-
-                if (item.options.translation_id) delete item.options.translation_id;
-
-                if (ds.type === 'datetime') {
-                    item.typeOptions = { timezone: state.timezone };
-                } else if (ds.type === 'more') {
-                    item.typeOptions = { displayKey: ds.key };
-                }
-
-                res[`data-${i}`] = item;
-            });
-
-            return res;
-        });
-
-        return {
-            ...toRefs(state),
-            dynamicFieldSlots,
-        };
-    },
-};
-</script>
diff --git a/packages/mirinae/src/data-display/dynamic/dynamic-layout/type/index.ts b/packages/mirinae/src/data-display/dynamic/dynamic-layout/type/index.ts
index b821766c44..4466e72344 100644
--- a/packages/mirinae/src/data-display/dynamic/dynamic-layout/type/index.ts
+++ b/packages/mirinae/src/data-display/dynamic/dynamic-layout/type/index.ts
@@ -35,18 +35,22 @@ export interface DynamicLayoutTypeOptions {
     sortable?: boolean;
 }
 
-export interface DynamicLayoutProps<
-    SchemaOptions = DynamicLayoutOptions,
-    > {
+// NOTE: Due to the version issue of mirinae vue, it is not possible to define a type with generics using defineProps, so DynamicLayoutBaseProps is added and used.
+export interface DynamicLayoutBaseProps {
     name: string;
     type: DynamicLayoutType;
-    options: SchemaOptions;
     data?: any;
     fetchOptions?: DynamicLayoutFetchOptions;
     typeOptions?: DynamicLayoutTypeOptions;
     fieldHandler?: DynamicLayoutFieldHandler;
 }
 
+export interface DynamicLayoutProps<
+    SchemaOptions = DynamicLayoutOptions,
+    > extends DynamicLayoutBaseProps {
+    options: SchemaOptions;
+}
+
 export interface DynamicLayoutFieldExtraData extends DynamicField {
     index: number;
 }

From 0d1fdc4faf1b6820cb29e902bccfbd2f33888a0b Mon Sep 17 00:00:00 2001
From: sulmo <sulmo@megazone.com>
Date: Tue, 17 Dec 2024 22:06:55 +0900
Subject: [PATCH 3/3] feat: add no-field case spec to Dynamic Layout item type

- Add computed property to check if fields are empty
- Add computed property to check if root data is empty
- Update fields computation based on new properties

Signed-off-by: sulmo <sulmo@megazone.com>
---
 .../dynamic/dynamic-layout/templates/item/index.vue    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue b/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue
index 8753c151c7..912164eac3 100644
--- a/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue
+++ b/packages/mirinae/src/data-display/dynamic/dynamic-layout/templates/item/index.vue
@@ -34,8 +34,16 @@ const props = withDefaults(defineProps<Props>(), {
 
 const state = reactive({
     layoutName: computed(() => (props.options.translation_id ? I18nConnector.i18n.t(props.options.translation_id) : props.name)),
+    isFieldEmpty: computed<boolean>(() => !props.options.fields || props.options.fields.length === 0),
+    isRootDataEmpty: computed<boolean>(() => !state.rootData || Object.keys(state.rootData).length === 0),
     fields: computed<DefinitionField[]>(() => {
-        if (!props.options.fields) return [];
+        if (state.isFieldEmpty) {
+            if (state.isRootDataEmpty) return [];
+            return Object.keys(state.rootData).map((key) => ({
+                label: key,
+                name: key,
+            }));
+        }
         const locale = I18nConnector.i18n.locale;
         return props.options.fields.map((d) => ({
             label: d.options?.translation_id ? I18nConnector.i18n.t(d.options.translation_id as string, locale) : d.name,