From c8d6a4f4d12edc6196c914ad1f358f40897e5b2b Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 1 Aug 2024 20:25:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ui):=20=E9=80=9A=E8=BF=87=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90dsl=E6=B8=B2=E6=9F=93=E7=9A=84=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=B2=E6=9F=93=E6=97=B6=E5=BE=80config=E4=B8=AD?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5IS=5FDSL=5FNODE=5FKEY=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E8=AF=86=E5=88=AB=E6=98=AF=E7=B3=BB=E7=BB=9F=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/schema/src/index.ts                |  5 +++++
 packages/ui/src/container/src/Container.vue | 18 ++++++------------
 packages/utils/src/index.ts                 |  3 ++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
index aafd8d8f..b20ded1b 100644
--- a/packages/schema/src/index.ts
+++ b/packages/schema/src/index.ts
@@ -297,3 +297,8 @@ export interface DisplayCondItem {
 export interface DisplayCond {
   cond: DisplayCondItem[];
 }
+
+export interface UiComponentProps<T extends MNode = MNode> {
+  config: T;
+  model?: any;
+}
diff --git a/packages/ui/src/container/src/Container.vue b/packages/ui/src/container/src/Container.vue
index 330eee4d..9607cf04 100644
--- a/packages/ui/src/container/src/Container.vue
+++ b/packages/ui/src/container/src/Container.vue
@@ -9,7 +9,7 @@
           :id="item.id"
           :class="`${item.className || ''}`"
           :style="app?.transformStyle(item.style || {})"
-          :config="item"
+          :config="{ ...item, [IS_DSL_NODE_KEY]: true }"
         ></component>
       </template>
     </slot>
@@ -19,19 +19,13 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 
-import type { MContainer } from '@tmagic/schema';
-import { toLine } from '@tmagic/utils';
+import type { MContainer, UiComponentProps } from '@tmagic/schema';
+import { IS_DSL_NODE_KEY, toLine } from '@tmagic/utils';
 import { useApp } from '@tmagic/vue-runtime-help';
 
-const props = withDefaults(
-  defineProps<{
-    config: MContainer;
-    model?: any;
-  }>(),
-  {
-    model: () => ({}),
-  },
-);
+const props = withDefaults(defineProps<UiComponentProps<MContainer>>(), {
+  model: () => ({}),
+});
 
 const { style, display, app } = useApp({
   config: props.config,
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index d645deef..6f34992b 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -249,7 +249,8 @@ export const replaceChildNode = (newNode: MNode, data?: MNode[], parentId?: Id)
   parent.items.splice(index, 1, newNode);
 };
 
-export const DSL_NODE_KEY_COPY_PREFIX = '__magic__';
+export const DSL_NODE_KEY_COPY_PREFIX = '__tmagic__';
+export const IS_DSL_NODE_KEY = '__tmagic__dslNode';
 
 export const compiledNode = (
   compile: (value: any) => any,