refactor(ui): 通过解析dsl渲染的组件，渲染时往config中加入IS_DSL_NODE_KEY，用于识别是系统渲染的

Mu-L · Aug 1, 2024 · c8d6a4f · c8d6a4f
1 parent 59f0527
commit c8d6a4f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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,