修复合并bug

src/window1/tabGridView/CellTextItem.vue

@@ -147,7 +147,7 @@
       </button>
     </template>
   </Modal>
-  <component :is="modal1Component" v-model:open="modal1Open" :model-data="modelData" />
+  <component :is="modal1Component" v-model:open="modal1Open" :model-data="modelData" @refresh-data="refreshDatas" />
 </template>
 
 <script>

src/window1/tabGridView/GridBody.vue

@@ -122,7 +122,6 @@
       </button>
     </template>
   </Modal>
-  <component :is="modal1Component" v-model:open="modal1Open" :model-data="modelData" @refresh-data="refreshDatas" />
 </template>
 
 <script>
@@ -226,8 +225,6 @@ export default {
       lastClickTime: 0,
       fieldUtil: FieldUtil,
       Language: Language,
-      modal1Open: false,
-      modal1Component: null,
       processReportResult: {},
       modal: false,
       titleModal: false,
@@ -372,11 +369,6 @@ export default {
       Notify.error('提示', '暂不支持该组件', false);
     },
 
-    closeModal: function(){
-      var _self = this;
-      _self.modal1Open.value = false;
-    },
-
     // 改变表格行元素的编辑状态
     editRecord: function () {
       this.$emit('editRecord');