@visactor/vtable 0.25.1-alpha.2 → 0.25.1-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/ListTable.js +1 -1
- package/cjs/ListTable.js.map +1 -1
- package/cjs/PivotChart.js +13 -13
- package/cjs/PivotChart.js.map +1 -1
- package/cjs/core/BaseTable.d.ts +2 -0
- package/cjs/core/BaseTable.js +7 -4
- package/cjs/core/BaseTable.js.map +1 -1
- package/cjs/data/DataSource.d.ts +1 -0
- package/cjs/data/DataSource.js +3 -0
- package/cjs/data/DataSource.js.map +1 -1
- package/cjs/dataset/dataset.js +1 -1
- package/cjs/dataset/dataset.js.map +1 -1
- package/cjs/event/listener/container-dom.js +3 -3
- package/cjs/event/listener/container-dom.js.map +1 -1
- package/cjs/index.d.ts +1 -1
- package/cjs/index.js +1 -1
- package/cjs/index.js.map +1 -1
- package/cjs/layout/chart-helper/get-axis-config.js +21 -13
- package/cjs/layout/chart-helper/get-axis-config.js.map +1 -1
- package/cjs/layout/chart-helper/get-chart-spec.js +15 -13
- package/cjs/layout/chart-helper/get-chart-spec.js.map +1 -1
- package/cjs/layout/pivot-header-layout.js +2 -2
- package/cjs/layout/pivot-header-layout.js.map +1 -1
- package/cjs/scenegraph/group-creater/cell-helper.d.ts +1 -4
- package/cjs/scenegraph/group-creater/cell-helper.js +2 -2
- package/cjs/scenegraph/group-creater/cell-helper.js.map +1 -1
- package/cjs/scenegraph/group-creater/cell-type/progress-bar-cell.js +3 -3
- package/cjs/scenegraph/group-creater/cell-type/progress-bar-cell.js.map +1 -1
- package/cjs/scenegraph/layout/compute-col-width.js +6 -7
- package/cjs/scenegraph/layout/compute-col-width.js.map +1 -1
- package/cjs/scenegraph/layout/compute-row-height.js +2 -2
- package/cjs/scenegraph/layout/compute-row-height.js.map +1 -1
- package/cjs/scenegraph/layout/update-height.js +7 -1
- package/cjs/scenegraph/layout/update-height.js.map +1 -1
- package/cjs/scenegraph/layout/update-width.js +7 -1
- package/cjs/scenegraph/layout/update-width.js.map +1 -1
- package/cjs/scenegraph/select/delete-select-border.d.ts +1 -0
- package/cjs/scenegraph/select/delete-select-border.js +9 -2
- package/cjs/scenegraph/select/delete-select-border.js.map +1 -1
- package/cjs/state/state.js +12 -2
- package/cjs/state/state.js.map +1 -1
- package/cjs/ts-types/base-table.d.ts +2 -0
- package/cjs/ts-types/base-table.js.map +1 -1
- package/cjs/vrender.js.map +1 -1
- package/dist/vtable.js +316 -187
- package/dist/vtable.min.js +2 -2
- package/es/ListTable.js +1 -1
- package/es/ListTable.js.map +1 -1
- package/es/PivotChart.js +13 -13
- package/es/PivotChart.js.map +1 -1
- package/es/core/BaseTable.d.ts +2 -0
- package/es/core/BaseTable.js +7 -4
- package/es/core/BaseTable.js.map +1 -1
- package/es/data/DataSource.d.ts +1 -0
- package/es/data/DataSource.js +3 -0
- package/es/data/DataSource.js.map +1 -1
- package/es/dataset/dataset.js +1 -1
- package/es/dataset/dataset.js.map +1 -1
- package/es/event/listener/container-dom.js +3 -3
- package/es/event/listener/container-dom.js.map +1 -1
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/index.js.map +1 -1
- package/es/layout/chart-helper/get-axis-config.js +21 -12
- package/es/layout/chart-helper/get-axis-config.js.map +1 -1
- package/es/layout/chart-helper/get-chart-spec.js +15 -13
- package/es/layout/chart-helper/get-chart-spec.js.map +1 -1
- package/es/layout/pivot-header-layout.js +2 -2
- package/es/layout/pivot-header-layout.js.map +1 -1
- package/es/scenegraph/group-creater/cell-helper.d.ts +1 -4
- package/es/scenegraph/group-creater/cell-helper.js +2 -2
- package/es/scenegraph/group-creater/cell-helper.js.map +1 -1
- package/es/scenegraph/group-creater/cell-type/progress-bar-cell.js +3 -3
- package/es/scenegraph/group-creater/cell-type/progress-bar-cell.js.map +1 -1
- package/es/scenegraph/layout/compute-col-width.js +7 -7
- package/es/scenegraph/layout/compute-col-width.js.map +1 -1
- package/es/scenegraph/layout/compute-row-height.js +3 -3
- package/es/scenegraph/layout/compute-row-height.js.map +1 -1
- package/es/scenegraph/layout/update-height.js +7 -1
- package/es/scenegraph/layout/update-height.js.map +1 -1
- package/es/scenegraph/layout/update-width.js +7 -1
- package/es/scenegraph/layout/update-width.js.map +1 -1
- package/es/scenegraph/select/delete-select-border.d.ts +1 -0
- package/es/scenegraph/select/delete-select-border.js +7 -0
- package/es/scenegraph/select/delete-select-border.js.map +1 -1
- package/es/state/state.js +13 -1
- package/es/state/state.js.map +1 -1
- package/es/ts-types/base-table.d.ts +2 -0
- package/es/ts-types/base-table.js.map +1 -1
- package/es/vrender.js.map +1 -1
- package/package.json +6 -6
package/dist/vtable.js
CHANGED
|
@@ -3924,7 +3924,7 @@
|
|
|
3924
3924
|
controlX = 0,
|
|
3925
3925
|
controlY = 0;
|
|
3926
3926
|
for (let i = 0, len = commandStrList.length; i < len; ++i) {
|
|
3927
|
-
switch (current = commandStrList[i], 1 === sX && 1 === sY || (current = scale$
|
|
3927
|
+
switch (current = commandStrList[i], 1 === sX && 1 === sY || (current = scale$3(current, sX, sY)), current[0]) {
|
|
3928
3928
|
case "l":
|
|
3929
3929
|
x += current[1], y += current[2], this.lineTo(x + l, y + t);
|
|
3930
3930
|
break;
|
|
@@ -4068,7 +4068,7 @@
|
|
|
4068
4068
|
}
|
|
4069
4069
|
}
|
|
4070
4070
|
const temp = ["l", 0, 0, 0, 0, 0, 0, 0];
|
|
4071
|
-
function scale$
|
|
4071
|
+
function scale$3(current, sX, sY) {
|
|
4072
4072
|
const c = temp[0] = current[0];
|
|
4073
4073
|
if ("a" === c || "A" === c) temp[1] = sX * current[1], temp[2] = sY * current[2], temp[3] = current[3], temp[4] = current[4], temp[5] = current[5], temp[6] = sX * current[6], temp[7] = sY * current[7];else if ("h" === c || "H" === c) temp[1] = sX * current[1];else if ("v" === c || "V" === c) temp[1] = sY * current[1];else for (let i = 1, n = current.length; i < n; ++i) temp[i] = (i % 2 == 1 ? sX : sY) * current[i];
|
|
4074
4074
|
return temp;
|
|
@@ -8145,7 +8145,7 @@
|
|
|
8145
8145
|
const SYMBOL_NUMBER_TYPE = genNumberType();
|
|
8146
8146
|
const TEXT_NUMBER_TYPE = genNumberType();
|
|
8147
8147
|
const GraphicService = Symbol.for("GraphicService");
|
|
8148
|
-
const GraphicCreator$
|
|
8148
|
+
const GraphicCreator$2 = Symbol.for("GraphicCreator");
|
|
8149
8149
|
const SVG_PARSE_ATTRIBUTE_MAP = {
|
|
8150
8150
|
"stroke-linecap": "lineCap",
|
|
8151
8151
|
"stroke-linejoin": "lineJoin",
|
|
@@ -11871,7 +11871,7 @@
|
|
|
11871
11871
|
function mat3Tomat4(out, b) {
|
|
11872
11872
|
out[0] = b.a, out[1] = b.b, out[2] = 0, out[3] = 0, out[4] = b.c, out[5] = b.d, out[6] = 0, out[7] = 0, out[8] = 0, out[9] = 0, out[10] = 1, out[11] = 0, out[12] = b.e, out[13] = b.f, out[14] = 0, out[15] = 1;
|
|
11873
11873
|
}
|
|
11874
|
-
function scale$
|
|
11874
|
+
function scale$2(out, a, v) {
|
|
11875
11875
|
const x = v[0],
|
|
11876
11876
|
y = v[1],
|
|
11877
11877
|
z = v[2];
|
|
@@ -11932,7 +11932,7 @@
|
|
|
11932
11932
|
} else _anchor[1] = anchor3d[1];
|
|
11933
11933
|
_anchor[2] = null !== (_a = anchor3d[2]) && void 0 !== _a ? _a : 0;
|
|
11934
11934
|
}
|
|
11935
|
-
if (identity$2(out), translate(out, out, [x + dx, y + dy, z + dz]), translate(out, out, [_anchor[0], _anchor[1], _anchor[2]]), rotateX(out, out, beta), rotateY(out, out, alpha), translate(out, out, [-_anchor[0], -_anchor[1], _anchor[2]]), scale$
|
|
11935
|
+
if (identity$2(out), translate(out, out, [x + dx, y + dy, z + dz]), translate(out, out, [_anchor[0], _anchor[1], _anchor[2]]), rotateX(out, out, beta), rotateY(out, out, alpha), translate(out, out, [-_anchor[0], -_anchor[1], _anchor[2]]), scale$2(out, out, [scaleX, scaleY, scaleZ]), angle) {
|
|
11936
11936
|
const m = mat4Allocate.allocate(),
|
|
11937
11937
|
_anchor = [0, 0];
|
|
11938
11938
|
if (anchor) {
|
|
@@ -12401,9 +12401,9 @@
|
|
|
12401
12401
|
return !!visible || (aabbBounds.clear(), !1);
|
|
12402
12402
|
}
|
|
12403
12403
|
};
|
|
12404
|
-
DefaultGraphicService = __decorate$19([injectable(), __param$F(0, inject(GraphicCreator$
|
|
12404
|
+
DefaultGraphicService = __decorate$19([injectable(), __param$F(0, inject(GraphicCreator$2)), __metadata$S("design:paramtypes", [Object])], DefaultGraphicService);
|
|
12405
12405
|
|
|
12406
|
-
class GraphicCreator {
|
|
12406
|
+
let GraphicCreator$1 = class GraphicCreator {
|
|
12407
12407
|
constructor() {
|
|
12408
12408
|
this.store = new Map();
|
|
12409
12409
|
}
|
|
@@ -12414,12 +12414,12 @@
|
|
|
12414
12414
|
const cb = this.store.get(name);
|
|
12415
12415
|
return cb ? cb(params) : null;
|
|
12416
12416
|
}
|
|
12417
|
-
}
|
|
12418
|
-
const graphicCreator = new GraphicCreator();
|
|
12417
|
+
};
|
|
12418
|
+
const graphicCreator$1 = new GraphicCreator$1();
|
|
12419
12419
|
|
|
12420
|
-
let text;
|
|
12421
|
-
function getTextBounds(params) {
|
|
12422
|
-
return text || (text = graphicCreator.CreateGraphic("text", {})), text.initAttributes(params), text.AABBBounds;
|
|
12420
|
+
let text$1;
|
|
12421
|
+
function getTextBounds$1(params) {
|
|
12422
|
+
return text$1 || (text$1 = graphicCreator$1.CreateGraphic("text", {})), text$1.initAttributes(params), text$1.AABBBounds;
|
|
12423
12423
|
}
|
|
12424
12424
|
|
|
12425
12425
|
const result = {
|
|
@@ -14654,7 +14654,7 @@
|
|
|
14654
14654
|
h = b.height();
|
|
14655
14655
|
b.set((null !== (_h = background.x) && void 0 !== _h ? _h : 0) + (null !== (_j = background.dx) && void 0 !== _j ? _j : 0), (null !== (_k = background.y) && void 0 !== _k ? _k : 0) + (null !== (_l = background.dy) && void 0 !== _l ? _l : 0), w, h);
|
|
14656
14656
|
}
|
|
14657
|
-
} else b = graphic.AABBBounds, onlyTranslate || (b = getTextBounds(Object.assign(Object.assign({}, graphic.attribute), {
|
|
14657
|
+
} else b = graphic.AABBBounds, onlyTranslate || (b = getTextBounds$1(Object.assign(Object.assign({}, graphic.attribute), {
|
|
14658
14658
|
angle: 0,
|
|
14659
14659
|
scaleX: 1,
|
|
14660
14660
|
scaleY: 1,
|
|
@@ -15189,7 +15189,7 @@
|
|
|
15189
15189
|
getShadowRoot(interactiveLayer) {
|
|
15190
15190
|
var _a;
|
|
15191
15191
|
let group = interactiveLayer.getElementById("_interactive_group");
|
|
15192
|
-
return group || (group = graphicCreator.CreateGraphic("group", {}), group.id = "_interactive_group", interactiveLayer.add(group)), null !== (_a = group.shadowRoot) && void 0 !== _a ? _a : group.attachShadow();
|
|
15192
|
+
return group || (group = graphicCreator$1.CreateGraphic("group", {}), group.id = "_interactive_group", interactiveLayer.add(group)), null !== (_a = group.shadowRoot) && void 0 !== _a ? _a : group.attachShadow();
|
|
15193
15193
|
}
|
|
15194
15194
|
}
|
|
15195
15195
|
class Canvas3DDrawItemInterceptor {
|
|
@@ -15442,7 +15442,7 @@
|
|
|
15442
15442
|
});
|
|
15443
15443
|
|
|
15444
15444
|
var graphicModule = new ContainerModule(bind => {
|
|
15445
|
-
bind(GraphicService).to(DefaultGraphicService).inSingletonScope(), bind(GraphicCreator$
|
|
15445
|
+
bind(GraphicService).to(DefaultGraphicService).inSingletonScope(), bind(GraphicCreator$2).toConstantValue(graphicCreator$1);
|
|
15446
15446
|
});
|
|
15447
15447
|
|
|
15448
15448
|
const AutoEnablePlugins = Symbol.for("AutoEnablePlugins");
|
|
@@ -18428,75 +18428,75 @@
|
|
|
18428
18428
|
});
|
|
18429
18429
|
|
|
18430
18430
|
function registerArcGraphic() {
|
|
18431
|
-
graphicCreator.RegisterGraphicCreator("arc", createArc);
|
|
18431
|
+
graphicCreator$1.RegisterGraphicCreator("arc", createArc);
|
|
18432
18432
|
}
|
|
18433
18433
|
|
|
18434
18434
|
function registerArc3dGraphic() {
|
|
18435
|
-
graphicCreator.RegisterGraphicCreator("arc3d", createArc3d);
|
|
18435
|
+
graphicCreator$1.RegisterGraphicCreator("arc3d", createArc3d);
|
|
18436
18436
|
}
|
|
18437
18437
|
|
|
18438
18438
|
function registerAreaGraphic() {
|
|
18439
|
-
graphicCreator.RegisterGraphicCreator("area", createArea);
|
|
18439
|
+
graphicCreator$1.RegisterGraphicCreator("area", createArea);
|
|
18440
18440
|
}
|
|
18441
18441
|
|
|
18442
18442
|
function registerCircleGraphic() {
|
|
18443
|
-
graphicCreator.RegisterGraphicCreator("circle", createCircle);
|
|
18443
|
+
graphicCreator$1.RegisterGraphicCreator("circle", createCircle);
|
|
18444
18444
|
}
|
|
18445
18445
|
|
|
18446
18446
|
function registerGlyphGraphic() {
|
|
18447
|
-
graphicCreator.RegisterGraphicCreator("glyph", createGlyph);
|
|
18447
|
+
graphicCreator$1.RegisterGraphicCreator("glyph", createGlyph);
|
|
18448
18448
|
}
|
|
18449
18449
|
|
|
18450
18450
|
function registerGroupGraphic() {
|
|
18451
|
-
graphicCreator.RegisterGraphicCreator("group", createGroup);
|
|
18451
|
+
graphicCreator$1.RegisterGraphicCreator("group", createGroup);
|
|
18452
18452
|
}
|
|
18453
18453
|
|
|
18454
18454
|
function registerImageGraphic() {
|
|
18455
|
-
graphicCreator.RegisterGraphicCreator("image", createImage);
|
|
18455
|
+
graphicCreator$1.RegisterGraphicCreator("image", createImage);
|
|
18456
18456
|
}
|
|
18457
18457
|
|
|
18458
18458
|
function registerLineGraphic() {
|
|
18459
|
-
graphicCreator.RegisterGraphicCreator("line", createLine);
|
|
18459
|
+
graphicCreator$1.RegisterGraphicCreator("line", createLine);
|
|
18460
18460
|
}
|
|
18461
18461
|
|
|
18462
18462
|
function registerPathGraphic() {
|
|
18463
|
-
graphicCreator.RegisterGraphicCreator("path", createPath);
|
|
18463
|
+
graphicCreator$1.RegisterGraphicCreator("path", createPath);
|
|
18464
18464
|
}
|
|
18465
18465
|
|
|
18466
18466
|
function registerPolygonGraphic() {
|
|
18467
|
-
graphicCreator.RegisterGraphicCreator("polygon", createPolygon);
|
|
18467
|
+
graphicCreator$1.RegisterGraphicCreator("polygon", createPolygon);
|
|
18468
18468
|
}
|
|
18469
18469
|
|
|
18470
18470
|
function registerPyramid3dGraphic() {
|
|
18471
|
-
graphicCreator.RegisterGraphicCreator("pyramid3d", createPyramid3d);
|
|
18471
|
+
graphicCreator$1.RegisterGraphicCreator("pyramid3d", createPyramid3d);
|
|
18472
18472
|
}
|
|
18473
18473
|
|
|
18474
18474
|
function registerRectGraphic() {
|
|
18475
|
-
graphicCreator.RegisterGraphicCreator("rect", createRect);
|
|
18475
|
+
graphicCreator$1.RegisterGraphicCreator("rect", createRect);
|
|
18476
18476
|
}
|
|
18477
18477
|
|
|
18478
18478
|
function registerRect3dGraphic() {
|
|
18479
|
-
graphicCreator.RegisterGraphicCreator("rect3d", createRect3d);
|
|
18479
|
+
graphicCreator$1.RegisterGraphicCreator("rect3d", createRect3d);
|
|
18480
18480
|
}
|
|
18481
18481
|
|
|
18482
18482
|
function registerRichtextGraphic() {
|
|
18483
|
-
graphicCreator.RegisterGraphicCreator("richtext", createRichText);
|
|
18483
|
+
graphicCreator$1.RegisterGraphicCreator("richtext", createRichText);
|
|
18484
18484
|
}
|
|
18485
18485
|
|
|
18486
18486
|
function registerSymbolGraphic() {
|
|
18487
|
-
graphicCreator.RegisterGraphicCreator("symbol", createSymbol);
|
|
18487
|
+
graphicCreator$1.RegisterGraphicCreator("symbol", createSymbol);
|
|
18488
18488
|
}
|
|
18489
18489
|
|
|
18490
18490
|
function registerTextGraphic() {
|
|
18491
|
-
graphicCreator.RegisterGraphicCreator("text", createText);
|
|
18491
|
+
graphicCreator$1.RegisterGraphicCreator("text", createText);
|
|
18492
18492
|
}
|
|
18493
18493
|
|
|
18494
18494
|
function registerShadowRootGraphic() {
|
|
18495
|
-
graphicCreator.RegisterGraphicCreator("shadowRoot", createShadowRoot);
|
|
18495
|
+
graphicCreator$1.RegisterGraphicCreator("shadowRoot", createShadowRoot);
|
|
18496
18496
|
}
|
|
18497
18497
|
|
|
18498
18498
|
function registerWrapTextGraphic() {
|
|
18499
|
-
graphicCreator.RegisterGraphicCreator("wrapText", createWrapText);
|
|
18499
|
+
graphicCreator$1.RegisterGraphicCreator("wrapText", createWrapText);
|
|
18500
18500
|
}
|
|
18501
18501
|
|
|
18502
18502
|
const REACT_TO_CANOPUS_EVENTS = {
|
|
@@ -18547,40 +18547,40 @@
|
|
|
18547
18547
|
onDblClick: "dblclick"
|
|
18548
18548
|
};
|
|
18549
18549
|
function VArc(params) {
|
|
18550
|
-
return graphicCreator.arc(params ? params.attribute : {});
|
|
18550
|
+
return graphicCreator$1.arc(params ? params.attribute : {});
|
|
18551
18551
|
}
|
|
18552
18552
|
function VArea(params) {
|
|
18553
|
-
return graphicCreator.area(params ? params.attribute : {});
|
|
18553
|
+
return graphicCreator$1.area(params ? params.attribute : {});
|
|
18554
18554
|
}
|
|
18555
18555
|
function VCircle(params) {
|
|
18556
|
-
return graphicCreator.circle(params ? params.attribute : {});
|
|
18556
|
+
return graphicCreator$1.circle(params ? params.attribute : {});
|
|
18557
18557
|
}
|
|
18558
18558
|
function VGroup(params) {
|
|
18559
|
-
return graphicCreator.group(params ? params.attribute : {});
|
|
18559
|
+
return graphicCreator$1.group(params ? params.attribute : {});
|
|
18560
18560
|
}
|
|
18561
18561
|
function VGlyph(params) {
|
|
18562
|
-
return graphicCreator.glyph(params ? params.attribute : {});
|
|
18562
|
+
return graphicCreator$1.glyph(params ? params.attribute : {});
|
|
18563
18563
|
}
|
|
18564
18564
|
function VImage(params) {
|
|
18565
|
-
return graphicCreator.image(params ? params.attribute : {});
|
|
18565
|
+
return graphicCreator$1.image(params ? params.attribute : {});
|
|
18566
18566
|
}
|
|
18567
18567
|
function VLine(params) {
|
|
18568
|
-
return graphicCreator.line(params ? params.attribute : {});
|
|
18568
|
+
return graphicCreator$1.line(params ? params.attribute : {});
|
|
18569
18569
|
}
|
|
18570
18570
|
function VPath(params) {
|
|
18571
|
-
return graphicCreator.path(params ? params.attribute : {});
|
|
18571
|
+
return graphicCreator$1.path(params ? params.attribute : {});
|
|
18572
18572
|
}
|
|
18573
18573
|
function VPolygon(params) {
|
|
18574
|
-
return graphicCreator.polygon(params ? params.attribute : {});
|
|
18574
|
+
return graphicCreator$1.polygon(params ? params.attribute : {});
|
|
18575
18575
|
}
|
|
18576
18576
|
function VRect(params) {
|
|
18577
|
-
return graphicCreator.rect(params ? params.attribute : {});
|
|
18577
|
+
return graphicCreator$1.rect(params ? params.attribute : {});
|
|
18578
18578
|
}
|
|
18579
18579
|
function VSymbol(params) {
|
|
18580
|
-
return graphicCreator.symbol(params ? params.attribute : {});
|
|
18580
|
+
return graphicCreator$1.symbol(params ? params.attribute : {});
|
|
18581
18581
|
}
|
|
18582
18582
|
function VText(params) {
|
|
18583
|
-
return graphicCreator.text(params ? params.attribute : {});
|
|
18583
|
+
return graphicCreator$1.text(params ? params.attribute : {});
|
|
18584
18584
|
}
|
|
18585
18585
|
|
|
18586
18586
|
var __rest$4 = undefined && undefined.__rest || function (s, e) {
|
|
@@ -18607,7 +18607,7 @@
|
|
|
18607
18607
|
} = _a,
|
|
18608
18608
|
props = __rest$4(_a, ["key", "name", "id", "attribute", "stateProxy"]);
|
|
18609
18609
|
let c = type;
|
|
18610
|
-
isString$2(type) && (c = graphicCreator[type]);
|
|
18610
|
+
isString$2(type) && (c = graphicCreator$1[type]);
|
|
18611
18611
|
const childrenList = [];
|
|
18612
18612
|
for (var _len = arguments.length, children = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
|
|
18613
18613
|
children[_key - 2] = arguments[_key];
|
|
@@ -25428,13 +25428,9 @@
|
|
|
25428
25428
|
});
|
|
25429
25429
|
}
|
|
25430
25430
|
|
|
25431
|
-
function scale(vector, scale) {
|
|
25431
|
+
function scale$1(vector, scale) {
|
|
25432
25432
|
return [vector[0] * scale, vector[1] * scale];
|
|
25433
25433
|
}
|
|
25434
|
-
function length(vector) {
|
|
25435
|
-
const [x, y] = vector;
|
|
25436
|
-
return Math.sqrt(x * x + y * y);
|
|
25437
|
-
}
|
|
25438
25434
|
function normalize$2(vector) {
|
|
25439
25435
|
const [x, y] = vector;
|
|
25440
25436
|
let len = x * x + y * y;
|
|
@@ -25462,7 +25458,7 @@
|
|
|
25462
25458
|
width: 0,
|
|
25463
25459
|
height: 0
|
|
25464
25460
|
};
|
|
25465
|
-
const bounds = getTextBounds({
|
|
25461
|
+
const bounds = getTextBounds$1({
|
|
25466
25462
|
text: text,
|
|
25467
25463
|
fontFamily: textSpec.fontFamily || defaultTextTheme.fontFamily || DEFAULT_TEXT_FONT_FAMILY$1,
|
|
25468
25464
|
fontSize: textSpec.fontSize || defaultTextTheme.fontSize || 12,
|
|
@@ -26106,7 +26102,7 @@
|
|
|
26106
26102
|
}
|
|
26107
26103
|
points.forEach((point, index) => {
|
|
26108
26104
|
var _a, _b;
|
|
26109
|
-
const line = graphicCreator.line(Object.assign(Object.assign({
|
|
26105
|
+
const line = graphicCreator$1.line(Object.assign(Object.assign({
|
|
26110
26106
|
points: point
|
|
26111
26107
|
}, isArray$3(lineStyle) ? null !== (_a = lineStyle[index]) && void 0 !== _a ? _a : lineStyle[lineStyle.length - 1] : lineStyle), {
|
|
26112
26108
|
fill: !1
|
|
@@ -26114,8 +26110,8 @@
|
|
|
26114
26110
|
line.name = `${this.name}-line`, line.id = this._getNodeId("line" + index), isEmpty(null == state ? void 0 : state.line) || (line.states = isArray$3(state.line) ? null !== (_b = state.line[index]) && void 0 !== _b ? _b : state.line[state.line.length - 1] : state.line), this.add(line);
|
|
26115
26111
|
});
|
|
26116
26112
|
} else {
|
|
26117
|
-
let lineCreator = graphicCreator.line;
|
|
26118
|
-
array$1(lineStyle)[0].cornerRadius && (lineCreator = graphicCreator.polygon);
|
|
26113
|
+
let lineCreator = graphicCreator$1.line;
|
|
26114
|
+
array$1(lineStyle)[0].cornerRadius && (lineCreator = graphicCreator$1.polygon);
|
|
26119
26115
|
const line = lineCreator(Object.assign(Object.assign({
|
|
26120
26116
|
points: this._clipPoints(this.attribute.points)
|
|
26121
26117
|
}, array$1(lineStyle)[0]), {
|
|
@@ -26155,7 +26151,7 @@
|
|
|
26155
26151
|
}, rotate = startAngle + Math.PI / 2) : (position = {
|
|
26156
26152
|
x: end.x + (isValidNumber$1(endAngle) ? refX * Math.cos(endAngle) + refY * Math.cos(endAngle - Math.PI / 2) : 0),
|
|
26157
26153
|
y: end.y + (isValidNumber$1(endAngle) ? refX * Math.sin(endAngle) + refY * Math.sin(endAngle - Math.PI / 2) : 0)
|
|
26158
|
-
}, rotate = endAngle + Math.PI / 2), symbol = graphicCreator.symbol(Object.assign(Object.assign(Object.assign({}, position), {
|
|
26154
|
+
}, rotate = endAngle + Math.PI / 2), symbol = graphicCreator$1.symbol(Object.assign(Object.assign(Object.assign({}, position), {
|
|
26159
26155
|
symbolType: symbolType,
|
|
26160
26156
|
size: size,
|
|
26161
26157
|
angle: autoRotate ? rotate + refAngle : 0,
|
|
@@ -26318,54 +26314,18 @@
|
|
|
26318
26314
|
}
|
|
26319
26315
|
};
|
|
26320
26316
|
|
|
26321
|
-
const clampRadian = function () {
|
|
26322
|
-
let angle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
|
|
26323
|
-
if (angle < 0) for (; angle < 0;) angle += tau;else if (angle > 0) for (; angle > tau;) angle -= tau;
|
|
26324
|
-
return angle;
|
|
26325
|
-
};
|
|
26326
|
-
function isInRange(a, min, max) {
|
|
26327
|
-
return !isLess(a, min, 0, 1e-6) && !isGreater(a, max, 0, 1e-6);
|
|
26328
|
-
}
|
|
26329
|
-
function getCircleLabelPosition(tickPosition, tickVector, text, style) {
|
|
26330
|
-
const labelBounds = getTextBounds(Object.assign({
|
|
26331
|
-
text: text
|
|
26332
|
-
}, style)),
|
|
26333
|
-
width = labelBounds.width(),
|
|
26334
|
-
height = labelBounds.height(),
|
|
26335
|
-
angle = clampRadian(Math.atan2(tickVector[1], tickVector[0])) - Math.PI,
|
|
26336
|
-
PI_3_4 = 3 * Math.PI / 4,
|
|
26337
|
-
PI_1_4 = Math.PI / 4,
|
|
26338
|
-
PI_1_2 = Math.PI / 2,
|
|
26339
|
-
baseX = tickPosition.x;
|
|
26340
|
-
let dx = 0;
|
|
26341
|
-
dx = isInRange(angle, -PI_3_4, -PI_1_4) ? ((angle + PI_3_4) / PI_1_2 - .5) * width : isInRange(angle, PI_1_4, PI_3_4) ? (.5 - (angle - PI_1_4) / PI_1_2) * width : Math.cos(angle) >= 0 ? .5 * width : .5 * -width;
|
|
26342
|
-
const x = baseX - dx,
|
|
26343
|
-
baseY = tickPosition.y;
|
|
26344
|
-
let dy = 0;
|
|
26345
|
-
dy = isInRange(angle, -PI_3_4, -PI_1_4) ? .5 * -height : isInRange(angle, PI_1_4, PI_3_4) ? .5 * height : Math.cos(angle) >= 0 ? (.5 - (PI_1_4 - angle) / PI_1_2) * height : (.5 - clampRadian(angle - PI_3_4) / PI_1_2) * height;
|
|
26346
|
-
return {
|
|
26347
|
-
x: x,
|
|
26348
|
-
y: baseY - dy
|
|
26349
|
-
};
|
|
26350
|
-
}
|
|
26351
26317
|
function getElMap(g) {
|
|
26352
26318
|
const elMap = {};
|
|
26353
26319
|
return traverseGroup(g, el => {
|
|
26354
26320
|
"group" !== el.type && el.id && (elMap[el.id] = el);
|
|
26355
26321
|
}), elMap;
|
|
26356
26322
|
}
|
|
26357
|
-
function getVerticalCoord(point, vector) {
|
|
26323
|
+
function getVerticalCoord$1(point, vector) {
|
|
26358
26324
|
return {
|
|
26359
26325
|
x: point.x + vector[0],
|
|
26360
26326
|
y: point.y + vector[1]
|
|
26361
26327
|
};
|
|
26362
26328
|
}
|
|
26363
|
-
function getCircleVerticalVector(offset, point, center) {
|
|
26364
|
-
let inside = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : !1;
|
|
26365
|
-
let axisInside = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : !1;
|
|
26366
|
-
const vector = [point.x - center.x, point.y - center.y];
|
|
26367
|
-
return scale(vector, (inside ? -1 : 1) * (axisInside ? -1 : 1) * offset / length(vector));
|
|
26368
|
-
}
|
|
26369
26329
|
|
|
26370
26330
|
class AxisBase extends AbstractComponent {
|
|
26371
26331
|
constructor() {
|
|
@@ -26397,14 +26357,14 @@
|
|
|
26397
26357
|
getBoundsWithoutRender(attributes) {
|
|
26398
26358
|
const currentAttribute = cloneDeep(this.attribute);
|
|
26399
26359
|
merge(this.attribute, attributes);
|
|
26400
|
-
const offscreenGroup = graphicCreator.group({
|
|
26360
|
+
const offscreenGroup = graphicCreator$1.group({
|
|
26401
26361
|
x: this.attribute.x,
|
|
26402
26362
|
y: this.attribute.y
|
|
26403
26363
|
});
|
|
26404
26364
|
return this.add(offscreenGroup), this._renderInner(offscreenGroup), this.removeChild(offscreenGroup), this.attribute = currentAttribute, offscreenGroup.AABBBounds;
|
|
26405
26365
|
}
|
|
26406
26366
|
render() {
|
|
26407
|
-
this._prevInnerView = this._innerView && getElMap(this._innerView), this.removeAllChild(!0), this._innerView = graphicCreator.group({
|
|
26367
|
+
this._prevInnerView = this._innerView && getElMap(this._innerView), this.removeAllChild(!0), this._innerView = graphicCreator$1.group({
|
|
26408
26368
|
x: 0,
|
|
26409
26369
|
y: 0,
|
|
26410
26370
|
pickable: !1
|
|
@@ -26426,13 +26386,13 @@
|
|
|
26426
26386
|
line: line,
|
|
26427
26387
|
items: items
|
|
26428
26388
|
} = this.attribute,
|
|
26429
|
-
axisContainer = graphicCreator.group({
|
|
26389
|
+
axisContainer = graphicCreator$1.group({
|
|
26430
26390
|
x: 0,
|
|
26431
26391
|
y: 0,
|
|
26432
26392
|
zIndex: 1
|
|
26433
26393
|
});
|
|
26434
26394
|
if (axisContainer.name = AXIS_ELEMENT_NAME.axisContainer, axisContainer.id = this._getNodeId("container"), axisContainer.setMode(this.mode), this.axisContainer = axisContainer, container.add(axisContainer), line && line.visible && this.renderLine(axisContainer), items && items.length && (this.data = this._transformItems(items[0]), tick && tick.visible && this.renderTicks(axisContainer), label && label.visible)) {
|
|
26435
|
-
const labelGroup = graphicCreator.group({
|
|
26395
|
+
const labelGroup = graphicCreator$1.group({
|
|
26436
26396
|
x: 0,
|
|
26437
26397
|
y: 0,
|
|
26438
26398
|
pickable: !1
|
|
@@ -26465,14 +26425,14 @@
|
|
|
26465
26425
|
}
|
|
26466
26426
|
renderTicks(container) {
|
|
26467
26427
|
const tickLineItems = this.getTickLineItems(),
|
|
26468
|
-
tickLineGroup = graphicCreator.group({
|
|
26428
|
+
tickLineGroup = graphicCreator$1.group({
|
|
26469
26429
|
x: 0,
|
|
26470
26430
|
y: 0,
|
|
26471
26431
|
pickable: !1
|
|
26472
26432
|
});
|
|
26473
26433
|
tickLineGroup.name = AXIS_ELEMENT_NAME.tickContainer, tickLineGroup.id = this._getNodeId("tick-container"), container.add(tickLineGroup), tickLineItems.forEach((item, index) => {
|
|
26474
26434
|
var _a;
|
|
26475
|
-
const line = graphicCreator.line(Object.assign({}, this._getTickLineAttribute("tick", item, index, tickLineItems)));
|
|
26435
|
+
const line = graphicCreator$1.line(Object.assign({}, this._getTickLineAttribute("tick", item, index, tickLineItems)));
|
|
26476
26436
|
if (line.name = AXIS_ELEMENT_NAME.tick, line.id = this._getNodeId(item.id), isEmpty(null === (_a = this.attribute.tick) || void 0 === _a ? void 0 : _a.state)) line.states = DEFAULT_STATES$2;else {
|
|
26477
26437
|
const data = this.data[index],
|
|
26478
26438
|
tickLineState = merge({}, DEFAULT_STATES$2, this.attribute.tick.state);
|
|
@@ -26488,7 +26448,7 @@
|
|
|
26488
26448
|
if (subTick && subTick.visible) {
|
|
26489
26449
|
const subTickLineItems = this.getSubTickLineItems();
|
|
26490
26450
|
subTickLineItems.length && subTickLineItems.forEach((item, index) => {
|
|
26491
|
-
const line = graphicCreator.line(Object.assign({}, this._getTickLineAttribute("subTick", item, index, tickLineItems)));
|
|
26451
|
+
const line = graphicCreator$1.line(Object.assign({}, this._getTickLineAttribute("subTick", item, index, tickLineItems)));
|
|
26492
26452
|
if (line.name = AXIS_ELEMENT_NAME.subTick, line.id = this._getNodeId(`${index}`), isEmpty(subTick.state)) line.states = DEFAULT_STATES$2;else {
|
|
26493
26453
|
const subTickLineState = merge({}, DEFAULT_STATES$2, subTick.state);
|
|
26494
26454
|
Object.keys(subTickLineState).forEach(key => {
|
|
@@ -26505,7 +26465,7 @@
|
|
|
26505
26465
|
} = this.attribute.label;
|
|
26506
26466
|
dataFilter && isFunction$1(dataFilter) && (items = dataFilter(items, layer));
|
|
26507
26467
|
const data = this._transformItems(items),
|
|
26508
|
-
labelGroup = graphicCreator.group({
|
|
26468
|
+
labelGroup = graphicCreator$1.group({
|
|
26509
26469
|
x: 0,
|
|
26510
26470
|
y: 0,
|
|
26511
26471
|
pickable: !1
|
|
@@ -26514,7 +26474,7 @@
|
|
|
26514
26474
|
var _a;
|
|
26515
26475
|
const labelStyle = this._getLabelAttribute(item, index, data, layer);
|
|
26516
26476
|
let text;
|
|
26517
|
-
if (text = isRichText(labelStyle) ? graphicCreator.richtext(richTextAttributeTransform(labelStyle)) : graphicCreator.text(labelStyle), text.name = AXIS_ELEMENT_NAME.label, text.id = this._getNodeId(`layer${layer}-label-${item.id}`), isEmpty(null === (_a = this.attribute.label) || void 0 === _a ? void 0 : _a.state)) text.states = DEFAULT_STATES$2;else {
|
|
26477
|
+
if (text = isRichText(labelStyle) ? graphicCreator$1.richtext(richTextAttributeTransform(labelStyle)) : graphicCreator$1.text(labelStyle), text.name = AXIS_ELEMENT_NAME.label, text.id = this._getNodeId(`layer${layer}-label-${item.id}`), isEmpty(null === (_a = this.attribute.label) || void 0 === _a ? void 0 : _a.state)) text.states = DEFAULT_STATES$2;else {
|
|
26518
26478
|
const labelState = merge({}, DEFAULT_STATES$2, this.attribute.label.state);
|
|
26519
26479
|
Object.keys(labelState).forEach(key => {
|
|
26520
26480
|
isFunction$1(labelState[key]) && (labelState[key] = labelState[key](item, index, data, layer));
|
|
@@ -26529,7 +26489,7 @@
|
|
|
26529
26489
|
axisTitle.name = AXIS_ELEMENT_NAME.title, axisTitle.id = this._getNodeId("title"), container.add(axisTitle);
|
|
26530
26490
|
}
|
|
26531
26491
|
getVerticalCoord(point, offset, inside) {
|
|
26532
|
-
return getVerticalCoord(point, this.getVerticalVector(offset, inside, point));
|
|
26492
|
+
return getVerticalCoord$1(point, this.getVerticalVector(offset, inside, point));
|
|
26533
26493
|
}
|
|
26534
26494
|
getTextAlign(vector) {
|
|
26535
26495
|
let align = "center";
|
|
@@ -26962,7 +26922,7 @@
|
|
|
26962
26922
|
axisVector = this.getRelativeVector(),
|
|
26963
26923
|
normalizedAxisVector = normalize$2(axisVector),
|
|
26964
26924
|
verticalVector = [normalizedAxisVector[1], -1 * normalizedAxisVector[0]];
|
|
26965
|
-
return scale(verticalVector, offset * (inside ? 1 : -1) * verticalFactor);
|
|
26925
|
+
return scale$1(verticalVector, offset * (inside ? 1 : -1) * verticalFactor);
|
|
26966
26926
|
}
|
|
26967
26927
|
}
|
|
26968
26928
|
|
|
@@ -26996,7 +26956,7 @@
|
|
|
26996
26956
|
if (panel && panel.visible) {
|
|
26997
26957
|
const axisContainer = this.axisContainer,
|
|
26998
26958
|
axisContainerBounds = axisContainer.AABBBounds,
|
|
26999
|
-
bgRect = graphicCreator.rect(Object.assign({
|
|
26959
|
+
bgRect = graphicCreator$1.rect(Object.assign({
|
|
27000
26960
|
x: axisContainerBounds.x1,
|
|
27001
26961
|
y: axisContainerBounds.y1,
|
|
27002
26962
|
width: axisContainerBounds.width(),
|
|
@@ -27278,7 +27238,7 @@
|
|
|
27278
27238
|
const minSize = this._getAxisLabelLimitLength(verticalMinSize, layerCount);
|
|
27279
27239
|
let x, y;
|
|
27280
27240
|
axisLabelContainerSize = Math.max(axisLabelContainerSize, minSize), "left" === orient ? (x = axisLabelContainerBounds.x2 - axisLabelContainerSize, y = axisLabelContainerBounds.y1) : "right" === orient ? (x = axisLabelContainerBounds.x1, y = axisLabelContainerBounds.y1) : "top" === orient ? (x = axisLabelContainerBounds.x1, y = axisLabelContainerBounds.y2 - axisLabelContainerSize) : "bottom" === orient && (x = axisLabelContainerBounds.x1, y = axisLabelContainerBounds.y1);
|
|
27281
|
-
const bgRect = graphicCreator.rect({
|
|
27241
|
+
const bgRect = graphicCreator$1.rect({
|
|
27282
27242
|
x: x,
|
|
27283
27243
|
y: y,
|
|
27284
27244
|
width: isHorizontal ? axisLabelContainerBounds.width() : axisLabelContainerSize,
|
|
@@ -27383,7 +27343,7 @@
|
|
|
27383
27343
|
this._current = defaultCurrent;
|
|
27384
27344
|
const parsedPadding = normalizePadding(padding),
|
|
27385
27345
|
isHorizontal = "horizontal" === layout,
|
|
27386
|
-
container = graphicCreator.group({
|
|
27346
|
+
container = graphicCreator$1.group({
|
|
27387
27347
|
x: 0,
|
|
27388
27348
|
y: 0
|
|
27389
27349
|
}),
|
|
@@ -27396,7 +27356,7 @@
|
|
|
27396
27356
|
nextShape: nextShape
|
|
27397
27357
|
} = handler;
|
|
27398
27358
|
preShape || (preShape = isHorizontal ? "triangleLeft" : "triangleUp"), nextShape || (nextShape = isHorizontal ? "triangleRight" : "triangleDown");
|
|
27399
|
-
const preHandler = graphicCreator.symbol(Object.assign(Object.assign({
|
|
27359
|
+
const preHandler = graphicCreator$1.symbol(Object.assign(Object.assign({
|
|
27400
27360
|
strokeBoundsBuffer: 0,
|
|
27401
27361
|
pickMode: "imprecise"
|
|
27402
27362
|
}, handlerStyle), {
|
|
@@ -27415,7 +27375,7 @@
|
|
|
27415
27375
|
}, textStyle), null === (_c = null === (_b = this.stage) || void 0 === _b ? void 0 : _b.getTheme()) || void 0 === _c ? void 0 : _c.text),
|
|
27416
27376
|
handlerSizeX = isNumber$4(handlerSize) ? handlerSize : handlerSize[0],
|
|
27417
27377
|
handlerSizeY = isNumber$4(handlerSize) ? handlerSize : handlerSize[1],
|
|
27418
|
-
text = graphicCreator.text(Object.assign({
|
|
27378
|
+
text = graphicCreator$1.text(Object.assign({
|
|
27419
27379
|
x: isHorizontal ? handlerSizeX / 2 + handlerSpace + maxTextWidth / 2 : 0,
|
|
27420
27380
|
y: isHorizontal ? 0 : handlerSizeY / 2 + handlerSpace + maxTextHeight / 2,
|
|
27421
27381
|
text: this._getPageText(defaultCurrent),
|
|
@@ -27424,7 +27384,7 @@
|
|
|
27424
27384
|
lineHeight: null == textStyle ? void 0 : textStyle.fontSize
|
|
27425
27385
|
}, textStyle));
|
|
27426
27386
|
this.text = text, container.add(text);
|
|
27427
|
-
const nextHandler = graphicCreator.symbol(Object.assign(Object.assign({
|
|
27387
|
+
const nextHandler = graphicCreator$1.symbol(Object.assign(Object.assign({
|
|
27428
27388
|
strokeBoundsBuffer: 0,
|
|
27429
27389
|
pickMode: "imprecise"
|
|
27430
27390
|
}, handlerStyle), {
|
|
@@ -27499,7 +27459,7 @@
|
|
|
27499
27459
|
padding = 0
|
|
27500
27460
|
} = this.attribute,
|
|
27501
27461
|
parsedPadding = normalizePadding(padding),
|
|
27502
|
-
innerView = graphicCreator.group({
|
|
27462
|
+
innerView = graphicCreator$1.group({
|
|
27503
27463
|
x: parsedPadding[3],
|
|
27504
27464
|
y: parsedPadding[0],
|
|
27505
27465
|
pickable: interactive,
|
|
@@ -27693,7 +27653,7 @@
|
|
|
27693
27653
|
if (!1 === item.visible || isEmpty(items)) return;
|
|
27694
27654
|
let legendItems = items;
|
|
27695
27655
|
reversed && (legendItems = null == items ? void 0 : items.reverse());
|
|
27696
|
-
const itemsContainer = graphicCreator.group({
|
|
27656
|
+
const itemsContainer = graphicCreator$1.group({
|
|
27697
27657
|
x: 0,
|
|
27698
27658
|
y: 0
|
|
27699
27659
|
});
|
|
@@ -27777,15 +27737,15 @@
|
|
|
27777
27737
|
backgroundStyle = this._handleStyle(background, item, isSelected, index, items),
|
|
27778
27738
|
parsedPadding = normalizePadding(padding);
|
|
27779
27739
|
let itemGroup;
|
|
27780
|
-
!1 === background.visible ? (itemGroup = graphicCreator.group({
|
|
27740
|
+
!1 === background.visible ? (itemGroup = graphicCreator$1.group({
|
|
27781
27741
|
x: 0,
|
|
27782
27742
|
y: 0,
|
|
27783
27743
|
cursor: null === (_a = backgroundStyle.style) || void 0 === _a ? void 0 : _a.cursor
|
|
27784
|
-
}), this._appendDataToShape(itemGroup, LEGEND_ELEMENT_NAME.item, item, itemGroup)) : (itemGroup = graphicCreator.group(Object.assign({
|
|
27744
|
+
}), this._appendDataToShape(itemGroup, LEGEND_ELEMENT_NAME.item, item, itemGroup)) : (itemGroup = graphicCreator$1.group(Object.assign({
|
|
27785
27745
|
x: 0,
|
|
27786
27746
|
y: 0
|
|
27787
27747
|
}, backgroundStyle.style)), this._appendDataToShape(itemGroup, LEGEND_ELEMENT_NAME.item, item, itemGroup, backgroundStyle.state)), itemGroup.id = `${null != id ? id : label}-${index}`, itemGroup.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected);
|
|
27788
|
-
const innerGroup = graphicCreator.group({
|
|
27748
|
+
const innerGroup = graphicCreator$1.group({
|
|
27789
27749
|
x: 0,
|
|
27790
27750
|
y: 0,
|
|
27791
27751
|
pickable: !1
|
|
@@ -27798,7 +27758,7 @@
|
|
|
27798
27758
|
if (shapeAttr && !1 !== shapeAttr.visible) {
|
|
27799
27759
|
const s = get$5(shapeStyle, "style.size", DEFAULT_SHAPE_SIZE);
|
|
27800
27760
|
shapeSize = isArray$3(s) ? s[0] || 0 : s, shapeSpace = get$5(shapeAttr, "space", DEFAULT_SHAPE_SPACE);
|
|
27801
|
-
const itemShape = graphicCreator.symbol(Object.assign(Object.assign({
|
|
27761
|
+
const itemShape = graphicCreator$1.symbol(Object.assign(Object.assign({
|
|
27802
27762
|
x: 0,
|
|
27803
27763
|
y: 0,
|
|
27804
27764
|
symbolType: "circle",
|
|
@@ -27813,7 +27773,7 @@
|
|
|
27813
27773
|
focusSpace = 0;
|
|
27814
27774
|
if (focus) {
|
|
27815
27775
|
const focusSize = get$5(focusIconStyle, "size", DEFAULT_SHAPE_SIZE);
|
|
27816
|
-
focusShape = graphicCreator.symbol(Object.assign(Object.assign({
|
|
27776
|
+
focusShape = graphicCreator$1.symbol(Object.assign(Object.assign({
|
|
27817
27777
|
x: 0,
|
|
27818
27778
|
y: -focusSize / 2 - 1,
|
|
27819
27779
|
strokeBoundsBuffer: 0
|
|
@@ -27833,7 +27793,7 @@
|
|
|
27833
27793
|
}, labelStyle.style), {
|
|
27834
27794
|
text: text
|
|
27835
27795
|
});
|
|
27836
|
-
labelShape = isRichText(labelAttributes) ? graphicCreator.richtext(richTextAttributeTransform(labelAttributes)) : graphicCreator.text(labelAttributes), this._appendDataToShape(labelShape, LEGEND_ELEMENT_NAME.itemLabel, item, itemGroup, labelStyle.state), labelShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), innerGroup.add(labelShape);
|
|
27796
|
+
labelShape = isRichText(labelAttributes) ? graphicCreator$1.richtext(richTextAttributeTransform(labelAttributes)) : graphicCreator$1.text(labelAttributes), this._appendDataToShape(labelShape, LEGEND_ELEMENT_NAME.itemLabel, item, itemGroup, labelStyle.state), labelShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), innerGroup.add(labelShape);
|
|
27837
27797
|
const labelSpace = get$5(labelAttr, "space", DEFAULT_LABEL_SPACE);
|
|
27838
27798
|
if (isValid$3(value)) {
|
|
27839
27799
|
const valueSpace = get$5(valueAttr, "space", focus ? DEFAULT_VALUE_SPACE : 0),
|
|
@@ -27848,7 +27808,7 @@
|
|
|
27848
27808
|
text: valueText
|
|
27849
27809
|
});
|
|
27850
27810
|
let valueShape;
|
|
27851
|
-
if (valueShape = isRichText(valueAttributes) ? graphicCreator.richtext(richTextAttributeTransform(valueAttributes)) : graphicCreator.text(valueAttributes), this._appendDataToShape(valueShape, LEGEND_ELEMENT_NAME.itemValue, item, itemGroup, valueStyle.state), valueShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), this._itemWidthByUser) {
|
|
27811
|
+
if (valueShape = isRichText(valueAttributes) ? graphicCreator$1.richtext(richTextAttributeTransform(valueAttributes)) : graphicCreator$1.text(valueAttributes), this._appendDataToShape(valueShape, LEGEND_ELEMENT_NAME.itemValue, item, itemGroup, valueStyle.state), valueShape.addState(isSelected ? LegendStateValue.selected : LegendStateValue.unSelected), this._itemWidthByUser) {
|
|
27852
27812
|
const layoutWidth = this._itemWidthByUser - parsedPadding[1] - parsedPadding[3] - shapeSize - shapeSpace - labelSpace - focusSpace - valueSpace;
|
|
27853
27813
|
this._autoEllipsis(autoEllipsisStrategy, layoutWidth, labelShape, valueShape), valueAttr.alignRight ? valueShape.setAttributes({
|
|
27854
27814
|
textAlign: "right",
|
|
@@ -28046,7 +28006,7 @@
|
|
|
28046
28006
|
this._itemContext.totalPage = total, this._updatePositionOfPager(contentWidth, contentHeight, renderStartY, compWidth, compHeight);
|
|
28047
28007
|
}
|
|
28048
28008
|
defaultCurrent > 1 && (isHorizontal ? itemsContainer.setAttribute("y", -(defaultCurrent - 1) * (compHeight + spaceRow)) : itemsContainer.setAttribute("x", -(defaultCurrent - 1) * (compWidth + spaceCol)));
|
|
28049
|
-
const clipGroup = graphicCreator.group({
|
|
28009
|
+
const clipGroup = graphicCreator$1.group({
|
|
28050
28010
|
x: 0,
|
|
28051
28011
|
y: renderStartY,
|
|
28052
28012
|
width: isHorizontal ? contentWidth : compWidth,
|
|
@@ -28093,7 +28053,7 @@
|
|
|
28093
28053
|
}), this._itemContext.totalPage = pages, this._itemContext.pages = pages, this._updatePositionOfScrollbar(contentWidth, contentHeight, renderStartY);
|
|
28094
28054
|
}
|
|
28095
28055
|
defaultCurrent > 1 && (isHorizontal ? itemsContainer.setAttribute("x", -(defaultCurrent - 1) * (contentWidth + spaceCol)) : itemsContainer.setAttribute("y", -(defaultCurrent - 1) * (contentHeight + spaceRow)));
|
|
28096
|
-
const clipGroup = graphicCreator.group({
|
|
28056
|
+
const clipGroup = graphicCreator$1.group({
|
|
28097
28057
|
x: 0,
|
|
28098
28058
|
y: renderStartY,
|
|
28099
28059
|
width: contentWidth,
|
|
@@ -29412,7 +29372,7 @@
|
|
|
29412
29372
|
};
|
|
29413
29373
|
const isHorizontal = "horizontal" === layout;
|
|
29414
29374
|
this._isHorizontal = isHorizontal;
|
|
29415
|
-
const innerView = graphicCreator.group({
|
|
29375
|
+
const innerView = graphicCreator$1.group({
|
|
29416
29376
|
x: 0,
|
|
29417
29377
|
y: 0
|
|
29418
29378
|
});
|
|
@@ -29420,7 +29380,7 @@
|
|
|
29420
29380
|
let startTextShape,
|
|
29421
29381
|
startLen = 0;
|
|
29422
29382
|
if (startText && startText.visible) {
|
|
29423
|
-
startTextShape = graphicCreator.text(Object.assign({
|
|
29383
|
+
startTextShape = graphicCreator$1.text(Object.assign({
|
|
29424
29384
|
x: isHorizontal ? 0 : railWidth / 2,
|
|
29425
29385
|
y: isHorizontal ? railHeight / 2 : 0,
|
|
29426
29386
|
textAlign: isHorizontal ? "start" : "center",
|
|
@@ -29431,19 +29391,19 @@
|
|
|
29431
29391
|
const space = isValid$3(startText.space) ? startText.space : 0;
|
|
29432
29392
|
startLen += (isHorizontal ? startTextShape.AABBBounds.width() : startTextShape.AABBBounds.height()) + space;
|
|
29433
29393
|
}
|
|
29434
|
-
const mainContainer = graphicCreator.group({
|
|
29394
|
+
const mainContainer = graphicCreator$1.group({
|
|
29435
29395
|
x: isHorizontal ? startLen : 0,
|
|
29436
29396
|
y: isHorizontal ? 0 : startLen
|
|
29437
29397
|
});
|
|
29438
29398
|
innerView.add(mainContainer);
|
|
29439
|
-
const railContainer = graphicCreator.group({
|
|
29399
|
+
const railContainer = graphicCreator$1.group({
|
|
29440
29400
|
x: 0,
|
|
29441
29401
|
y: 0
|
|
29442
29402
|
});
|
|
29443
29403
|
let endTextShape;
|
|
29444
29404
|
if (railContainer.name = SLIDER_ELEMENT_NAME.railContainer, this._railContainer = railContainer, mainContainer.add(railContainer), this._mainContainer = mainContainer, this._renderRail(railContainer), startLen += isHorizontal ? railWidth : railHeight, endText && endText.visible) {
|
|
29445
29405
|
const space = isValid$3(endText.space) ? endText.space : 0;
|
|
29446
|
-
endTextShape = graphicCreator.text(Object.assign({
|
|
29406
|
+
endTextShape = graphicCreator$1.text(Object.assign({
|
|
29447
29407
|
x: isHorizontal ? startLen + space : railWidth / 2,
|
|
29448
29408
|
y: isHorizontal ? railHeight / 2 : startLen + space,
|
|
29449
29409
|
textAlign: isHorizontal ? "start" : "center",
|
|
@@ -29463,7 +29423,7 @@
|
|
|
29463
29423
|
} = this.attribute;
|
|
29464
29424
|
let cursor = "default";
|
|
29465
29425
|
!1 !== slidable && (cursor = "pointer");
|
|
29466
|
-
const railShape = graphicCreator.rect(Object.assign({
|
|
29426
|
+
const railShape = graphicCreator$1.rect(Object.assign({
|
|
29467
29427
|
x: 0,
|
|
29468
29428
|
y: 0,
|
|
29469
29429
|
width: railWidth,
|
|
@@ -29537,7 +29497,7 @@
|
|
|
29537
29497
|
} else startValue = min, endValue = clamp$3(value, min, max);
|
|
29538
29498
|
const isHorizontal = this._isHorizontal;
|
|
29539
29499
|
range || (startValue = min);
|
|
29540
|
-
const trackContainer = graphicCreator.group({
|
|
29500
|
+
const trackContainer = graphicCreator$1.group({
|
|
29541
29501
|
x: 0,
|
|
29542
29502
|
y: 0,
|
|
29543
29503
|
width: railWidth,
|
|
@@ -29552,7 +29512,7 @@
|
|
|
29552
29512
|
cursor = !1 === slidable ? "default" : !1 === range || !1 === draggableTrack ? "pointer" : getDefaultCursor(isHorizontal);
|
|
29553
29513
|
const startPos = this.calculatePosByValue(startValue, "start"),
|
|
29554
29514
|
endPos = this.calculatePosByValue(endValue, range ? "end" : "start"),
|
|
29555
|
-
track = graphicCreator.rect(Object.assign({
|
|
29515
|
+
track = graphicCreator$1.rect(Object.assign({
|
|
29556
29516
|
x: isHorizontal ? Math.min(startPos, endPos) : 0,
|
|
29557
29517
|
y: isHorizontal ? 0 : Math.min(startPos, endPos),
|
|
29558
29518
|
width: isHorizontal ? Math.abs(endPos - startPos) : railWidth,
|
|
@@ -29562,7 +29522,7 @@
|
|
|
29562
29522
|
track.name = SLIDER_ELEMENT_NAME.track, this._track = track, trackContainer.add(track), container.add(trackContainer);
|
|
29563
29523
|
}
|
|
29564
29524
|
_renderHandler(style) {
|
|
29565
|
-
return graphicCreator.symbol(style);
|
|
29525
|
+
return graphicCreator$1.symbol(style);
|
|
29566
29526
|
}
|
|
29567
29527
|
_renderHandlerText(value, position) {
|
|
29568
29528
|
var _a, _b, _c;
|
|
@@ -29583,7 +29543,7 @@
|
|
|
29583
29543
|
cursor: !1 === slidable ? "default" : getDefaultCursor(isHorizontal)
|
|
29584
29544
|
};
|
|
29585
29545
|
isHorizontal ? "top" === align ? (textStyle.textBaseline = "bottom", textStyle.textAlign = "center", textStyle.x = pos, textStyle.y = (railHeight - handlerSize) / 2 - textSpace) : (textStyle.textBaseline = "top", textStyle.textAlign = "center", textStyle.x = pos, textStyle.y = (railHeight + handlerSize) / 2 + textSpace) : "left" === align ? (textStyle.textBaseline = "middle", textStyle.textAlign = "end", textStyle.x = (railWidth - handlerSize) / 2 - textSpace, textStyle.y = pos) : (textStyle.textBaseline = "middle", textStyle.textAlign = "start", textStyle.x = (railWidth + handlerSize) / 2 + textSpace, textStyle.y = pos);
|
|
29586
|
-
return graphicCreator.text(Object.assign(Object.assign({}, textStyle), handlerText.style));
|
|
29546
|
+
return graphicCreator$1.text(Object.assign(Object.assign({}, textStyle), handlerText.style));
|
|
29587
29547
|
}
|
|
29588
29548
|
_renderTooltip() {
|
|
29589
29549
|
var _a;
|
|
@@ -29600,7 +29560,7 @@
|
|
|
29600
29560
|
const cx = this._isHorizontal ? 0 : railWidth / 2,
|
|
29601
29561
|
cy = this._isHorizontal ? railHeight / 2 : 0;
|
|
29602
29562
|
if (tooltip && tooltip.shape) {
|
|
29603
|
-
const shape = graphicCreator.symbol(Object.assign({
|
|
29563
|
+
const shape = graphicCreator$1.symbol(Object.assign({
|
|
29604
29564
|
pickable: !1,
|
|
29605
29565
|
visible: !!this._tooltipState,
|
|
29606
29566
|
x: cx,
|
|
@@ -29617,7 +29577,7 @@
|
|
|
29617
29577
|
text: ""
|
|
29618
29578
|
};
|
|
29619
29579
|
this._isHorizontal ? (textStyle.x = cx, textStyle.y = "top" === align ? cy - railHeight / 2 - space : cy + railHeight / 2 + space, textStyle.textAlign = "center", textStyle.textBaseline = "top" === align ? "bottom" : "top") : (textStyle.y = cy, textStyle.x = "left" === align ? cx - railWidth / 2 - space : cy + railWidth / 2 + space, textStyle.textAlign = "left" === align ? "end" : "start", textStyle.textBaseline = "middle");
|
|
29620
|
-
const text = graphicCreator.text(Object.assign(Object.assign({}, textStyle), textConfig.style));
|
|
29580
|
+
const text = graphicCreator$1.text(Object.assign(Object.assign({}, textStyle), textConfig.style));
|
|
29621
29581
|
this._mainContainer.add(text), this._tooltipText = text, this._tooltipState && this._updateTooltip();
|
|
29622
29582
|
}
|
|
29623
29583
|
_updateTooltip() {
|
|
@@ -30047,7 +30007,7 @@
|
|
|
30047
30007
|
disableTriggerEvent: disableTriggerEvent,
|
|
30048
30008
|
inverse: inverse
|
|
30049
30009
|
} = this.attribute,
|
|
30050
|
-
mainContainer = graphicCreator.group({
|
|
30010
|
+
mainContainer = graphicCreator$1.group({
|
|
30051
30011
|
x: 0,
|
|
30052
30012
|
y: 0
|
|
30053
30013
|
});
|
|
@@ -30086,7 +30046,7 @@
|
|
|
30086
30046
|
let path,
|
|
30087
30047
|
start = 0;
|
|
30088
30048
|
"horizontal" === layout ? "top" === align ? (path = `M0,0L${railWidth},0L${inverse ? 0 : railWidth},12Z`, start = railHeight) : (path = `M0,12L${railWidth},12L${inverse ? 0 : railWidth},0Z`, slider.setAttribute("y", 12)) : "left" === align ? path = `M${railWidth},0L${railWidth + 12},${inverse ? 0 : railHeight}L${railWidth},${railHeight}Z` : (path = `M0,${inverse ? 0 : railHeight}L12,${railHeight}L12,0Z`, slider.setAttribute("x", 12));
|
|
30089
|
-
const background = graphicCreator.path(Object.assign(Object.assign({
|
|
30049
|
+
const background = graphicCreator$1.path(Object.assign(Object.assign({
|
|
30090
30050
|
x: 0,
|
|
30091
30051
|
y: start,
|
|
30092
30052
|
path: path
|
|
@@ -32089,6 +32049,25 @@
|
|
|
32089
32049
|
|
|
32090
32050
|
const DEFAULT_CONTINUOUS_TICK_COUNT$1 = 5;
|
|
32091
32051
|
|
|
32052
|
+
class GraphicCreator {
|
|
32053
|
+
constructor() {
|
|
32054
|
+
this.store = new Map();
|
|
32055
|
+
}
|
|
32056
|
+
RegisterGraphicCreator(name, cb) {
|
|
32057
|
+
this.store.set(name, cb), this[name] = cb;
|
|
32058
|
+
}
|
|
32059
|
+
CreateGraphic(name, params) {
|
|
32060
|
+
const cb = this.store.get(name);
|
|
32061
|
+
return cb ? cb(params) : null;
|
|
32062
|
+
}
|
|
32063
|
+
}
|
|
32064
|
+
const graphicCreator = new GraphicCreator();
|
|
32065
|
+
|
|
32066
|
+
let text;
|
|
32067
|
+
function getTextBounds(params) {
|
|
32068
|
+
return text || (text = graphicCreator.CreateGraphic("text", {})), text.initAttributes(params), text.AABBBounds;
|
|
32069
|
+
}
|
|
32070
|
+
|
|
32092
32071
|
const initTextMeasure$1 = (textSpec, option, useNaiveCanvas, defaultFontParams) => new TextMeasure(Object.assign({
|
|
32093
32072
|
defaultFontParams: Object.assign({
|
|
32094
32073
|
fontFamily: "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol",
|
|
@@ -32098,6 +32077,57 @@
|
|
|
32098
32077
|
specialCharSet: "-/: .,@%'\"~" + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase()
|
|
32099
32078
|
}, null != option ? option : {}), textSpec);
|
|
32100
32079
|
|
|
32080
|
+
function scale(vector, scale) {
|
|
32081
|
+
return [vector[0] * scale, vector[1] * scale];
|
|
32082
|
+
}
|
|
32083
|
+
function length(vector) {
|
|
32084
|
+
const [x, y] = vector;
|
|
32085
|
+
return Math.sqrt(x * x + y * y);
|
|
32086
|
+
}
|
|
32087
|
+
|
|
32088
|
+
const clampRadian = function () {
|
|
32089
|
+
let angle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
|
|
32090
|
+
if (angle < 0) for (; angle < 0;) angle += tau;else if (angle > 0) for (; angle > tau;) angle -= tau;
|
|
32091
|
+
return angle;
|
|
32092
|
+
};
|
|
32093
|
+
function isInRange(a, min, max) {
|
|
32094
|
+
return !isLess(a, min, 0, 1e-6) && !isGreater(a, max, 0, 1e-6);
|
|
32095
|
+
}
|
|
32096
|
+
function getCircleLabelPosition(tickPosition, tickVector, text, style) {
|
|
32097
|
+
const labelBounds = getTextBounds(Object.assign({
|
|
32098
|
+
text: text
|
|
32099
|
+
}, style)),
|
|
32100
|
+
width = labelBounds.width(),
|
|
32101
|
+
height = labelBounds.height(),
|
|
32102
|
+
angle = clampRadian(Math.atan2(tickVector[1], tickVector[0])) - Math.PI,
|
|
32103
|
+
PI_3_4 = 3 * Math.PI / 4,
|
|
32104
|
+
PI_1_4 = Math.PI / 4,
|
|
32105
|
+
PI_1_2 = Math.PI / 2,
|
|
32106
|
+
baseX = tickPosition.x;
|
|
32107
|
+
let dx = 0;
|
|
32108
|
+
dx = isInRange(angle, -PI_3_4, -PI_1_4) ? ((angle + PI_3_4) / PI_1_2 - .5) * width : isInRange(angle, PI_1_4, PI_3_4) ? (.5 - (angle - PI_1_4) / PI_1_2) * width : Math.cos(angle) >= 0 ? .5 * width : .5 * -width;
|
|
32109
|
+
const x = baseX - dx,
|
|
32110
|
+
baseY = tickPosition.y;
|
|
32111
|
+
let dy = 0;
|
|
32112
|
+
dy = isInRange(angle, -PI_3_4, -PI_1_4) ? .5 * -height : isInRange(angle, PI_1_4, PI_3_4) ? .5 * height : Math.cos(angle) >= 0 ? (.5 - (PI_1_4 - angle) / PI_1_2) * height : (.5 - clampRadian(angle - PI_3_4) / PI_1_2) * height;
|
|
32113
|
+
return {
|
|
32114
|
+
x: x,
|
|
32115
|
+
y: baseY - dy
|
|
32116
|
+
};
|
|
32117
|
+
}
|
|
32118
|
+
function getVerticalCoord(point, vector) {
|
|
32119
|
+
return {
|
|
32120
|
+
x: point.x + vector[0],
|
|
32121
|
+
y: point.y + vector[1]
|
|
32122
|
+
};
|
|
32123
|
+
}
|
|
32124
|
+
function getCircleVerticalVector(offset, point, center) {
|
|
32125
|
+
let inside = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : !1;
|
|
32126
|
+
let axisInside = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : !1;
|
|
32127
|
+
const vector = [point.x - center.x, point.y - center.y];
|
|
32128
|
+
return scale(vector, (inside ? -1 : 1) * (axisInside ? -1 : 1) * offset / length(vector));
|
|
32129
|
+
}
|
|
32130
|
+
|
|
32101
32131
|
function getLabelPosition(angle, center, radius, labelOffset, inside, text, style) {
|
|
32102
32132
|
const point = polarToCartesian({
|
|
32103
32133
|
x: 0,
|
|
@@ -34250,6 +34280,9 @@
|
|
|
34250
34280
|
this.updatePagerData();
|
|
34251
34281
|
this.fireListeners(EVENT_TYPE.CHANGE_ORDER, null);
|
|
34252
34282
|
}
|
|
34283
|
+
setSortedIndexMap(field, filedMap) {
|
|
34284
|
+
this.sortedIndexMap.set(field, filedMap);
|
|
34285
|
+
}
|
|
34253
34286
|
clearFilteredChildren(record) {
|
|
34254
34287
|
record.filteredChildren = undefined;
|
|
34255
34288
|
for (let i = 0; i < record.children?.length ?? 0; i++) {
|
|
@@ -36892,7 +36925,7 @@
|
|
|
36892
36925
|
const barTop = top + contentHeight - barHeight - barBottom;
|
|
36893
36926
|
let barSize = Math.min(barMaxWidth * percentile, barMaxWidth);
|
|
36894
36927
|
const barLeft = barRightToLeft ? left + right - barSize : left;
|
|
36895
|
-
if (col === table.colCount - 1 && percentile === 1) {
|
|
36928
|
+
if (col === table.colCount - 1 && percentile === 1 && !barRightToLeft) {
|
|
36896
36929
|
barSize -= 1;
|
|
36897
36930
|
}
|
|
36898
36931
|
const bgFillColor = getOrApply(barBgColor, {
|
|
@@ -36994,7 +37027,7 @@
|
|
|
36994
37027
|
});
|
|
36995
37028
|
percentCompleteBarGroup.addChild(barNega);
|
|
36996
37029
|
let barSizePosi = Math.min(barMaxWidth * positiveFactor * positiveRate, barMaxWidth);
|
|
36997
|
-
if (col === table.colCount - 1 && positiveRate === 1) {
|
|
37030
|
+
if (col === table.colCount - 1 && positiveRate === 1 && !barRightToLeft) {
|
|
36998
37031
|
barSizePosi -= 1;
|
|
36999
37032
|
}
|
|
37000
37033
|
const barRectPosi = barRightToLeft
|
|
@@ -37120,7 +37153,7 @@
|
|
|
37120
37153
|
const percentile = range === 0 ? 0 : Math.abs(num) / range;
|
|
37121
37154
|
const barMaxWidth = contentWidth;
|
|
37122
37155
|
let barSize = Math.min(barMaxWidth * percentile, barMaxWidth);
|
|
37123
|
-
if (col === table.colCount - 1 && percentile === 1) {
|
|
37156
|
+
if (col === table.colCount - 1 && percentile === 1 && !barRightToLeft) {
|
|
37124
37157
|
barSize -= 1;
|
|
37125
37158
|
}
|
|
37126
37159
|
const barTop = top + contentHeight - barHeight - barBottom;
|
|
@@ -39461,7 +39494,7 @@
|
|
|
39461
39494
|
cellGroup.contentWidth = contentWidth;
|
|
39462
39495
|
cellGroup.contentHeight = contentHeight;
|
|
39463
39496
|
resizeCellGroup(cellGroup, rangeWidth, rangeHeight, customMergeRange, table);
|
|
39464
|
-
return
|
|
39497
|
+
return customMergeRange;
|
|
39465
39498
|
}
|
|
39466
39499
|
}
|
|
39467
39500
|
}
|
|
@@ -39843,7 +39876,7 @@
|
|
|
39843
39876
|
visible: true,
|
|
39844
39877
|
text: indicatorInfo?.title
|
|
39845
39878
|
},
|
|
39846
|
-
range
|
|
39879
|
+
range
|
|
39847
39880
|
}, axisOption, {
|
|
39848
39881
|
orient: 'bottom',
|
|
39849
39882
|
type: axisOption?.type || 'linear',
|
|
@@ -39868,14 +39901,20 @@
|
|
|
39868
39901
|
if (axisOption?.visible === false) {
|
|
39869
39902
|
return;
|
|
39870
39903
|
}
|
|
39904
|
+
const spec = layout.getRawChartSpec(col + 1, row);
|
|
39871
39905
|
return merge({
|
|
39872
|
-
domain: chartType === '
|
|
39906
|
+
domain: chartType === 'scatter'
|
|
39907
|
+
? undefined
|
|
39908
|
+
: spec?.series?.length >= 1
|
|
39909
|
+
? Array.from(domain)
|
|
39910
|
+
: Array.from(domain).reverse(),
|
|
39911
|
+
range: chartType === 'scatter' ? domain : undefined,
|
|
39873
39912
|
title: {
|
|
39874
39913
|
autoRotate: true
|
|
39875
39914
|
}
|
|
39876
39915
|
}, axisOption, {
|
|
39877
39916
|
orient: 'left',
|
|
39878
|
-
type: 'band',
|
|
39917
|
+
type: chartType === 'scatter' ? axisOption?.type ?? 'linear' : 'band',
|
|
39879
39918
|
__vtableChartTheme: theme
|
|
39880
39919
|
});
|
|
39881
39920
|
}
|
|
@@ -39993,15 +40032,16 @@
|
|
|
39993
40032
|
const data = layout.dataset.collectedValues[columnDimensionKey] ?? [];
|
|
39994
40033
|
const colPath = layout.getColKeysPath(col, row);
|
|
39995
40034
|
const domain = data?.[colPath ?? ''] ?? [];
|
|
39996
|
-
const { axisOption, isPercent, theme } = getAxisOption(col, row - 1, 'bottom', layout);
|
|
40035
|
+
const { axisOption, isPercent, theme, chartType } = getAxisOption(col, row - 1, 'bottom', layout);
|
|
39997
40036
|
if (axisOption?.visible === false) {
|
|
39998
40037
|
return;
|
|
39999
40038
|
}
|
|
40000
40039
|
return merge({
|
|
40001
|
-
domain: Array.from(domain)
|
|
40040
|
+
domain: chartType === 'scatter' ? undefined : Array.from(domain),
|
|
40041
|
+
range: chartType === 'scatter' ? domain : undefined
|
|
40002
40042
|
}, axisOption, {
|
|
40003
40043
|
orient: 'bottom',
|
|
40004
|
-
type: 'band',
|
|
40044
|
+
type: chartType === 'scatter' ? axisOption?.type ?? 'linear' : 'band',
|
|
40005
40045
|
__vtableChartTheme: theme
|
|
40006
40046
|
});
|
|
40007
40047
|
}
|
|
@@ -40010,15 +40050,31 @@
|
|
|
40010
40050
|
}
|
|
40011
40051
|
function getAxisOption(col, row, orient, layout) {
|
|
40012
40052
|
const spec = layout.getRawChartSpec(col, row);
|
|
40013
|
-
|
|
40014
|
-
|
|
40053
|
+
const axes = spec.axes ?? [];
|
|
40054
|
+
layout._table.pivotChartAxes.forEach(axis => {
|
|
40055
|
+
const index = axes.findIndex((a) => {
|
|
40056
|
+
return axis.orient === a.orient;
|
|
40057
|
+
});
|
|
40058
|
+
if (index === -1) {
|
|
40059
|
+
axes.push(axis);
|
|
40060
|
+
}
|
|
40061
|
+
});
|
|
40062
|
+
if (spec && isArray$3(axes)) {
|
|
40063
|
+
const axisOption = axes.find((axis) => {
|
|
40015
40064
|
return axis.orient === orient;
|
|
40016
40065
|
});
|
|
40017
40066
|
if (axisOption) {
|
|
40018
40067
|
const { seriesIndex, seriesId } = axisOption;
|
|
40019
40068
|
let seriesIndice;
|
|
40069
|
+
let seriesSpec;
|
|
40020
40070
|
if (isValid$3(seriesId) && isArray$3(spec.series)) {
|
|
40021
|
-
seriesIndice = (isArray$3(seriesId) ? seriesId : [seriesId]).map(id =>
|
|
40071
|
+
seriesIndice = (isArray$3(seriesId) ? seriesId : [seriesId]).map(id => {
|
|
40072
|
+
const index = spec.series.findIndex((s) => s.id === id);
|
|
40073
|
+
if (index >= 0) {
|
|
40074
|
+
seriesSpec = spec.series[index];
|
|
40075
|
+
}
|
|
40076
|
+
return index;
|
|
40077
|
+
});
|
|
40022
40078
|
}
|
|
40023
40079
|
else if (isValid$3(seriesIndex) && isArray$3(spec.series)) {
|
|
40024
40080
|
seriesIndice = seriesIndex;
|
|
@@ -40029,7 +40085,7 @@
|
|
|
40029
40085
|
isZeroAlign: checkZeroAlign(spec, orient, layout),
|
|
40030
40086
|
seriesIndice,
|
|
40031
40087
|
theme: spec.theme,
|
|
40032
|
-
chartType: spec.type
|
|
40088
|
+
chartType: seriesSpec?.type ?? spec.type
|
|
40033
40089
|
};
|
|
40034
40090
|
}
|
|
40035
40091
|
}
|
|
@@ -40529,7 +40585,7 @@
|
|
|
40529
40585
|
fontFamily: DefaultTextStyle.fontFamily,
|
|
40530
40586
|
fontSize: DefaultTextStyle.fontSize
|
|
40531
40587
|
},
|
|
40532
|
-
getTextBounds: useNaiveCanvas ? undefined : getTextBounds,
|
|
40588
|
+
getTextBounds: useNaiveCanvas ? undefined : getTextBounds$1,
|
|
40533
40589
|
specialCharSet: `{}()//&-/: .,@%'"~…=${TextMeasure.ALPHABET_CHAR_SET}${TextMeasure.ALPHABET_CHAR_SET.toUpperCase()}0123456789${customAlphabetCharSet}`,
|
|
40534
40590
|
...(option ?? {})
|
|
40535
40591
|
}, textSpec);
|
|
@@ -41155,7 +41211,7 @@
|
|
|
41155
41211
|
}
|
|
41156
41212
|
else {
|
|
41157
41213
|
text = cellValue;
|
|
41158
|
-
const lines =
|
|
41214
|
+
const lines = breakString(text, table);
|
|
41159
41215
|
const cellWidth = table.getColsWidth(col, endCol);
|
|
41160
41216
|
if (iconInlineFront.length || iconInlineEnd.length) {
|
|
41161
41217
|
if (autoWrapText) {
|
|
@@ -41351,7 +41407,20 @@
|
|
|
41351
41407
|
let customElementsGroup;
|
|
41352
41408
|
customContainer.removeAllChild();
|
|
41353
41409
|
cell.removeChild(customContainer);
|
|
41354
|
-
|
|
41410
|
+
const customMergeRange = getCustomCellMergeCustom(col, row, cell, scene.table);
|
|
41411
|
+
if (customMergeRange) {
|
|
41412
|
+
for (let mergeRow = customMergeRange.start.row; mergeRow <= customMergeRange.end.row; mergeRow++) {
|
|
41413
|
+
if (mergeRow === row) {
|
|
41414
|
+
continue;
|
|
41415
|
+
}
|
|
41416
|
+
const mergedCell = scene.getCell(col, mergeRow);
|
|
41417
|
+
const customContainer = mergedCell.getChildByName('custom-container');
|
|
41418
|
+
customContainer.removeAllChild();
|
|
41419
|
+
mergedCell.removeChild(customContainer);
|
|
41420
|
+
getCustomCellMergeCustom(col, mergeRow, mergedCell, scene.table);
|
|
41421
|
+
}
|
|
41422
|
+
}
|
|
41423
|
+
else {
|
|
41355
41424
|
let customRender;
|
|
41356
41425
|
let customLayout;
|
|
41357
41426
|
const cellLocation = scene.table.getCellLocation(col, row);
|
|
@@ -41658,7 +41727,20 @@
|
|
|
41658
41727
|
let customElementsGroup;
|
|
41659
41728
|
customContainer.removeAllChild();
|
|
41660
41729
|
cell.removeChild(customContainer);
|
|
41661
|
-
|
|
41730
|
+
const customMergeRange = getCustomCellMergeCustom(col, row, cell, scene.table);
|
|
41731
|
+
if (customMergeRange) {
|
|
41732
|
+
for (let mergeCol = customMergeRange.start.col; mergeCol <= customMergeRange.end.col; mergeCol++) {
|
|
41733
|
+
if (mergeCol === col) {
|
|
41734
|
+
continue;
|
|
41735
|
+
}
|
|
41736
|
+
const mergedCell = scene.getCell(mergeCol, row);
|
|
41737
|
+
const customContainer = mergedCell.getChildByName('custom-container');
|
|
41738
|
+
customContainer.removeAllChild();
|
|
41739
|
+
mergedCell.removeChild(customContainer);
|
|
41740
|
+
getCustomCellMergeCustom(mergeCol, row, mergedCell, scene.table);
|
|
41741
|
+
}
|
|
41742
|
+
}
|
|
41743
|
+
else {
|
|
41662
41744
|
let customRender;
|
|
41663
41745
|
let customLayout;
|
|
41664
41746
|
const cellType = scene.table.getCellLocation(col, row);
|
|
@@ -44758,13 +44840,7 @@
|
|
|
44758
44840
|
else {
|
|
44759
44841
|
text = cellValue;
|
|
44760
44842
|
}
|
|
44761
|
-
|
|
44762
|
-
if (!table.internalProps.enableLineBreak && !table.options.customConfig?.multilinesForXTable) {
|
|
44763
|
-
lines = [validToString(text)];
|
|
44764
|
-
}
|
|
44765
|
-
else {
|
|
44766
|
-
lines = validToString(text).split('\n') || [];
|
|
44767
|
-
}
|
|
44843
|
+
const lines = breakString(text, table);
|
|
44768
44844
|
if (lines.length >= 1) {
|
|
44769
44845
|
lines.forEach((line) => {
|
|
44770
44846
|
const width = table.measureText(line.slice(0, table.options.maxCharactersNumber || 200), {
|
|
@@ -47203,6 +47279,13 @@
|
|
|
47203
47279
|
});
|
|
47204
47280
|
scene.selectedRangeComponents = new Map();
|
|
47205
47281
|
}
|
|
47282
|
+
function deleteAllSelectingBorder(scene) {
|
|
47283
|
+
scene.selectingRangeComponents.forEach((selectComp, key) => {
|
|
47284
|
+
selectComp.rect.delete();
|
|
47285
|
+
selectComp.fillhandle?.delete();
|
|
47286
|
+
});
|
|
47287
|
+
scene.selectingRangeComponents = new Map();
|
|
47288
|
+
}
|
|
47206
47289
|
function removeFillHandleFromSelectComponents(scene) {
|
|
47207
47290
|
scene.selectedRangeComponents.forEach((selectComp, key) => {
|
|
47208
47291
|
selectComp.fillhandle?.delete();
|
|
@@ -51923,7 +52006,27 @@
|
|
|
51923
52006
|
if (this.select.ranges.length === 0) {
|
|
51924
52007
|
return;
|
|
51925
52008
|
}
|
|
51926
|
-
|
|
52009
|
+
const currentRange = this.select.ranges[this.select.ranges.length - 1];
|
|
52010
|
+
let isSame = false;
|
|
52011
|
+
for (let i = 0; i < this.select.ranges.length - 1; i++) {
|
|
52012
|
+
const range = this.select.ranges[i];
|
|
52013
|
+
if (range &&
|
|
52014
|
+
range.start.col === currentRange.start.col &&
|
|
52015
|
+
range.start.row === currentRange.start.row &&
|
|
52016
|
+
range.end.col === currentRange.end.col &&
|
|
52017
|
+
range.end.row === currentRange.end.row) {
|
|
52018
|
+
isSame = true;
|
|
52019
|
+
break;
|
|
52020
|
+
}
|
|
52021
|
+
}
|
|
52022
|
+
if (isSame) {
|
|
52023
|
+
this.select.ranges.pop();
|
|
52024
|
+
deleteAllSelectingBorder(this.table.scenegraph);
|
|
52025
|
+
this.table.scenegraph.selectingRangeComponents.clear();
|
|
52026
|
+
}
|
|
52027
|
+
else {
|
|
52028
|
+
selectEnd(this.table.scenegraph);
|
|
52029
|
+
}
|
|
51927
52030
|
const lastCol = this.select.ranges[this.select.ranges.length - 1].end.col;
|
|
51928
52031
|
const lastRow = this.select.ranges[this.select.ranges.length - 1].end.row;
|
|
51929
52032
|
fireListener &&
|
|
@@ -53669,7 +53772,7 @@
|
|
|
53669
53772
|
table.selectCell(targetCol, targetRow);
|
|
53670
53773
|
if ((table.options.keyboardOptions?.moveEditCellOnArrowKeys ?? false) &&
|
|
53671
53774
|
table.editorManager.editingEditor) {
|
|
53672
|
-
table.editorManager.completeEdit();
|
|
53775
|
+
table.editorManager.completeEdit(e);
|
|
53673
53776
|
table.getElement().focus();
|
|
53674
53777
|
if (table.getEditor(targetCol, targetRow)) {
|
|
53675
53778
|
table.editorManager.startEditCell(targetCol, targetRow);
|
|
@@ -53681,7 +53784,7 @@
|
|
|
53681
53784
|
}
|
|
53682
53785
|
else if (e.key === 'Enter') {
|
|
53683
53786
|
if (table.editorManager.editingEditor) {
|
|
53684
|
-
table.editorManager.completeEdit();
|
|
53787
|
+
table.editorManager.completeEdit(e);
|
|
53685
53788
|
table.getElement().focus();
|
|
53686
53789
|
}
|
|
53687
53790
|
else {
|
|
@@ -53719,7 +53822,7 @@
|
|
|
53719
53822
|
}
|
|
53720
53823
|
table.selectCell(targetCol, targetRow);
|
|
53721
53824
|
if (table.editorManager.editingEditor) {
|
|
53722
|
-
table.editorManager.completeEdit();
|
|
53825
|
+
table.editorManager.completeEdit(e);
|
|
53723
53826
|
table.getElement().focus();
|
|
53724
53827
|
if (table.getEditor(targetCol, targetRow)) {
|
|
53725
53828
|
table.editorManager.startEditCell(targetCol, targetRow);
|
|
@@ -57987,7 +58090,7 @@
|
|
|
57987
58090
|
return TABLE_EVENT_TYPE;
|
|
57988
58091
|
}
|
|
57989
58092
|
options;
|
|
57990
|
-
version = "0.25.1-alpha.
|
|
58093
|
+
version = "0.25.1-alpha.4";
|
|
57991
58094
|
pagination;
|
|
57992
58095
|
id = `VTable${Date.now()}`;
|
|
57993
58096
|
headerStyleCache;
|
|
@@ -58086,7 +58189,6 @@
|
|
|
58086
58189
|
internalProps.theme = themes.of(options.theme ?? themes.DEFAULT);
|
|
58087
58190
|
internalProps.theme.isPivot = this.isPivotTable();
|
|
58088
58191
|
if (container) {
|
|
58089
|
-
container.innerHTML = '';
|
|
58090
58192
|
container.appendChild(internalProps.element);
|
|
58091
58193
|
this._updateSize();
|
|
58092
58194
|
}
|
|
@@ -60641,6 +60743,9 @@
|
|
|
60641
60743
|
}
|
|
60642
60744
|
}
|
|
60643
60745
|
}
|
|
60746
|
+
setSortedIndexMap(field, filedMap) {
|
|
60747
|
+
this.dataSource?.setSortedIndexMap(field, filedMap);
|
|
60748
|
+
}
|
|
60644
60749
|
}
|
|
60645
60750
|
|
|
60646
60751
|
var core = /*#__PURE__*/Object.freeze({
|
|
@@ -60839,7 +60944,10 @@
|
|
|
60839
60944
|
for (let i = 0; i < layout.indicatorsDefine.length; i++) {
|
|
60840
60945
|
const columnObj = layout.indicatorsDefine[i];
|
|
60841
60946
|
if (columnObj.chartSpec) {
|
|
60842
|
-
if (columnObj.chartSpec.type !== '
|
|
60947
|
+
if (columnObj.chartSpec.type !== 'wordCloud' &&
|
|
60948
|
+
columnObj.chartSpec.type !== 'radar' &&
|
|
60949
|
+
columnObj.chartSpec.type !== 'gauge' &&
|
|
60950
|
+
columnObj.chartSpec.type !== 'pie' &&
|
|
60843
60951
|
columnObj.chartSpec.type !== 'funnel' &&
|
|
60844
60952
|
columnObj.chartSpec.type !== 'rose') {
|
|
60845
60953
|
isHasCartesianChart = true;
|
|
@@ -60853,7 +60961,12 @@
|
|
|
60853
60961
|
let isHasCartesianChart = true;
|
|
60854
60962
|
const chartSpec = layout.getRawChartSpec(col, row);
|
|
60855
60963
|
if (chartSpec) {
|
|
60856
|
-
if (chartSpec.type === 'pie' ||
|
|
60964
|
+
if (chartSpec.type === 'pie' ||
|
|
60965
|
+
chartSpec.type === 'radar' ||
|
|
60966
|
+
chartSpec.type === 'gauge' ||
|
|
60967
|
+
chartSpec.type === 'wordCloud' ||
|
|
60968
|
+
chartSpec.type === 'funnel' ||
|
|
60969
|
+
chartSpec.type === 'rose') {
|
|
60857
60970
|
isHasCartesianChart = false;
|
|
60858
60971
|
}
|
|
60859
60972
|
}
|
|
@@ -60869,6 +60982,9 @@
|
|
|
60869
60982
|
const columnObj = layout.indicatorsDefine[i];
|
|
60870
60983
|
if (columnObj.chartSpec) {
|
|
60871
60984
|
if (columnObj.chartSpec.type !== 'pie' &&
|
|
60985
|
+
columnObj.chartSpec.type !== 'wordCloud' &&
|
|
60986
|
+
columnObj.chartSpec.type !== 'radar' &&
|
|
60987
|
+
columnObj.chartSpec.type !== 'gauge' &&
|
|
60872
60988
|
columnObj.chartSpec.type !== 'funnel' &&
|
|
60873
60989
|
columnObj.chartSpec.type !== 'rose') {
|
|
60874
60990
|
isHasCartesianChart = true;
|
|
@@ -60880,7 +60996,12 @@
|
|
|
60880
60996
|
else {
|
|
60881
60997
|
const chartSpec = layout.getRawChartSpec(col, row);
|
|
60882
60998
|
if (chartSpec) {
|
|
60883
|
-
if (chartSpec.type !== 'pie' &&
|
|
60999
|
+
if (chartSpec.type !== 'pie' &&
|
|
61000
|
+
chartSpec.type !== 'radar' &&
|
|
61001
|
+
chartSpec.type !== 'gauge' &&
|
|
61002
|
+
chartSpec.type !== 'wordCloud' &&
|
|
61003
|
+
chartSpec.type !== 'funnel' &&
|
|
61004
|
+
chartSpec.type !== 'rose') {
|
|
60884
61005
|
isHasCartesianChart = true;
|
|
60885
61006
|
}
|
|
60886
61007
|
}
|
|
@@ -60901,7 +61022,9 @@
|
|
|
60901
61022
|
serie.sortDataByAxis = true;
|
|
60902
61023
|
});
|
|
60903
61024
|
}
|
|
60904
|
-
chartSpec.
|
|
61025
|
+
if (chartSpec.type !== 'gauge' && chartSpec.type !== 'rose' && chartSpec.type !== 'radar') {
|
|
61026
|
+
chartSpec.axes = layout.getChartAxes(col, row);
|
|
61027
|
+
}
|
|
60905
61028
|
chartSpec.padding = 0;
|
|
60906
61029
|
chartSpec.dataZoom = [];
|
|
60907
61030
|
return chartSpec;
|
|
@@ -60955,11 +61078,12 @@
|
|
|
60955
61078
|
[];
|
|
60956
61079
|
const rowPath = layout.getRowKeysPath(col, row);
|
|
60957
61080
|
const domain = data[rowPath ?? ''];
|
|
60958
|
-
const { axisOption, isPercent } = getAxisOption(col, row, 'left', layout);
|
|
61081
|
+
const { axisOption, isPercent, chartType } = getAxisOption(col, row, 'left', layout);
|
|
60959
61082
|
axes.push(merge({
|
|
60960
|
-
domain: Array.from(domain ?? [])
|
|
61083
|
+
domain: chartType === 'scatter' && !Array.isArray(domain) ? undefined : Array.from(domain ?? []),
|
|
61084
|
+
range: chartType === 'scatter' && !Array.isArray(domain) ? domain : undefined
|
|
60961
61085
|
}, axisOption, {
|
|
60962
|
-
type: 'band',
|
|
61086
|
+
type: chartType === 'scatter' && !Array.isArray(domain) ? axisOption?.type ?? 'linear' : 'band',
|
|
60963
61087
|
orient: 'left',
|
|
60964
61088
|
label: { visible: false },
|
|
60965
61089
|
domainLine: { visible: false },
|
|
@@ -61011,11 +61135,12 @@
|
|
|
61011
61135
|
[];
|
|
61012
61136
|
const colPath = layout.getColKeysPath(col, row);
|
|
61013
61137
|
const domain = data?.[colPath ?? ''] ?? [];
|
|
61014
|
-
const { axisOption, isPercent } = getAxisOption(col, row, 'bottom', layout);
|
|
61138
|
+
const { axisOption, isPercent, chartType } = getAxisOption(col, row, 'bottom', layout);
|
|
61015
61139
|
axes.push(merge({
|
|
61016
|
-
domain: Array.from(domain)
|
|
61140
|
+
domain: chartType === 'scatter' && !Array.isArray(domain) ? undefined : Array.from(domain ?? []),
|
|
61141
|
+
range: chartType === 'scatter' && !Array.isArray(domain) ? domain : undefined
|
|
61017
61142
|
}, axisOption, {
|
|
61018
|
-
type: 'band',
|
|
61143
|
+
type: chartType === 'scatter' && !Array.isArray(domain) ? axisOption?.type ?? 'linear' : 'band',
|
|
61019
61144
|
orient: 'bottom',
|
|
61020
61145
|
visible: true,
|
|
61021
61146
|
label: { visible: false },
|
|
@@ -63219,7 +63344,6 @@
|
|
|
63219
63344
|
return;
|
|
63220
63345
|
}
|
|
63221
63346
|
this.internalProps.transpose = transpose;
|
|
63222
|
-
this.options.transpose = transpose;
|
|
63223
63347
|
if (this.internalProps.layoutMap) {
|
|
63224
63348
|
this.internalProps.layoutMap.transpose = transpose;
|
|
63225
63349
|
this.refreshRowColCount();
|
|
@@ -65275,6 +65399,7 @@
|
|
|
65275
65399
|
if (this._table.isPivotChart() &&
|
|
65276
65400
|
this.indicatorsAsCol &&
|
|
65277
65401
|
!this.dataset?.colKeys?.length &&
|
|
65402
|
+
this.columnDimensionTree?.tree?.level === 0 &&
|
|
65278
65403
|
!this.hasTwoIndicatorAxes) {
|
|
65279
65404
|
this.columnHeaderLevelCount = 0;
|
|
65280
65405
|
return;
|
|
@@ -67365,7 +67490,7 @@
|
|
|
67365
67490
|
record[derivedFieldRule.fieldName] = derivedFieldRule.derivedFunc(record);
|
|
67366
67491
|
});
|
|
67367
67492
|
for (const field in this.collectValuesBy) {
|
|
67368
|
-
if (record[field]) {
|
|
67493
|
+
if (isValid$3(record[field])) {
|
|
67369
67494
|
if (!this.collectedValues[field]) {
|
|
67370
67495
|
this.collectedValues[field] = {};
|
|
67371
67496
|
}
|
|
@@ -69708,7 +69833,11 @@
|
|
|
69708
69833
|
const collectValuesBy = {};
|
|
69709
69834
|
for (let i = 0, len = indicators?.length; i < len; i++) {
|
|
69710
69835
|
if (typeof indicators[i] !== 'string' && indicators[i].chartSpec) {
|
|
69711
|
-
if (indicators[i].chartSpec?.type === 'pie'
|
|
69836
|
+
if (indicators[i].chartSpec?.type === 'pie' ||
|
|
69837
|
+
indicators[i].chartSpec?.type === 'rose' ||
|
|
69838
|
+
indicators[i].chartSpec?.type === 'radar' ||
|
|
69839
|
+
indicators[i].chartSpec?.type === 'gauge' ||
|
|
69840
|
+
indicators[i].chartSpec?.type === 'wordCloud') {
|
|
69712
69841
|
continue;
|
|
69713
69842
|
}
|
|
69714
69843
|
const indicatorDefine = indicators[i];
|
|
@@ -69728,7 +69857,7 @@
|
|
|
69728
69857
|
collectValuesBy[xField] = {
|
|
69729
69858
|
by: columnKeys,
|
|
69730
69859
|
type: chartSeries.direction !== 'horizontal' ? 'xField' : undefined,
|
|
69731
|
-
range: chartSeries.direction === 'horizontal',
|
|
69860
|
+
range: chartSeries.type === 'scatter' ? true : chartSeries.direction === 'horizontal',
|
|
69732
69861
|
sortBy: chartSeries.direction !== 'horizontal'
|
|
69733
69862
|
? chartSeries?.data?.fields?.[xField]?.domain ?? indicatorSpec?.data?.fields?.[xField]?.domain
|
|
69734
69863
|
: undefined
|
|
@@ -69739,7 +69868,7 @@
|
|
|
69739
69868
|
(chartSeries.stack = true);
|
|
69740
69869
|
collectValuesBy[yField] = {
|
|
69741
69870
|
by: rowKeys,
|
|
69742
|
-
range: chartSeries.direction !== 'horizontal',
|
|
69871
|
+
range: chartSeries.type === 'scatter' ? true : chartSeries.direction !== 'horizontal',
|
|
69743
69872
|
sumBy: chartSeries.stack && columnKeys.concat(chartSeries?.xField),
|
|
69744
69873
|
sortBy: chartSeries.direction === 'horizontal'
|
|
69745
69874
|
? chartSeries?.data?.fields?.[yField]?.domain ?? indicatorSpec?.data?.fields?.[yField]?.domain
|
|
@@ -69753,7 +69882,7 @@
|
|
|
69753
69882
|
collectValuesBy[xField] = {
|
|
69754
69883
|
by: columnKeys,
|
|
69755
69884
|
type: indicatorSpec.direction !== 'horizontal' ? 'xField' : undefined,
|
|
69756
|
-
range: indicatorSpec.direction === 'horizontal',
|
|
69885
|
+
range: indicatorSpec.type === 'scatter' ? true : indicatorSpec.direction === 'horizontal',
|
|
69757
69886
|
sortBy: indicatorSpec.direction !== 'horizontal' ? indicatorSpec?.data?.fields?.[xField]?.domain : undefined
|
|
69758
69887
|
};
|
|
69759
69888
|
indicatorSpec?.stack !== false &&
|
|
@@ -69785,7 +69914,7 @@
|
|
|
69785
69914
|
collectValuesBy[yField] = {
|
|
69786
69915
|
by: rowKeys,
|
|
69787
69916
|
type: chartSeries.direction === 'horizontal' ? 'yField' : undefined,
|
|
69788
|
-
range: chartSeries.direction !== 'horizontal',
|
|
69917
|
+
range: chartSeries.type === 'scatter' ? true : chartSeries.direction !== 'horizontal',
|
|
69789
69918
|
sortBy: chartSeries.direction === 'horizontal'
|
|
69790
69919
|
? chartSeries?.data?.fields?.[yField]?.domain ?? indicatorSpec?.data?.fields?.[yField]?.domain
|
|
69791
69920
|
: undefined
|
|
@@ -69796,7 +69925,7 @@
|
|
|
69796
69925
|
(chartSeries.stack = true);
|
|
69797
69926
|
collectValuesBy[xField] = {
|
|
69798
69927
|
by: columnKeys,
|
|
69799
|
-
range: chartSeries.direction === 'horizontal',
|
|
69928
|
+
range: chartSeries.type === 'scatter' ? true : chartSeries.direction === 'horizontal',
|
|
69800
69929
|
sumBy: chartSeries.stack && rowKeys.concat(chartSeries?.yField),
|
|
69801
69930
|
sortBy: chartSeries.direction !== 'horizontal'
|
|
69802
69931
|
? chartSeries?.data?.fields?.[xField]?.domain ?? indicatorSpec?.data?.fields?.[xField]?.domain
|
|
@@ -69810,7 +69939,7 @@
|
|
|
69810
69939
|
collectValuesBy[yField] = {
|
|
69811
69940
|
by: rowKeys,
|
|
69812
69941
|
type: indicatorSpec.direction === 'horizontal' ? 'yField' : undefined,
|
|
69813
|
-
range: indicatorSpec.direction !== 'horizontal',
|
|
69942
|
+
range: indicatorSpec.type === 'scatter' ? true : indicatorSpec.direction !== 'horizontal',
|
|
69814
69943
|
sortBy: indicatorSpec.direction === 'horizontal' ? indicatorSpec?.data?.fields?.[yField]?.domain : undefined
|
|
69815
69944
|
};
|
|
69816
69945
|
indicatorSpec?.stack !== false &&
|
|
@@ -69819,7 +69948,7 @@
|
|
|
69819
69948
|
const xField = indicatorSpec.xField;
|
|
69820
69949
|
collectValuesBy[xField] = {
|
|
69821
69950
|
by: columnKeys,
|
|
69822
|
-
range: indicatorSpec.direction === 'horizontal',
|
|
69951
|
+
range: indicatorSpec.type === 'scatter' ? true : indicatorSpec.direction === 'horizontal',
|
|
69823
69952
|
sumBy: indicatorSpec.stack && rowKeys.concat(indicatorSpec?.yField),
|
|
69824
69953
|
sortBy: indicatorSpec.direction !== 'horizontal' ? indicatorSpec?.data?.fields?.[xField]?.domain : undefined,
|
|
69825
69954
|
extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
|
|
@@ -70623,7 +70752,7 @@
|
|
|
70623
70752
|
}
|
|
70624
70753
|
|
|
70625
70754
|
registerForVrender();
|
|
70626
|
-
const version = "0.25.1-alpha.
|
|
70755
|
+
const version = "0.25.1-alpha.4";
|
|
70627
70756
|
function getIcons() {
|
|
70628
70757
|
return get$2();
|
|
70629
70758
|
}
|