diff --git a/packages/editor-setters/src/events-setter/index.tsx b/packages/editor-setters/src/events-setter/index.tsx
index 92f4eb319..6f364cdfe 100644
--- a/packages/editor-setters/src/events-setter/index.tsx
+++ b/packages/editor-setters/src/events-setter/index.tsx
@@ -33,15 +33,24 @@ export default class EventsSetter extends Component<{
     relatedEventName: '',
   };
 
-
+  // constructor (){
+  //   super();
+  //   debugger;
+  //   if (!this.props || !this.props.value){
+  //     this.setState({
+  //       eventDataList:[]
+  //     })
+  //   }
+  // }
 
   static getDerivedStateFromProps(nextProps, prevState) {
-    const { value } = nextProps;
-    if (value !== prevState.eventDataList) {
-      return {
-        value,
-      };
-    }
+    // const { value } = nextProps;
+    // debugger;
+    // if (value !== prevState.eventDataList) {
+    //   return {
+    //     value,
+    //   };
+    // }
     return null;
   }
 
diff --git a/packages/editor-skeleton/src/transducers/addon-combine.ts b/packages/editor-skeleton/src/transducers/addon-combine.ts
index 35844ab29..45eded24d 100644
--- a/packages/editor-skeleton/src/transducers/addon-combine.ts
+++ b/packages/editor-skeleton/src/transducers/addon-combine.ts
@@ -179,7 +179,7 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp
       title: { type: 'i18n', 'zh-CN': '事件', 'en-US': 'Events' },
       items: [
         {
-          name: '!events',
+          name: 'events',
           title: { type: 'i18n', 'zh-CN': '事件设置', 'en-US': 'Events' },
           setter: {
             componentName: 'EventsSetter',
@@ -188,12 +188,25 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp
             },
           },
           getValue(field: SettingTarget, val?: any[]) {
-            // todo:
-            return val;
+            let eventDataList = []
+            for (let key in val){
+              if (val[key].__eventData){
+                eventDataList.push(val[key].__eventData)
+              }
+            }
+            return eventDataList;
           },
 
           setValue(field: SettingTarget, eventDataList: any[]) {
             // todo:
+            eventDataList.map((item)=>{
+              field.setPropValue(item.name,{
+                type: 'JSFunction',
+                value: `function(){ this.${item.relatedEventName}() }`,
+                __eventData:item
+              })
+              return item;
+            })
             return;
           },
         },
diff --git a/packages/plugin-source-editor/src/index.tsx b/packages/plugin-source-editor/src/index.tsx
index 3becac7b7..245a3198a 100644
--- a/packages/plugin-source-editor/src/index.tsx
+++ b/packages/plugin-source-editor/src/index.tsx
@@ -258,7 +258,7 @@ export default class SourceEditor extends Component<{
               <MonacoEditor
                 value={jsCode}
                 {...defaultEditorOption}
-                {...{ language: 'typescript' }}
+                {...{ language: 'javascript' }}
                 onChange={(newCode) => this.updateCode(newCode)}
                 editorDidMount={(editor, monaco) => this.editorDidMount.call(this, editor, monaco,TAB_KEY.JS_TAB)}
               />