Merge branch 'master' of https://a.leanwo.com:3000/prodog-client-2023/client-base-v4

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.86",
+  "version": "4.0.87",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry http://wuzhixin.vip:4873",

src/window1/tabGridView/NewTabButton.vue

@@ -118,7 +118,31 @@
     </template>
   </Modal>
 
+  <<<<<<< HEAD
   <component :is="modal1Component" v-model:open="modal1Open" :model-data="selectDatas" @refresh-data="refresh" />
+  =======
+  <Modal v-model:show="titleModal" :show-canel-button="false" :show-ok-button="false">
+    <template #header>
+      {{ tabButtonModel.tipsTitle }}
+    </template>
+    {{ tabButtonModel.tipsContent }}
+    <template #footer>
+      <button type="button" class="btn btn-default" @click="titleModalClose">
+        {{ $t("lang.tabButton.cancel") }}
+      </button>
+      <button type="primary" class="btn btn-default" @click="executeProcess">
+        确认
+      </button>
+    </template>
+  </Modal>
+
+  <component
+    :is="modal1Component"
+    v-model:open="modal1Open"
+    :model-data="selectDatas"
+    @refresh-data="refresh"
+  />
+  >>>>>>> 5152f209cc33b97d23cb378b32e5ff64cf301097
 </template>
 
 <script setup>
@@ -796,6 +820,7 @@ const executeProcess = async function () {
         });
       }
       titleModal.value = false;
+      refresh();
     },
     errorData => {
       titleModal.value = false;