diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue
index f23d653c..b9c8f41a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue
@@ -150,6 +150,7 @@ const tdClick = () => {
         }
       }
     }
+
     if (tools.table.store.inlineEditStatus === Constant.EDIT_STATUS.NONE && tools.props.selectMode === Constant.SELECT_MODE.CELL) {
       tools.table.store.cellSelected = {
         row: toRaw(props.scope.row),
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
index 4a1d89d8..2f902b95 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
@@ -163,7 +163,7 @@ const addScrollListener = () => {
 
     // 修改锁定列的最后一列TD右边框
     if (tools.table.store.scrollLeft > 0) {
-      // 计算当前列
+      // 计算当前锁定列一共占用多少列
     }
   });
 };
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/extra/inline-edit/CellEditor.vue b/io.sc.platform.core.frontend/src/platform/components/grid/extra/inline-edit/CellEditor.vue
index 8243d13d..1df35f8b 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/extra/inline-edit/CellEditor.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/extra/inline-edit/CellEditor.vue
@@ -1,6 +1,17 @@
 <template>
-  <w-dialog ref="dialogRef" :title="dialog.title" v-bind="tools.props.editor?.cellEditor" :buttons="dialog.buttons">
-    <w-form ref="dialogFormRef" :cols-num="1" :fields="fieldsComputed" class="pt-1.5 px-1.5"></w-form>
+  <w-dialog
+    ref="dialogRef"
+    :title="dialog.title"
+    v-bind="bindDialogComputed"
+    :buttons="dialog.buttons"
+    @hide="
+      () => {
+        saveLoading = false;
+        tools.table.store.inlineEditStatus = Constant.EDIT_STATUS.NONE;
+      }
+    "
+  >
+    <w-form ref="dialogFormRef" v-bind="bindFormComputed" :cols-num="1" :fields="fieldsComputed" class="pt-1.5 px-1.5"></w-form>
   </w-dialog>
 </template>
 <script setup lang="ts">
@@ -13,6 +24,23 @@ const dialogFormRef = ref();
 
 const tools = <GridTools>inject('tools');
 
+const bindDialogComputed = computed(() => {
+  if (tools.props.editor?.cellDialog) {
+    return tools.props.editor.cellDialog;
+  } else if (tools.props.editor?.dialog) {
+    return tools.props.editor.dialog;
+  }
+  return undefined;
+});
+const bindFormComputed = computed(() => {
+  if (tools.props.editor?.cellForm) {
+    return tools.props.editor.cellForm;
+  } else if (tools.props.editor?.form) {
+    return tools.props.editor.form;
+  }
+  return undefined;
+});
+
 const fieldsComputed = computed(() => {
   const fields = <any>[];
   const cellSelected = tools.table.store.cellSelected;
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/EditStatus.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/EditStatus.ts
index 99e2baf2..b1db7592 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/EditStatus.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/EditStatus.ts
@@ -10,6 +10,10 @@ export class EditStatus {
    * 单元格编辑状态
    */
   public static CELL = 'cellEdit';
+  /**
+   * 单元格弹窗编辑状态
+   */
+  public static CELL_DIALOG = 'cellDialogEdit';
   /**
    * 行编辑状态
    */
@@ -27,6 +31,7 @@ export class EditStatus {
     return {
       [EditStatus.NONE]: EditStatus.NONE,
       [EditStatus.CELL]: EditStatus.CELL,
+      [EditStatus.CELL_DIALOG]: EditStatus.CELL_DIALOG,
       [EditStatus.ROW]: EditStatus.ROW,
       [EditStatus.ROWS]: EditStatus.ROWS,
     };
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/ExposeApiManager.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/ExposeApiManager.ts
index 1a3af05e..97598d6a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/ExposeApiManager.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/ExposeApiManager.ts
@@ -67,9 +67,7 @@ export class ExposeApiManager {
       // 获取子组件ref的api
       getQueryForm: tools.apiFM.componentRef.getQueryForm,
       getEditorDialog: tools.apiFM.componentRef.getEditorDialog,
-      getCellEditorDialog: tools.apiFM.componentRef.getCellEditorDialog,
       getEditorForm: tools.apiFM.componentRef.getEditorForm,
-      getCellEditorForm: tools.apiFM.componentRef.getCellEditorForm,
       getViewerDrawer: tools.apiFM.componentRef.getViewerDrawer,
       getViewerPanel: tools.apiFM.componentRef.getViewerPanel,
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/ComponentRef.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/ComponentRef.ts
index 760ab7f5..1ca94185 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/ComponentRef.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/ComponentRef.ts
@@ -1,5 +1,5 @@
 import { Base } from '../../Base';
-import { PropsType, TableType } from '../../index';
+import { PropsType, TableType, Constant } from '../../index';
 
 /**
  * w-grid 获取内置组件ref对象API
@@ -9,9 +9,7 @@ export class ComponentRef extends Base {
     super(props, table);
     this.getQueryForm = this.getQueryForm.bind(this);
     this.getEditorDialog = this.getEditorDialog.bind(this);
-    this.getCellEditorDialog = this.getCellEditorDialog.bind(this);
     this.getEditorForm = this.getEditorForm.bind(this);
-    this.getCellEditorForm = this.getCellEditorForm.bind(this);
     this.getViewerDrawer = this.getViewerDrawer.bind(this);
     this.getViewerPanel = this.getViewerPanel.bind(this);
   }
@@ -20,16 +18,18 @@ export class ComponentRef extends Base {
     return this.table.componentRef.getTopRef().getQueryForm();
   }
   getEditorDialog() {
-    return this.table.componentRef.getEditorRef()?.getDialog();
-  }
-  getCellEditorDialog() {
-    return this.table.componentRef.getCellEditorRef()?.getDialog();
+    if (this.table.store.inlineEditStatus === Constant.EDIT_STATUS.CELL_DIALOG) {
+      return this.table.componentRef.getCellEditorRef()?.getDialog();
+    } else {
+      return this.table.componentRef.getEditorRef()?.getDialog();
+    }
   }
   getEditorForm() {
-    return this.table.componentRef.getEditorRef()?.getForm();
-  }
-  getCellEditorForm() {
-    return this.table.componentRef.getCellEditorRef()?.getForm();
+    if (this.table.store.inlineEditStatus === Constant.EDIT_STATUS.CELL_DIALOG) {
+      return this.table.componentRef.getCellEditorRef()?.getForm();
+    } else {
+      return this.table.componentRef.getEditorRef()?.getForm();
+    }
   }
   getViewerDrawer() {
     return this.table.componentRef.getViewRef()?.getViewerDrawer();
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/CellEdit.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/CellEdit.ts
index 779bda21..5de47e7a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/CellEdit.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/toolbar/buttons/CellEdit.ts
@@ -24,8 +24,9 @@ export class CellEdit extends Button {
       console.warn('[w-grid]The column selected is not configured with a component type for editing.');
       return false;
     }
+    this.table.store.inlineEditStatus = Constant.EDIT_STATUS.CELL_DIALOG;
     // 弹出模态框编辑，但是只编辑该列的值
-    args.grid.getCellEditorDialog().show();
+    args.grid.getEditorDialog().show();
     const this_ = this;
     nextTick(() => {
       this_.tools?.em.afterEditorOpen(toRaw(args.selected));