@ecan-bi/tools 1.0.26 → 1.0.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/indicator.ts +6 -4
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ecan-bi/tools",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.28",
|
|
4
4
|
"description": "General tools",
|
|
5
5
|
"main": "lib/index.es.js",
|
|
6
6
|
"module": "lib/index.es.js",
|
|
7
7
|
"type": "module",
|
|
8
8
|
"scripts": {
|
|
9
9
|
"build": "npm run clean && npx rollup -c",
|
|
10
|
-
"release": "npm publish",
|
|
10
|
+
"release": "npm run build && npm publish",
|
|
11
11
|
"clean": "rimraf ./dist ./types ./es ./lib"
|
|
12
12
|
},
|
|
13
13
|
"author": "huangjunhao",
|
package/src/indicator.ts
CHANGED
|
@@ -883,10 +883,12 @@ export const formatIndicatorParams = (props: any, otherParams: any = {}) => {
|
|
|
883
883
|
})
|
|
884
884
|
|
|
885
885
|
let indicatorsData = indicators
|
|
886
|
-
|
|
886
|
+
console.log('otherParams?.pivotTableCal', otherParams?.pivotTableCal)
|
|
887
|
+
if (otherParams?.pivotTableCal) {
|
|
887
888
|
// 透视表全设计模式，替换设计态拖拽的指标
|
|
888
|
-
indicatorsData = otherParams.pivotTableCal
|
|
889
|
+
indicatorsData = otherParams.pivotTableCal?.indicators || []
|
|
889
890
|
}
|
|
891
|
+
console.log('indicatorsData', indicatorsData)
|
|
890
892
|
indicatorsData?.forEach((indicator: { [key:string]: any }) => {
|
|
891
893
|
indicator.location = 'LEFT'
|
|
892
894
|
indicatorList.push(handleIndicator(indicator, classification))
|
|
@@ -897,9 +899,9 @@ export const formatIndicatorParams = (props: any, otherParams: any = {}) => {
|
|
|
897
899
|
if (['ecanList', 'ecanCirculate'].includes(type) && classificationList?.length > 1) {
|
|
898
900
|
queryColumnList = classificationList
|
|
899
901
|
}
|
|
900
|
-
if (otherParams?.pivotTableCal
|
|
902
|
+
if (otherParams?.pivotTableCal) {
|
|
901
903
|
// 透视表全设计模式，替换设计态拖拽的维度
|
|
902
|
-
queryColumnList = otherParams.pivotTableCal
|
|
904
|
+
queryColumnList = otherParams.pivotTableCal?.dimensions || []
|
|
903
905
|
}
|
|
904
906
|
queryColumnList?.forEach((queryColumn: { [key:string]: any }) => {
|
|
905
907
|
const { label, name, location, show, indexCode, sort, typeGuid, indexCodeNum, dateFormat, conditions } = queryColumn
|