Jelajahi Sumber

4.0.96 curd优化 查询窗口默认多选

liuyanpeng 1 tahun lalu
induk
melakukan
8e2a93c99a

+ 2 - 2
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.95",
+  "version": "4.0.96",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry http://wuzhixin.vip:4873",
@@ -20,7 +20,7 @@
     "click-outside-vue3": "^4.0.1",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.10.3",
-    "pc-component-v3": "^1.0.92",
+    "pc-component-v3": "^1.0.94",
     "uuid": "^8.3.2",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-request": "^1.2.4",

+ 1 - 1
src/info/InfoWindowPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <InfoWindow :info-window-no="infoWindowNo" />
+    <InfoWindow :info-window-no="infoWindowNo" :multiple="true" />
   </div>
 </template>
 <script>

+ 1 - 4
src/window1/tabGridView/CellTextItem.vue

@@ -156,7 +156,7 @@
       </button>
     </template>
   </Modal>
-  <component :is="modal1Component" v-model:open="modal1Open" :model-data="modelData" @refresh-data="refreshDatas" />
+  <component :is="modal1Component" v-model:open="modal1Open" :class-name="className" :model-data="modelData" @refresh-data="refreshDatas" />
 </template>
 
 <script>
@@ -314,7 +314,6 @@ export default {
       deep: true,
       immediate: true,
       handler(curVal, oldVal) {
-        console.log('cellTextItem监听');
         this.cellTextItemTabGridButtonShowLogical();
       },
     },
@@ -354,7 +353,6 @@ export default {
      */
     cellTextItemTabGridButtonShowLogical: function () {
       var _self = this;
-      console.log('cellTextItemTabGridButtonShowLogical');
       if (_self.gridFieldItem.tabGridButtonDtos != null &&
         _self.gridFieldItem.tabGridButtonDtos != undefined && _self.gridFieldItem.tabGridButtonDtos.length > 0
       ) {
@@ -603,7 +601,6 @@ export default {
     renderRemoteComponentModule: async function () {
       const _self = this;
 
-      console.log('renderRemoteComponentModule');
       
       if(this.gridFieldItem == null || !FieldUtil.isCustomerRender(this.gridFieldItem)){
         return;

+ 17 - 12
src/window1/tabGridView/NewTabButton.vue

@@ -26,7 +26,7 @@
         <a-button v-else-if="item.action === 'REFRESH'" :icon="h(ReloadOutlined)" @click="refresh">
           {{ item.name }}
         </a-button>
-        <a-button v-else-if="item.action === 'NOTICE'" :icon="h(BellTwoTone)">
+        <a-button v-else-if="item.action === 'NOTICE'" :icon="h(BellTwoTone)" @click="sendNotification">
           {{ item.name }}
         </a-button>
         <a-button
@@ -41,13 +41,7 @@
     
     <div v-else />
 
-    <a-space size="small">
-      <template v-for="(item, index) in tabButtonsInEveryPage" :key="index">
-        <a-button>
-          {{ item.name }}
-        </a-button>
-      </template>
-    </a-space>
+   
 
 
     <a-space v-if="rightTabButton && rightTabButton.length" size="small">
@@ -61,13 +55,13 @@
         <a-button v-else-if="item.action === 'DELETE'" :icon="h(DeleteTwoTone)" @click="deleteData">
           {{ item.name }}
         </a-button>
-        <a-button v-else-if="item.action === 'RUN_PROCESS_REPORT'" :icon="h(ControlTwoTone)">
+        <a-button v-else-if="item.action === 'RUN_PROCESS_REPORT'" :icon="h(ControlTwoTone)" @click="execute(item)">
           {{ item.name }}
         </a-button>
-        <a-button v-else-if="item.action === 'OPEN_CUSTOMER_WINDOW'" :icon="h(BookTwoTone)">
+        <a-button v-else-if="item.action === 'OPEN_CUSTOMER_WINDOW'" :icon="h(BookTwoTone)" @click="execute(item)">
           {{ item.name }}
         </a-button>
-        <a-button v-else-if="item.action === 'OPEN_HTML_WINDOW'" :icon="h(ContainerTwoTone)">
+        <a-button v-else-if="item.action === 'OPEN_HTML_WINDOW'" :icon="h(ContainerTwoTone)" @click="execute(item)">
           {{ item.name }}
         </a-button>
         <a-button v-else-if="item.action === 'EXPORT'" :icon="h(FileTextTwoTone)" @click="exportConfirm">
@@ -76,7 +70,7 @@
         <a-button v-else-if="item.action === 'REFRESH'" :icon="h(ReloadOutlined)" @click="refresh">
           {{ item.name }}
         </a-button>
-        <a-button v-else-if="item.action === 'NOTICE'" :icon="h(BellTwoTone)">
+        <a-button v-else-if="item.action === 'NOTICE'" :icon="h(BellTwoTone)" @click="sendNotification">
           {{ item.name }}
         </a-button>
         <a-button
@@ -90,6 +84,13 @@
     </a-space>
     <div v-else />
   </div>
+  <!-- <a-space size="small">
+    <template v-for="(item, index) in tabButtonsInEveryPage" :key="index">
+      <a-button>
+        {{ item.name }}
+      </a-button>
+    </template>
+  </a-space> -->
   <Modal v-model:show="modal" :full="true">
     <ProcessReportResultPreview
       v-if="
@@ -470,6 +471,10 @@ const tabButtonsHandler = () => {
       }
     }
   }
+  if(tabButtonsInEveryPage.value && tabButtonsInEveryPage.value.length){
+    const tabButtons = JSON.parse(JSON.stringify(tabButtonsInEveryPage.value));
+    parseLeftRightButton(tabButtons);
+  }
 };
 
 // 获取表头按钮分组值,如果没有分组则使用页签按钮