@ecan-bi/tools 1.0.21 → 1.0.22

package/package.json

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

package/src/hooks/useTransformChartDataByAttrKey.ts

@@ -19,7 +19,7 @@ export interface KeyTypeDataFieldNames {
  * @param data 数据
  * @param dataFieldNames 字段映射
  */
-export const useTransformChartDataByAttrKey = (data: Data = [], dataFieldNames: KeyTypeDataFieldNames) => {
+export const useTransformChartDataByAttrKey = (data: Data = [], dataFieldNames: KeyTypeDataFieldNames, isIndicator: boolean = false) => {
   let { name = 'name', types = [] } = dataFieldNames || {}
   name = name?.trim() || name
   const set = new Set()
@@ -27,7 +27,7 @@ export const useTransformChartDataByAttrKey = (data: Data = [], dataFieldNames:
   const dataLen = data.length
   const typesLen = types.length
   // 只有一条记录
-  if (dataLen === 1) {
+  if (dataLen === 1 && !isIndicator) {
     const vs: any = []
     // data 为一个值取第一个
     for (let i = 0; i < typesLen; i++) {

package/src/hooks/useTransformChartDataByAttrValue.ts

@@ -23,7 +23,7 @@ export const useTransformChartDataByAttrValue = (data: Data, dataFieldNames?: Va
   name = name?.trim()
   value = value?.trim()
   type = type?.trim()
-  const set = new Set()
+  // const set = new Set()
   const map = new Map()
   const len = data.length
   for (let i = 0; i < len; i++) {
@@ -34,7 +34,7 @@ export const useTransformChartDataByAttrValue = (data: Data, dataFieldNames?: Va
     const y = item[value] || ''
     // 系列（类型）
     const t = item[type] || ''
-    set.add(x)
+    // set.add(x)
     if (map.has(t)) {
       const arr = map.get(t)
       // @ts-ignore
@@ -45,13 +45,25 @@ export const useTransformChartDataByAttrValue = (data: Data, dataFieldNames?: Va
       map.set(t, [{ name: x, value: y, ...item }])
     }
   }
-  const dimensions = Array.from(set)
+  // const dimensions = Array.from(set)
+  const dimensions = []
   const dataset: { [key:string]:any } [] = []
   for (const [name, data] of map) {
     dataset.push({
       name,
       data
     })
+    if (data?.length) {
+      if (dimensions.length) {
+        for (const d of data) {
+          if (!dimensions.includes(d.name)) {
+            dimensions.push(d.name)
+          }
+        }
+      } else {
+        dimensions.push(...data.map((v: any) => v.name))
+      }
+    }
   }
   return {
     dimensions,

package/src/hooks/useVariablesInText.ts

@@ -5,6 +5,8 @@ export const useVariablesInText = (
   { useNewline = false, useSpace = false } = {}
 ) => {
   // 引入全局变量
+  // @ts-ignore
+  const config = window.config || {}
   const data = { ...textData }
   const variables = (formatter || '').match(/\{(.+?)\}/g)
   if (variables == null || variables.length === 0) {
@@ -18,7 +20,7 @@ export const useVariablesInText = (
     for (let j = 0; j < textVariables.length; j++) {
       const textVariable = textVariables[j]
       const usedVariable = data[textVariable]
-      if (usedVariable != null) {
+      if (usedVariable != null && typeof usedVariable !== 'function') {
         // 使用的变量
         statement = statement.replace(textVariable, usedVariable)
       }

package/src/index.ts

@@ -8,7 +8,7 @@ import useTransformChartDataByAttrValue from './hooks/useTransformChartDataByAtt
 import useValueFormatter from './hooks/useValueFormatter'
 import useVariablesInText from './hooks/useVariablesInText'
 import transformProps from './utils/transformProps'
-import { getIndicatorParams } from './utils/util'
+import { getIndicatorParams, lowerCaseIncludes, hasOwn } from './utils/util'
 
 export {
   formatIndicatorParams,
@@ -18,5 +18,7 @@ export {
   useValueFormatter,
   useVariablesInText,
   transformProps,
-  getIndicatorParams
+  getIndicatorParams,
+  lowerCaseIncludes,
+  hasOwn
 }