lambo-design-bi 0.0.188 → 0.0.190

package/bi/widget/search/search-form.vue

@@ -14,7 +14,13 @@ import LamboQueryFilter from "@lambo-design/query-filter"
 import { deepCopy } from "@lambo-design/shared/utils/assist"
 import moment from 'moment'
 import BiSearchItem from "./search-item.vue"
-import { SEARCH_DICT, DATE_RANGE_PFIX, DEFAULT_DATE_FORMAT } from '../../../util/constants'
+import {
+  SEARCH_DICT,
+  DATE_RANGE_PFIX,
+  DEFAULT_DATE_FORMAT,
+  DEFAULT_YEAR_FORMAT,
+  DEFAULT_MONTH_FORMAT
+} from '../../../util/constants'
 
 export default {
   name: 'BiSearchForm',
@@ -53,7 +59,12 @@ export default {
               } else {
                 if (item.options.searchType === SEARCH_DICT.SINGLE_DATE.id) {
                   params[qKey] = moment(val).format(DEFAULT_DATE_FORMAT)
-                } else {
+                }else if (item.options.searchType === SEARCH_DICT.SINGLE_YEAR.id) {
+                  params[qKey] = moment(val).format(DEFAULT_YEAR_FORMAT)
+                }else if (item.options.searchType === SEARCH_DICT.SINGLE_MONTH.id) {
+                  params[qKey] = moment(val).format(DEFAULT_MONTH_FORMAT)
+                }
+                else {
                   params[qKey] = val
                 }
               }

package/bi/widget/search/search-item.vue

@@ -47,6 +47,14 @@
       <DatePicker v-model="widget.options.val" format="yyyy-MM-dd" placeholder="请选择" placement="bottom-end"
         class="lambo-query-class" type="daterange"></DatePicker>
     </div>
+    <div v-else-if="widget.options.searchType === searchDict.SINGLE_YEAR.id"> <!-- 年选择框 -->
+      <DatePicker v-model="widget.options.val" format="yyyy" placeholder="请选择" placement="bottom-end"
+                  class="lambo-query-class" type="year"></DatePicker>
+    </div>
+    <div v-else-if="widget.options.searchType === searchDict.SINGLE_MONTH.id"> <!-- 月选择框 -->
+      <DatePicker v-model="widget.options.val" format="yyyy-MM" placeholder="请选择" placement="bottom-end"
+        class="lambo-query-class" type="month"></DatePicker>
+    </div>
   </div>
 </template>
 <script>

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

@@ -3,19 +3,14 @@
     <LamboPagingTableBi ref="table" :auto-search="false" :columns="columns" :dataUrl="widget.options.url"
       :export-batch-size="20000" :show-table-option="false" :exportName="widget.name"
       :page-disable="widget.options.isPaging === '0'" :page-size="widget.options.pageSize" :export-request-limit="200"
-      :isSingleSelectModel="true" @on-data-load="onDataLoad" :searchParams="tableSearchParams">
+      :isSingleSelectModel="true" :showSummary="widget.options.isAllSum === '1'" :summary-method="handleSummary"
+      @on-data-load="onDataLoad" :searchParams="tableSearchParams">
       <div slot="search"></div>
-      <div slot="footer">
-        <Table class="ivu-table-summary" v-if="widget.options.isAllSum && allSumData && allSumData.length > 0"
-          cellspacing="0" cellpadding="0" :columns="sumColumns" :data="allSumData" :border="true" :show-header="false">
-        </Table>
-      </div>
     </LamboPagingTableBi>
   </div>
 </template>
 <script>
 import biConfig from '../config/config'
-import { getListMapData } from '../api/data'
 import LamboPagingTableBi from '../../../pub/table/paging-table/index.vue'
 import { accAdd } from '../../../util/math-util'
 
@@ -57,81 +52,77 @@ export default {
         query: newQuery
       })
     },
-    onDataLoad(res) {
-      console.log("onDataLoad res:", res)
-      console.log("onDataLoad this.$refs.table.tableData:", this.$refs.table.tableData)
-      if (this.widget.options.isAllSum === '1') {
-        if (this.widget.options.isPaging === '1' && this.widget.options.sumApiId) {
-          // 请求后端做合计
-          getListMapData(this.widget.options.sumApiId, this.params).then(res => {
-            if (res && res.data.code === 1) {
-              if (res.data.data.rows.length > 0) {
-                let sumRows = res.data.data.rows[0]
-                let bakSumColumns = this.sumColumns
-                console.log("onDataLoad this.sumColumns:", this.sumColumns)
-                if (bakSumColumns && bakSumColumns.length > 0) {
-                  sumRows[bakSumColumns[0].key] = '总计'
-                }
-                this.allSumData = [sumRows]
-                console.log("onDataLoad this.allSumData:", this.allSumData)
+    onDataLoad(dataRes) {
+      console.log("onDataLoad dataRes:", dataRes)
+      if (this.widget.options.isPaging === '1' && this.widget.options.isAllSum === '1') {
+        // 接收数据，并赋值
+        if (dataRes && dataRes.code === 1) {
+          this.allSumData = dataRes.data.sums || []
+          console.log("onDataLoad this.allSumData:", this.allSumData)
+        }
+      }
+    },
+    handleSummary({ columns, data }) {
+      console.log("handleSummary { columns, data }:", { columns, data })
+      const sums = {}
+      if (columns && columns.length > 0) {
+        sums[columns[0].key] = {
+          key: columns[0].key,
+          value: '总计'
+        }
+        // 如果是分页表格
+        if (this.widget.options.isPaging === '1') {
+          let allSumObj = {}
+          if (this.allSumData && this.allSumData.length > 0) {
+            allSumObj = this.allSumData[0] || {}
+          }
+          console.log("handleSummary allSumObj:", allSumObj)
+          for (let i = 1; i < columns.length; i++) {
+            let col = columns[i]
+            let colKey = col.key
+            if (Object.prototype.hasOwnProperty.call(allSumObj, colKey)) {
+              sums[colKey] = {
+                key: colKey,
+                value: allSumObj[colKey] || ''
               }
             } else {
-              console.error("调用总计服务[" + this.widget.options.sumApiId + "]失败：" + res.data.message)
+              sums[colKey] = {
+                key: colKey,
+                value: ''
+              }
             }
-          }).catch(err => {
-            console.error("调用总计服务[" + this.widget.options.sumApiId + "]异常：", err)
-          })
-        } else {
-          if (this.$refs.table.tableData && this.$refs.table.tableData.length > 0) {
-            // 前端遍历求和
-            let sumObj = {}
-            let bakSumColumns = this.getLeafNodes(this.sumColumns)
-            let tableData = this.$refs.table.tableData
-            console.log("onDataLoad bakSumColumns:", bakSumColumns)
-            if (bakSumColumns && bakSumColumns.length > 0 && tableData && tableData.length > 0) {
-              bakSumColumns.forEach((column, index) => {
-                const key = column.key
-                if (index === 0) {
-                  sumObj[key] = "总计"
-                } else {
-                  const values = tableData.map(item => Number(item[key]))
-                  console.log("onDataLoad values:", values)
-                  if (!values.every(value => isNaN(value))) {
-                    const v = values.reduce((prev, curr) => {
-                      const value = Number(curr)
-                      if (!isNaN(value)) {
-                        return accAdd(prev, curr)
-                      } else {
-                        return prev
-                      }
-                    }, 0)
-                    sumObj[key] = v
+          }
+        }
+        // 如果不是分页表格
+        else {
+          columns.forEach((column, index) => {
+            const key = column.key
+            if (index > 0) {
+              const values = data.map(item => Number(item[key]))
+              if (values && values.length > 0 && !values.every(value => isNaN(value))) {
+                const v = values.reduce((prev, curr) => {
+                  const value = Number(curr)
+                  if (!isNaN(value)) {
+                    return accAdd(prev, curr)
+                  } else {
+                    return prev
                   }
+                }, 0);
+                sums[key] = {
+                  key,
+                  value: v
                 }
-              })
-            }
-            if (sumObj) {
-              this.allSumData = [sumObj]
+              } else {
+                sums[key] = {
+                  key,
+                  value: ''
+                }
+              }
             }
-            console.log("onDataLoad this.allSumData:", this.allSumData)
-          }
-        }
-      }
-    },
-    getLeafNodes(columns) {
-      const leafNodes = [];
-      function traverse(nodes) {
-        if (!Array.isArray(nodes)) return;
-        for (const node of nodes) {
-          if (!node.children || !Array.isArray(node.children) || node.children.length === 0) {
-            leafNodes.push(node);
-          } else {
-            traverse(node.children);
-          }
+          })
         }
       }
-      traverse(columns);
-      return leafNodes;
+      return sums
     }
   },
   created() {
@@ -176,26 +167,6 @@ export default {
         }
       }
       return columns
-    },
-    sumColumns() {
-      let sumColumnsStr = this.widget.options.columns
-      let sumColumns = []
-      if (this.widget && Object.prototype.hasOwnProperty.call(this.widget, "options") && Object.prototype.hasOwnProperty.call(this.widget.options, "columns")) {
-        if (this.widget.options.columns) {
-          try {
-            sumColumns = JSON.parse(sumColumnsStr)
-            if (sumColumns && sumColumns.length > 0) {
-              sumColumns[0].type = '-'
-            }
-          } catch (e) {
-            console.log("BiPagingTable -- sumColumns() -- this.widget.options.columns:", this.widget.options.columns)
-            console.error("BiPagingTable -- sumColumns() JSON解析异常:", e)
-            this.$Message.info("合计的表格头配置数据解析异常")
-            sumColumns = []
-          }
-        }
-      }
-      return sumColumns
     }
   },
   watch: {

package/package.json

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

package/pub/charts/factory/options.js

@@ -96,7 +96,7 @@ function getLevelOption() {
  * 41 矩形树图
  * 42 桑基图
  * 43 仪表盘进度条)
- * 2A：单个柱状图以及多条折线,
+ * 2A：单个柱状图以及多条曲线,
  * 2B：单个柱状图以及左右 <br/>
  * 44:雷达图
  * 45:圆形进度图
@@ -2594,37 +2594,36 @@ export function getECharts(type, dataX, dataY, dataDim) {
     };
   }
   else if (type === '44') {
+    const transData = transpose(dataY);
     const indicators = dataX.map((name, index) => {
       let maxValue = 0;
-      for (let i = 0; i < dataY.length; i++) {
-        if (dataY[i] && dataY[i][index] > maxValue) {
-          maxValue = dataY[i][index];
+      for (let i = 0; i < dataY[index].length; i++) {
+        if (dataY[index] && dataY[index][i] > maxValue) {
+          maxValue = dataY[index][i];
         }
       }
       return {
         name: name,
-        max: Math.ceil(maxValue * 1.2)
+        max: Math.ceil(maxValue )
       };
     });
-
     const seriesData = [];
-
-      dataY.forEach((data, index) => {
-        seriesData.push({
-          name: dataDim[index],
-          value: data,
-          lineStyle: {
-            width: 3,
-            color: colors[index % colors.length]
-          },
-          itemStyle: {
-            color: colors[index % colors.length]
-          },
-          areaStyle: {
-            color: areaColors[index % areaColors.length]
-          }
-        });
+    transData.forEach((data, index) => {
+      seriesData.push({
+        name: dataDim[index],
+        value: data,
+        lineStyle: {
+          width: 3,
+          color: colors[index % colors.length]
+        },
+        itemStyle: {
+          color: colors[index % colors.length]
+        },
+        areaStyle: {
+          color: areaColors[index % areaColors.length]
+        }
       });
+    });
     opt = {
       legend: {
         data: seriesData.map(item => item.name),
@@ -2697,7 +2696,7 @@ export function getECharts(type, dataX, dataY, dataDim) {
     opt = {
       title: [
         {
-          text: dataDim[0] || '',
+          text: dataX[0] || '',
           x: 'center',
           top: '32%',
           textStyle: {

package/util/constants.js

@@ -31,6 +31,14 @@ export const SEARCH_DICT = Object.freeze({
     id: "51",
     name: "日期范围帮助框"
   },
+  SINGLE_YEAR: {
+    id: "52",
+    name: "年选择框"
+  },
+  SINGLE_MONTH: {
+    id: "53",
+    name: "月选择框"
+  },
   NOT_SHOW_INPUT: {
     id: "A0",
     name: "隐形输入框"
@@ -46,3 +54,5 @@ export const DEFAULT_DATE_FORMAT = "YYYYMMDD"
 export const DEFAULT_DATE_TIME_FORMAT = "YYYYMMDDHHmmss"
 export const DEFAULT_DISPLAY_DATE_FORMAT = "YYYY-MM-DD"
 export const DEFAULT_DISPLAY_DATE_TIME_FORMAT = "YYYY-MM-DD HH:mm:ss"
+export const DEFAULT_YEAR_FORMAT = "YYYY"
+export const DEFAULT_MONTH_FORMAT = "YYYYMM"