lambo-design-bi 0.0.201 → 0.0.204

package/bi/widget/page/index-page-tm.vue

@@ -2,7 +2,7 @@
 <template>
   <LamboPageContainer :has-footer="false" :has-header="pageTitle ? true : false">
     <template #page-title>{{ pageTitle }}</template>
-
+    
     <LamboIndicatorCardBiSearch v-if="shouldShowLamboIndicator" :has-extend="false" :has-title="false">
       <BiSearchForm :widget="pageWidget.search" @on-search="doSearch">
       </BiSearchForm>

package/bi/widget/table/paging-table.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <LamboPagingTableBi ref="table" :auto-search="false" :columns="columns" :dataUrl="widget.options.url"
-      :export-batch-size="20000" :show-table-option="true" :exportName="widget.name"
+      :export-batch-size="200" :show-table-option="true" :exportName="widget.name"
       :page-disable="widget.options.isPaging === '0'" :page-size="widget.options.pageSize" :export-request-limit="200"
       :isSingleSelectModel="true" :showSummary="widget.options.isAllSum === '1'" :summary-method="handleSummary"
       @on-data-load="onDataLoad" :searchParams="tableSearchParams">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambo-design-bi",
-  "version": "0.0.201",
+  "version": "0.0.204",
   "description": "Vue2 BI 数据可视化组件库",
   "main": "index.js",
   "author": "finch",

package/pub/table/paging-table/comps/export-data.vue

@@ -238,11 +238,35 @@ export default {
         self.dealWithStream(params)
       }
     },
+    formatCurrentTime(format = 'yyyyMMddHHmmss', date = new Date()) {
+      const d = date instanceof Date ? date : new Date(date);
+
+      const year = d.getFullYear();
+      const month = (d.getMonth() + 1).toString().padStart(2, '0');
+      const day = d.getDate().toString().padStart(2, '0');
+      const hours = d.getHours().toString().padStart(2, '0');
+      const minutes = d.getMinutes().toString().padStart(2, '0');
+      const seconds = d.getSeconds().toString().padStart(2, '0');
+
+      const map = {
+        'yyyy': year,
+        'MM': month,
+        'dd': day,
+        'HH': hours,
+        'mm': minutes,
+        'ss': seconds
+      };
+
+      return format.replace(
+        /(yyyy|MM|dd|HH|mm|ss)/g,
+        match => map[match]
+      );
+    },
     dealWithStream(params) {
       let self = this;
       let exportParams = {
         fileFormat: self.form.fileFormat,
-        fileName: self.form.fileName + new Date().Format('yyyyMMddHHmmss'),
+        fileName: self.form.fileName + this.formatCurrentTime('yyyyMMddHHmmss', new Date()),
         exportType: self.form.exportType,
         tableColumns: self.tableParsedColumns
       }
@@ -284,10 +308,11 @@ export default {
       ajax.request(options).then(function (resp) {
         if (self.requestSuccessCodes.includes(resp.data.code)) {
           let resultData = deepCopy(resp.data.data.rows)
-          if (self.showSummary && resultData) {
-            let sum = self.summaryData(resultData)
-            resultData.push(sum)
-          }
+          // 这里的合计整合过，是总合计不是页合计，暂时隐藏
+          // if (self.showSummary && resultData) {
+          //   let sum = self.summaryData(resultData)
+          //   resultData.push(sum)
+          // }
           self.exportExcel(resultData)
         } else {
           self.$Message.error(resp.data.data)
@@ -359,7 +384,7 @@ export default {
           key: keys,
           data: data,
           autoWidth: true,
-          filename: this.form.fileName + new Date().Format('yyyyMMddHHmmss'),
+          filename: this.form.fileName + this.formatCurrentTime('yyyyMMddHHmmss', new Date()),
           format: this.form.fileFormat,
           spanColumns: this.exportSpanColumns,
         }

package/pub/table/paging-table/comps/export-drawer.vue

@@ -135,7 +135,7 @@ export default {
     exportIndex(index) {
       let self = this;
       let file = self.getFile(index);
-      self.exportFile(file).then(() => {
+            self.exportFile(file).then(() => {
         if (index < self.fileList.length && self.showFileList) {
           self.exportIndex(++index);
         }

package/pub/table/paging-table/index.vue

@@ -138,7 +138,7 @@
               <Tabs type="card" name="export-tab" class="drop-down-tabs">
                 <TabPane label="导出" tab="export-tab">
                   <export-data ref="exportPart" :dataUrl="dataUrl" :exportUrl="exportUrl" :exportMode="exportMode"
-                    :exportName="exportTableName" :export-batch-size="exportBatchSize"
+                    :exportName="exportTableName" :export-batch-size="totalNumber"
                     :export-request-limit="exportRequestLimit" :requestMethod="reqMethod"
                     :request-success-codes="requestSuccessCodes" :paginationParams="paginationParams"
                     :parsedColumns="parsedColumns" :searchParams="searchParams" :show-summary="tableShowSummary"