fix: compare incoming value with modal's value

DTStack · Jun 17, 2024 · 96187df · 96187df
1 parent 555abe1
commit 96187df
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/services/workbench/__tests__/editorService.test.tsx b/src/services/workbench/__tests__/editorService.test.tsx
@@ -208,9 +208,12 @@ describe('Test EditorService', () => {
  expect(groups?.length).toBe(1);
 
  const setValFn = jest.fn();
+ const getValFn = jest.fn();
  (MonacoEditor.getModel as jest.Mock).mockImplementation(() => ({
  setValue: setValFn,
+ getValue: getValFn,
  }));
+
  act(() => {
  editor.updateTab({
  id: mockTab.id,

diff --git a/src/services/workbench/editorService.ts b/src/services/workbench/editorService.ts
@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import { singleton, container } from 'tsyringe';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, isString } from 'lodash';
 import { Component } from 'mo/react';
 import {
  EditorModel,
@@ -337,8 +337,13 @@ export class EditorService
  const model = MonacoEditor.getModel(
  Uri.parse(tab.id.toString())
  );
- if (model) {
- model.setValue(editorValue || '');
+ const currentValue = model?.getValue();
+ if (
+ model &&
+ isString(editorValue) &&
+ currentValue !== editorValue
+ ) {
+ model.setValue(editorValue);
  }
  this.updateGroup(groupId, group);
 
@@ -362,8 +367,13 @@ export class EditorService
  const model = MonacoEditor.getModel(
  Uri.parse(tab.id.toString())
  );
- if (model) {
- model.setValue(editorValue || '');
+ const currentValue = model?.getValue();
+ if (
+ model &&
+ isString(editorValue) &&
+ currentValue !== editorValue
+ ) {
+ model.setValue(editorValue);
  }
  });