diff --git a/packages/datalib/src/chartDefinitions.ts b/packages/datalib/src/chartDefinitions.ts index 72831ec07..f8f856439 100644 --- a/packages/datalib/src/chartDefinitions.ts +++ b/packages/datalib/src/chartDefinitions.ts @@ -49,6 +49,8 @@ export interface ChartDefinition { xdef: ChartXFieldDefinition; ydefs: ChartYFieldDefinition[]; + + useDataLabels?: boolean; } export interface ChartDateParsed { diff --git a/packages/tools/src/stringTools.ts b/packages/tools/src/stringTools.ts index 19a867b0f..9cfb1dd69 100644 --- a/packages/tools/src/stringTools.ts +++ b/packages/tools/src/stringTools.ts @@ -637,7 +637,7 @@ export function parseNumberSafe(value) { return parseFloat(value); } -const frontMatterRe = /^--\ >>>[ \t]*\n(.*)\n-- <<<[ \t]*\n/s; +const frontMatterRe = /^--\ >>>[ \t\r]*\n(.*)\n-- <<<[ \t\r]*\n/s; export function getSqlFrontMatter(text: string, yamlModule) { const match = text.match(frontMatterRe); diff --git a/packages/web/package.json b/packages/web/package.json index eb5223a84..9d8b64224 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -24,6 +24,7 @@ "ace-builds": "^1.36.5", "chart.js": "^4.4.2", "chartjs-adapter-moment": "^1.0.0", + "chartjs-plugin-datalabels": "^2.2.0", "cross-env": "^7.0.3", "dbgate-datalib": "^6.0.0-alpha.1", "dbgate-query-splitter": "^4.11.5", diff --git a/yarn.lock b/yarn.lock index 3d12564cb..378b45b5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3796,6 +3796,11 @@ chartjs-adapter-moment@^1.0.0: resolved "https://registry.yarnpkg.com/chartjs-adapter-moment/-/chartjs-adapter-moment-1.0.1.tgz#0f04c30d330b207c14bfb57dfaae9ce332f09102" integrity sha512-Uz+nTX/GxocuqXpGylxK19YG4R3OSVf8326D+HwSTsNw1LgzyIGRo+Qujwro1wy6X+soNSnfj5t2vZ+r6EaDmA== +chartjs-plugin-datalabels@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz#369578e131d743c2e34b5fbe2d3f9335f6639b8f" + integrity sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw== + chartjs-plugin-zoom@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/chartjs-plugin-zoom/-/chartjs-plugin-zoom-1.3.0.tgz#3dc525a59e9ca34c5823ba543b32218ccefabac9"