diff --git a/packages/designer/src/components/components/form-designer/components/external-component-panel/components/external-component-selector/external-component-selector.component.tsx b/packages/designer/src/components/components/form-designer/components/external-component-panel/components/external-component-selector/external-component-selector.component.tsx
index d6ea25cf0aeba15cb27387aafad80bbce858e242..c5105f9eeb8bc8ae8c7900a54bed0f95d332f36a 100644
--- a/packages/designer/src/components/components/form-designer/components/external-component-panel/components/external-component-selector/external-component-selector.component.tsx
+++ b/packages/designer/src/components/components/form-designer/components/external-component-panel/components/external-component-selector/external-component-selector.component.tsx
@@ -20,7 +20,7 @@ export default defineComponent({
         const metadataService = new MetadataService();
 
         const formBasicInfo = formSchemaUtils.getFormMetadataBasicInfo();
-        const editorParams = { formBasicInfo };
+        const editorParams = { formBasicInfo, enableGroup: false };
         const viewOptions = [
             { id: 'recommend', title: '推荐', type: 'Card', dataSource: 'Recommand', pagination: true },
             { id: 'total', title: '全部', type: 'Card', dataSource: 'Total', pagination: true }
diff --git a/packages/designer/src/components/composition/schema-repository/lookup/lookup-schema.service.ts b/packages/designer/src/components/composition/schema-repository/lookup/lookup-schema.service.ts
index 66a64d3c5d6799b9add670a1843f9b8acd083906..09a9d4b8a7fb86f833c95b5521edbb82ff805de6 100644
--- a/packages/designer/src/components/composition/schema-repository/lookup/lookup-schema.service.ts
+++ b/packages/designer/src/components/composition/schema-repository/lookup/lookup-schema.service.ts
@@ -5,8 +5,7 @@ export class LookupSchemaService {
 
     private metadataType = '.hlp';
 
-    constructor(private metadataService: MetadataService) {
-    }
+    constructor(private metadataService: MetadataService) { }
 
     private getLocalMetadata(metadataPath) {
         return this.metadataService?.getMetadataListInSu(metadataPath, this.metadataType);
@@ -31,18 +30,37 @@ export class LookupSchemaService {
         });
     }
 
-    getRecommandData = async (searchingText: string, pagination: SchemaRepositoryPagination, editorParams): Promise<SchemaItem[]> => {
-        const {relativePath} = editorParams.formBasicInfo;
+    private mergeAndDeduplicateById<T extends { id: string | number }>(...items: T[][]): T[] {
+        const idSet = new Set<string | number>();
+        const mergedItems: T[] = [];
+
+        for (const array of items) {
+            for (const item of array) {
+                if (!idSet.has(item.id)) {
+                    idSet.add(item.id);
+                    mergedItems.push(item);
+                }
+            }
+        }
+        return mergedItems;
+    }
+
+    getRecommandData = async (searchingText: string, pagination: SchemaRepositoryPagination, editorParams: any): Promise<SchemaItem[]> => {
+        const { relativePath } = editorParams.formBasicInfo;
+        const shouldDeduplicate = editorParams.enableGroup === false;
         const recentRequest = await this.getRecentMetadata(relativePath);
         const recentData = this.metadata2SchemaItem(recentRequest.data, 'recent');
 
         const suMetadataRequest = await this.getLocalMetadata(relativePath);
         const localData = this.metadata2SchemaItem(suMetadataRequest.data, 'local');
 
+        if (shouldDeduplicate) {
+            return this.mergeAndDeduplicateById(recentData, localData);
+        }
         return recentData.concat(localData);
     };
 
-    getSchemaData = async (searchingText: string, pagination: SchemaRepositoryPagination, editorParams): Promise<SchemaItem[]> => {
+    getSchemaData = async (searchingText: string, pagination: SchemaRepositoryPagination, editorParams: any): Promise<SchemaItem[]> => {
         const { relativePath } = editorParams.formBasicInfo;
         const allMetadataRes = await this.metadataService?.getAllMetadataList(relativePath, this.metadataType);
         let items = allMetadataRes.data;
diff --git a/packages/ui-vue/components/lookup/src/property-config/external-lookup.property-config.ts b/packages/ui-vue/components/lookup/src/property-config/external-lookup.property-config.ts
index 8247a36218dd7c59b457078f93b513c4a638ab1b..2b8e0387783a2764fdd78c5dca1a839bf71e12cf 100644
--- a/packages/ui-vue/components/lookup/src/property-config/external-lookup.property-config.ts
+++ b/packages/ui-vue/components/lookup/src/property-config/external-lookup.property-config.ts
@@ -76,16 +76,8 @@ export class ExternalLookupPropertyConfig extends BaseControlProperty {
     private getEventPropConfig(propertyData: any) {
         const self: any = this;
         const initialData = self.eventsEditorUtils['formProperties'](propertyData, self.viewModelId, this.events);
-        const properties = {};
-        properties[self.viewModelId] = {
-            type: 'events-editor',
-            editor: {
-                initialData,
-                viewSourceHandle: (commandInfo: any) => {
-                    self.eventsEditorUtils.jumpToMethod(commandInfo);
-                }
-            }
-        };
+        const properties = self.createBaseEventProperty(initialData);
+
         return {
             title: '事件',
             hideTitle: true,
diff --git a/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts b/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts
index 72a57b7d066d77f675826a294d0ae1fd3fed4564..d4669ba11885c8a4b7e7d96f9f41a849e315c228 100644
--- a/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts
+++ b/packages/ui-vue/components/modal/src/property-config/modal.property-config.ts
@@ -84,16 +84,8 @@ export class ModalProperty extends BaseControlProperty {
         const self: any = this;
         const events = ModalEvents;
         const initialData = self.eventsEditorUtils['formProperties'](propertyData, self.viewModelId, events);
-        const properties = {};
-        properties[self.viewModelId] = {
-            type: 'events-editor',
-            editor: {
-                initialData,
-                viewSourceHandle: (commandInfo: any) => {
-                    self.eventsEditorUtils.jumpToMethod(commandInfo);
-                }
-            }
-        };
+        const properties = self.createBaseEventProperty(initialData);
+
         return {
             title: '事件',
             hideTitle: true,
@@ -110,8 +102,7 @@ export class ModalProperty extends BaseControlProperty {
                 }
                 events.forEach(event => {
                     newPropertyData[event.label] = propertyData[event.label];
-                })
-
+                });
             }
         };
     }