@ecan-bi/tools 1.0.35 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecan-bi/tools",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "General tools",
   "main": "lib/index.es.js",
   "module": "lib/index.es.js",

package/src/indicator.ts

@@ -283,6 +283,7 @@ const handleSqlConditions = (graphicConfig: { [key:string]: any }) => {
     leftAxisList = [],
     rightAxisList = [],
     queryColumnList = [],
+    indexLibColumns = [],
     indicators = []
   } = graphicConfig
   handleControlList(controlList)
@@ -294,6 +295,7 @@ const handleSqlConditions = (graphicConfig: { [key:string]: any }) => {
     ...leftAxisList,
     ...rightAxisList,
     ...queryColumnList,
+    ...indexLibColumns,
     ...indicators
   ]
   const conditionList: any = []
@@ -716,6 +718,7 @@ export const formatIndicatorParams = (props: any, otherParams: any = {}) => {
     leftAxisList = [],
     rightAxisList = [],
     queryColumnList = [],
+    indexLibColumns = [],
     indicators = [],
     controlList = [],
     formFields = {},
@@ -944,6 +947,22 @@ export const formatIndicatorParams = (props: any, otherParams: any = {}) => {
     queryColumns.push(itemObj)
   })
 
+  const libColumns = []
+  if (['ecanTable'].includes(type) && graphicConfig.isIndexSet) {
+    // 表格组件并且开启了指标集
+    indexLibColumns.forEach((column: any) => {
+      const objItem: any = {
+        label: column.label,
+        calcType: column.calcType,
+        show: column.show
+      }
+      if (column.formula) {
+        objItem.formula = column.formula
+      }
+      libColumns.push(objItem)
+    })
+  }
+
   // 行表头
   let rowHeaders: any = []
   let resultRowHeaderList: any = []
@@ -1118,7 +1137,7 @@ export const formatIndicatorParams = (props: any, otherParams: any = {}) => {
     } else {
       chartType = 'grouptable'
     }
-  } else if (layer === '1' && queryColumns.length === 0) {
+  } else if (layer === '1' && !queryColumns.length && !libColumns.length) {
     return
     // queryColumns 图表配置为空返回
   } else if (layer === '2' && indicatorList.length === 0) {
@@ -1171,7 +1190,7 @@ export const formatIndicatorParams = (props: any, otherParams: any = {}) => {
       ...someParams
     }
   } else {
-    let classParams = {}
+    let classParams: any = {}
     if (lowerCaseIncludes(type, ['scatter', 'valueline'])) {
       // 散点图多个维度
       classParams = {
@@ -1182,6 +1201,10 @@ export const formatIndicatorParams = (props: any, otherParams: any = {}) => {
         classification
       }
     }
+    if (libColumns?.length) {
+      classParams.indexLibColumns = libColumns
+      classParams.isIndexSet = true
+    }
     resultParams = {
       url: '/diagram',
       source,