lambo-design-bi 0.0.219 → 0.0.221

package/package.json

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

package/pub/flow/comps/flow-util.js

@@ -74,9 +74,9 @@ export function getStatusText(status) {
 export function getAuditResultClass(auditResult) {
   const classMap = {
     '30': 'pass',
-    '40': 'reject',
-    '50': 'transfer',
-    '60': 'return'
+    '40': 'return',
+    '50': 'reject',
+    '60': 'transfer',
   }
   return classMap[auditResult] || 'default'
 }
@@ -89,9 +89,9 @@ export function getAuditResultClass(auditResult) {
 export function getAuditResultText(auditResult) {
   const textMap = {
     '30': '同意',
-    '40': '驳回',
-    '50': '转办',
-    '60': '退回'
+    '40': '退回',
+    '50': '驳回',
+    '60': '转办'
   }
   return textMap[auditResult] || '审批'
 }
@@ -104,9 +104,9 @@ export function getAuditResultText(auditResult) {
 export function getAuditIcon(auditResult) {
   const iconMap = {
     '30': 'md-checkmark',
-    '40': 'md-close',
-    '50': 'md-redo',
-    '60': 'md-undo'
+    '40': 'md-undo',
+    '50': 'md-close',
+    '60': 'md-redo'
   }
   return iconMap[auditResult] || 'md-radio-button-off'
 }

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

@@ -32,7 +32,7 @@
     </Row>
     <export-drawer v-model="showFileList" :file-list="fileList" :export-mode="exportMode" :request-url="requestUrl"
       :request-limit="exportRequestLimit" :requestMethod="reqMethod" :request-success-codes="requestSuccessCodes"
-      :searchParams="searchParams" :sortParams="sortParams" :tableColumns="tableColumns" :parsed-columns="parsedColumns"
+      :searchParams="searchParams" :sortParams="sortParams" :tableColumns="tableColumns" :parsed-columns="tableParsedColumns"
       :show-summary="showSummary" :summary-method="summaryMethod"></export-drawer>
   </div>
 </template>
@@ -308,11 +308,10 @@ 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)

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

@@ -123,8 +123,8 @@ export default {
       this.$emit("input", false);
     },
     getFile(index) {
-      let self = this;
-      let file = self.fileList[index];
+      let self = this
+      let file = self.fileList[index]
       if (file.status === 'finished') {
         ++index;
         return self.getFile(index)
@@ -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);
         }
@@ -338,8 +338,9 @@ export default {
     },
     summaryData(data) {
       let sums = {};
+      console.log("--summaryData this.parsedColumns:", this.parsedColumns)
       if (this.summaryMethod) {
-        sums = this.summaryMethod({ columns: this.tableParsedColumns, data: data });
+        sums = this.summaryMethod({ columns: this.parsedColumns, data: data });
       } else {
         this.cloneColumns.forEach((column, index) => {
           const key = column.key;