fix: onChange无法触发

Pivot-Studio · Oct 10, 2023 · c684f94 · c684f94
1 parent fb4c3ed
commit c684f94
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/packages/design/components/MonacoEditor/Editor.tsx b/packages/design/components/MonacoEditor/Editor.tsx
@@ -6,6 +6,7 @@ import InitPlugin from './plugins/initPlugin';
 import { useControlled, useDebounce } from '../hooks';
 import Preview from './components/Preview';
 import { useWorkers } from './workers/useWorkers';
+import { omit } from '../utils/omit';
 interface MocacoEditorProps extends EditorProps {
   modules?: TabsItemProps[];
 }
@@ -45,10 +46,7 @@ const MonacoEditor = (props: MocacoEditorProps) => {
     InitPlugin(monaco);
   };
 
-  // todo: 这里没有处罚
   const handleEditorChange: OnChange = useDebounce((value, e) => {
-    console.log(111);
-
     onChange?.(value ?? '', e);
     compilerWorker.postMessage({
       type: MessageChangeType.Compile,
@@ -70,7 +68,7 @@ const MonacoEditor = (props: MocacoEditorProps) => {
         theme={theme}
         onChange={handleEditorChange}
         onMount={handleEditorDidMount}
-        {...rest}
+        {...omit(rest, ['value', 'onChange'])}
         // beforeMount={handleEditorWillMount}
         // onValidate={handleEditorValidation}
       />

diff --git a/packages/design/components/MonacoEditor/workers/compilerWorker.ts b/packages/design/components/MonacoEditor/workers/compilerWorker.ts
@@ -103,11 +103,9 @@ const babelTransform = (
 
 self.addEventListener('message', (e) => {
   const { type, data } = e.data;
-  console.log(e);
 
   if (type === MessageChangeType.Compile) {
     // 发送结果回主线程
-
     self.postMessage({
       type,
       data: babelTransform(data.filename, data.code, data.modules),

diff --git a/packages/design/components/utils/omit.ts b/packages/design/components/utils/omit.ts
@@ -0,0 +1,15 @@
+export function omit<T extends Record<string, any>, K extends keyof T>(
+  obj: T,
+  keys: K[]
+): Omit<T, K> {
+  const result = { ...obj };
+
+  keys.forEach((key) => {
+    // eslint-disable-next-line no-prototype-builtins
+    if (result.hasOwnProperty(key)) {
+      delete result[key];
+    }
+  });
+
+  return result;
+}