diff --git a/packages/vchart-schema/vchart.json b/packages/vchart-schema/vchart.json index ce6f28426d..61c54d2dc3 100644 --- a/packages/vchart-schema/vchart.json +++ b/packages/vchart-schema/vchart.json @@ -18364,7 +18364,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -19764,7 +19764,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -20555,7 +20555,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -21632,7 +21632,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -22316,7 +22316,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -23557,7 +23557,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -25248,7 +25248,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -25632,7 +25632,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -26080,7 +26080,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -26565,7 +26565,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -27968,9 +27968,6 @@ "series": { "items": { "anyOf": [ - { - "$ref": "#/definitions/IAreaSeriesSpec" - }, { "$ref": "#/definitions/IBarSeriesSpec" }, @@ -29235,7 +29232,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -29687,7 +29684,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -30505,6 +30502,7 @@ "arc", "area", "boxPlot", + "group", "image", "line", "linkPath", @@ -30523,7 +30521,6 @@ "arc", "area", "boxPlot", - "group", "image", "line", "linkPath", @@ -30786,7 +30783,7 @@ "description": "模块绝对布局下,与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效" }, "type": { - "$ref": "#/definitions/ICustomMarkSpec.T_1" + "$ref": "#/definitions/ICustomMarkSpec.T" }, "visible": { "description": "mark 层 是否显示配置", @@ -32823,7 +32820,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -33762,7 +33759,7 @@ "description": "模块绝对布局下,与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效" }, "type": { - "$ref": "#/definitions/ICustomMarkSpec.T" + "$ref": "#/definitions/ICustomMarkSpec.T_1" }, "visible": { "description": "mark 层 是否显示配置", @@ -34121,7 +34118,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -34871,7 +34868,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -35382,7 +35379,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -35944,7 +35941,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -36433,7 +36430,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -39828,7 +39825,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -40820,7 +40817,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -41373,7 +41370,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -44515,7 +44512,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -45876,7 +45873,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -46476,7 +46473,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -46885,7 +46882,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -47127,7 +47124,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -48893,7 +48890,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -49279,7 +49276,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -51999,7 +51996,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52007,7 +52004,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52027,7 +52024,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52035,11 +52032,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52047,7 +52044,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52063,7 +52060,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52071,7 +52068,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52091,7 +52088,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52099,11 +52096,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52111,7 +52108,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52127,7 +52124,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52135,7 +52132,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52155,7 +52152,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52163,11 +52160,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52175,7 +52172,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52191,7 +52188,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52199,7 +52196,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52219,7 +52216,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52227,11 +52224,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52239,7 +52236,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52255,7 +52252,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52263,7 +52260,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52283,7 +52280,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52291,11 +52288,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52303,7 +52300,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec_1", + "$ref": "#/definitions/ConvertToMarkStyleSpec", "description": "style格式转换" }, { @@ -52324,7 +52321,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52332,7 +52329,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52348,7 +52345,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52356,11 +52353,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52368,7 +52365,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52384,7 +52381,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52392,7 +52389,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52408,7 +52405,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52416,11 +52413,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52428,7 +52425,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52444,7 +52441,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52452,7 +52449,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52468,7 +52465,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52476,11 +52473,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52488,7 +52485,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52504,7 +52501,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52512,7 +52509,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52528,7 +52525,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52536,11 +52533,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52548,7 +52545,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52564,7 +52561,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52572,7 +52569,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52588,7 +52585,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52596,11 +52593,11 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -52608,7 +52605,7 @@ "description": "style格式转换" }, { - "$ref": "#/definitions/ConvertToMarkStyleSpec", + "$ref": "#/definitions/ConvertToMarkStyleSpec_1", "description": "style格式转换" }, { @@ -54496,7 +54493,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -55001,7 +54998,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -57384,7 +57381,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -57918,7 +57915,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -58443,7 +58440,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -59493,7 +59490,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -60011,7 +60008,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -61104,7 +61101,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -62239,7 +62236,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -62717,7 +62714,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -63460,7 +63457,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -64011,7 +64008,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -64509,7 +64506,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -65534,7 +65531,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -66702,7 +66699,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -69148,7 +69145,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -69605,7 +69602,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -72556,7 +72553,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -73050,7 +73047,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -76077,7 +76074,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -77199,7 +77196,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -77992,7 +77989,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -78487,7 +78484,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -80647,7 +80644,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -81485,7 +81482,7 @@ "items": { "anyOf": [ { - "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"rect3d\"|\"arc\"|\"arc3d\"|\"pyramid3d\"|\"rule\"|\"linkPath\"|\"boxPlot\"|\"ripple\">" + "$ref": "#/definitions/IExtensionGroupMarkSpec" }, { "$ref": "#/definitions/IExtensionMarkSpec<\"symbol\"|\"image\"|\"line\"|\"path\"|\"polygon\"|\"rect\"|\"text\"|\"area\"|\"arc\"|\"rule\"|\"boxPlot\"|\"linkPath\"|\"ripple\">" @@ -116666,4 +116663,5 @@ ] } } -} \ No newline at end of file +} + diff --git a/packages/vchart/src/component/player/player.ts b/packages/vchart/src/component/player/player.ts index c1251d38df..deb7584066 100644 --- a/packages/vchart/src/component/player/player.ts +++ b/packages/vchart/src/component/player/player.ts @@ -330,6 +330,7 @@ export class Player extends BaseComponent implements IComponent { // 自动播放 this._option.globalInstance.on(ChartEvent.rendered, () => { if (this._spec?.auto) { + this._playerComponent.pause(); this._playerComponent.play(); } }); diff --git a/packages/vchart/src/core/vchart.ts b/packages/vchart/src/core/vchart.ts index 28960f990f..bdcac157c5 100644 --- a/packages/vchart/src/core/vchart.ts +++ b/packages/vchart/src/core/vchart.ts @@ -793,7 +793,6 @@ export class VChart implements IVChart { if (!this._beforeRender(option)) { return self; } - this._updateAnimateState(true); // 填充数据绘图 this._compiler?.render(option.morphConfig); this._updateAnimateState(false); @@ -811,7 +810,7 @@ export class VChart implements IVChart { const updateGraphicAnimationState = (graphic: IMarkGraphic) => { const diffState = graphic.context?.diffState; if (initial) { - return diffState === 'exit' ? undefined : AnimationStateEnum.appear; + return diffState === 'exit' ? AnimationStateEnum.none : AnimationStateEnum.appear; } return diffState; }; @@ -939,13 +938,12 @@ export class VChart implements IVChart { if (this._chart) { this._chart.updateData(id, data, true, parserOptions); - // after layout - this._compiler.render(); - if (userUpdateOptions?.reAnimate) { this.stopAnimation(); this._updateAnimateState(true); } + this._compiler.render(); + return this as unknown as IVChart; } this._spec.data = array(this._spec.data); @@ -968,11 +966,12 @@ export class VChart implements IVChart { if (this._chart) { this._chart.updateFullData(data); if (reRender) { - this._compiler.render(); if (userUpdateOptions?.reAnimate) { this.stopAnimation(); this._updateAnimateState(true); } + + this._compiler.render(); } return this as unknown as IVChart; } diff --git a/packages/vchart/src/mark/base/base-mark.ts b/packages/vchart/src/mark/base/base-mark.ts index 183906121f..02081e0e4c 100644 --- a/packages/vchart/src/mark/base/base-mark.ts +++ b/packages/vchart/src/mark/base/base-mark.ts @@ -51,7 +51,7 @@ import type { IMarkStateManager, StateValueType } from '../../compile/mark/interface'; -import { array, degreeToRadian, has, isArray, isBoolean, isFunction, isNil, isObject, isValid } from '@visactor/vutils'; +import { array, degreeToRadian, isArray, isBoolean, isFunction, isNil, isObject, isValid } from '@visactor/vutils'; import { curveTypeTransform, groupData, runEncoder } from '../utils/common'; import type { ICompilableInitOption } from '../../compile/interface'; import { LayoutState } from '../../compile/interface'; @@ -67,7 +67,8 @@ import type { ICompilableData } from '../../compile/data/interface'; import type { IAnimationConfig } from '../../animation/interface'; import { AnimationStateEnum, type MarkAnimationSpec } from '../../animation/interface'; import { CompilableData } from '../../compile/data/compilable-data'; -import { log } from '../../util'; +import { getDiffAttributesOfGraphic } from '../../util/mark'; +import { log } from '../../util/debug'; import { morph as runMorph } from '../../compile/morph'; export type ExChannelCall = ( @@ -1074,6 +1075,7 @@ export class BaseMark extends GrammarItem implements IMar this._dataByKey = (mark as any)._dataByKey; this._prevDataByKey = (mark as any)._prevDataByKey; this.needClear = (mark as any).needClear; + this._aniamtionStateCallback = (mark as any)._aniamtionStateCallback; } private _parseProgressiveContext(data: Datum[]) { @@ -1145,12 +1147,18 @@ export class BaseMark extends GrammarItem implements IMar // TODO 因为数据的覆盖特点,无动画的时候新的更新一定会覆盖前一次的旧值,所以默认都是后面的动画覆盖前面的动画 // TODO 但是如果用户定义了一个动画数组,他的预期是动画不会覆盖,通过priority为INfinity来控制不覆盖 if (Array.isArray(config)) { - config = config.map((item: any, index: number) => ({ + return config.map((item: any, index: number) => ({ ...item, priority: item.priority ?? Infinity })); } - return config; + return config + ? { + ...config, + // 循环动画的优先级定为最高,不会被屏蔽掉 + priority: type === 'normal' ? config.priority ?? Infinity : config.priority + } + : config; } /** @@ -1177,6 +1185,7 @@ export class BaseMark extends GrammarItem implements IMar if (!this._animationConfig || graphics.length === 0) { return; } + if (this.tryRunMorphing(graphics)) { return; } @@ -1262,10 +1271,29 @@ export class BaseMark extends GrammarItem implements IMar } } + protected _setAnimationState(g: IMarkGraphic) { + const customizedState = this._aniamtionStateCallback ? this._aniamtionStateCallback(g) : undefined; + + g.context.animationState = customizedState ?? g.context.diffState; + + // 复用exit的图元,需要设置属性为最初的属性 + if (g.context.animationState === DiffState.exit) { + // 表示正在被复用,后续需要重设属性的 + g.context.reusing = true; + // 停止所有动画, + // TODO:属性可能回不去了(如果enter和exit不是一个动画),所以在encode阶段要获取finalAttribute,设置上去 + (g as any).animates && (g as any).animates.forEach((a: any) => a.stop()); + // force element to stop exit animation if it is reentered + // todo animaiton + // const animators = this.animate?.getElementAnimators(element, DiffState.exit); + // animators && animators.forEach(animator => animator.stop('start')); + } + } + protected _runJoin(data: Datum[]) { const newGroupedData = this._getDataByKey(data); const prevGroupedData = this._prevDataByKey; - const newGraphics: IMarkGraphic[] = []; + const allGraphics: IMarkGraphic[] = []; const enterGraphics = new Set(this._graphics.filter(g => g.context.diffState === DiffState.enter)); @@ -1289,32 +1317,20 @@ export class BaseMark extends GrammarItem implements IMar diffState = DiffState.enter; g.isExiting = false; - // 复用exit的图元,需要设置属性为最初的属性 - if (g.context?.diffState === DiffState.exit) { - // 表示正在被复用,后续需要重设属性的 - g.context.reusing = true; - // 停止所有动画, - // TODO:属性可能回不去了(如果enter和exit不是一个动画),所以在encode阶段要获取finalAttribute,设置上去 - (g as any).animates && (g as any).animates.forEach((a: any) => a.stop()); - // force element to stop exit animation if it is reentered - // todo animaiton - // const animators = this.animate?.getElementAnimators(element, DiffState.exit); - // animators && animators.forEach(animator => animator.stop('start')); - } - this._graphicMap.set(key, g as IMarkGraphic); - newGraphics.push(g as IMarkGraphic); + allGraphics.push(g as IMarkGraphic); } else { // update g = this._graphicMap.get(key); if (g) { diffState = DiffState.update; - newGraphics.push(g as IMarkGraphic); + allGraphics.push(g); } } if (g) { + enterGraphics.delete(g); g.context = { ...this._getCommonContext(), diffState, @@ -1328,7 +1344,6 @@ export class BaseMark extends GrammarItem implements IMar fieldX: g.context?.fieldX, // 从旧context中继承 fieldY: g.context?.fieldY, - animationState: diffState, // TODO 如果newData为空,则使用旧的data,避免exit图元找不到data data: newData ?? g.context?.data, uniqueKey: key, @@ -1338,7 +1353,7 @@ export class BaseMark extends GrammarItem implements IMar indexKey: '__VCHART_DEFAULT_DATA_INDEX', stateAnimateConfig: this.getAnimationConfig()?.state }; - enterGraphics.delete(g); + this._setAnimationState(g); } return g; }; @@ -1363,6 +1378,7 @@ export class BaseMark extends GrammarItem implements IMar const g = callback(key, newGroupedData.data.get(key), null); if (g) { g.context.animationState = AnimationStateEnum.appear; + // this._setAnimationState(g); } }); } else if (prevGroupedData) { @@ -1370,6 +1386,7 @@ export class BaseMark extends GrammarItem implements IMar // disappear const g = callback(key, null, prevGroupedData.data.get(key)); g.context.animationState = AnimationStateEnum.disappear; + // this._setAnimationState(g); }); } @@ -1383,13 +1400,13 @@ export class BaseMark extends GrammarItem implements IMar (g as IMarkGraphic).release(); }); - const graphicCount = newGraphics.length; - newGraphics.forEach((g, index) => { + const graphicCount = allGraphics.length; + allGraphics.forEach((g, index) => { g.context.graphicCount = graphicCount; g.context.graphicIndex = index; }); this._dataByKey = newGroupedData; - this._graphics = newGraphics; + this._graphics = allGraphics; this.needClear = true; } @@ -1543,14 +1560,7 @@ export class BaseMark extends GrammarItem implements IMar this._graphicMap.set(g.context.uniqueKey, g); } } else { - // diff一下,获取差异的属性 - const prevAttrs: Record = g.getAttributes(true); - const diffAttrs: Record = {}; - Object.keys(finalAttrs).forEach(key => { - if (prevAttrs[key] !== finalAttrs[key]) { - diffAttrs[key] = finalAttrs[key]; - } - }); + const diffAttrs = getDiffAttributesOfGraphic(g, finalAttrs); g.context.diffAttrs = diffAttrs; if (g.context.reusing) { // 表示正在被复用,需要重设属性的 @@ -1759,29 +1769,30 @@ export class BaseMark extends GrammarItem implements IMar } }; this._graphicMap.forEach((g, key) => { + if (g.context.diffState !== DiffState.exit || g.isExiting) { + return; + } // 避免重复执行退场动画 - if (g.context.diffState === DiffState.exit && !g.isExiting) { - if (this.hasAnimationByState('exit')) { - g.isExiting = true; - // 执行exit动画 - const animationConfig = this.getAnimationConfig(); - if ((animationConfig as any).exit && (animationConfig as any).exit.length) { - const exitConfigList = (animationConfig as any).exit.map((item: any, index: number) => ({ - name: `exit_${index}`, - animation: { - ...item, - customParameters: g.context - } - })); - g.applyAnimationState(['exit'], [exitConfigList.length === 1 ? exitConfigList[0] : exitConfigList], () => { - // 有可能又被复用了,所以这里需要判断,如果还是在exiting阶段的话才删除 - // TODO 这里如果频繁执行的话,可能会误判 - doRemove(g, key); - }); - } - } else { - doRemove(g, key); + if (g.context.animationState === DiffState.exit && this.hasAnimationByState('exit')) { + g.isExiting = true; + // 执行exit动画 + const animationConfig = this.getAnimationConfig(); + if ((animationConfig as any).exit && (animationConfig as any).exit.length) { + const exitConfigList = (animationConfig as any).exit.map((item: any, index: number) => ({ + name: `exit_${index}`, + animation: { + ...item, + customParameters: g.context + } + })); + g.applyAnimationState(['exit'], [exitConfigList.length === 1 ? exitConfigList[0] : exitConfigList], () => { + // 有可能又被复用了,所以这里需要判断,如果还是在exiting阶段的话才删除 + // TODO 这里如果频繁执行的话,可能会误判 + doRemove(g, key); + }); } + } else { + doRemove(g, key); } }); } @@ -1966,19 +1977,17 @@ export class BaseMark extends GrammarItem implements IMar } } + protected _aniamtionStateCallback: (g: IMarkGraphic) => AnimationStateValues; + updateAnimationState(callback: (graphic: IMarkGraphic) => AnimationStateValues) { - if (this._graphics && this._graphics.length) { - this._graphics.forEach(g => { - g.context.animationState = callback(g); - }); - } + this._aniamtionStateCallback = callback; } - hasAnimationByState(state: keyof MarkAnimationSpec) { - if (!state || !this._animationConfig || !this._animationConfig[state]) { + hasAnimationByState(state: AnimationStateValues) { + if (!state || !this._animationConfig || !(this._animationConfig as any)[state]) { return false; } - const stateAnimationConfig = this._animationConfig[state]; + const stateAnimationConfig = (this._animationConfig as any)[state]; return (stateAnimationConfig as IAnimationConfig[]).length > 0 || isObject(stateAnimationConfig); } diff --git a/packages/vchart/src/mark/group.ts b/packages/vchart/src/mark/group.ts index f2cb19aa0e..361364f971 100644 --- a/packages/vchart/src/mark/group.ts +++ b/packages/vchart/src/mark/group.ts @@ -4,7 +4,14 @@ import type { Maybe } from '../typings'; import { log, warn } from '../util/debug'; import type { IGroupMarkSpec } from '../typings/visual'; import { BaseMark } from './base/base-mark'; -import type { AnimationStateValues, IGroupMark, IMark, IMarkGraphic, MarkType } from './interface'; +import { + DiffState, + type AnimationStateValues, + type IGroupMark, + type IMark, + type IMarkGraphic, + type MarkType +} from './interface'; // eslint-disable-next-line no-duplicate-imports import { MarkTypeEnum } from './interface/type'; import { type IMarkCompileOption } from '../compile/mark'; @@ -12,7 +19,7 @@ import type { IGroup, IGroupGraphicAttribute } from '@visactor/vrender-core'; import { registerGroup, registerShadowRoot } from '@visactor/vrender-kits'; import { isNil } from '@visactor/vutils'; import { traverseGroupMark } from '../compile/util'; -import { LayoutState } from '../compile/interface'; +import { getDiffAttributesOfGraphic } from '../util/mark'; export class GroupMark extends BaseMark implements IGroupMark { static readonly type = MarkTypeEnum.group; @@ -110,9 +117,33 @@ export class GroupMark extends BaseMark implements IGroupMark { } const style = this._simpleStyle ?? this.getAttributesOfState({}); + const prevState = this._product.context?.diffState; + + this._product.context = { + ...this._product.context, + ...this._getCommonContext(), + diffState: prevState ? DiffState.update : DiffState.enter + }; + this._setAnimationState(this._product as unknown as IMarkGraphic); + const newAttrs = this._getAttrsFromConfig(style); + + // TODO: 需要优化,现在group mark 走了一些特殊逻辑 + if (this._product.context.diffState === DiffState.update) { + const hasAnimation = this.hasAnimation(); + const diffAttrs = getDiffAttributesOfGraphic(this._product as unknown as IMarkGraphic, newAttrs); + this._product.context.diffAttrs = diffAttrs; + + if (!this.hasAnimationByState(this._product.context.animationState)) { + hasAnimation ? this._product.setAttributesAndPreventAnimate(diffAttrs) : this._product.setAttributes(diffAttrs); + } + + if (hasAnimation) { + this._product.setFinalAttributes(newAttrs); + } + } else { + this._product.setAttributes(newAttrs); + } - this._product.context = { ...this._product.context, ...this._getCommonContext() }; - this._product.setAttributes(this._getAttrsFromConfig(style)); this.needClear = true; } @@ -129,11 +160,8 @@ export class GroupMark extends BaseMark implements IGroupMark { } updateAnimationState(callback: (g: IMarkGraphic) => AnimationStateValues) { - this.getGraphics().forEach(g => { - if (g) { - g.context = { ...g.context, animationState: callback(g) }; - } - }); + super.updateAnimationState(callback); + this.getMarks().forEach(mark => { mark.updateAnimationState(callback); }); diff --git a/packages/vchart/src/mark/interface/common.ts b/packages/vchart/src/mark/interface/common.ts index f8be31e81e..82ea9942a7 100644 --- a/packages/vchart/src/mark/interface/common.ts +++ b/packages/vchart/src/mark/interface/common.ts @@ -59,7 +59,7 @@ export type IMarkStyle = { export type DiffStateValues = 'update' | 'enter' | 'exit'; -export type AnimationStateValues = 'appear' | 'enter' | 'update' | 'exit' | 'disappear'; +export type AnimationStateValues = 'appear' | 'enter' | 'update' | 'exit' | 'disappear' | 'none' | 'state'; export interface IGraphicContext { markType: MarkTypeEnum; diff --git a/packages/vchart/src/series/base/base-series.ts b/packages/vchart/src/series/base/base-series.ts index 7e500453ae..f6c648a7f1 100644 --- a/packages/vchart/src/series/base/base-series.ts +++ b/packages/vchart/src/series/base/base-series.ts @@ -1292,14 +1292,11 @@ export abstract class BaseSeries extends BaseModel imp if (isNil(dataView)) { m.setData(this._data); - m.setSkipBeforeLayouted(true); } else if (dataView !== false) { m.setDataView(dataView); } - if (isBoolean(skipBeforeLayouted)) { - m.setSkipBeforeLayouted(skipBeforeLayouted); - } + m.setSkipBeforeLayouted(skipBeforeLayouted !== false); if (!isNil(groupKey)) { m.setGroupKey(groupKey); diff --git a/packages/vchart/src/series/funnel/funnel.ts b/packages/vchart/src/series/funnel/funnel.ts index 037dac301b..9a46d56f14 100644 --- a/packages/vchart/src/series/funnel/funnel.ts +++ b/packages/vchart/src/series/funnel/funnel.ts @@ -222,7 +222,6 @@ export class FunnelSeries }, { themeSpec: this._theme?.transform, - skipBeforeLayouted: true, noSeparateStyle: true } ); @@ -238,7 +237,6 @@ export class FunnelSeries this._funnelOuterLabelMark.label = this._createMark(FunnelSeries.mark.outerLabel, { themeSpec: this._theme?.outerLabel, markSpec: this._spec.outerLabel, - skipBeforeLayouted: true, noSeparateStyle: true, parent: false }) as ITextMark; diff --git a/packages/vchart/src/series/map/map.ts b/packages/vchart/src/series/map/map.ts index 3e09cb1d23..f3db0f7497 100644 --- a/packages/vchart/src/series/map/map.ts +++ b/packages/vchart/src/series/map/map.ts @@ -127,8 +127,7 @@ export class MapSeries extends GeoSer MapSeries.mark.area, { groupKey: this.getDimensionField()[0], - isSeriesMark: true, - skipBeforeLayouted: true + isSeriesMark: true }, { morph: shouldMarkDoMorph(this._spec, MapSeries.mark.area.name), diff --git a/packages/vchart/src/series/pie/pie.ts b/packages/vchart/src/series/pie/pie.ts index 62ca737334..2f31ca059c 100644 --- a/packages/vchart/src/series/pie/pie.ts +++ b/packages/vchart/src/series/pie/pie.ts @@ -191,7 +191,6 @@ export class BasePieSeries extends PolarSeries { key: DEFAULT_DATA_KEY, groupKey: this._seriesField, - skipBeforeLayouted: true, isSeriesMark: true }, { diff --git a/packages/vchart/src/util/mark.ts b/packages/vchart/src/util/mark.ts index ca5b75ae43..7feb75dce4 100644 --- a/packages/vchart/src/util/mark.ts +++ b/packages/vchart/src/util/mark.ts @@ -32,3 +32,16 @@ export const findMarkGraphic = (rootGroup: IGraphic, target: IGraphic) => { return null; }; + +export const getDiffAttributesOfGraphic = (g: IMarkGraphic, newAttrs: any) => { + // diff一下,获取差异的属性 + const prevAttrs: Record = g.getAttributes(true); + const diffAttrs: Record = {}; + Object.keys(newAttrs).forEach(key => { + if (prevAttrs[key] !== newAttrs[key]) { + diffAttrs[key] = newAttrs[key]; + } + }); + + return diffAttrs; +};