npm - @visactor/vchart - Versions diffs - 1.6.1-alpha.0 → 1.6.2 - Mend

@visactor/vchart 1.6.1-alpha.0 → 1.6.2

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.

Files changed (133) hide show

package/cjs/theme/builtin/common/component/title.js CHANGED Viewed

@@ -24,7 +24,7 @@ exports.title = {
         lineHeight: constants_1.THEME_CONSTANTS.l4LineHeight,
         fill: {
             type: "palette",
-            key: "tertiaryFontColor"
+            key: "secondaryFontColor"
         }
     }
 };

package/cjs/theme/builtin/common/component/title.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/builtin/common/component/title.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAElC,QAAA,KAAK,GAAgB;IAChC,OAAO,EAAE;QACP,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,EAAE;KACX;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,~~mBAAmB~~,EAAE;~~KACpD~~;CACF,CAAC","file":"title.js","sourcesContent":["import type { ITitleTheme } from '../../../../component/title/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const title: ITitleTheme = {\n padding: {\n top: 4,\n bottom: 20\n },\n textStyle: {\n fontSize: THEME_CONSTANTS.l3FontSize,\n lineHeight: THEME_CONSTANTS.l3LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n fill: { type: 'palette', key: 'primaryFontColor' }\n },\n subtextStyle: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n fill: { type: 'palette', key: '~~tertiaryFontColor~~' }\n }\n};\n"]}
1	+ {"version":3,"sources":["../src/theme/builtin/common/component/title.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAElC,QAAA,KAAK,GAAgB;IAChC,OAAO,EAAE;QACP,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,EAAE;KACX;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;KACrD;CACF,CAAC","file":"title.js","sourcesContent":["import type { ITitleTheme } from '../../../../component/title/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const title: ITitleTheme = {\n padding: {\n top: 4,\n bottom: 20\n },\n textStyle: {\n fontSize: THEME_CONSTANTS.l3FontSize,\n lineHeight: THEME_CONSTANTS.l3LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n fill: { type: 'palette', key: 'primaryFontColor' }\n },\n subtextStyle: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n fill: { type: 'palette', key: 'secondaryFontColor' }\n }\n};\n"]}

package/cjs/theme/builtin/common/component/tooltip.js CHANGED Viewed

@@ -20,12 +20,12 @@ exports.tooltip = {
         },
         backgroundColor: {
             type: "palette",
-            key: "popupBackgroundColor"
+            key: "tooltipBackgroundColor"
         },
         border: {
             color: {
                 type: "palette",
-                key: "popupBackgroundColor"
+                key: "tooltipBackgroundColor"
             },
             width: 0,
             radius: 3
@@ -37,7 +37,8 @@ exports.tooltip = {
             spread: 0,
             color: {
                 type: "palette",
-                key: "shadowColor"
+                key: "shadowColor",
+                a: .1
             }
         }
     },

package/cjs/theme/builtin/common/component/tooltip.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/builtin/common/component/tooltip.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAElC,QAAA,OAAO,GAAkB;IACpC,MAAM,EAAE;QACN,CAAC,EAAE,EAAE;QACL,CAAC,EAAE,EAAE;KACN;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;QACD,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,~~sBAAsB~~,EAAE;~~QACjE~~,MAAM,EAAE;YACN,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,~~sBAAsB~~,EAAE;~~YACvD~~,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACV;QACD,MAAM,EAAE;YACN,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,IAAI,EAAE,EAAE;YACR,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE;~~SAC/C~~;KACF;IACD,QAAQ,EAAE,CAAC;IACX,UAAU,EAAE;QACV,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACzD,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,EAAE;KACZ;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;CACF,CAAC","file":"tooltip.js","sourcesContent":["import type { ITooltipTheme } from '../../../../component/tooltip/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const tooltip: ITooltipTheme = {\n offset: {\n x: 10,\n y: 10\n },\n panel: {\n padding: {\n top: 10,\n left: 10,\n right: 10,\n bottom: 10\n },\n backgroundColor: { type: 'palette', key: '~~popupBackgroundColor~~' },\n border: {\n color: { type: 'palette', key: '~~popupBackgroundColor~~' },\n width: 0,\n radius: 3\n },\n shadow: {\n x: 0,\n y: 4,\n blur: 12,\n spread: 0,\n color: { type: 'palette', key: 'shadowColor' }\n }\n },\n spaceRow: 6,\n titleLabel: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontColor: { type: 'palette', key: 'primaryFontColor' },\n fontWeight: 'bold',\n textAlign: 'left',\n textBaseline: 'middle',\n spacing: 0\n },\n shape: {\n size: 8,\n spacing: 6\n },\n keyLabel: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontColor: { type: 'palette', key: 'secondaryFontColor' },\n textAlign: 'left',\n textBaseline: 'middle',\n spacing: 26\n },\n valueLabel: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontColor: { type: 'palette', key: 'primaryFontColor' },\n fontWeight: 'bold',\n textBaseline: 'middle',\n spacing: 0\n }\n};\n"]}
1	+ {"version":3,"sources":["../src/theme/builtin/common/component/tooltip.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAElC,QAAA,OAAO,GAAkB;IACpC,MAAM,EAAE;QACN,CAAC,EAAE,EAAE;QACL,CAAC,EAAE,EAAE;KACN;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;QACD,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE;QACnE,MAAM,EAAE;YACN,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE;YACzD,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACV;QACD,MAAM,EAAE;YACN,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,IAAI,EAAE,EAAE;YACR,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,GAAG,EAAE;SACvD;KACF;IACD,QAAQ,EAAE,CAAC;IACX,UAAU,EAAE;QACV,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACzD,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,EAAE;KACZ;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,2BAAe,CAAC,UAAU;QACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;CACF,CAAC","file":"tooltip.js","sourcesContent":["import type { ITooltipTheme } from '../../../../component/tooltip/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const tooltip: ITooltipTheme = {\n offset: {\n x: 10,\n y: 10\n },\n panel: {\n padding: {\n top: 10,\n left: 10,\n right: 10,\n bottom: 10\n },\n backgroundColor: { type: 'palette', key: 'tooltipBackgroundColor' },\n border: {\n color: { type: 'palette', key: 'tooltipBackgroundColor' },\n width: 0,\n radius: 3\n },\n shadow: {\n x: 0,\n y: 4,\n blur: 12,\n spread: 0,\n color: { type: 'palette', key: 'shadowColor', a: 0.1 }\n }\n },\n spaceRow: 6,\n titleLabel: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontColor: { type: 'palette', key: 'primaryFontColor' },\n fontWeight: 'bold',\n textAlign: 'left',\n textBaseline: 'middle',\n spacing: 0\n },\n shape: {\n size: 8,\n spacing: 6\n },\n keyLabel: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontColor: { type: 'palette', key: 'secondaryFontColor' },\n textAlign: 'left',\n textBaseline: 'middle',\n spacing: 26\n },\n valueLabel: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontColor: { type: 'palette', key: 'primaryFontColor' },\n fontWeight: 'bold',\n textBaseline: 'middle',\n spacing: 0\n }\n};\n"]}

package/cjs/theme/builtin/common/component/total-label.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/builtin/common/component/total-label.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAElC,QAAA,UAAU,GAAqB;IAC1C,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,CAAC;IACT,OAAO,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb;IACD,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE;QACL,QAAQ,EAAE,2BAAe,CAAC,UAAU;~~QACpC~~,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;CACF,CAAC","file":"total-label.js","sourcesContent":["import type { ITotalLabelTheme } from '../../../../component/label';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const totalLabel: ITotalLabelTheme = {\n visible: false,\n offset: 5,\n overlap: {\n clampForce: true,\n strategy: []\n },\n smartInvert: false,\n animation: false,\n style: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n fill: { type: 'palette', key: 'primaryFontColor' }\n }\n};\n"]}
1	+ {"version":3,"sources":["../src/theme/builtin/common/component/total-label.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAElC,QAAA,UAAU,GAAqB;IAC1C,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,CAAC;IACT,OAAO,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb;IACD,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE;QACL,QAAQ,EAAE,2BAAe,CAAC,UAAU;QAGpC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;CACF,CAAC","file":"total-label.js","sourcesContent":["import type { ITotalLabelTheme } from '../../../../component/label';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const totalLabel: ITotalLabelTheme = {\n visible: false,\n offset: 5,\n overlap: {\n clampForce: true,\n strategy: []\n },\n smartInvert: false,\n animation: false,\n style: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n // lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fill: { type: 'palette', key: 'primaryFontColor' }\n }\n};\n"]}

package/cjs/theme/builtin/common/mark.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/builtin/common/mark.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAEjC,QAAA,UAAU,GAA2B;IAChD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,2BAAe,CAAC,UAAU;YACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;YAExC,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;CACF,CAAC;AAEW,QAAA,UAAU,GAA2B;IAChD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,2BAAe,CAAC,UAAU;~~YACpC~~,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,WAAW,EAAE,2BAAe,CAAC,WAAW;SACzC;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,OAAO;SAClB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,WAAW,EAAE;QACX,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,aAAa,EAAE;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,MAAM,EAAE,KAAK;SACd;KACF;IACD,aAAa,EAAE;QACb,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE;SAC5D;KACF;CACF,CAAC","file":"mark.js","sourcesContent":["import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType } from '../../interface';\nimport { THEME_CONSTANTS } from './constants';\n\nexport const markByType: IGlobalMarkThemeByType = {\n text: {\n style: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontWeight: 'normal',\n fillOpacity: 1\n }\n }\n};\n\nexport const markByName: IGlobalMarkThemeByName = {\n label: {\n style: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n fontWeight: 'normal',\n fillOpacity: 1\n }\n },\n area: {\n style: {\n fillOpacity: THEME_CONSTANTS.areaOpacity\n }\n },\n line: {\n style: {\n lineWidth: 2,\n lineCap: 'round',\n lineJoin: 'round'\n }\n },\n point: {\n style: {\n size: 8,\n stroke: { type: 'palette', key: 'backgroundColor' },\n lineWidth: 1,\n fillOpacity: 1\n }\n },\n word: {\n style: {\n fontSize: null\n }\n },\n fillingWord: {\n style: {\n fontSize: null\n }\n },\n sunburst: {\n style: {\n lineWidth: 1,\n stroke: { type: 'palette', key: 'backgroundColor' }\n }\n },\n circlePacking: {\n style: {\n lineWidth: 1,\n stroke: { type: 'palette', key: 'backgroundColor' }\n }\n },\n funnel3d: {\n style: {\n stroke: false\n }\n },\n barBackground: {\n visible: false,\n style: {\n fill: { type: 'palette', key: 'primaryFontColor', a: 0.06 }\n }\n }\n};\n"]}
1	+ {"version":3,"sources":["../src/theme/builtin/common/mark.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAEjC,QAAA,UAAU,GAA2B;IAChD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,2BAAe,CAAC,UAAU;YACpC,UAAU,EAAE,2BAAe,CAAC,YAAY;YAExC,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;CACF,CAAC;AAEW,QAAA,UAAU,GAA2B;IAChD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,2BAAe,CAAC,UAAU;YAGpC,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,WAAW,EAAE,2BAAe,CAAC,WAAW;SACzC;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,OAAO;SAClB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,WAAW,EAAE;QACX,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,aAAa,EAAE;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,MAAM,EAAE,KAAK;SACd;KACF;IACD,aAAa,EAAE;QACb,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE;SAC5D;KACF;CACF,CAAC","file":"mark.js","sourcesContent":["import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType } from '../../interface';\nimport { THEME_CONSTANTS } from './constants';\n\nexport const markByType: IGlobalMarkThemeByType = {\n text: {\n style: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontWeight: 'normal',\n fillOpacity: 1\n }\n }\n};\n\nexport const markByName: IGlobalMarkThemeByName = {\n label: {\n style: {\n fontSize: THEME_CONSTANTS.l4FontSize,\n // lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n fontWeight: 'normal',\n fillOpacity: 1\n }\n },\n area: {\n style: {\n fillOpacity: THEME_CONSTANTS.areaOpacity\n }\n },\n line: {\n style: {\n lineWidth: 2,\n lineCap: 'round',\n lineJoin: 'round'\n }\n },\n point: {\n style: {\n size: 8,\n stroke: { type: 'palette', key: 'backgroundColor' },\n lineWidth: 1,\n fillOpacity: 1\n }\n },\n word: {\n style: {\n fontSize: null\n }\n },\n fillingWord: {\n style: {\n fontSize: null\n }\n },\n sunburst: {\n style: {\n lineWidth: 1,\n stroke: { type: 'palette', key: 'backgroundColor' }\n }\n },\n circlePacking: {\n style: {\n lineWidth: 1,\n stroke: { type: 'palette', key: 'backgroundColor' }\n }\n },\n funnel3d: {\n style: {\n stroke: false\n }\n },\n barBackground: {\n visible: false,\n style: {\n fill: { type: 'palette', key: 'primaryFontColor', a: 0.06 }\n }\n }\n};\n"]}

package/cjs/theme/builtin/common/series/rangeColumn.js CHANGED Viewed

@@ -14,7 +14,7 @@ exports.rangeColumn = {
         style: {
             fill: {
                 type: "palette",
-                key: "axisMarkerFontColor"
+                key: "labelReverseFontColor"
             }
         },
         minLabel: {

package/cjs/theme/builtin/common/series/rangeColumn.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/builtin/common/series/rangeColumn.ts"],"names":[],"mappings":";;;AAAA,yEAA6G;AAEhG,QAAA,WAAW,GAA4B;IAClD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,~~qBAAqB~~,EAAE;~~SACtD~~;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,8BAAkB,CAAC,GAAG;SACjC;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,8BAAkB,CAAC,KAAK;SACnC;KACF;CACF,CAAC","file":"rangeColumn.js","sourcesContent":["import { minMaxPositionEnum, type IRangeColumnSeriesTheme } from '../../../../series/range-column/interface';\n\nexport const rangeColumn: IRangeColumnSeriesTheme = {\n label: {\n visible: false,\n offset: 5,\n position: 'inside',\n style: {\n fill: { type: 'palette', key: '~~axisMarkerFontColor~~' }\n },\n minLabel: {\n position: minMaxPositionEnum.end\n },\n maxLabel: {\n position: minMaxPositionEnum.start\n }\n }\n};\n"]}
1	+ {"version":3,"sources":["../src/theme/builtin/common/series/rangeColumn.ts"],"names":[],"mappings":";;;AAAA,yEAA6G;AAEhG,QAAA,WAAW,GAA4B;IAClD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,uBAAuB,EAAE;SACxD;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,8BAAkB,CAAC,GAAG;SACjC;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,8BAAkB,CAAC,KAAK;SACnC;KACF;CACF,CAAC","file":"rangeColumn.js","sourcesContent":["import { minMaxPositionEnum, type IRangeColumnSeriesTheme } from '../../../../series/range-column/interface';\n\nexport const rangeColumn: IRangeColumnSeriesTheme = {\n label: {\n visible: false,\n offset: 5,\n position: 'inside',\n style: {\n fill: { type: 'palette', key: 'labelReverseFontColor' }\n },\n minLabel: {\n position: minMaxPositionEnum.end\n },\n maxLabel: {\n position: minMaxPositionEnum.start\n }\n }\n};\n"]}

package/cjs/theme/builtin/dark/color-scheme.js CHANGED Viewed

@@ -12,31 +12,22 @@ exports.colorScheme = {
         palette: {
             backgroundColor: "#202226",
             borderColor: "#404349",
-            shadowColor: "rgba(0,0,0,0.1)",
-            hoverBackgroundColor: "#404349",
-            sliderRailColor: "#404349",
-            sliderHandleColor: "#202226",
-            sliderTrackColor: "#4284FF",
-            popupBackgroundColor: "#404349",
+            shadowColor: "#000000",
             primaryFontColor: "#fdfdfd",
-            secondaryFontColor: "#bbbdc3",
-            tertiaryFontColor: "#888c93",
-            axisLabelFontColor: "#888c93",
+            secondaryFontColor: "#888c93",
+            axisFontColor: "#bbbdc3",
             disableFontColor: "#55595f",
-            axisMarkerFontColor: "#202226",
+            labelReverseFontColor: "#202226",
             axisGridColor: "#404349",
             axisDomainColor: "#4b4f54",
-            dataZoomHandleStrokeColor: "#bbbdc3",
+            dataZoomHandlerStrokeColor: "#888c93",
+            dataZoomHandlerFillColor: "#202226",
+            dataZoomBackgroundColor: "#404349",
             dataZoomChartColor: "#55595F",
-            playerControllerColor: "#4284FF",
+            dataZoomSelectedColor: "#4284FF",
             scrollBarSliderColor: "#ffffff",
-            axisMarkerBackgroundColor: "#fdfdfd",
-            markLabelBackgroundColor: "#404349",
-            markLineStrokeColor: "#bbbdc3",
-            dangerColor: "#eb4b4b",
-            warningColor: "#f0bd30",
-            successColor: "#14b267",
-            infoColor: "#4284ff"
+            tooltipBackgroundColor: "#404349",
+            markLabelBackgroundColor: "#f0bd30"
         }
     }
 };

package/cjs/theme/builtin/dark/color-scheme.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/builtin/dark/color-scheme.ts"],"names":[],"mappings":";;;AACA,gEAAgE;AAGnD,QAAA,WAAW,GAAsB;IAC5C,OAAO,EAAE;QACP,UAAU,EAAV,oBAAU;QACV,OAAO,EAAE;YAEP,eAAe,EAAE,SAAS;YAE1B,WAAW,EAAE,SAAS;YAEtB,WAAW,EAAE,~~iBAAiB;YAE9B,oBAAoB,EAAE,~~SAAS;~~YAE/B~~,~~eAAe~~,EAAE,SAAS;~~YAE1B~~,~~iBAAiB~~,EAAE,SAAS;~~YAE5B~~,~~gBAAgB~~,EAAE,SAAS;~~YAE3B~~,~~oBAAoB,EAAE,SAAS;YAG/B,~~gBAAgB,EAAE,SAAS;YAE3B,~~kBAAkB~~,EAAE,SAAS;~~YAE7B~~,~~iBAAiB~~,EAAE,SAAS;~~YAE5B~~,~~kBAAkB~~,EAAE,SAAS;~~YAE7B~~,~~gBAAgB~~,EAAE,SAAS;~~YAE3B~~,~~mBAAmB~~,EAAE,SAAS;~~YAG9B~~,~~aAAa~~,EAAE,SAAS;~~YAExB~~,~~eAAe,EAAE,SAAS;YAG1B,yBAAyB,EAAE,SAAS;YAEpC,~~kBAAkB,EAAE,SAAS;~~YAG7B~~,qBAAqB,EAAE,SAAS;YAGhC,oBAAoB,EAAE,SAAS;YAG/B,~~yBAAyB~~,EAAE,SAAS;~~YAEpC~~,wBAAwB,EAAE,SAAS;~~YAEnC,mBAAmB,EAAE,SAAS~~;~~YAG9B,WAAW,EAAE,SAAS;YAEtB,YAAY,EAAE,SAAS;YAEvB,YAAY,EAAE,SAAS;YAEvB,SAAS,EAAE,SAAS;SACE;~~KACzB;CACF,CAAC","file":"color-scheme.js","sourcesContent":["import type { IThemeColorScheme } from '../../color-scheme/interface';\nimport { dataScheme } from '../../color-scheme/builtin/default';\nimport type { BuiltinColorPalette } from '../../color-scheme/builtin/interface';\n\nexport const colorScheme: IThemeColorScheme = {\n default: {\n dataScheme,\n palette: {\n /** 背景色 /\n backgroundColor: '#202226',\n /* 图表边框色 /\n borderColor: '#404349',\n /* 默认阴影颜色 /\n shadowColor: '~~rgba(0,0,0,0.1)',\n /* 鼠标 hover 项背景颜色 /\n hoverBackgroundColor: '~~#~~404349~~',\n /* 滑块类组件背景条填充颜色 /\n sliderRailColor: '#404349',\n /* 滑块类组件滑块填充颜色 /\n sliderHandleColor: '#202226',\n /* 滑块类组件已选范围填充颜色 /\n sliderTrackColor: '#4284FF',\n /* 浮层背景区域颜色 /\n popupBackgroundColor: '#404349',\n\n /* 主要字色 /\n primaryFontColor: '#fdfdfd',\n /* 次要字色 /\n secondaryFontColor: '#~~bbbdc3',\n /* 第三字色 /\n tertiaryFontColor: '#~~888c93',\n /* ~~轴标签字色~~ /\n ~~axisLabelFontColor~~: '#~~888c93~~',\n /* 禁用字色 /\n disableFontColor: '#55595f',\n /* ~~轴高亮标记字色~~ /\n ~~axisMarkerFontColor~~: '#202226',\n\n /* 轴网格线颜色 /\n axisGridColor: '#404349',\n /* 轴线颜色 /\n axisDomainColor: '#4b4f54',\n\n /* 缩略轴滑块描边颜色 /\n ~~dataZoomHandleStrokeColor~~: '#~~bbbdc3~~',\n /* ~~缩略轴图表区域颜色~~ /\n ~~dataZoomChartColor~~: '#~~55595F~~',\n\n /* ~~播放器控制器填充颜色~~ /\n ~~playerControllerColor~~: '#~~4284FF~~',\n\n /* ~~滚动条滑块颜色~~ /\n ~~scrollBarSliderColor~~: '#~~ffffff~~',\n\n /* ~~轴高亮标记背景色~~ /\n ~~axisMarkerBackgroundColor~~: '#~~fdfdfd~~',\n ~~/* 标注标签背景颜色 /\~~n ~~markLabelBackgroundColor: '#404349',\n~~ /* ~~标注线颜色~~ /\n ~~markLineStrokeColor~~: '#~~bbbdc3~~',\n\n /* ~~危险色~~ /\n ~~dangerColor~~: '#~~eb4b4b~~',\n /* ~~警告色~~ /\n ~~warningColor~~: '#f0bd30'~~,\n /* 成功色 /\n successColor: '#14b267',\n /* 信息色 */\n infoColor: '#4284ff'~~\n } as BuiltinColorPalette\n }\n};\n"]}
1	+ {"version":3,"sources":["../src/theme/builtin/dark/color-scheme.ts"],"names":[],"mappings":";;;AACA,gEAAgE;AAGnD,QAAA,WAAW,GAAsB;IAC5C,OAAO,EAAE;QACP,UAAU,EAAV,oBAAU;QACV,OAAO,EAAE;YAEP,eAAe,EAAE,SAAS;YAE1B,WAAW,EAAE,SAAS;YAEtB,WAAW,EAAE,SAAS;YAGtB,gBAAgB,EAAE,SAAS;YAE3B,kBAAkB,EAAE,SAAS;YAE7B,aAAa,EAAE,SAAS;YAExB,gBAAgB,EAAE,SAAS;YAE3B,qBAAqB,EAAE,SAAS;YAGhC,aAAa,EAAE,SAAS;YAExB,eAAe,EAAE,SAAS;YAG1B,0BAA0B,EAAE,SAAS;YAErC,wBAAwB,EAAE,SAAS;YAEnC,uBAAuB,EAAE,SAAS;YAElC,kBAAkB,EAAE,SAAS;YAE7B,qBAAqB,EAAE,SAAS;YAGhC,oBAAoB,EAAE,SAAS;YAG/B,sBAAsB,EAAE,SAAS;YAGjC,wBAAwB,EAAE,SAAS;SACb;KACzB;CACF,CAAC","file":"color-scheme.js","sourcesContent":["import type { IThemeColorScheme } from '../../color-scheme/interface';\nimport { dataScheme } from '../../color-scheme/builtin/default';\nimport type { BuiltinColorPalette } from '../../color-scheme/builtin/interface';\n\nexport const colorScheme: IThemeColorScheme = {\n default: {\n dataScheme,\n palette: {\n /** 背景色 /\n backgroundColor: '#202226',\n /* 图表边框色 /\n borderColor: '#404349',\n /* 默认阴影颜色 /\n shadowColor: '#000000',\n\n /* 主要字色 /\n primaryFontColor: '#fdfdfd',\n /* 次要字色 /\n secondaryFontColor: '#888c93',\n /* 轴字色 /\n axisFontColor: '#bbbdc3',\n /* 禁用字色 /\n disableFontColor: '#55595f',\n /* 标签反转字色 /\n labelReverseFontColor: '#202226',\n\n /* 轴网格线颜色 /\n axisGridColor: '#404349',\n /* 轴线颜色 /\n axisDomainColor: '#4b4f54',\n\n /* 缩略轴滑块描边颜色 /\n dataZoomHandlerStrokeColor: '#888c93',\n /* 缩略轴滑块填充颜色 /\n dataZoomHandlerFillColor: '#202226',\n /* 缩略轴背景区域颜色 /\n dataZoomBackgroundColor: '#404349',\n /* 缩略轴图表区域颜色 /\n dataZoomChartColor: '#55595F',\n /* 缩略轴选择区域颜色 /\n dataZoomSelectedColor: '#4284FF',\n\n /* 滚动条滑块颜色 /\n scrollBarSliderColor: '#ffffff',\n\n /* 提示信息背景区域颜色 /\n tooltipBackgroundColor: '#404349',\n\n /* 标注标签背景颜色 */\n markLabelBackgroundColor: '#f0bd30'\n } as BuiltinColorPalette\n }\n};\n"]}

package/cjs/theme/builtin/light/color-scheme.js CHANGED Viewed

@@ -12,31 +12,22 @@ exports.colorScheme = {
         palette: {
             backgroundColor: "#ffffff",
             borderColor: "#e3e5e8",
-            shadowColor: "rgba(33,37,44,0.1)",
-            hoverBackgroundColor: "#f1f2f5",
-            sliderRailColor: "#f1f3f4",
-            sliderHandleColor: "#ffffff",
-            sliderTrackColor: "#0040ff",
-            popupBackgroundColor: "#ffffff",
+            shadowColor: "#21252c",
             primaryFontColor: "#21252c",
             secondaryFontColor: "#606773",
-            tertiaryFontColor: "#89909d",
-            axisLabelFontColor: "#89909d",
+            axisFontColor: "#89909d",
             disableFontColor: "#bcc1cb",
-            axisMarkerFontColor: "#ffffff",
+            labelReverseFontColor: "#ffffff",
             axisGridColor: "#f1f2f5",
             axisDomainColor: "#d9dde4",
-            dataZoomHandleStrokeColor: "#aeb5be",
+            dataZoomHandlerStrokeColor: "#aeb5be",
+            dataZoomHandlerFillColor: "#ffffff",
+            dataZoomBackgroundColor: "#f1f3f4",
             dataZoomChartColor: "#c9ced8",
-            playerControllerColor: "#0040ff",
+            dataZoomSelectedColor: "#0040ff",
             scrollBarSliderColor: "#000000",
-            axisMarkerBackgroundColor: "#21252c",
-            markLabelBackgroundColor: "#f1f2f5",
-            markLineStrokeColor: "#606773",
-            dangerColor: "#e33232",
-            warningColor: "#ffc528",
-            successColor: "#07a35a",
-            infoColor: "#3073f2"
+            tooltipBackgroundColor: "#ffffff",
+            markLabelBackgroundColor: "#ffc528"
         }
     }
 };

package/cjs/theme/builtin/light/color-scheme.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/builtin/light/color-scheme.ts"],"names":[],"mappings":";;;AACA,gEAAgE;AAGnD,QAAA,WAAW,GAAsB;IAC5C,OAAO,EAAE;QACP,UAAU,EAAV,oBAAU;QACV,OAAO,EAAE;YAEP,eAAe,EAAE,SAAS;YAE1B,WAAW,EAAE,SAAS;YAEtB,WAAW,EAAE,~~oBAAoB;YAEjC,oBAAoB,EAAE,~~SAAS;~~YAE/B~~,~~eAAe~~,EAAE,SAAS;~~YAE1B~~,~~iBAAiB~~,EAAE,SAAS;~~YAE5B~~,~~gBAAgB~~,EAAE,SAAS;~~YAE3B~~,~~oBAAoB,EAAE,SAAS;YAG/B,~~gBAAgB,EAAE,SAAS;YAE3B,~~kBAAkB~~,EAAE,SAAS;~~YAE7B~~,~~iBAAiB~~,EAAE,SAAS;~~YAE5B~~,~~kBAAkB~~,EAAE,SAAS;~~YAE7B~~,~~gBAAgB~~,EAAE,SAAS;~~YAE3B~~,~~mBAAmB~~,EAAE,SAAS;~~YAG9B~~,~~aAAa~~,EAAE,SAAS;~~YAExB~~,~~eAAe,EAAE,SAAS;YAG1B,yBAAyB,EAAE,SAAS;YAEpC,~~kBAAkB,EAAE,SAAS;~~YAG7B~~,qBAAqB,EAAE,SAAS;YAGhC,oBAAoB,EAAE,SAAS;YAG/B,~~yBAAyB~~,EAAE,SAAS;~~YAEpC~~,wBAAwB,EAAE,SAAS;~~YAEnC,mBAAmB,EAAE,SAAS~~;~~YAG9B,WAAW,EAAE,SAAS;YAEtB,YAAY,EAAE,SAAS;YAEvB,YAAY,EAAE,SAAS;YAEvB,SAAS,EAAE,SAAS;SACE;~~KACzB;CACF,CAAC","file":"color-scheme.js","sourcesContent":["import type { IThemeColorScheme } from '../../color-scheme/interface';\nimport { dataScheme } from '../../color-scheme/builtin/default';\nimport type { BuiltinColorPalette } from '../../color-scheme/builtin/interface';\n\nexport const colorScheme: IThemeColorScheme = {\n default: {\n dataScheme,\n palette: {\n /** 背景色 /\n backgroundColor: '#ffffff',\n /* 图表边框色 /\n borderColor: '#e3e5e8',\n /* 默认阴影颜色 /\n shadowColor: '~~rgba(33,37,44,0.1)',\n /* 鼠标 hover 项背景颜色 /\n hoverBackgroundColor: '~~#~~f1f2f5~~',\n /* 滑块类组件背景条填充颜色 /\n sliderRailColor: '#f1f3f4',\n /* 滑块类组件滑块填充颜色 /\n sliderHandleColor: '#ffffff',\n /* 滑块类组件已选范围填充颜色 /\n sliderTrackColor: '#0040ff',\n /* 浮层背景区域颜色 /\n popupBackgroundColor: '#ffffff',\n\n /* 主要字色 /\n primaryFontColor: '#21252c',\n /* 次要字色 /\n secondaryFontColor: '#606773',\n /* ~~第三字色~~ /\n ~~tertiaryFontColor~~: '#89909d',\n /* 轴标签字色 /\n axisLabelFontColor: '#89909d',\n /* 禁用字色 /\n disableFontColor: '#bcc1cb',\n /* ~~轴高亮标记字色~~ /\n ~~axisMarkerFontColor~~: '#ffffff',\n\n /* 轴网格线颜色 /\n axisGridColor: '#f1f2f5',\n /* 轴线颜色 /\n axisDomainColor: '#d9dde4',\n\n /* 缩略轴滑块描边颜色 /\n ~~dataZoomHandleStrokeColor~~: '#aeb5be',\n /* ~~缩略轴图表区域颜色~~ /\n ~~dataZoomChartColor~~: '#~~c9ced8~~',\n\n /* ~~播放器控制器填充颜色~~ /\n ~~playerControllerColor~~: '#~~0040ff~~',\n\n /* ~~滚动条滑块颜色~~ /\n ~~scrollBarSliderColor~~: '#~~000000~~',\n\n /* ~~轴高亮标记背景色~~ /\n ~~axisMarkerBackgroundColor~~: '#~~21252c~~',\n ~~/* 标注标签背景颜色 /\~~n ~~markLabelBackgroundColor: '#f1f2f5',\n~~ /* ~~标注线颜色~~ /\n ~~markLineStrokeColor~~: '#~~606773~~',\n\n /* ~~危险色~~ /\n ~~dangerColor~~: '#~~e33232~~',\n /* ~~警告色~~ /\n ~~warningColor~~: '#ffc528'~~,\n /* 成功色 /\n successColor: '#07a35a',\n /* 信息色 */\n infoColor: '#3073f2'~~\n } as BuiltinColorPalette\n }\n};\n"]}
1	+ {"version":3,"sources":["../src/theme/builtin/light/color-scheme.ts"],"names":[],"mappings":";;;AACA,gEAAgE;AAGnD,QAAA,WAAW,GAAsB;IAC5C,OAAO,EAAE;QACP,UAAU,EAAV,oBAAU;QACV,OAAO,EAAE;YAEP,eAAe,EAAE,SAAS;YAE1B,WAAW,EAAE,SAAS;YAEtB,WAAW,EAAE,SAAS;YAGtB,gBAAgB,EAAE,SAAS;YAE3B,kBAAkB,EAAE,SAAS;YAE7B,aAAa,EAAE,SAAS;YAExB,gBAAgB,EAAE,SAAS;YAE3B,qBAAqB,EAAE,SAAS;YAGhC,aAAa,EAAE,SAAS;YAExB,eAAe,EAAE,SAAS;YAG1B,0BAA0B,EAAE,SAAS;YAErC,wBAAwB,EAAE,SAAS;YAEnC,uBAAuB,EAAE,SAAS;YAElC,kBAAkB,EAAE,SAAS;YAE7B,qBAAqB,EAAE,SAAS;YAGhC,oBAAoB,EAAE,SAAS;YAG/B,sBAAsB,EAAE,SAAS;YAGjC,wBAAwB,EAAE,SAAS;SACb;KACzB;CACF,CAAC","file":"color-scheme.js","sourcesContent":["import type { IThemeColorScheme } from '../../color-scheme/interface';\nimport { dataScheme } from '../../color-scheme/builtin/default';\nimport type { BuiltinColorPalette } from '../../color-scheme/builtin/interface';\n\nexport const colorScheme: IThemeColorScheme = {\n default: {\n dataScheme,\n palette: {\n /** 背景色 /\n backgroundColor: '#ffffff',\n /* 图表边框色 /\n borderColor: '#e3e5e8',\n /* 默认阴影颜色 /\n shadowColor: '#21252c',\n\n /* 主要字色 /\n primaryFontColor: '#21252c',\n /* 次要字色 /\n secondaryFontColor: '#606773',\n /* 轴字色 /\n axisFontColor: '#89909d',\n /* 禁用字色 /\n disableFontColor: '#bcc1cb',\n /* 标签反转字色 /\n labelReverseFontColor: '#ffffff',\n\n /* 轴网格线颜色 /\n axisGridColor: '#f1f2f5',\n /* 轴线颜色 /\n axisDomainColor: '#d9dde4',\n\n /* 缩略轴滑块描边颜色 /\n dataZoomHandlerStrokeColor: '#aeb5be',\n /* 缩略轴滑块填充颜色 /\n dataZoomHandlerFillColor: '#ffffff',\n /* 缩略轴背景区域颜色 /\n dataZoomBackgroundColor: '#f1f3f4',\n /* 缩略轴图表区域颜色 /\n dataZoomChartColor: '#c9ced8',\n /* 缩略轴选择区域颜色 /\n dataZoomSelectedColor: '#0040ff',\n\n /* 滚动条滑块颜色 /\n scrollBarSliderColor: '#000000',\n\n /* 提示信息背景区域颜色 /\n tooltipBackgroundColor: '#ffffff',\n\n /* 标注标签背景颜色 */\n markLabelBackgroundColor: '#ffc528'\n } as BuiltinColorPalette\n }\n};\n"]}

package/cjs/theme/color-scheme/builtin/interface.d.ts CHANGED Viewed

@@ -3,28 +3,19 @@ export type BuiltinColorPalette = IColorSchemeStruct['palette'] & {
     backgroundColor: string;
     borderColor: string;
     shadowColor: string;
-    hoverBackgroundColor: string;
-    sliderRailColor: string;
-    sliderHandleColor: string;
-    sliderTrackColor: string;
-    popupBackgroundColor: string;
     primaryFontColor: string;
     secondaryFontColor: string;
-    tertiaryFontColor: string;
-    axisLabelFontColor: string;
+    axisFontColor: string;
     disableFontColor: string;
-    axisMarkerFontColor: string;
+    labelReverseFontColor: string;
     axisGridColor: string;
     axisDomainColor: string;
-    dataZoomHandleStrokeColor: string;
+    dataZoomHandlerStrokeColor: string;
+    dataZoomHandlerFillColor: string;
+    dataZoomBackgroundColor: string;
     dataZoomChartColor: string;
-    playerControllerColor: string;
+    dataZoomSelectedColor: string;
     scrollBarSliderColor: string;
-    axisMarkerBackgroundColor: string;
+    tooltipBackgroundColor: string;
     markLabelBackgroundColor: string;
-    markLineStrokeColor: string;
-    dangerColor: string;
-    warningColor: string;
-    successColor: string;
-    infoColor: string;
 };

package/cjs/theme/color-scheme/builtin/interface.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/color-scheme/builtin/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IColorSchemeStruct } from '../interface';\n\nexport type BuiltinColorPalette = IColorSchemeStruct['palette'] & {\n /** 背景色 /\n backgroundColor: string;\n /* 图表边框色 /\n borderColor: string;\n /* 默认阴影颜色 /\n shadowColor: string;\n /* 鼠标 hover 项背景颜色 /\n hoverBackgroundColor: string;\n /* 滑块类组件背景条填充颜色 /\n sliderRailColor: string;\n /* 滑块类组件滑块填充颜色 /\n sliderHandleColor: string;\n /* 滑块类组件已选范围填充颜色 /\n sliderTrackColor: string;\n /* 浮层背景区域颜色 /\n popupBackgroundColor: string;\n\n /* 主要字色（图表标题、大数字） /\n primaryFontColor: string;\n /* 次要字色（图例、tooltip、数据标签） /\n secondaryFontColor: string;\n /* ~~第三字色（图表副标题）~~ /\n ~~tertiaryFontColor~~: string;\n /* 轴标签字色 /\n axisLabelFontColor: string;\n /* 禁用字色（非激活态字色） /\n disableFontColor: string;\n /* ~~轴高亮标记字色（crosshair~~ ~~标签字色）~~ /\n ~~axisMarkerFontColor~~: string;\n\n /* 轴网格线颜色 /\n axisGridColor: string;\n /* 轴线颜色 /\n axisDomainColor: string;\n\n /* 缩略轴滑块描边颜色 /\n ~~dataZoomHandleStrokeColor~~: string;\n /* ~~缩略轴图表区域颜色~~ /\n ~~dataZoomChartColor~~: string;\n\n /* ~~播放器控制器填充颜色~~ /\n ~~playerControllerColor~~: string;\n\n /* ~~滚动条滑块颜色~~ /\n ~~scrollBarSliderColor~~: string;\n\n /* ~~轴高亮标记背景色（crosshair~~ ~~标签背景色）~~ /\n ~~axisMarkerBackgroundColor~~: string;\n ~~/* 标注标签背景颜色 /\~~n ~~markLabelBackgroundColor: string;\n~~ /* ~~标注线颜色~~ /\n ~~markLineStrokeColor~~: string;\n\n /* ~~危险色~~ /\n ~~dangerColor~~: string;\n ~~/* 警告色 /\~~n ~~warningColor: string;\n~~ /* ~~成功色~~ /\n ~~successColor~~: string;\n ~~/* 信息色 */\n infoColor: string;\n~~};\n"]}
1	+ {"version":3,"sources":["../src/theme/color-scheme/builtin/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IColorSchemeStruct } from '../interface';\n\nexport type BuiltinColorPalette = IColorSchemeStruct['palette'] & {\n /** 背景色 /\n backgroundColor: string;\n /* 图表边框色 /\n borderColor: string;\n /* 默认阴影颜色 /\n shadowColor: string;\n\n /* 主要字色（图表标题、大数字） /\n primaryFontColor: string;\n /* 次要字色（图例、tooltip、数据标签） /\n secondaryFontColor: string;\n /* 轴字色 /\n axisFontColor: string;\n /* 禁用字色（非激活态字色） /\n disableFontColor: string;\n /* 标签反转字色 /\n labelReverseFontColor: string;\n\n /* 轴网格线颜色 /\n axisGridColor: string;\n /* 轴线颜色 /\n axisDomainColor: string;\n\n /* 缩略轴滑块描边颜色 /\n dataZoomHandlerStrokeColor: string;\n /* 缩略轴滑块填充颜色 /\n dataZoomHandlerFillColor: string;\n /* 缩略轴背景区域颜色 /\n dataZoomBackgroundColor: string;\n /* 缩略轴图表区域颜色 /\n dataZoomChartColor: string;\n /* 缩略轴选择区域颜色 /\n dataZoomSelectedColor: string;\n\n /* 滚动条滑块颜色 /\n scrollBarSliderColor: string;\n\n /* 提示信息背景区域颜色 /\n tooltipBackgroundColor: string;\n\n /* 标注标签背景颜色 */\n markLabelBackgroundColor: string;\n};\n"]}

package/cjs/theme/color-scheme/legacy.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import type { BuiltinColorPalette } from './builtin';
+import type { ColorSchemeItem, IColorSchemeStruct } from './interface';
+export declare const newTokenToLegacyToken: Record<keyof BuiltinColorPalette, string>;
+export declare const legacyTokenToNewToken: Record<string, keyof BuiltinColorPalette>;
+export declare function getUpgradedTokenValue(palette: IColorSchemeStruct['palette'], key: string): ColorSchemeItem;

package/cjs/theme/color-scheme/legacy.js ADDED Viewed

@@ -0,0 +1,21 @@
+"use strict";
+function getUpgradedTokenValue(palette, key) {
+    const legacyKey = exports.newTokenToLegacyToken[key];
+    if (legacyKey && palette[legacyKey]) return palette[legacyKey];
+    if (palette[key]) return palette[key];
+    const newKey = exports.legacyTokenToNewToken[key];
+    return newKey ? palette[newKey] : void 0;
+}
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.getUpgradedTokenValue = exports.legacyTokenToNewToken = exports.newTokenToLegacyToken = void 0,
+exports.newTokenToLegacyToken = {
+    primaryFontColor: "titleFontColor",
+    secondaryFontColor: "labelFontColor"
+}, exports.legacyTokenToNewToken = {
+    titleFontColor: "primaryFontColor",
+    labelFontColor: "secondaryFontColor"
+}, exports.getUpgradedTokenValue = getUpgradedTokenValue;
+//# sourceMappingURL=legacy.js.map

package/cjs/theme/color-scheme/legacy.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"sources":["../src/theme/color-scheme/legacy.ts"],"names":[],"mappings":";;;AAQa,QAAA,qBAAqB,GAA8C;IAC9E,gBAAgB,EAAE,gBAAgB;IAClC,kBAAkB,EAAE,gBAAgB;CACrC,CAAC;AAEW,QAAA,qBAAqB,GAA8C;IAC9E,cAAc,EAAE,kBAAkB;IAClC,cAAc,EAAE,oBAAoB;CACrC,CAAC;AAEF,SAAgB,qBAAqB,CAAC,OAAsC,EAAE,GAAW;IAEvF,MAAM,SAAS,GAAG,6BAAqB,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QACnC,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;KAC3B;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;KACrB;IAED,MAAM,MAAM,GAAG,6BAAqB,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,MAAM,EAAE;QACV,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;KACxB;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAjBD,sDAiBC","file":"legacy.js","sourcesContent":["// FIXME: token 兼容策略，照目前的设计不应该硬编码。\n// 后续需要二选一：\n// - 主题模块指定唯一一套支持的 token（可以保留这段硬编码）\n// - 在默认主题中做声明式的兼容（需要删除这段硬编码，并在 IColorKey 中支持新属性）\n\nimport type { BuiltinColorPalette } from './builtin';\nimport type { ColorSchemeItem, IColorSchemeStruct } from './interface';\n\nexport const newTokenToLegacyToken: Record<keyof BuiltinColorPalette, string> = {\n primaryFontColor: 'titleFontColor',\n secondaryFontColor: 'labelFontColor'\n};\n\nexport const legacyTokenToNewToken: Record<string, keyof BuiltinColorPalette> = {\n titleFontColor: 'primaryFontColor',\n labelFontColor: 'secondaryFontColor'\n};\n\nexport function getUpgradedTokenValue(palette: IColorSchemeStruct['palette'], key: string): ColorSchemeItem {\n // 情况一：用户定义了包含旧 token 的新色板\n const legacyKey = newTokenToLegacyToken[key];\n if (legacyKey && palette[legacyKey]) {\n return palette[legacyKey];\n }\n // 情况二：默认情况，用户尝试取色（大部分情况下在此退出）\n if (palette[key]) {\n return palette[key];\n }\n // 情况三：用户没有取到颜色，判断用户是否在尝试用旧 token 取色\n const newKey = legacyTokenToNewToken[key];\n if (newKey) {\n return palette[newKey];\n }\n // 情况四：真的取不到颜色\n return undefined;\n}\n"]}

package/cjs/theme/color-scheme/util.js CHANGED Viewed

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getColorSchemeBySeries = exports.transformColorSchemeToStandardStruct = exports.isProgressiveDataColorScheme = exports.isColorKey = exports.getActualColor = exports.queryColorFromColorScheme = exports.computeActualDataScheme = exports.getDataScheme = void 0;
-const vutils_1 = require("@visactor/vutils"), color_1 = require("../../util/color"), spec_1 = require("../../series/util/spec");
+const vutils_1 = require("@visactor/vutils"), color_1 = require("../../util/color"), spec_1 = require("../../series/util/spec"), legacy_1 = require("./legacy");
 function getDataScheme(colorScheme, seriesSpec) {
     var _a;
@@ -33,10 +33,9 @@ function queryColorFromColorScheme(colorScheme, colorKey, seriesSpec) {
     if (!scheme) return;
     let color;
     const {palette: palette} = scheme;
-    if ((0, vutils_1.isObject)(palette) && (color = null !== (_a = palette[colorKey.key]) && void 0 !== _a ? _a : colorKey.default),
+    if ((0, vutils_1.isObject)(palette) && (color = null !== (_a = (0, legacy_1.getUpgradedTokenValue)(palette, colorKey.key)) && void 0 !== _a ? _a : colorKey.default),
     !color) return;
-    if (!(0, vutils_1.isValid)(colorKey.a) && !(0, vutils_1.isValid)(colorKey.l) || !(0,
-    vutils_1.isString)(color)) return color;
+    if ((0, vutils_1.isNil)(colorKey.a) && (0, vutils_1.isNil)(colorKey.l) || !(0, vutils_1.isString)(color)) return color;
     let c = new color_1.Color(color);
     if ((0, vutils_1.isValid)(colorKey.l)) {
         const {r: r, g: g, b: b} = c.color, {h: h, s: s} = vutils_1.ColorUtil.rgbToHsl(r, g, b), rgb = vutils_1.ColorUtil.hslToRgb(h, s, colorKey.l), newColor = new color_1.Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);
@@ -75,10 +74,10 @@ function getColorSchemeBySeries(colorScheme, seriesSpec) {
     var _a, _b;
     const {type: seriesType} = null != seriesSpec ? seriesSpec : {};
     let scheme;
-    if (seriesSpec && (0, vutils_1.isValid)(seriesType)) {
+    if (!seriesSpec || (0, vutils_1.isNil)(seriesType)) scheme = null == colorScheme ? void 0 : colorScheme.default; else {
         const direction = (0, spec_1.getDirectionFromSeriesSpec)(seriesSpec);
         scheme = null !== (_b = null !== (_a = null == colorScheme ? void 0 : colorScheme[`${seriesType}_${direction}`]) && void 0 !== _a ? _a : null == colorScheme ? void 0 : colorScheme[seriesType]) && void 0 !== _b ? _b : null == colorScheme ? void 0 : colorScheme.default;
-    } else scheme = null == colorScheme ? void 0 : colorScheme.default;
+    }
     return scheme;
 }

package/cjs/theme/color-scheme/util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/theme/color-scheme/util.ts"],"names":[],"mappings":";;;AAAA,~~6CAA+F~~;~~AAC/F~~,4CAAyC;AAWzC,iDAAoE;~~AAQpE~~,SAAgB,aAAa,CAC3B,WAA+B,EAC/B,UAAwB;;IAExB,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IACD,MAAM,MAAM,GAAG,sBAAsB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC/D,IAAI,CAAC,MAAM,IAAI,IAAA,gBAAO,EAAC,MAAM,CAAC,EAAE;QAE9B,OAAO,MAAC,MAA0E,mCAAI,EAAE,CAAC;KAC1F;SAAM,IAAI,IAAA,iBAAQ,EAAC,MAAM,CAAC,EAAE;QAE3B,MAAM,EAAE,UAAU,EAAE,GAAG,MAA4B,CAAC;QACpD,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,EAAE,CAAC;SACX;QAED,IAAI,4BAA4B,CAAC,UAAU,CAAC,EAAE;YAC5C,OAAO,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iCACzB,IAAI,KACP,MAAM,EAAE,IAAI,CAAC,MAAM;qBAChB,GAAG,CAAC,KAAK,CAAC,EAAE;oBACX,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;wBACrB,OAAO,yBAAyB,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;qBAClE;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC;qBACD,MAAM,CAAC,gBAAO,CAAC,IAClB,CAAC,CAAC;SACL;QAED,OAAO,UAAU;aACd,GAAG,CAAC,KAAK,CAAC,EAAE;YACX,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;gBACrB,OAAO,yBAAyB,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;aAClE;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;aACD,MAAM,CAAC,gBAAO,CAAC,CAAC;KACpB;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AA1CD,sCA0CC;AAQD,SAAgB,uBAAuB,CACrC,UAA2E,EAC3E,WAAkB;;IAElB,IAAI,4BAA4B,CAAC,UAAU,CAAC,EAAE;QAC5C,OAAO,CACL,MAAA,MAAA,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE;gBAC7B,IAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE;oBAChC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;iBACtC;gBACD,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;aAC3B;iBAAM,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,eAAe,CAAC,EAAE;gBACxC,OAAO,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,IAAI,CAAC,eAAe,CAAC;aACpD;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,0CAAE,MAAM,mCAAI,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CACvD,CAAC;KACH;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AApBD,0DAoBC;AASD,SAAgB,yBAAyB,CACvC,WAA8B,EAC9B,QAAmB,EACnB,UAAwB;;IAExB,MAAM,MAAM,GAAG,sBAAsB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC/D,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,KAAK,CAAC;IACV,MAAM,EAAE,OAAO,EAAE,GAAG,MAA4B,CAAC;IACjD,IAAI,IAAA,iBAAQ,EAAC,OAAO,CAAC,EAAE;QACrB,KAAK,GAAG,MAAA,OAAO,~~CAAC~~,QAAQ,CAAC,GAAG,CAAC,mCAAI,QAAQ,CAAC,OAAO,CAAC;~~KACnD~~;IACD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,CAAC,~~CAAC,~~IAAA,~~gBAAO~~,EAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,~~CAAC,~~IAAA,~~gBAAO~~,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;~~QACtE~~,OAAO,KAAK,CAAC;KACd;IACD,IAAI,CAAC,GAAG,IAAI,aAAK,CAAC,KAAK,CAAC,CAAC;IACzB,IAAI,IAAA,gBAAO,EAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACvB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC;QAC5B,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,kBAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,kBAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,aAAK,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAChE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC,GAAG,QAAQ,CAAC;KACd;IACD,IAAI,IAAA,gBAAO,EAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACvB,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;AACpB,CAAC;AAjCD,8DAiCC;AAGM,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,WAA+B,EAAE,UAAwB,EAAE,EAAE;IACtG,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;QACrB,IAAI,WAAW,EAAE;YACf,MAAM,KAAK,GAAG,yBAAyB,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YACxE,IAAI,KAAK,EAAE;gBACT,OAAO,KAAK,CAAC;aACd;SACF;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAVW,QAAA,cAAc,kBAUzB;AAEF,SAAgB,UAAU,CAAC,GAAQ;IACjC,OAAO,IAAA,iBAAQ,EAAC,GAAG,CAAC,IAAK,GAAiB,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAE,GAAiB,CAAC,GAAG,CAAC;AAC5F,CAAC;AAFD,gCAEC;AAED,SAAgB,4BAA4B,CAAI,GAAQ;IACtD,IAAI,CAAC,IAAA,gBAAO,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACtB,OAAO,IAAA,gBAAO,EAAE,IAAsC,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,oEAOC;AAGD,SAAgB,oCAAoC,CAAC,WAAwB;IAC3E,IAAI,IAAA,gBAAO,EAAC,WAAW,CAAC,EAAE;QACxB,OAAO;YACL,UAAU,EAAE,WAAW;SACxB,CAAC;KACH;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAPD,oFAOC;AAED,SAAgB,sBAAsB,CACpC,WAA+B,EAC/B,UAAwB;;IAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC;IAC9C,IAAI,MAA+B,CAAC;IACpC,IAAI,CAAC,UAAU,IAAI,~~CAAC,~~IAAA,~~gBAAO~~,EAAC,UAAU,CAAC,EAAE;~~QACvC~~,MAAM,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC;KAC/B;SAAM;QACL,MAAM,SAAS,GAAG,IAAA,iCAA0B,EAAC,UAAU,CAAC,CAAC;QACzD,MAAM,GAAG,MAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,GAAG,UAAU,IAAI,SAAS,EAAE,CAAC,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,UAAU,CAAC,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC;KAC3G;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,wDAaC","file":"util.js","sourcesContent":["import { isArray, isFunction, isObject, isString, isValid, ColorUtil } from '@visactor/vutils';\nimport { Color } from '../../util/color';\nimport type {\n ColorScheme,\n ColorSchemeItem,\n IColorKey,\n IColorSchemeStruct,\n IProgressiveDataSchemeCase,\n IThemeColorScheme,\n ProgressiveDataScheme\n} from './interface';\nimport type { ISeriesSpec } from '../../typings';\nimport { getDirectionFromSeriesSpec } from '../../series/util/spec';\n\n/*\n 从色板中获取数据色板（在此步骤中替换语义色值）\n * @param colorScheme\n * @param seriesType\n * @returns\n /\nexport function getDataScheme(\n colorScheme?: IThemeColorScheme,\n seriesSpec?: ISeriesSpec\n): Array<ColorSchemeItem> \| ProgressiveDataScheme<ColorSchemeItem> {\n if (!colorScheme) {\n return [];\n }\n const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);\n if (!scheme \|\| isArray(scheme)) {\n // 不带语义色板，直接输出\n return (scheme as Array<ColorSchemeItem> \| ProgressiveDataScheme<ColorSchemeItem>) ?? [];\n } else if (isObject(scheme)) {\n // 带语义色板，转换颜色后输出\n const { dataScheme } = scheme as IColorSchemeStruct;\n if (!dataScheme) {\n return [];\n }\n // 渐进式色板的情况\n if (isProgressiveDataColorScheme(dataScheme)) {\n return dataScheme.map(item => ({\n ...item,\n scheme: item.scheme\n .map(color => {\n if (isColorKey(color)) {\n return queryColorFromColorScheme(colorScheme, color, seriesSpec);\n }\n return color;\n })\n .filter(isValid)\n }));\n }\n // 普通色板的情况\n return dataScheme\n .map(color => {\n if (isColorKey(color)) {\n return queryColorFromColorScheme(colorScheme, color, seriesSpec);\n }\n return color;\n })\n .filter(isValid);\n }\n return [];\n}\n\n/\n 计算最终数据色板（在此步骤中获得渐进式色板的最终色板）\n * @param colorScheme\n * @param seriesType\n * @returns\n /\nexport function computeActualDataScheme(\n dataScheme: Array<ColorSchemeItem> \| ProgressiveDataScheme<ColorSchemeItem>,\n colorDomain: any[]\n): Array<ColorSchemeItem> {\n if (isProgressiveDataColorScheme(dataScheme)) {\n return (\n dataScheme.find(item => {\n if (isValid(item.isAvailable)) {\n if (isFunction(item.isAvailable)) {\n return item.isAvailable(colorDomain);\n }\n return !!item.isAvailable;\n } else if (isValid(item.maxDomainLength)) {\n return colorDomain?.length <= item.maxDomainLength;\n }\n return true;\n })?.scheme ?? dataScheme[dataScheme.length - 1].scheme\n );\n }\n return dataScheme;\n}\n\n/\n 根据色板和色值索引生成颜色\n * @param colorScheme\n * @param colorKey\n * @param seriesType\n * @returns\n /\nexport function queryColorFromColorScheme(\n colorScheme: IThemeColorScheme,\n colorKey: IColorKey,\n seriesSpec?: ISeriesSpec\n): ColorSchemeItem \| undefined {\n const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);\n if (!scheme) {\n return undefined;\n }\n let color;\n const { palette } = scheme as IColorSchemeStruct;\n if (isObject(palette)) {\n color = palette[colorKey.key] ?? colorKey.default;\n }\n if (!color) {\n return undefined;\n }\n if ((~~!isValid~~(colorKey.a) && ~~!isValid~~(colorKey.l)) \|\| !isString(color)) {\n return color;\n }\n let c = new Color(color);\n if (isValid(colorKey.l)) {\n const { r, g, b } = c.color;\n const { h, s } = ColorUtil.rgbToHsl(r, g, b);\n const rgb = ColorUtil.hslToRgb(h, s, colorKey.l);\n const newColor = new Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);\n newColor.setOpacity(c.color.opacity);\n c = newColor;\n }\n if (isValid(colorKey.a)) {\n c.setOpacity(colorKey.a);\n }\n return c.toRGBA();\n}\n\n/* 查询语义化颜色 /\nexport const getActualColor = (value: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec) => {\n if (isColorKey(value)) {\n if (colorScheme) {\n const color = queryColorFromColorScheme(colorScheme, value, seriesSpec);\n if (color) {\n return color;\n }\n }\n }\n return value;\n};\n\nexport function isColorKey(obj: any): obj is IColorKey {\n return isObject(obj) && (obj as IColorKey).type === 'palette' && !!(obj as IColorKey).key;\n}\n\nexport function isProgressiveDataColorScheme<T>(obj: any): obj is ProgressiveDataScheme<T> {\n if (!isArray(obj) \|\| obj.length === 0) {\n return false;\n }\n return obj.every(item => {\n return isValid((item as IProgressiveDataSchemeCase<T>).scheme);\n });\n}\n\n/* 将色板转化为标准形式 */\nexport function transformColorSchemeToStandardStruct(colorScheme: ColorScheme): IColorSchemeStruct {\n if (isArray(colorScheme)) {\n return {\n dataScheme: colorScheme\n };\n }\n return colorScheme;\n}\n\nexport function getColorSchemeBySeries(\n colorScheme?: IThemeColorScheme,\n seriesSpec?: ISeriesSpec\n): ColorScheme \| undefined {\n const { type: seriesType } = seriesSpec ?? {};\n let scheme: ColorScheme \| undefined;\n if (!seriesSpec \|\| ~~!isValid~~(seriesType)) {\n scheme = colorScheme?.default;\n } else {\n const direction = getDirectionFromSeriesSpec(seriesSpec);\n scheme = colorScheme?.[`${seriesType}_${direction}`] ?? colorScheme?.[seriesType] ?? colorScheme?.default;\n }\n return scheme;\n}\n"]}
1	+ {"version":3,"sources":["../src/theme/color-scheme/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isArray, isFunction, isObject, isString, isValid, ColorUtil, isNil } from '@visactor/vutils';\nimport { Color } from '../../util/color';\nimport type {\n ColorScheme,\n ColorSchemeItem,\n IColorKey,\n IColorSchemeStruct,\n IProgressiveDataSchemeCase,\n IThemeColorScheme,\n ProgressiveDataScheme\n} from './interface';\nimport type { ISeriesSpec } from '../../typings';\nimport { getDirectionFromSeriesSpec } from '../../series/util/spec';\nimport { getUpgradedTokenValue } from './legacy';\n\n/*\n 从色板中获取数据色板（在此步骤中替换语义色值）\n * @param colorScheme\n * @param seriesType\n * @returns\n /\nexport function getDataScheme(\n colorScheme?: IThemeColorScheme,\n seriesSpec?: ISeriesSpec\n): Array<ColorSchemeItem> \| ProgressiveDataScheme<ColorSchemeItem> {\n if (!colorScheme) {\n return [];\n }\n const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);\n if (!scheme \|\| isArray(scheme)) {\n // 不带语义色板，直接输出\n return (scheme as Array<ColorSchemeItem> \| ProgressiveDataScheme<ColorSchemeItem>) ?? [];\n } else if (isObject(scheme)) {\n // 带语义色板，转换颜色后输出\n const { dataScheme } = scheme as IColorSchemeStruct;\n if (!dataScheme) {\n return [];\n }\n // 渐进式色板的情况\n if (isProgressiveDataColorScheme(dataScheme)) {\n return dataScheme.map(item => ({\n ...item,\n scheme: item.scheme\n .map(color => {\n if (isColorKey(color)) {\n return queryColorFromColorScheme(colorScheme, color, seriesSpec);\n }\n return color;\n })\n .filter(isValid)\n }));\n }\n // 普通色板的情况\n return dataScheme\n .map(color => {\n if (isColorKey(color)) {\n return queryColorFromColorScheme(colorScheme, color, seriesSpec);\n }\n return color;\n })\n .filter(isValid);\n }\n return [];\n}\n\n/\n 计算最终数据色板（在此步骤中获得渐进式色板的最终色板）\n * @param colorScheme\n * @param seriesType\n * @returns\n /\nexport function computeActualDataScheme(\n dataScheme: Array<ColorSchemeItem> \| ProgressiveDataScheme<ColorSchemeItem>,\n colorDomain: any[]\n): Array<ColorSchemeItem> {\n if (isProgressiveDataColorScheme(dataScheme)) {\n return (\n dataScheme.find(item => {\n if (isValid(item.isAvailable)) {\n if (isFunction(item.isAvailable)) {\n return item.isAvailable(colorDomain);\n }\n return !!item.isAvailable;\n } else if (isValid(item.maxDomainLength)) {\n return colorDomain?.length <= item.maxDomainLength;\n }\n return true;\n })?.scheme ?? dataScheme[dataScheme.length - 1].scheme\n );\n }\n return dataScheme;\n}\n\n/\n 根据色板和色值索引生成颜色\n * @param colorScheme\n * @param colorKey\n * @param seriesType\n * @returns\n /\nexport function queryColorFromColorScheme(\n colorScheme: IThemeColorScheme,\n colorKey: IColorKey,\n seriesSpec?: ISeriesSpec\n): ColorSchemeItem \| undefined {\n const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);\n if (!scheme) {\n return undefined;\n }\n let color;\n const { palette } = scheme as IColorSchemeStruct;\n if (isObject(palette)) {\n color = getUpgradedTokenValue(palette, colorKey.key) ?? colorKey.default;\n }\n if (!color) {\n return undefined;\n }\n if ((isNil(colorKey.a) && isNil(colorKey.l)) \|\| !isString(color)) {\n return color;\n }\n let c = new Color(color);\n if (isValid(colorKey.l)) {\n const { r, g, b } = c.color;\n const { h, s } = ColorUtil.rgbToHsl(r, g, b);\n const rgb = ColorUtil.hslToRgb(h, s, colorKey.l);\n const newColor = new Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);\n newColor.setOpacity(c.color.opacity);\n c = newColor;\n }\n if (isValid(colorKey.a)) {\n c.setOpacity(colorKey.a);\n }\n return c.toRGBA();\n}\n\n/* 查询语义化颜色 /\nexport const getActualColor = (value: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec) => {\n if (isColorKey(value)) {\n if (colorScheme) {\n const color = queryColorFromColorScheme(colorScheme, value, seriesSpec);\n if (color) {\n return color;\n }\n }\n }\n return value;\n};\n\nexport function isColorKey(obj: any): obj is IColorKey {\n return isObject(obj) && (obj as IColorKey).type === 'palette' && !!(obj as IColorKey).key;\n}\n\nexport function isProgressiveDataColorScheme<T>(obj: any): obj is ProgressiveDataScheme<T> {\n if (!isArray(obj) \|\| obj.length === 0) {\n return false;\n }\n return obj.every(item => {\n return isValid((item as IProgressiveDataSchemeCase<T>).scheme);\n });\n}\n\n/* 将色板转化为标准形式 */\nexport function transformColorSchemeToStandardStruct(colorScheme: ColorScheme): IColorSchemeStruct {\n if (isArray(colorScheme)) {\n return {\n dataScheme: colorScheme\n };\n }\n return colorScheme;\n}\n\nexport function getColorSchemeBySeries(\n colorScheme?: IThemeColorScheme,\n seriesSpec?: ISeriesSpec\n): ColorScheme \| undefined {\n const { type: seriesType } = seriesSpec ?? {};\n let scheme: ColorScheme \| undefined;\n if (!seriesSpec \|\| isNil(seriesType)) {\n scheme = colorScheme?.default;\n } else {\n const direction = getDirectionFromSeriesSpec(seriesSpec);\n scheme = colorScheme?.[`${seriesType}_${direction}`] ?? colorScheme?.[seriesType] ?? colorScheme?.default;\n }\n return scheme;\n}\n"]}

package/esm/compile/compilable-base.js CHANGED Viewed

@@ -12,5 +12,4 @@ export class CompilableBase {
     release() {
         this._option = null;
     }
-}
-//# sourceMappingURL=compilable-base.js.map
+}

package/esm/compile/grammar-item.js CHANGED Viewed

@@ -45,4 +45,5 @@ export class GrammarItem extends CompilableBase {
         this.getCompiler().removeGrammarItem(this, reserveVGrammarModel), this._product = null,
         this._compiledProductId = null;
     }
-}
+}
+//# sourceMappingURL=grammar-item.js.map

package/esm/component/marker/mark-point/interface/spec.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import type { IPointLike } from '@visactor/vutils';
 import type { IComponent } from '../../../interface';
-import type { IDataPointSpec, IMarkerSpec, IMarkerSymbol } from '../../interface';
+import type { IDataPointSpec, IMarkerSpec } from '../../interface';
 import type { IMarkPointTheme } from './theme';
 export type IMarkPoint = IComponent;
-export type IMarkPointSpec = IMarkerSpec & (IMarkPointCoordinateSpec | IMarkPointPositionsSpec) & IMarkPointTheme<IMarkerSymbol>;
+export type IMarkPointSpec = IMarkerSpec & (IMarkPointCoordinateSpec | IMarkPointPositionsSpec) & IMarkPointTheme;
 export type IMarkPointCoordinateSpec = {
     coordinates: IDataPointSpec;
     relativeRelativeSeriesIndex?: number;

package/esm/component/marker/mark-point/interface/spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/component/marker/mark-point/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { IComponent } from '../../../interface';\nimport type { IDataPointSpec, IMarkerSpec, ~~IMarkerSymbol~~ } from '../../interface';\nimport type { IMarkPointTheme } from './theme';\n\nexport type IMarkPoint = IComponent;\n\nexport type IMarkPointSpec = IMarkerSpec &\n (\n \| IMarkPointCoordinateSpec // 标注目标：数据元素\n \| IMarkPointPositionsSpec\n ) &\n IMarkPointTheme~~<IMarkerSymbol>;~~ // 标注目标：任意位置\n\nexport type IMarkPointCoordinateSpec = {\n /*\n 指定数据点的参考线。基于指定数据点进行参考线的绘制，可以对数据点进行数据处理\n /\n coordinates: IDataPointSpec;\n /\n 被标注数据关联的series\n /\n relativeRelativeSeriesIndex?: number;\n relativeRelativeSeriesId?: string;\n};\n\n/\n 指定坐标点的参考线。基于指定坐标进行参考线的绘制\n */\nexport type IMarkPointPositionsSpec = {\n position: IPointLike;\n};\n"]}
1	+ {"version":3,"sources":["../src/component/marker/mark-point/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { IComponent } from '../../../interface';\nimport type { IDataPointSpec, IMarkerSpec } from '../../interface';\nimport type { IMarkPointTheme } from './theme';\n\nexport type IMarkPoint = IComponent;\n\nexport type IMarkPointSpec = IMarkerSpec &\n (\n \| IMarkPointCoordinateSpec // 标注目标：数据元素\n \| IMarkPointPositionsSpec\n ) &\n IMarkPointTheme; // 标注目标：任意位置\n\nexport type IMarkPointCoordinateSpec = {\n /*\n 指定数据点的参考线。基于指定数据点进行参考线的绘制，可以对数据点进行数据处理\n /\n coordinates: IDataPointSpec;\n /\n 被标注数据关联的series\n /\n relativeRelativeSeriesIndex?: number;\n relativeRelativeSeriesId?: string;\n};\n\n/\n 指定坐标点的参考线。基于指定坐标进行参考线的绘制\n */\nexport type IMarkPointPositionsSpec = {\n position: IPointLike;\n};\n"]}

package/esm/component/marker/mark-point/interface/theme.d.ts CHANGED Viewed

@@ -18,20 +18,20 @@ export interface IItemContent extends IMarkerRef {
         style?: IRichTextGraphicAttribute;
     };
 }
-export type IItemLine<T extends Partial<IMarkerSymbol> = IMarkerSymbol> = {
+export type IItemLine = {
     type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';
     visible?: boolean;
     decorativeLine?: {
         visible?: boolean;
         length?: number;
     };
-    startSymbol?: T;
-    endSymbol?: T;
+    startSymbol?: IMarkerSymbol;
+    endSymbol?: IMarkerSymbol;
     line?: {
         style?: Omit<ILineMarkSpec, 'visible'>;
     };
 };
-export interface IMarkPointTheme<T extends Partial<IMarkerSymbol> = Partial<IMarkerSymbol>> {
-    itemLine?: IItemLine<T>;
+export interface IMarkPointTheme {
+    itemLine?: IItemLine;
     itemContent?: IItemContent;
 }

package/esm/component/marker/mark-point/interface/theme.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/component/marker/mark-point/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { IImageGraphicAttribute, IRichTextGraphicAttribute } from '@visactor/vrender-core';\nimport type { IMarkPointItemPosition } from '@visactor/vrender-components';\nimport type { ILineMarkSpec, ISymbolMarkSpec } from '../../../../typings';\nimport type { IMarkerLabelSpec, IMarkerRef, IMarkerSymbol } from '../../interface';\n\nexport interface IItemContent extends IMarkerRef {\n /*\n 标注类型\n /\n type?: 'symbol' \| 'text' \| 'image' \| 'richText';\n /\n 标注内容相对于定位点的位置\n /\n position?: IMarkPointItemPosition;\n /\n x 方向偏移量\n /\n offsetX?: number;\n /\n y 方向偏移量\n /\n offsetY?: number;\n /\n type为symbol时, symbol的样式\n /\n symbol?: {\n style?: ISymbolMarkSpec;\n };\n /\n type为image时, image的样式\n /\n image?: {\n style?: IImageGraphicAttribute;\n };\n /\n type为text时, text的样式\n /\n text?: IMarkerLabelSpec;\n /\n type为rich text时, rich text的样式\n /\n richText?: {\n style?: IRichTextGraphicAttribute;\n };\n}\n\nexport type IItemLine<T ~~extends Partial<IMarkerSymbol>~~ = ~~IMarkerSymbol> =~~ {\n /* TODO：'type-opo' /\n /\n 引导线类型\n * 'type-s'表示起点和终点直接连线; 'type-do'表示包含一个折点，且折点x坐标为起点到终点的 1/2 x坐标，折点y坐标为起点y坐标；'type-op' 表示包含一个折点，且折点x坐标为起点x坐标，折点y坐标为终点y坐标；'type-po' 表示包含一个折点，且折点x坐标为终点x坐标，折点y坐标为起点y坐标\n * 引导线类型的具体形式参考：https://journals.sagepub.com/doi/10.1177/1473871618799500\n /\n type?: 'type-s' \| 'type-do' \| 'type-po' \| 'type-op';\n /\n 引导线可见性\n /\n visible?: boolean;\n /\n 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n /\n decorativeLine?: {\n /\n 装饰线可见性\n /\n visible?: boolean;\n /\n 装饰线的长度\n /\n length?: number;\n };\n /\n 引导线起点symbol样式\n /\n startSymbol?: T;\n /\n 引导线终点symbol样式\n /\n endSymbol?: T;\n /\n 引导线样式\n /\n line?: {\n style?: Omit<ILineMarkSpec, 'visible'>;\n };\n};\n\nexport interface IMarkPointTheme<T ~~extends Partial<IMarkerSymbol> = Partial<IMarkerSymbol>>~~ {\n /\n 标注引导线\n /\n itemLine?: IItemLine~~<T>;\~~n\n /\n 标注内容\n */\n itemContent?: IItemContent;\n}\n"]}
1	+ {"version":3,"sources":["../src/component/marker/mark-point/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { IImageGraphicAttribute, IRichTextGraphicAttribute } from '@visactor/vrender-core';\nimport type { IMarkPointItemPosition } from '@visactor/vrender-components';\nimport type { ILineMarkSpec, ISymbolMarkSpec } from '../../../../typings';\nimport type { IMarkerLabelSpec, IMarkerRef, IMarkerSymbol } from '../../interface';\n\nexport interface IItemContent extends IMarkerRef {\n /*\n 标注类型\n /\n type?: 'symbol' \| 'text' \| 'image' \| 'richText';\n /\n 标注内容相对于定位点的位置\n /\n position?: IMarkPointItemPosition;\n /\n x 方向偏移量\n /\n offsetX?: number;\n /\n y 方向偏移量\n /\n offsetY?: number;\n /\n type为symbol时, symbol的样式\n /\n symbol?: {\n style?: ISymbolMarkSpec;\n };\n /\n type为image时, image的样式\n /\n image?: {\n style?: IImageGraphicAttribute;\n };\n /\n type为text时, text的样式\n /\n text?: IMarkerLabelSpec;\n /\n type为rich text时, rich text的样式\n /\n richText?: {\n style?: IRichTextGraphicAttribute;\n };\n}\n\nexport type IItemLine = {\n /* TODO：'type-opo' /\n /\n 引导线类型\n * 'type-s'表示起点和终点直接连线; 'type-do'表示包含一个折点，且折点x坐标为起点到终点的 1/2 x坐标，折点y坐标为起点y坐标；'type-op' 表示包含一个折点，且折点x坐标为起点x坐标，折点y坐标为终点y坐标；'type-po' 表示包含一个折点，且折点x坐标为终点x坐标，折点y坐标为起点y坐标\n * 引导线类型的具体形式参考：https://journals.sagepub.com/doi/10.1177/1473871618799500\n /\n type?: 'type-s' \| 'type-do' \| 'type-po' \| 'type-op';\n /\n 引导线可见性\n /\n visible?: boolean;\n /\n 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n /\n decorativeLine?: {\n /\n 装饰线可见性\n /\n visible?: boolean;\n /\n 装饰线的长度\n /\n length?: number;\n };\n /\n 引导线起点symbol样式\n /\n startSymbol?: IMarkerSymbol;\n /\n 引导线终点symbol样式\n /\n endSymbol?: IMarkerSymbol;\n /\n 引导线样式\n /\n line?: {\n style?: Omit<ILineMarkSpec, 'visible'>;\n };\n};\n\nexport interface IMarkPointTheme {\n /\n 标注引导线\n /\n itemLine?: IItemLine;\n\n /\n 标注内容\n */\n itemContent?: IItemContent;\n}\n"]}

package/esm/component/tooltip/handler/dom/model/content-column-model.js CHANGED Viewed

@@ -51,12 +51,14 @@ export class ContentColumnModel extends BaseTooltipModel {
             if ("key-box" === this.className) {
                 const {key: key, isKeyAdaptive: isKeyAdaptive} = line;
                 childStyle = mergeSpec({}, isKeyAdaptive ? defaultAdaptiveKeyStyle : defaultKeyStyle, Object.assign(Object.assign({
-                    height: getPixelPropertyStr(contentAttributes[i].height)
+                    height: getPixelPropertyStr(contentAttributes[i].height),
+                    overflowWrap: "normal"
                 }, tooltipStyle.keyColumn.common), null === (_a = tooltipStyle.keyColumn.items) || void 0 === _a ? void 0 : _a[i]));
                 isString(key) && "" !== (null === (_b = null == key ? void 0 : key.trim) || void 0 === _b ? void 0 : _b.call(key)) || isNumber(key) || childStyle.visibility ? childStyle.visibility = "visible" : childStyle.visibility = "hidden",
                 this.children[i].setStyle(childStyle);
             } else "value-box" === this.className ? (childStyle = mergeSpec({}, defaultValueStyle, Object.assign(Object.assign({
-                height: getPixelPropertyStr(contentAttributes[i].height)
+                height: getPixelPropertyStr(contentAttributes[i].height),
+                overflowWrap: "normal"
             }, tooltipStyle.valueColumn.common), null === (_c = tooltipStyle.valueColumn.items) || void 0 === _c ? void 0 : _c[i])),
             this.children[i].setStyle(childStyle)) : "shape-box" === this.className && (childStyle = mergeSpec({}, defaultShapeStyle, Object.assign(Object.assign({
                 height: getPixelPropertyStr(contentAttributes[i].height + contentAttributes[i].spaceRow)

package/esm/component/tooltip/handler/dom/model/content-column-model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/component/tooltip/handler/dom/model/content-column-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAIhE,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;IAGtD,YACE,MAAsC,EACtC,MAA2B,EAC3B,SAA4B,EAC5B,UAAmB;QAEnB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,IAAI;;QACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;SAC5D;QACD,MAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,0CAAE,OAAO,mCAAI,EAAE,CAAC;QAErE,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,SAAS,CAAC,EAAE;YAEzF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACvC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;SACJ;aAAM;YAEL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACvC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACxB,IAAI,CAAC,IAAI,aAAa,CAAC,MAAM,EAAE;oBAC7B,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;oBAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;iBACzB;YACH,CAAC,CAAC,CAAC;YAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;oBACrB,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;wBAClE,MAAM,IAAI,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;wBAC3D,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;wBACxF,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;qBACzB;yBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;wBACzC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;wBAC7D,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;wBACxC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;qBAC1B;iBACF;aACF;SACF;IACH,CAAC;IAED,QAAQ;;QACN,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAEpD,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,yBAAyB,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;QAE9G,MAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,0CAAE,OAAO,mCAAI,EAAE,CAAC;QACrE,MAAM,iBAAiB,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,0CAAE,OAAO,mCAAI,EAAE,CAAC;QAC7E,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;;YAChC,IAAI,UAAU,GAAQ,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;gBAChC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;gBACpC,UAAU,GAAG,SAAS,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,eAAe,gCAClF,MAAM,EAAE,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IACrD,YAAY,CAAC,SAAS,CAAC,MAAM,GAC7B,MAAA,YAAY,CAAC,SAAS,CAAC,KAAK,0CAAG,CAAC,CAAC,EACpC,CAAC;gBACH,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mDAAI,MAAK,EAAE,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC5E,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;oBACzC,UAAU,CAAC,UAAU,GAAG,QAAQ,CAAC;iBAClC;qBAAM;oBACL,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;iBACnC;gBACA,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;aACtD;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;gBACzC,UAAU,GAAG,SAAS,CAAC,EAAE,EAAE,iBAAiB,gCAC1C,MAAM,EAAE,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IACrD,YAAY,CAAC,WAAW,CAAC,MAAM,GAC/B,MAAA,YAAY,CAAC,WAAW,CAAC,KAAK,0CAAG,CAAC,CAAC,EACtC,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;aACtD;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;gBACzC,UAAU,GAAG,SAAS,CAAC,EAAE,EAAE,iBAAiB,gCAC1C,MAAM,EAAE,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IACrF,YAAY,CAAC,WAAW,CAAC,MAAM,GAC/B,MAAA,YAAY,CAAC,WAAW,CAAC,KAAK,0CAAG,CAAC,CAAC,EACtC,CAAC;gBACH,MAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAgB,0CAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;aAC1F;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU;;QACR,MAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,0CAAE,OAAO,mCAAI,EAAE,CAAC;QACrE,MAAM,iBAAiB,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,0CAAE,OAAO,mCAAI,EAAE,CAAC;QAC7E,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;;YAChC,IAAI,YAAiB,CAAC;YACtB,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;gBAChC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC;gBAC5B,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,0DAAI,MAAK,EAAE,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE;oBACjF,YAAY,GAAG,UAAU,CAAC;iBAC3B;qBAAM;oBACL,YAAY,GAAG,oBAAoB,CAAC;iBACrC;gBACD,MAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAe,0CAAE,UAAU,CAAC,YAAY,EAAE,MAAA,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAAG,0CAAE,SAAS,CAAC,CAAC;aAChG;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;gBACzC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,4DAAI,MAAK,EAAE,CAAC,IAAI,QAAQ,CAAC,YAAY,CAAC,EAAE;oBACvF,YAAY,GAAG,YAAY,CAAC;iBAC7B;qBAAM;oBACL,YAAY,GAAG,oBAAoB,CAAC;iBACrC;gBACD,MAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAe,0CAAE,UAAU,CAAC,YAAY,EAAE,MAAA,iBAAiB,CAAC,CAAC,CAAC,CAAC,KAAK,0CAAE,SAAS,CAAC,CAAC;aAClG;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;gBACzC,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChD,MAAA,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,0CAAE,UAAU,CAAC,YAAY,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,sBAAsB;;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAEpD,QAAQ,IAAI,CAAC,SAAS,EAAE;YACtB,KAAK,WAAW;gBACd,MAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,0CAAE,OAAO,mCAAI,EAAE,CAAC;gBACrE,uCACK,YAAY,CAAC,WAAW,GACxB,CAAC,IAAI,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,SAAS,CAAC;oBACvF,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE;oBACrB,CAAC,CAAC,EAAE,CAAC,EACP;YACJ,KAAK,SAAS;gBACZ,OAAO,YAAY,CAAC,SAAS,CAAC;YAChC,KAAK,WAAW;gBACd,OAAO,YAAY,CAAC,WAAW,CAAC;SACnC;IACH,CAAC;IAES,kBAAkB,CAAC,IAAwB,EAAE,KAAa;;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,WAAW,mCACZ,YAAY,CAAC,WAAW,GACxB,MAAA,YAAY,CAAC,WAAW,CAAC,KAAK,0CAAG,KAAK,CAAC,CAC3C,CAAC;QACF,MAAM,SAAS,mCACV,YAAY,CAAC,SAAS,GACtB,MAAA,YAAY,CAAC,SAAS,CAAC,KAAK,0CAAG,KAAK,CAAC,CACzC,CAAC;QACF,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,IAAI,EAAE,MAAA,IAAI,CAAC,SAAS,mCAAI,IAAI,CAAC,UAAU;YACvC,MAAM,EAAE,IAAI,CAAC,WAAW;YACxB,SAAS,EAAE,IAAI,CAAC,cAAc;YAC9B,MAAM,EAAE,IAAI,CAAC,WAAW;YACxB,SAAS,EAAE,SAAS,MAAA,MAAA,SAAS,CAAC,UAAU,mCAAI,SAAS,CAAC,QAAQ,mCAAI,MAAM,MAAM,MAAA,WAAW,CAAC,KAAK,mCAAI,KAAK,QAAQ;SAC9F,CAAC;IACvB,CAAC;CACF","file":"content-column-model.js","sourcesContent":["import { isNumber, isString, toNumber } from '@visactor/vutils';\nimport {\n defaultKeyStyle,\n defaultContentColumnStyle,\n defaultValueStyle,\n defaultAdaptiveKeyStyle,\n defaultShapeStyle\n} from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport type { ITooltipModelOption } from './interface';\nimport type { IShapeSvgOption } from './shape-model';\n// eslint-disable-next-line no-duplicate-imports\nimport { ShapeModel } from './shape-model';\nimport { TextModel } from './text-model';\nimport { TOOLTIP_EMPTY_STRING } from '../../constants';\nimport { getPixelPropertyStr } from '../util';\nimport type { IToolTipLineActual } from '../../../../../typings';\nimport { mergeSpec } from '../../../../../util/spec/merge-spec';\n\nexport type ContentColumnType = 'shape-box' \| 'key-box' \| 'value-box';\n\nexport class ContentColumnModel extends BaseTooltipModel {\n readonly className: ContentColumnType;\n\n constructor(\n parent: BaseTooltipModel \| HTMLElement,\n option: ITooltipModelOption,\n className: ContentColumnType,\n childIndex?: number\n ) {\n super(parent, option, childIndex);\n this.className = className;\n }\n\n init(): void {\n if (!this.product) {\n this.product = this.createElement('div', [this.className]);\n }\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n\n if (this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)) {\n // 当有一行配有形状的时候，其他行要对齐。如果没有一行配有形状，则删除所有的行\n Object.keys(this.children).forEach(key => {\n const i = toNumber(key);\n this.children[i].release();\n delete this.children[i];\n });\n } else {\n // 删除多余的行\n Object.keys(this.children).forEach(key => {\n const i = toNumber(key);\n if (i >= renderContent.length) {\n this.children[i].release();\n delete this.children[i];\n }\n });\n // 新增没有的行\n for (let i = 0; i < renderContent.length; i++) {\n if (!this.children[i]) {\n if (this.className === 'key-box' \|\| this.className === 'value-box') {\n const text = new TextModel(this.product!, this._option, i);\n text.init([this.className.substring(0, this.className.indexOf('-'))], undefined, 'div');\n this.children[i] = text;\n } else if (this.className === 'shape-box') {\n const shape = new ShapeModel(this.product!, this._option, i);\n shape.init(['shape'], undefined, 'div');\n this.children[i] = shape;\n }\n }\n }\n }\n }\n\n setStyle() {\n const tooltipStyle = this._option.getTooltipStyle();\n\n super.setStyle(mergeSpec({}, defaultContentColumnStyle, tooltipStyle.content, this._getContentColumnStyle()));\n\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n renderContent.forEach((line, i) => {\n let childStyle: any = {};\n if (this.className === 'key-box') {\n const { key, isKeyAdaptive } = line;\n childStyle = mergeSpec({}, isKeyAdaptive ? defaultAdaptiveKeyStyle : defaultKeyStyle, {\n height: getPixelPropertyStr(contentAttributes[i].height),\n ...tooltipStyle.keyColumn.common,\n ...tooltipStyle.keyColumn.items?.[i]\n });\n const hasContent = (isString(key) && key?.trim?.() !== '') \|\| isNumber(key);\n if (!hasContent && !childStyle.visibility) {\n childStyle.visibility = 'hidden';\n } else {\n childStyle.visibility = 'visible';\n }\n (this.children[i] as TextModel).setStyle(childStyle);\n } else if (this.className === 'value-box') {\n childStyle = mergeSpec({}, defaultValueStyle, {\n height: getPixelPropertyStr(contentAttributes[i].height),\n ...tooltipStyle.valueColumn.common,\n ...tooltipStyle.valueColumn.items?.[i]\n });\n (this.children[i] as TextModel).setStyle(childStyle);\n } else if (this.className === 'shape-box') {\n childStyle = mergeSpec({}, defaultShapeStyle, {\n height: getPixelPropertyStr(contentAttributes[i].height + contentAttributes[i].spaceRow),\n ...tooltipStyle.shapeColumn.common,\n ...tooltipStyle.shapeColumn.items?.[i]\n });\n (this.children[i] as ShapeModel)?.setStyle(childStyle, this._getShapeSvgOption(line, i));\n }\n });\n }\n\n setContent(): void {\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n renderContent.forEach((line, i) => {\n let childContent: any;\n if (this.className === 'key-box') {\n const keyContent = line.key;\n if ((isString(keyContent) && keyContent?.trim?.() !== '') \|\| isNumber(keyContent)) {\n childContent = keyContent;\n } else {\n childContent = TOOLTIP_EMPTY_STRING;\n }\n (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].key?.multiLine);\n } else if (this.className === 'value-box') {\n const valueContent = line.value;\n if ((isString(valueContent) && valueContent?.trim?.() !== '') \|\| isNumber(valueContent)) {\n childContent = valueContent;\n } else {\n childContent = TOOLTIP_EMPTY_STRING;\n }\n (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].value?.multiLine);\n } else if (this.className === 'shape-box') {\n childContent = this._getShapeSvgOption(line, i);\n this.children[i]?.setContent(childContent);\n }\n });\n }\n\n protected _getContentColumnStyle() {\n const tooltipStyle = this._option.getTooltipStyle();\n\n switch (this.className) {\n case 'shape-box':\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n return {\n ...tooltipStyle.shapeColumn,\n ...(this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)\n ? { display: 'none' }\n : {})\n };\n case 'key-box':\n return tooltipStyle.keyColumn;\n case 'value-box':\n return tooltipStyle.valueColumn;\n }\n }\n\n protected _getShapeSvgOption(line: IToolTipLineActual, index: number): IShapeSvgOption {\n const tooltipStyle = this._option.getTooltipStyle();\n const shapeColumn = {\n ...tooltipStyle.shapeColumn,\n ...tooltipStyle.shapeColumn.items?.[index]\n };\n const keyColumn = {\n ...tooltipStyle.keyColumn,\n ...tooltipStyle.keyColumn.items?.[index]\n };\n return {\n hasShape: line.hasShape,\n symbolType: line.shapeType,\n size: shapeColumn.width,\n fill: line.shapeFill ?? line.shapeColor,\n stroke: line.shapeStroke,\n lineWidth: line.shapeLineWidth,\n hollow: line.shapeHollow,\n marginTop: `calc((${keyColumn.lineHeight ?? keyColumn.fontSize ?? '18px'} - ${shapeColumn.width ?? '8px'}) / 2)`\n } as IShapeSvgOption;\n }\n}\n"]}
1	+ {"version":3,"sources":["../src/component/tooltip/handler/dom/model/content-column-model.ts"],"names":[],"mappings":"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","file":"content-column-model.js","sourcesContent":["import { isNumber, isString, toNumber } from '@visactor/vutils';\nimport {\n defaultKeyStyle,\n defaultContentColumnStyle,\n defaultValueStyle,\n defaultAdaptiveKeyStyle,\n defaultShapeStyle\n} from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport type { ITooltipModelOption } from './interface';\nimport type { IShapeSvgOption } from './shape-model';\n// eslint-disable-next-line no-duplicate-imports\nimport { ShapeModel } from './shape-model';\nimport { TextModel } from './text-model';\nimport { TOOLTIP_EMPTY_STRING } from '../../constants';\nimport { getPixelPropertyStr } from '../util';\nimport type { IToolTipLineActual } from '../../../../../typings';\nimport { mergeSpec } from '../../../../../util/spec/merge-spec';\n\nexport type ContentColumnType = 'shape-box' \| 'key-box' \| 'value-box';\n\nexport class ContentColumnModel extends BaseTooltipModel {\n readonly className: ContentColumnType;\n\n constructor(\n parent: BaseTooltipModel \| HTMLElement,\n option: ITooltipModelOption,\n className: ContentColumnType,\n childIndex?: number\n ) {\n super(parent, option, childIndex);\n this.className = className;\n }\n\n init(): void {\n if (!this.product) {\n this.product = this.createElement('div', [this.className]);\n }\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n\n if (this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)) {\n // 当有一行配有形状的时候，其他行要对齐。如果没有一行配有形状，则删除所有的行\n Object.keys(this.children).forEach(key => {\n const i = toNumber(key);\n this.children[i].release();\n delete this.children[i];\n });\n } else {\n // 删除多余的行\n Object.keys(this.children).forEach(key => {\n const i = toNumber(key);\n if (i >= renderContent.length) {\n this.children[i].release();\n delete this.children[i];\n }\n });\n // 新增没有的行\n for (let i = 0; i < renderContent.length; i++) {\n if (!this.children[i]) {\n if (this.className === 'key-box' \|\| this.className === 'value-box') {\n const text = new TextModel(this.product!, this._option, i);\n text.init([this.className.substring(0, this.className.indexOf('-'))], undefined, 'div');\n this.children[i] = text;\n } else if (this.className === 'shape-box') {\n const shape = new ShapeModel(this.product!, this._option, i);\n shape.init(['shape'], undefined, 'div');\n this.children[i] = shape;\n }\n }\n }\n }\n }\n\n setStyle() {\n const tooltipStyle = this._option.getTooltipStyle();\n\n super.setStyle(mergeSpec({}, defaultContentColumnStyle, tooltipStyle.content, this._getContentColumnStyle()));\n\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n renderContent.forEach((line, i) => {\n let childStyle: any = {};\n if (this.className === 'key-box') {\n const { key, isKeyAdaptive } = line;\n childStyle = mergeSpec({}, isKeyAdaptive ? defaultAdaptiveKeyStyle : defaultKeyStyle, {\n height: getPixelPropertyStr(contentAttributes[i].height),\n overflowWrap: 'normal', // 覆盖外界对此属性的预先配置\n ...tooltipStyle.keyColumn.common,\n ...tooltipStyle.keyColumn.items?.[i]\n } as Partial<CSSStyleDeclaration>);\n const hasContent = (isString(key) && key?.trim?.() !== '') \|\| isNumber(key);\n if (!hasContent && !childStyle.visibility) {\n childStyle.visibility = 'hidden';\n } else {\n childStyle.visibility = 'visible';\n }\n (this.children[i] as TextModel).setStyle(childStyle);\n } else if (this.className === 'value-box') {\n childStyle = mergeSpec({}, defaultValueStyle, {\n height: getPixelPropertyStr(contentAttributes[i].height),\n overflowWrap: 'normal', // 覆盖外界对此属性的预先配置\n ...tooltipStyle.valueColumn.common,\n ...tooltipStyle.valueColumn.items?.[i]\n } as Partial<CSSStyleDeclaration>);\n (this.children[i] as TextModel).setStyle(childStyle);\n } else if (this.className === 'shape-box') {\n childStyle = mergeSpec({}, defaultShapeStyle, {\n height: getPixelPropertyStr(contentAttributes[i].height + contentAttributes[i].spaceRow),\n ...tooltipStyle.shapeColumn.common,\n ...tooltipStyle.shapeColumn.items?.[i]\n });\n (this.children[i] as ShapeModel)?.setStyle(childStyle, this._getShapeSvgOption(line, i));\n }\n });\n }\n\n setContent(): void {\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n renderContent.forEach((line, i) => {\n let childContent: any;\n if (this.className === 'key-box') {\n const keyContent = line.key;\n if ((isString(keyContent) && keyContent?.trim?.() !== '') \|\| isNumber(keyContent)) {\n childContent = keyContent;\n } else {\n childContent = TOOLTIP_EMPTY_STRING;\n }\n (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].key?.multiLine);\n } else if (this.className === 'value-box') {\n const valueContent = line.value;\n if ((isString(valueContent) && valueContent?.trim?.() !== '') \|\| isNumber(valueContent)) {\n childContent = valueContent;\n } else {\n childContent = TOOLTIP_EMPTY_STRING;\n }\n (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].value?.multiLine);\n } else if (this.className === 'shape-box') {\n childContent = this._getShapeSvgOption(line, i);\n this.children[i]?.setContent(childContent);\n }\n });\n }\n\n protected _getContentColumnStyle() {\n const tooltipStyle = this._option.getTooltipStyle();\n\n switch (this.className) {\n case 'shape-box':\n const renderContent = this._option.getTooltipActual()?.content ?? [];\n return {\n ...tooltipStyle.shapeColumn,\n ...(this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)\n ? { display: 'none' }\n : {})\n };\n case 'key-box':\n return tooltipStyle.keyColumn;\n case 'value-box':\n return tooltipStyle.valueColumn;\n }\n }\n\n protected _getShapeSvgOption(line: IToolTipLineActual, index: number): IShapeSvgOption {\n const tooltipStyle = this._option.getTooltipStyle();\n const shapeColumn = {\n ...tooltipStyle.shapeColumn,\n ...tooltipStyle.shapeColumn.items?.[index]\n };\n const keyColumn = {\n ...tooltipStyle.keyColumn,\n ...tooltipStyle.keyColumn.items?.[index]\n };\n return {\n hasShape: line.hasShape,\n symbolType: line.shapeType,\n size: shapeColumn.width,\n fill: line.shapeFill ?? line.shapeColor,\n stroke: line.shapeStroke,\n lineWidth: line.shapeLineWidth,\n hollow: line.shapeHollow,\n marginTop: `calc((${keyColumn.lineHeight ?? keyColumn.fontSize ?? '18px'} - ${shapeColumn.width ?? '8px'}) / 2)`\n } as IShapeSvgOption;\n }\n}\n"]}

package/esm/component/tooltip/handler/dom/util.js CHANGED Viewed

@@ -77,8 +77,8 @@ function getLabelStyle(labelStyle, defaultStyle) {
     return styleObj.fontFamily = labelFont, styleObj.fontSize = getPixelPropertyStr(labelFontSize),
     styleObj.color = labelColor, styleObj.textAlign = textAlign, styleObj.lineHeight = getPixelPropertyStr(lineHeight),
     styleObj.fontWeight = fontWeight, styleObj.whiteSpace = multiLine ? "initial" : "nowrap",
-    styleObj.wordBreak = wordBreak, styleObj.maxWidth = getPixelPropertyStr(maxWidth),
-    styleObj;
+    styleObj.wordBreak = multiLine ? null != wordBreak ? wordBreak : "break-word" : "normal",
+    styleObj.maxWidth = getPixelPropertyStr(maxWidth), styleObj;
 }
 function getShapeStyle(shapeStyle, defaultStyle) {