Merge pull request #182 from VisActor/release/2.0.2

666haiwen · web-flow · commit ac84561521d5 · 2025-02-23T18:26:26.000+08:00
[Auto release] release 2.0.2
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -2,7 +2,7 @@
   {
     "definitionName": "lockStepVersion",
     "policyName": "vmindMin",
-    "version": "1.2.14",
+    "version": "2.0.2",
     "mainProject": "@visactor/vmind",
     "nextBump": "patch"
   }
diff --git a/packages/calculator/package.json b/packages/calculator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/calculator",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "SQL-like query executor with DSL",
   "main": "lib",
   "module": "es",
diff --git a/packages/chart-advisor/package.json b/packages/chart-advisor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/chart-advisor",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "图表推荐模块",
   "main": "lib",
   "module": "es",
diff --git a/packages/vmind/CHANGELOG.json b/packages/vmind/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@visactor/vmind",
   "entries": [
+    {
+      "version": "2.0.2",
+      "tag": "@visactor/vmind_v2.0.2",
+      "date": "Sun, 23 Feb 2025 10:21:08 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix fieldinfo may undefiend while chart-advistor"
+          }
+        ]
+      }
+    },
     {
       "version": "2.0.1",
       "tag": "@visactor/vmind_v2.0.1",
@@ -152,4 +164,4 @@
       "comments": {}
     }
   ]
-}
+}
diff --git a/packages/vmind/CHANGELOG.md b/packages/vmind/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @visactor/vmind
 
-This log was last generated on Fri, 21 Feb 2025 07:38:30 GMT and should not be manually modified.
+This log was last generated on Sun, 23 Feb 2025 10:21:08 GMT and should not be manually modified.
+
+## 2.0.2
+Sun, 23 Feb 2025 10:21:08 GMT
+
+### Updates
+
+- fix fieldinfo may undefiend while chart-advistor
 
 ## 2.0.1
 Fri, 21 Feb 2025 07:38:30 GMT
@@ -10,17 +17,6 @@ Fri, 21 Feb 2025 07:38:30 GMT
 - Overall architecture upgrade
 - Support DeepSeek and other custom model with api-key
 - 12 new chart types added for chart generation
-  - [Range Bar Chart](https://www.visactor.io/vchart/demo/range-column-chart/range-bar)
-  - [Liquid Chart](https://www.visactor.io/vchart/demo/liquid-chart/liquid-chart)
-  - [Linear Progress Bar](https://www.visactor.io/vchart/demo/progress/linear-progress)
-  - [Circular Progress Bar](https://www.visactor.io/vchart/demo/progress/circular-progress)
-  - [Circle Packing Chart](https://www.visactor.io/vchart/demo/circle-packing-chart/basic-circle-packing)
-  - [Sunburst Chart](https://www.visactor.io/vchart/demo/sunburst-chart/basic-sunburst)
-  - [Gauge Chart](https://www.visactor.io/vchart/demo/gauge-chart/basic-gauge)
-  - [Treemap Chart](https://www.visactor.io/vchart/demo/treemap-chart/basic-treemap)
-  - [Heatmap Chart](https://www.visactor.io/vchart/demo/heatmap-chart/basic-heatmap)
-  - [Venn Chart](https://www.visactor.io/vchart/demo/venn-chart/venn-chart)
-  - [Map](https://www.visactor.io/vchart/demo/map-chart/basic-map)
 - Add Text2Chart capability
 - Add Chart Insight capability
 
diff --git a/packages/vmind/package.json b/packages/vmind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vmind",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
@@ -93,14 +93,14 @@
   },
   "dependencies": {
     "chroma-js": "^3.1.1",
-    "@visactor/chart-advisor": "workspace:2.0.1",
+    "@visactor/chart-advisor": "workspace:2.0.2",
     "@visactor/vdataset": "~0.17.4",
     "@visactor/vutils": "~0.17.4",
     "axios": "^1.4.0",
     "json5": "~2.2.3",
     "dayjs": "~1.11.10",
     "js-yaml": "~4.1.0",
-    "@visactor/calculator": "workspace:2.0.1",
+    "@visactor/calculator": "workspace:2.0.2",
     "alasql": "~4.3.2",
     "@visactor/vchart-theme": "^1.11.2",
     "jstat": "~1.9.6",
diff --git a/packages/vmind/src/atom/chartGenerator/index.ts b/packages/vmind/src/atom/chartGenerator/index.ts
@@ -146,12 +146,13 @@ export class ChartGeneratorAtom extends BaseAtom<ChartGeneratorCtx, ChartGenerat
     };
     if (!this.useRule && (this.useChartAdvisor || this.options.useChartAdvisor)) {
       // @todo
-      const { cell, dataset, chartType, advisedList } = getCellContextByAdvisor({
+      const { cell, dataset, chartType, advisedList, usage } = getCellContextByAdvisor({
         ...this.context,
         ...additionalCtx
       });
       this.context = {
         ...this.context,
+        usage,
         cell,
         dataTable: dataset,
         chartType,
diff --git a/packages/vmind/src/atom/chartGenerator/spec/transformers.ts b/packages/vmind/src/atom/chartGenerator/spec/transformers.ts
@@ -21,7 +21,7 @@ import type { GenerateChartCellContext } from '../type';
 import { getFieldByDataType, getFieldIdInCell } from '../../../utils/field';
 import { isValidDataTable } from '../../../utils/dataTable';
 import { DataType, ChartType, ROLE } from '../../../types';
-import type { DataCell, DataTable, FieldInfo } from '../../../types';
+import type { DataCell, DataTable } from '../../../types';
 import { builtinThemeMap } from '../const';
 
 const chartTypeMap: { [chartName: string]: string } = {
@@ -919,7 +919,7 @@ export const axis = (context: GenerateChartCellContext) => {
   const { y: celly } = cell;
   const yFields = isArray(celly) ? celly : [celly];
   const yFieldsInfo = yFields.map(field => fieldInfo.find(v => v.fieldName === field));
-  const isAllRatio = yFieldsInfo.every(v => !!v.ratioGranularity);
+  const isAllRatio = yFieldsInfo.every(v => !!v?.ratioGranularity);
   const isSameUnit = uniqArray(yFieldsInfo.map(v => v?.unit).filter(v => !!v)).length === 1;
 
   spec.axes = [
@@ -975,7 +975,7 @@ export const commonLabel = (context: GenerateChartCellContext) => {
   } else if (celly) {
     const field = isArray(celly) ? celly[0] : celly;
     const info = fieldInfo.find(v => v.fieldName === field);
-    if (info.ratioGranularity) {
+    if (info?.ratioGranularity) {
       spec.label.formatter = `{${field}:~%}`;
     }
   }
@@ -1066,7 +1066,7 @@ export const scatterAxis = (context: GenerateChartCellContext) => {
   spec.axes = [
     {
       orient: 'bottom',
-      type: [DataType.DATE, DataType.STRING].includes(xFieldInfo.type) ? 'band' : 'linear',
+      type: [DataType.DATE, DataType.STRING].includes(xFieldInfo?.type) ? 'band' : 'linear',
       label: {
         style: {
           //fill: '#FFFFFF'
@@ -1081,7 +1081,7 @@ export const scatterAxis = (context: GenerateChartCellContext) => {
     },
     {
       orient: 'left',
-      type: [DataType.DATE, DataType.STRING].includes(yFieldInfo.type) ? 'band' : 'linear',
+      type: [DataType.DATE, DataType.STRING].includes(yFieldInfo?.type) ? 'band' : 'linear',
       label: {
         style: {
           //fill: '#FFFFFF'
diff --git a/packages/vmind/src/atom/dataClean/utils.ts b/packages/vmind/src/atom/dataClean/utils.ts
@@ -150,9 +150,9 @@ export const getCtxBymeasureAutoTransfer = (context: DataCleanCtx, text?: string
             }
           }
           // transfer ratio value to absolue value without unit
-          if (info.ratioGranularity === '%') {
+          if (info?.ratioGranularity === '%') {
             dataTable[i][info.fieldName] = value / 100;
-          } else if (info.ratioGranularity === '‰') {
+          } else if (info?.ratioGranularity === '‰') {
             dataTable[i][info.fieldName] = value / 1000;
           }
         }
diff --git a/packages/vmind/src/schedule/index.ts b/packages/vmind/src/schedule/index.ts
@@ -131,7 +131,7 @@ export class Schedule<T extends AtomName[]> {
     for (const key in oldUsage) {
       if (Object.prototype.hasOwnProperty.call(oldUsage, key)) {
         const curKey = key as keyof Usage;
-        result[curKey] = (oldUsage[curKey] || 0) + (newUsage[curKey] || 0);
+        result[curKey] = (oldUsage[curKey] || 0) + (newUsage?.[curKey] || 0);
       }
     }
 
diff --git a/packages/vmind/src/utils/field.ts b/packages/vmind/src/utils/field.ts
@@ -16,7 +16,7 @@ export const formatFieldInfo = (fieldInfo: FieldInfo[]) => {
   fieldInfo.forEach(info => {
     info.role = getRoleByFieldType(info.type);
     info.location = getRoleByFieldType(info.type) as any;
-    info.ratioGranularity = info?.type === DataType.RATIO ? info.ratioGranularity || '%' : null;
+    info.ratioGranularity = info?.type === DataType.RATIO ? info?.ratioGranularity || '%' : null;
   });
   return fieldInfo;
 };
@@ -36,7 +36,7 @@ export const getFieldByRole = (fields: FieldInfo[], role: ROLE) => {
 };
 
 export const getFieldByDataType = (fields: FieldInfo[], dataTypeList: DataType[]) => {
-  return fields.find(f => dataTypeList.includes(f.type));
+  return (fields || []).find(f => dataTypeList.includes(f.type));
 };
 export const getFieldsByDataType = (fields: FieldInfo[], dataTypeList: DataType[]) => {
   return fields.filter(f => dataTypeList.includes(f.type));

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`"definitionName": "lockStepVersion",`
`4`	`4`	`"policyName": "vmindMin",`
`5`		`- "version": "1.2.14",`
	`5`	`+ "version": "2.0.2",`
`6`	`6`	`"mainProject": "@visactor/vmind",`
`7`	`7`	`"nextBump": "patch"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@visactor/calculator",`
`3`		`- "version": "2.0.1",`
	`3`	`+ "version": "2.0.2",`
`4`	`4`	`"description": "SQL-like query executor with DSL",`
`5`	`5`	`"main": "lib",`
`6`	`6`	`"module": "es",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@visactor/chart-advisor",`
`3`		`- "version": "2.0.1",`
	`3`	`+ "version": "2.0.2",`
`4`	`4`	`"description": "图表推荐模块",`
`5`	`5`	`"main": "lib",`
`6`	`6`	`"module": "es",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,18 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@visactor/vmind",`
`3`	`3`	`"entries": [`
	`4`	`+ {`
	`5`	`+ "version": "2.0.2",`
	`6`	`+ "tag": "@visactor/vmind_v2.0.2",`
	`7`	`+ "date": "Sun, 23 Feb 2025 10:21:08 GMT",`
	`8`	`+ "comments": {`
	`9`	`+ "none": [`
	`10`	`+ {`
	`11`	`+ "comment": "fix fieldinfo may undefiend while chart-advistor"`
	`12`	`+ }`
	`13`	`+ ]`
	`14`	`+ }`
	`15`	`+ },`
`4`	`16`	`{`
`5`	`17`	`"version": "2.0.1",`
`6`	`18`	`"tag": "@visactor/vmind_v2.0.1",`
`@@ -152,4 +164,4 @@`
`152`	`164`	`"comments": {}`
`153`	`165`	`}`
`154`	`166`	`]`
`155`		`-}`
	`167`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,9 @@ export const getCtxBymeasureAutoTransfer = (context: DataCleanCtx, text?: string`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`// transfer ratio value to absolue value without unit`
`153`		`- if (info.ratioGranularity === '%') {`
	`153`	`+ if (info?.ratioGranularity === '%') {`
`154`	`154`	`dataTable[i][info.fieldName] = value / 100;`
`155`		`- } else if (info.ratioGranularity === '‰') {`
	`155`	`+ } else if (info?.ratioGranularity === '‰') {`
`156`	`156`	`dataTable[i][info.fieldName] = value / 1000;`
`157`	`157`	`}`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ export class Schedule<T extends AtomName[]> {`
`131`	`131`	`for (const key in oldUsage) {`
`132`	`132`	`if (Object.prototype.hasOwnProperty.call(oldUsage, key)) {`
`133`	`133`	`const curKey = key as keyof Usage;`
`134`		`- result[curKey] = (oldUsage[curKey] \|\| 0) + (newUsage[curKey] \|\| 0);`
	`134`	`+ result[curKey] = (oldUsage[curKey] \|\| 0) + (newUsage?.[curKey] \|\| 0);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`