From 870a67d45aced80c31bb38d0419116eedcd749b7 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 24 Jan 2024 16:19:32 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8A=A0=E8=BD=BD=E4=B8=AD=E8=BF=87=E6=B8=A1=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=20-=20[=E4=BF=AE=E5=A4=8D]=E6=8A=A5=E8=A1=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=80=89=E6=8B=A9=E6=A8=A1=E5=9D=97=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=20-=20[=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D]=E6=8A=A5=E8=A1=A8=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=87=E6=8D=A2=E4=B8=8D=E5=90=8C=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datawarehouse/datawarehouse-manage.vue    | 18 +++++++++-
 .../pages/report/report/report-manage.vue     | 23 +++++-------
 .../reportinstance/reportinstance-manage.vue  | 36 ++++++-------------
 3 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/src/views/pages/framework/datawarehouse/datawarehouse-manage.vue b/src/views/pages/framework/datawarehouse/datawarehouse-manage.vue
index 021a82f0..6d187f2a 100644
--- a/src/views/pages/framework/datawarehouse/datawarehouse-manage.vue
+++ b/src/views/pages/framework/datawarehouse/datawarehouse-manage.vue
@@ -5,7 +5,15 @@
         <div class="action-group">
           <span class="action-item tsfont-plus" @click="addReportDataSource()">{{ $t('page.datasource') }}</span>
           <span class="tsfont-upload action-item" @click="uploadAction()">{{ $t('page.import') }}</span>
-          <span :class="{ 'text-disabled': !selectList || selectList.length == 0 }" class="tsfont-download action-item" @click="exportList()">{{ $t('page.export') }}</span>
+          <span
+            v-if="!isExportDataWareHouse"
+            :class="{ 'text-disabled': !selectList || selectList.length == 0 }"
+            class="tsfont-download action-item"
+            @click="exportList()"
+          >{{ $t('page.export') }}</span>
+          <span v-else class="action-item">
+            <Icon type="ios-loading" size="16" class="loading">{{ $t('term.codehub.exporting') }}</Icon>
+          </span>
           <span v-auth="['ADMIN']" class="action-item"><AuditConfig :title="$t('term.framework.saveexpire')" auditName="DATAWAREHOUSE-AUDIT"></AuditConfig></span>
         </div>
       </template>
@@ -95,6 +103,7 @@ export default {
   props: {},
   data() {
     return {
+      isExportDataWareHouse: false,
       doingIdList: [],
       currentDataSourceId: null,
       reportDataSourceData: {},
@@ -278,6 +287,13 @@ export default {
         url: 'api/binary/datawarehouse/datasource/export',
         params: {
           idList: this.selectList
+        },
+        changeStatus: status => {
+          if (status == 'start') {
+            this.isExportDataWareHouse = true;
+          } else if (status == 'success' || status == 'error') {
+            this.isExportDataWareHouse = false;
+          }
         }
       };
       this.download(param);
diff --git a/src/views/pages/report/report/report-manage.vue b/src/views/pages/report/report/report-manage.vue
index 9dc097b1..1de3211a 100644
--- a/src/views/pages/report/report/report-manage.vue
+++ b/src/views/pages/report/report/report-manage.vue
@@ -19,7 +19,7 @@
         <div>
           <InputSearcher
             v-model="keyword"
-            @change="searchReport()"
+            @change="() => updatePagesize()"
           ></InputSearcher>
         </div>
       </template>
@@ -40,6 +40,7 @@
         <TsTable
           v-if="reportData"
           v-bind="reportData"
+          :theadList="theadList"
           selectedRemain
           keyName="id"
           :canSelectRow="true"
@@ -110,7 +111,6 @@ export default {
   directives: { download },
   props: {},
   data() {
-    let _this = this;
     return {
       keyword: '',
       actionUrl: BASEURLPREFIX + '/api/binary/report/import', //导入地址
@@ -202,27 +202,19 @@ export default {
       };
       this.$api.report.report.searchReport(params).then(res => {
         this.reportData = res.Return;
-        this.reportData.theadList = this.theadList;
       });
     },
     addReport: function() {
       this.reportId = null;
       this.reportDislogShow = true;
     },
-    updatePagesize: function(pageSize) {
-      if (pageSize) {
-        this.searchParam.pageSize = pageSize;
-      } else {
-        this.searchParam.pageSize = 20;
-      }
+    updatePagesize(pageSize) {
+      this.searchParam.currentPage = 1;
+      this.searchParam.pageSize = pageSize || 20; 
       this.searchReport();
     },
-    updatePage: function(currentPage) {
-      if (currentPage) {
-        this.searchParam.currentPage = currentPage;
-      } else {
-        this.searchParam.currentPage = 1;
-      }
+    updatePage(currentPage) {
+      this.searchParam.currentPage = currentPage || 1;
       this.searchReport();
     },
     toggleReportActive: function(report) {
@@ -284,6 +276,7 @@ export default {
       } else {
         this.searchParam.type = name;
       }
+      this.selectList = [];
       this.searchReport();
     },
     showReport: function(id) {
diff --git a/src/views/pages/report/reportinstance/reportinstance-manage.vue b/src/views/pages/report/reportinstance/reportinstance-manage.vue
index e787cbdb..349a7f93 100644
--- a/src/views/pages/report/reportinstance/reportinstance-manage.vue
+++ b/src/views/pages/report/reportinstance/reportinstance-manage.vue
@@ -6,9 +6,11 @@
       </template>
       <template slot="topRight">
         <TsRow>
-          <Col :span="8"><TsFormSelect v-model="searchParam.reportId" v-bind="reportSelectConfig"></TsFormSelect></Col>
+          <Col :span="8">
+            <TsFormSelect v-model="searchParam.reportId" v-bind="reportSelectConfig" @change="searchReportInstance()"></TsFormSelect>
+          </Col>
           <Col :span="16">
-            <InputSearcher v-model="searchParam.keyword" @change="searchReportInstance()"></InputSearcher>
+            <InputSearcher v-model="searchParam.keyword" @change="() => updatePagesize()"></InputSearcher>
           </Col>
         </TsRow>
       </template>
@@ -16,6 +18,7 @@
         <TsTable
           v-if="reportInstanceData"
           v-bind="reportInstanceData"
+          :theadList="theadList"
           @changeCurrent="updatePage"
           @changePageSize="updatePagesize"
         >
@@ -62,12 +65,10 @@ export default {
   },
   props: {},
   data() {
-    let _this = this;
     return {
       reportInstanceDialogShow: false,
       reportInstanceId: null,
       searchParam: {},
-      searchTimmer: null,
       reportInstanceData: {},
       reportSelectConfig: {
         search: true,
@@ -109,7 +110,6 @@ export default {
   beforeMount() {},
   mounted() {
     this.searchReportInstance();
-    //this.getReportList();
   },
   beforeUpdate() {},
   updated() {},
@@ -118,38 +118,22 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    getReportList: function() {
-      //这里是获取报表模版分类下拉的
-      this.$api.report.report.getReportDatalist({ needPage: false }).then(res => {
-        if (res.Status == 'OK') {
-          this.reportSelectConfig.dataList = res.Return.tbodyList;
-        }
-      });
-    },
     searchReportInstance: function() {
       this.$api.report.report.searchReportInstance(this.searchParam).then(res => {
         this.reportInstanceData = res.Return;
-        this.reportInstanceData.theadList = this.theadList;
       });
     },
     addReportInstance: function() {
       this.reportInstanceId = null;
       this.reportInstanceDialogShow = true;
     },
-    updatePagesize: function(pageSize) {
-      if (pageSize) {
-        this.searchParam.pageSize = pageSize;
-      } else {
-        this.searchParam.pageSize = 20;
-      }
+    updatePagesize(pageSize) {
+      this.searchParam.currentPage = 1;
+      this.searchParam.pageSize = pageSize || 20;
       this.searchReportInstance();
     },
-    updatePage: function(currentPage) {
-      if (currentPage) {
-        this.searchParam.currentPage = currentPage;
-      } else {
-        this.searchParam.currentPage = 1;
-      }
+    updatePage(currentPage = 1) {
+      this.searchParam.currentPage = currentPage;
       this.searchReportInstance();
     },
     toggleReportInstanceActive: function(report) {
-- 
Gitee