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

# Conflicts:
#	src/window1/tabGridView/GridBody.vue

src/window1/tabGridView/GridBody.vue

@@ -132,6 +132,7 @@
     </template>
   </Modal>
   <component :is="modal1Component" v-model:open="modal1Open" />
+  <component :is="modal1Component" v-model:open="modal1Open" :model-data="modelData" />
 </template>
 
 <script>
@@ -665,7 +666,6 @@ export default {
     openRemoteComponentModule: function (tabButton) {
       var _self = this;
       let jsUrl = tabButton.remoteComponentModuleJsUrl;
-
       let cssUrl = tabButton.remoteComponentModuleCssUrl;
 
       // 显示模态框

src/window1/tabGridView/NewTabButton.vue

@@ -67,7 +67,8 @@
         <a-button v-else :icon="h(LayoutTwoTone)">{{ item.name }}</a-button>
       </template>
     </a-space>
-    <a-space size="small">
+    <div v-else />
+    <a-space v-if="rightTabButton && rightTabButton.length" size="small">
       <template v-for="(item, index) in rightTabButton" :key="index">
         <a-button
           v-if="item.action === 'CREATE'"
@@ -131,6 +132,7 @@
         <a-button v-else :icon="h(LayoutTwoTone)">{{ item.name }}</a-button>
       </template>
     </a-space>
+    <div v-else />
   </div>
   <Modal v-model:show="modal" :full="true">
     <ProcessReportResultPreview
@@ -520,9 +522,10 @@ const tabButtonsHandler = nowTabButtons => {
       leftTabButton.value.push(item);
     }
   });
-  if (leftTabButton.value.length > 0 && rightTabButton.value.length > 0) {
+  if (leftTabButton.value.length > 0 || rightTabButton.value.length > 0) {
     emit('judgeIsHaveButtons', true);
-  } else {
+  }
+  if (leftTabButton.value.length === 0 && rightTabButton.value.length === 0) {
     emit('judgeIsHaveButtons', false);
   }
 };