lambo-design-bi 0.0.237 → 0.0.239

package/bi/widget/charts/index.vue

@@ -6,7 +6,7 @@
 <script>
 import { getListMapData } from "../api/data"
 import LamboChartsFactory from "../../../pub/charts/factory/charts-factory.vue"
-import { convertChartsData } from "./util/charts-data-util"
+import { convertChartsData, convertChartsDataType42 } from "./util/charts-data-util"
 import { EventBus, EVENT_TYPES } from '../util/event-bus'
 
 export default {
@@ -81,8 +81,13 @@ export default {
           if (res.data.data.rows.length > 0) {
             let rows = res.data.data.rows
             if (rows && this.columns) {
-              let resObj = convertChartsData(rows, this.columns)
-              console.log("resObj:", resObj)
+              let resObj = {}
+              if (this.chartsType === '42') {
+                resObj = convertChartsDataType42(rows, this.columns)
+              } else {
+                resObj = convertChartsData(rows, this.columns)
+              }
+              console.log( "chartsType:", this.chartsType, "resObj:", resObj)
               if (resObj) {
                 this.dataX = resObj.dataX
                 this.dataY = resObj.dataY
@@ -112,7 +117,7 @@ export default {
               let rows = res.data.data.rows
               if (rows && rows.length > 0) {
                 let rowData = rows[0]
-                if(rowData && Object.prototype.hasOwnProperty.call(rowData, "val")){
+                if (rowData && Object.prototype.hasOwnProperty.call(rowData, "val")) {
                   this.chartsNote = rowData["val"] || ''
                 }
               }

package/bi/widget/charts/util/charts-data-util.js

@@ -156,3 +156,114 @@ export function convertChartsData(rows, columns) {
   return { dataX, dataY, dataDim }
 }
 
+/**
+ * 桑基图类型的charts的数据rows，根据columns的配置转换输出 { dataX, dataY, dataZ, dataDim }
+ * 
+ * @param {*} rows 
+ * @param {*} columns 
+ * 示例输入："rows": [
+  {
+    "source_node": "电",
+    "target_node": "业务环节",
+    "index_val": 9
+  },
+  {
+    "source_node": "油",
+    "target_node": "业务环节",
+    "index_val": 8
+  },
+  {
+    "source_node": "电",
+    "target_node": "高架库区",
+    "index_val": 5
+  },
+  {
+    "source_node": "业务环节",
+    "target_node": "高架库区",
+    "index_val": 1
+  },
+  {
+    "source_node": "电",
+    "target_node": "分拣区",
+    "index_val": 3
+  },
+  {
+    "source_node": "油",
+    "target_node": "分拣区",
+    "index_val": 3
+  },
+  {
+    "source_node": "业务环节",
+    "target_node": "发货区",
+    "index_val": 2
+  }
+]
+ * 示例输入："columns": '{"x_key":"source_node", "y_key":"target_node", "z_key":"index_val", "data_col":"z", "height":"400px"}'
+ * 示例输出：{
+ *    dataX: ['业务环节', '高架库区', '电', '油', '分拣区', '发货区',],
+      dataY: [['电', '业务环节', 9], ['油', '业务环节', 8], ['电', '高架库区', 5], ['业务环节', '高架库区', 1],['电', '分拣区', 3], ['油', '分拣区', 3], ['业务环节', '发货区', 2]],
+      dataZ: [],
+      dataDim: []
+      }
+ * 
+ */
+export function convertChartsDataType42(rows, columns) {
+  if (!rows || !columns) {
+    console.error(`convertChartsDataType42 rows:${rows}，或者columns:${columns}为无效值`)
+    return null
+  }
+
+  let xKey = null
+  let yKey = null
+  let zKey = null
+  let dataCol = null
+
+  if (Object.prototype.hasOwnProperty.call(columns, "x_key")) {
+    xKey = columns["x_key"]
+  }
+  if (Object.prototype.hasOwnProperty.call(columns, "y_key")) {
+    yKey = columns["y_key"]
+  }
+  if (Object.prototype.hasOwnProperty.call(columns, "z_key")) {
+    zKey = columns["z_key"]
+  }
+  if (Object.prototype.hasOwnProperty.call(columns, "data_col")) {
+    dataCol = columns["data_col"]
+  }
+
+  if (!xKey || !yKey || !zKey || dataCol !== 'z') {
+    console.error("convertChartsDataType42 columns的xKey，或者yKey，或者zKey，或者dataCol为无效值:", columns)
+    return null
+  }
+
+  let dataX = []
+  let dataY = []
+  let dataZ = []
+  let dataDim = []
+  let sourceArr = []
+  let targetArr = []
+
+  rows.forEach(rowData => {
+    if (!rowData || !Object.prototype.hasOwnProperty.call(rowData, xKey)
+      || !Object.prototype.hasOwnProperty.call(rowData, yKey)
+      || !Object.prototype.hasOwnProperty.call(rowData, zKey)) {
+      return
+    }
+
+    const source = rowData[xKey]
+    const target = rowData[yKey]
+    const value = Number(rowData[zKey])
+    if (source === null || source === undefined || target === null || target === undefined || isNaN(value)) {
+      return
+    }
+
+    sourceArr.push(source)
+    targetArr.push(target)
+    dataY.push([source, target, value])
+  })
+
+  dataX = [...new Set(sourceArr.concat(targetArr))]
+  return { dataX, dataY, dataZ, dataDim }
+}
+
+

package/package.json

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