@arcgis/charts-components 5.0.0-next.162 → 5.0.0-next.164
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/dist/cdn/{TQRAYSWN.js → 2ZSCSQKE.js} +1 -1
- package/dist/cdn/{SW6ENGEK.js → 3ETPKJLH.js} +1 -1
- package/dist/cdn/3FJBR2FR.js +2 -0
- package/dist/cdn/3HSM4YOY.js +4 -0
- package/dist/cdn/{EYXP4YQW.js → 3IU5PLYH.js} +1 -1
- package/dist/cdn/{VMSL4CWI.js → 43YS2I72.js} +1 -1
- package/dist/cdn/45NODT2J.js +2 -0
- package/dist/cdn/{62OZB7FK.js → 4CICGGRX.js} +1 -1
- package/dist/cdn/{37TWMIC2.js → 4R2UOKDR.js} +1 -1
- package/dist/cdn/{UHB77RAE.js → 4TFNYB6N.js} +1 -1
- package/dist/cdn/{BYAYB5LF.js → 4WOGY3WA.js} +1 -1
- package/dist/cdn/{CTDG3FOZ.js → 4Z3XHMLM.js} +1 -1
- package/dist/cdn/{TUTT6I7D.js → 55KRKYFS.js} +1 -1
- package/dist/cdn/567U5TC6.js +2 -0
- package/dist/cdn/{7WZV7AE3.js → 5FIT7FHW.js} +1 -1
- package/dist/cdn/{PQRPDV2N.js → 5MM7SODQ.js} +1 -1
- package/dist/cdn/{7XUX4ZTI.js → 5R6MQSUY.js} +1 -1
- package/dist/cdn/{B5LXWQRU.js → 62V455IN.js} +1 -1
- package/dist/cdn/{UUZWRA5G.js → 6ERZOPDO.js} +1 -1
- package/dist/cdn/{DB3UL5LX.js → 735B4X34.js} +1 -1
- package/dist/cdn/{4L3ESTCL.js → 7SZ3MTAV.js} +1 -1
- package/dist/cdn/{XQAUA2KI.js → A6NRPBTW.js} +1 -1
- package/dist/cdn/{KLOSKKEF.js → A7BXN5EL.js} +1 -1
- package/dist/cdn/{OMR6RCJW.js → AAHVSFKB.js} +1 -1
- package/dist/cdn/AGJFBRLT.js +2 -0
- package/dist/cdn/{HAAT4GZV.js → AI3L7T2E.js} +1 -1
- package/dist/cdn/{RKJFJ3VI.js → AJHQESHE.js} +1 -1
- package/dist/cdn/{JBHDZEVD.js → ATTQBQ5G.js} +1 -1
- package/dist/cdn/{P3XTRZL3.js → B2MBGCT2.js} +1 -1
- package/dist/cdn/{KOC7VWEQ.js → BELVV3ZC.js} +1 -1
- package/dist/cdn/{MMVZJQGM.js → CDCU3GES.js} +1 -1
- package/dist/cdn/{MSNUKDFY.js → CJFTBI6B.js} +1 -1
- package/dist/cdn/{TBYLHPGX.js → CNCVZK7E.js} +1 -1
- package/dist/cdn/{TCKDCNZ6.js → COJU472P.js} +1 -1
- package/dist/cdn/CQUCOSCR.js +2 -0
- package/dist/cdn/{277KZ5EH.js → DUDOTKJA.js} +1 -1
- package/dist/cdn/{JASXULGK.js → E4D75GTQ.js} +1 -1
- package/dist/cdn/{7KAPOFBN.js → F2HVMZZK.js} +1 -1
- package/dist/cdn/{SW62HLGO.js → FU2EQLXU.js} +1 -1
- package/dist/cdn/{64DXX3FX.js → G7VC2XBZ.js} +1 -1
- package/dist/cdn/{GKUTVRCP.js → GS3GRA2H.js} +1 -1
- package/dist/cdn/GSVN46KN.js +2 -0
- package/dist/cdn/{DACWGPLL.js → GTHSVE2K.js} +1 -1
- package/dist/cdn/{WCBXBXTZ.js → GTSIEQM5.js} +1 -1
- package/dist/cdn/{KF4ILYWV.js → HHJIYADP.js} +1 -1
- package/dist/cdn/{GB223HFN.js → HZDRSBX2.js} +1 -1
- package/dist/cdn/{D2HQHUZF.js → I457NPW3.js} +1 -1
- package/dist/cdn/{IDMPL6T7.js → IP4VBE6Z.js} +1 -1
- package/dist/cdn/{WTZ23CRY.js → IYXHOL5D.js} +1 -1
- package/dist/cdn/{SZ2BB7ZG.js → J5JH47IU.js} +1 -1
- package/dist/cdn/{7HDTPUIY.js → K3LNGUQX.js} +1 -1
- package/dist/cdn/{6AP262U4.js → K4YRNWYA.js} +1 -1
- package/dist/cdn/{YHIJMVJQ.js → KKYRF4QI.js} +1 -1
- package/dist/cdn/{GRUDYKUK.js → KQHMG4PC.js} +1 -1
- package/dist/cdn/{S3MAP4NY.js → L6HK4PG5.js} +1 -1
- package/dist/cdn/{IBMHE4HG.js → LHJS2B4G.js} +1 -1
- package/dist/cdn/{KHPBPGZW.js → LN5HOZFK.js} +1 -1
- package/dist/cdn/{CBTHS6I5.js → M4XXCCFI.js} +1 -1
- package/dist/cdn/{Y7OQUVXC.js → M5OKIJH6.js} +1 -1
- package/dist/cdn/{IL22JCIC.js → M6KGYVL2.js} +1 -1
- package/dist/cdn/{PUO6TAT3.js → N673HFEJ.js} +1 -1
- package/dist/cdn/{DLT5ZL25.js → NYBZPU4F.js} +1 -1
- package/dist/cdn/{PZ5VL76M.js → OI76MVPM.js} +1 -1
- package/dist/cdn/{G7UITT5F.js → OJXN4Y6A.js} +1 -1
- package/dist/cdn/{OWTDESPZ.js → OQZBAWVC.js} +1 -1
- package/dist/cdn/{35FGLAKV.js → P4ZZY7IW.js} +1 -1
- package/dist/cdn/{7LRO7RMI.js → PFRK5465.js} +11 -5
- package/dist/cdn/{NNTJCO7Q.js → PO4LLHQE.js} +1 -1
- package/dist/cdn/{53QDB3IL.js → QJGDTSOH.js} +1 -1
- package/dist/cdn/{IYGUWGB6.js → QNI5OMGX.js} +1 -1
- package/dist/cdn/RICBVTMN.js +2 -0
- package/dist/cdn/{YHVWLHT7.js → ROH4QPZI.js} +1 -1
- package/dist/cdn/{R7TVVBB7.js → TLIZYLM2.js} +1 -1
- package/dist/cdn/{NLNJYC2E.js → TZEMRMGW.js} +1 -1
- package/dist/cdn/{IBDFXE7F.js → UZWDIHM7.js} +1 -1
- package/dist/cdn/{ISB65KPT.js → VBHRSNOL.js} +1 -1
- package/dist/cdn/{7HCS3J2W.js → VMTV5CBU.js} +1 -1
- package/dist/cdn/{CAXYDF5R.js → WEMAQZCY.js} +1 -1
- package/dist/cdn/{DHBBU7AG.js → WN37QN4E.js} +1 -1
- package/dist/cdn/{KDGGKNBV.js → XJ7KF4OJ.js} +1 -1
- package/dist/cdn/{3TCYZ5OB.js → XLJBOHXR.js} +10 -10
- package/dist/cdn/{OR2MF4BU.js → XQ4KCPRX.js} +1 -1
- package/dist/cdn/{FGMU7G6T.js → YHGIRUKH.js} +1 -1
- package/dist/cdn/YLV6SOAM.js +2 -0
- package/dist/cdn/{C72B5RSG.js → YVYDVSXP.js} +1 -1
- package/dist/cdn/{WORQWDJQ.js → Z5O5KIH5.js} +1 -1
- package/dist/cdn/{SAKNSC4M.js → ZOPR2Y4S.js} +1 -1
- package/dist/cdn/{XIFLK5EG.js → ZWD6ENTH.js} +1 -1
- package/dist/cdn/assets/common/t9n/messages.fr.json +1 -1
- package/dist/cdn/index.js +1 -1
- package/dist/chart-rendering/common/interfaces.d.ts +65 -73
- package/dist/chunks/action-bar-utils.js +1 -1
- package/dist/chunks/axis-lines-symbol.js +20 -20
- package/dist/chunks/bar-chart-model.js +8 -8
- package/dist/chunks/box-plot-data.js +60 -60
- package/dist/chunks/box-plot-model.js +20 -20
- package/dist/chunks/chart-model.js +37 -37
- package/dist/chunks/chart-ui-utils2.js +1 -1
- package/dist/chunks/class-breaks.js +120 -122
- package/dist/chunks/combo-bar-line-chart-model.js +4 -4
- package/dist/chunks/data-labels-symbol.js +1 -1
- package/dist/chunks/data.js +11 -11
- package/dist/chunks/gauge-model.js +17 -17
- package/dist/chunks/generate-x-axis-title.js +4 -4
- package/dist/chunks/heat-chart-model.js +32 -20
- package/dist/chunks/histogram-data.js +7 -7
- package/dist/chunks/histogram-model.js +8 -8
- package/dist/chunks/index.js +336 -360
- package/dist/chunks/index2.js +49 -49
- package/dist/chunks/index3.js +3 -3
- package/dist/chunks/line-chart-model.js +6 -6
- package/dist/chunks/model-setter.js +3 -3
- package/dist/chunks/model-with-guides.js +15 -15
- package/dist/chunks/model-with-tooltips.js +8 -8
- package/dist/chunks/model-with-y-guides.js +12 -12
- package/dist/chunks/negative-values-stacked-to-baseline.js +1 -1
- package/dist/chunks/pie-chart-data.js +26 -26
- package/dist/chunks/pie-chart-model.js +22 -22
- package/dist/chunks/radar-chart-model.js +7 -7
- package/dist/chunks/rotated-state.js +1 -1
- package/dist/chunks/scatterplot-model.js +15 -15
- package/dist/chunks/serial-chart-data.js +162 -165
- package/dist/chunks/serial-chart-model.js +17 -17
- package/dist/chunks/series-length.js +1 -1
- package/dist/chunks/series.js +3 -3
- package/dist/chunks/utils.js +43 -43
- package/dist/chunks/utils2.js +5 -5
- package/dist/chunks/web-component-utils.js +175 -169
- package/dist/components/arcgis-chart/customElement.d.ts +4 -4
- package/dist/components/arcgis-chart/customElement.js +864 -847
- package/dist/components/arcgis-charts-config-bar-chart/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-bar-chart-data/customElement.js +4 -4
- package/dist/components/arcgis-charts-config-bar-chart-popover/customElement.js +8 -8
- package/dist/components/arcgis-charts-config-bar-chart-series/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-bar-chart-series-popover/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-box-plot/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-box-plot-data/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-box-plot-popover/customElement.js +10 -10
- package/dist/components/arcgis-charts-config-box-plot-series/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-box-plot-series-popover/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-create-flow/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-font-style/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-format/customElement.js +42 -39
- package/dist/components/arcgis-charts-config-guide/customElement.js +8 -8
- package/dist/components/arcgis-charts-config-heat-chart/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-heat-chart-data/customElement.js +18 -18
- package/dist/components/arcgis-charts-config-heat-chart-popover/customElement.js +4 -4
- package/dist/components/arcgis-charts-config-histogram/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-histogram-data/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-histogram-popover/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-line-chart/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-line-chart-data/customElement.js +5 -5
- package/dist/components/arcgis-charts-config-line-chart-popover/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-line-chart-series/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-line-chart-series-popover/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-pie-chart/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-pie-chart-data/customElement.js +4 -4
- package/dist/components/arcgis-charts-config-pie-chart-popover/customElement.js +3 -3
- package/dist/components/arcgis-charts-config-pie-chart-slices/customElement.js +4 -4
- package/dist/components/arcgis-charts-config-pie-chart-slices-popover/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-scatter-plot/customElement.js +1 -1
- package/dist/components/arcgis-charts-config-scatter-plot-data/customElement.js +7 -7
- package/dist/components/arcgis-charts-config-scatter-plot-popover/customElement.js +1 -1
- package/dist/components/arcgis-charts-info-modal/customElement.js +1 -1
- package/dist/docs/api.json +1 -1
- package/dist/docs/docs.json +1 -1
- package/dist/docs/web-types.json +1 -1
- package/dist/index.js +154 -153
- package/dist/interfaces.d.ts +6 -5
- package/dist/json-schema/index.d.ts +12 -20
- package/dist/model/heat-chart-model/heat-chart-model.d.ts +9 -1
- package/dist/spec/data-source.d.ts +26 -18
- package/dist/spec/events.d.ts +2 -5
- package/dist/spec/rest-js-types.d.ts +27 -9
- package/dist/utils/chart-config/converter/index.d.ts +7 -7
- package/dist/utils/chart-config/validator/index.d.ts +6 -4
- package/dist/utils/components/event-payloads.d.ts +3 -3
- package/dist/utils/data/index.d.ts +10 -1
- package/dist/utils/errors/index.d.ts +5 -5
- package/dist/utils/layer/index.d.ts +2 -2
- package/dist/utils/layer/inline-conversion/index.d.ts +7 -8
- package/dist/utils/layer/interfaces.d.ts +3 -3
- package/dist/utils/layer/query-features/interfaces.d.ts +1 -1
- package/dist/utils/layer/query-parser/index.d.ts +1 -1
- package/dist/utils/layer/utils/index.d.ts +11 -5
- package/dist/utils/localization/index.d.ts +1 -1
- package/dist/utils/misc/index.d.ts +3 -3
- package/dist/utils/misc/interfaces.d.ts +7 -6
- package/dist/utils/types/index.d.ts +17 -17
- package/package.json +3 -3
- package/dist/cdn/3UBEHDWK.js +0 -2
- package/dist/cdn/CIW6WMFK.js +0 -4
- package/dist/cdn/DKC6E3QZ.js +0 -2
- package/dist/cdn/HTKSTR36.js +0 -2
- package/dist/cdn/KPBKHH3V.js +0 -2
- package/dist/cdn/LRATJMH3.js +0 -2
- package/dist/cdn/V65HT7NA.js +0 -2
- package/dist/cdn/WNZXN6Y2.js +0 -2
- package/dist/cdn/XNTLXVQF.js +0 -2
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/* COPYRIGHT Esri - https://js.arcgis.com/5.0/LICENSE.txt */
|
|
2
2
|
import "@arcgis/toolkit/intl";
|
|
3
|
-
import { memoize as E, isEmpty as
|
|
3
|
+
import { memoize as E, isEmpty as _, isNull as $, cloneDeep as R } from "lodash-es";
|
|
4
4
|
import "luxon";
|
|
5
5
|
import "d3-array";
|
|
6
6
|
import "@arcgis/toolkit/type";
|
|
7
|
-
import { a as m, g as
|
|
7
|
+
import { a as m, g as b, t as F, W as U } from "./series-types.js";
|
|
8
8
|
import { f as z } from "./rest-js-object-literals.js";
|
|
9
|
-
import { d as O,
|
|
9
|
+
import { d as O, bM as A, aS as G, bt as M, c_ as P, _ as V, bc as k, a as w } from "./index.js";
|
|
10
10
|
import "@arcgis/core/Graphic.js";
|
|
11
11
|
import "@arcgis/core/renderers/support/jsonUtils.js";
|
|
12
12
|
import "@arcgis/core/symbols/support/symbolUtils.js";
|
|
@@ -26,11 +26,11 @@ import "./runtime.js";
|
|
|
26
26
|
import "@arcgis/toolkit/dom";
|
|
27
27
|
import { g as L, u as q } from "./utils.js";
|
|
28
28
|
import { a as y, P as g } from "./common.js";
|
|
29
|
-
import { g as
|
|
30
|
-
import { g as
|
|
31
|
-
import { g as
|
|
29
|
+
import { g as H } from "./data.js";
|
|
30
|
+
import { g as J } from "./series-length.js";
|
|
31
|
+
import { g as Q } from "./utils2.js";
|
|
32
32
|
function v(s) {
|
|
33
|
-
const { config: t, layerInfo: e, mode: i, commonStrings: r } = s, a = e !== void 0 ? D({ config: t, layerInfo: e, commonStrings: r, mode: i }) : "", l =
|
|
33
|
+
const { config: t, layerInfo: e, mode: i, commonStrings: r } = s, a = e !== void 0 ? D({ config: t, layerInfo: e, commonStrings: r, mode: i }) : "", l = J(t), d = V(t);
|
|
34
34
|
return a === l || d;
|
|
35
35
|
}
|
|
36
36
|
function B(s) {
|
|
@@ -40,18 +40,18 @@ function B(s) {
|
|
|
40
40
|
commonStrings: r,
|
|
41
41
|
numericFields: f(t),
|
|
42
42
|
aggregationType: T(t, i)
|
|
43
|
-
}) : "", l =
|
|
43
|
+
}) : "", l = Q(1, t), d = V(t);
|
|
44
44
|
return a === l || d;
|
|
45
45
|
}
|
|
46
46
|
const I = (s) => s.series?.[0]?.x ?? "";
|
|
47
|
-
function
|
|
47
|
+
function X(s, t) {
|
|
48
48
|
const e = s.series?.[0];
|
|
49
|
-
return [`${t === y.Category ? e.y : w} ${
|
|
49
|
+
return [`${t === y.Category ? e.y : w} ${b.Descending}`];
|
|
50
50
|
}
|
|
51
51
|
const K = (s, t) => {
|
|
52
52
|
let e = g.valueDesc;
|
|
53
|
-
const i = s.orderOptions?.data?.orderType ??
|
|
54
|
-
return i === F.Category && Array.isArray(r) ? e = g.customSort : i === F.Category ? r ===
|
|
53
|
+
const i = s.orderOptions?.data?.orderType ?? X(s, t), r = s.orderOptions?.data && "orderBy" in s.orderOptions.data ? s.orderOptions.data.orderBy : b.Descending;
|
|
54
|
+
return i === F.Category && Array.isArray(r) ? e = g.customSort : i === F.Category ? r === b.Ascending ? e = g.labelAsc : e = g.labelDesc : r === b.Ascending ? e = g.valueAsc : e = g.valueDesc, e;
|
|
55
55
|
}, f = E(
|
|
56
56
|
// without memoizing, the worst case efficiency is O(series.length), best case is O(1)
|
|
57
57
|
// with memoizing, the worst case efficiency for repeated calls becomes O(1)
|
|
@@ -69,13 +69,13 @@ const K = (s, t) => {
|
|
|
69
69
|
return t === y.Fields && e.length === 0 ? i = m.Sum : i = s.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? m.NoAggregation, i;
|
|
70
70
|
};
|
|
71
71
|
function Y(s) {
|
|
72
|
-
const { config: t, layerInfo: e, mode: i, commonStrings: r } = s, a = A(e?.layer).idField, l =
|
|
72
|
+
const { config: t, layerInfo: e, mode: i, commonStrings: r } = s, a = A(e?.layer).idField, l = k(r, a), d = I(t), c = t.series[0]?.dataLabels, o = {
|
|
73
73
|
...l,
|
|
74
74
|
x: i === y.Category ? d : O,
|
|
75
75
|
slices: t.series?.[0]?.slices,
|
|
76
76
|
dataLabels: {
|
|
77
77
|
...l.dataLabels,
|
|
78
|
-
type: l.dataLabels?.type ??
|
|
78
|
+
type: l.dataLabels?.type ?? U.Text,
|
|
79
79
|
content: { ...l.dataLabels?.content, ...c?.content, type: z.TS },
|
|
80
80
|
visible: c?.visible ?? !1
|
|
81
81
|
},
|
|
@@ -100,25 +100,25 @@ function Y(s) {
|
|
|
100
100
|
] : []
|
|
101
101
|
};
|
|
102
102
|
}
|
|
103
|
-
return i === y.Category && o.query !== void 0 ? o.query.groupByFieldsForStatistics = [d] : delete o.query?.groupByFieldsForStatistics,
|
|
103
|
+
return i === y.Category && o.query !== void 0 ? o.query.groupByFieldsForStatistics = [d] : delete o.query?.groupByFieldsForStatistics, R(o);
|
|
104
104
|
}
|
|
105
105
|
function D(s) {
|
|
106
106
|
const { config: t, layerInfo: e, mode: i, commonStrings: r } = s, { layerFieldsInfo: a } = e, { idField: l, isTraditionalTypeOID: d } = A(e.layer), c = I(t), o = f(t), n = T(t, i), u = d && (o.length === 0 || o.includes(l)), p = M(n, r), x = u ? "" : o.map((W) => P(a ?? [], W)).join(", "), S = P(a ?? [], c);
|
|
107
|
-
let
|
|
108
|
-
return i === y.Fields ? N = o.length === 0 : N = c === "", N ?
|
|
107
|
+
let C = "", N;
|
|
108
|
+
return i === y.Fields ? N = o.length === 0 : N = c === "", N ? C = r.utilsStrings.chartType.pieChart : n === m.NoAggregation ? C = h(r.titleLabels.aggrFieldsByCategory, {
|
|
109
109
|
aggregationFields: u ? l : x,
|
|
110
110
|
category: S
|
|
111
|
-
}) : n === m.Count ?
|
|
111
|
+
}) : n === m.Count ? C = h(r.titleLabels.aggrTypeCategory, {
|
|
112
112
|
aggregationType: p,
|
|
113
113
|
category: S
|
|
114
|
-
}) : o.length > 0 && (S === O ||
|
|
114
|
+
}) : o.length > 0 && (S === O || _(S) || $(S) ? C = h(r.titleLabels.aggrTypeOfAggrFields, {
|
|
115
115
|
aggregationType: p,
|
|
116
116
|
aggregationFields: x
|
|
117
|
-
}) :
|
|
117
|
+
}) : C = h(r.titleLabels.aggrTypeOfAggrFieldsByCategory, {
|
|
118
118
|
aggregationType: p,
|
|
119
119
|
aggregationFields: x,
|
|
120
120
|
category: S
|
|
121
|
-
})),
|
|
121
|
+
})), C;
|
|
122
122
|
}
|
|
123
123
|
const ve = (s) => {
|
|
124
124
|
const { newSortOrderKind: t, config: e, orderByList: i } = s;
|
|
@@ -127,7 +127,7 @@ const ve = (s) => {
|
|
|
127
127
|
orderBy: [...i]
|
|
128
128
|
} : e.orderOptions.data = {
|
|
129
129
|
orderType: t === g.labelAsc || t === g.labelDesc ? F.Category : F.YValue,
|
|
130
|
-
orderBy: t === g.labelAsc || t === g.valueAsc ?
|
|
130
|
+
orderBy: t === g.labelAsc || t === g.valueAsc ? b.Ascending : b.Descending
|
|
131
131
|
};
|
|
132
132
|
}, Be = (s) => {
|
|
133
133
|
const { newCategory: t, config: e, layerInfo: i, mode: r, commonStrings: a } = s, l = e.series?.length ?? 0, d = v({ config: e, layerInfo: i, commonStrings: a, mode: r }), c = B({ config: e, layerInfo: i, commonStrings: a, mode: r });
|
|
@@ -150,7 +150,7 @@ const ve = (s) => {
|
|
|
150
150
|
}
|
|
151
151
|
e.title && d && (e.title.content.text = D({ config: e, layerInfo: i, commonStrings: a, mode: r }));
|
|
152
152
|
const o = r === y.Fields ? f(e).filter((n) => n !== A(i.layer).idField) : f(e);
|
|
153
|
-
|
|
153
|
+
Z({ newNumericFields: o, config: e, layerInfo: i, mode: r, commonStrings: a });
|
|
154
154
|
}
|
|
155
155
|
};
|
|
156
156
|
function j(s) {
|
|
@@ -166,7 +166,7 @@ function j(s) {
|
|
|
166
166
|
}
|
|
167
167
|
};
|
|
168
168
|
t.length <= 1 ? n.query.where = o.query?.where : delete n.query.where;
|
|
169
|
-
const u =
|
|
169
|
+
const u = H({
|
|
170
170
|
config: i,
|
|
171
171
|
xAxisField: I(i),
|
|
172
172
|
numericFields: t,
|
|
@@ -226,7 +226,7 @@ const Ie = (s) => {
|
|
|
226
226
|
displayPercentage: u,
|
|
227
227
|
displayCategory: o
|
|
228
228
|
};
|
|
229
|
-
},
|
|
229
|
+
}, Z = (s) => {
|
|
230
230
|
let { newNumericFields: t } = s;
|
|
231
231
|
const { config: e, layerInfo: i, mode: r, commonStrings: a } = s, l = A(i?.layer).idField;
|
|
232
232
|
let d = T(e, r);
|
|
@@ -270,7 +270,7 @@ const Ie = (s) => {
|
|
|
270
270
|
export {
|
|
271
271
|
f as a,
|
|
272
272
|
T as b,
|
|
273
|
-
|
|
273
|
+
Z as c,
|
|
274
274
|
Ie as d,
|
|
275
275
|
K as e,
|
|
276
276
|
ve as f,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* COPYRIGHT Esri - https://js.arcgis.com/5.0/LICENSE.txt */
|
|
2
|
-
import { log as
|
|
3
|
-
import { C as
|
|
2
|
+
import { log as M } from "@arcgis/toolkit/log";
|
|
3
|
+
import { C as F } from "./chart-model.js";
|
|
4
4
|
import { m as s } from "./model-setter.js";
|
|
5
5
|
import { b as c, a as f } from "./common.js";
|
|
6
6
|
import { M as v, a as W, W as A, b as w } from "./model-with-tooltips.js";
|
|
@@ -12,7 +12,7 @@ import "@arcgis/toolkit/intl";
|
|
|
12
12
|
import { cloneDeep as B } from "lodash-es";
|
|
13
13
|
import "luxon";
|
|
14
14
|
import "d3-array";
|
|
15
|
-
import {
|
|
15
|
+
import { aS as d, ba as T, aO as b, ax as V, o as S, di as h, _ as E, bj as R, bc as j, bM as U } from "./index.js";
|
|
16
16
|
import "@arcgis/core/Graphic.js";
|
|
17
17
|
import "@arcgis/core/renderers/support/jsonUtils.js";
|
|
18
18
|
import "@arcgis/core/symbols/support/symbolUtils.js";
|
|
@@ -31,7 +31,7 @@ import "@arcgis/core/time/TimeExtent.js";
|
|
|
31
31
|
import "@arcgis/core/core/promiseUtils.js";
|
|
32
32
|
import "./runtime.js";
|
|
33
33
|
import "@arcgis/toolkit/dom";
|
|
34
|
-
import { g as _, s as K, a as $, c as q, b as H, d as J, e as Q, f as X, h as
|
|
34
|
+
import { g as _, s as K, a as $, c as q, b as H, d as J, e as Q, f as X, h as O, i as L, j as Y } from "./pie-chart-data.js";
|
|
35
35
|
import { f as y } from "./rest-js-object-literals.js";
|
|
36
36
|
const Z = (t) => t.legend?.displayNumericValue ?? !1, ee = (t, e) => {
|
|
37
37
|
e.series[0]?.type === p.PieSeries && (e.legend === void 0 && (e.legend = d()), e.legend.displayNumericValue = t);
|
|
@@ -122,7 +122,7 @@ const de = (t) => t.series?.[0]?.innerRadius, ue = (t, e) => {
|
|
|
122
122
|
e.series?.[0] && (e.series[0].startAngle = t);
|
|
123
123
|
}, me = (t, e) => {
|
|
124
124
|
e.series?.[0] && (e.series[0].endAngle = t);
|
|
125
|
-
}, be = (t) => t.series?.[0]?.displayCategoryOnTooltip ?? !0, Se = (t) => t.series?.[0]?.displayCategoryOnDataLabel ?? !0, _e = (t) => t.series?.[0]?.displayNumericValueOnDataLabel ?? !0,
|
|
125
|
+
}, be = (t) => t.series?.[0]?.displayCategoryOnTooltip ?? !0, Se = (t) => t.series?.[0]?.displayCategoryOnDataLabel ?? !0, _e = (t) => t.series?.[0]?.displayNumericValueOnDataLabel ?? !0, Oe = (t) => t.series?.[0]?.displayPercentageOnDataLabel ?? !1, Le = (t) => t.series?.[0]?.displayNumericValueOnTooltip ?? !0, De = (t) => t.series?.[0]?.displayPercentageOnTooltip ?? !0, Ce = (t, e) => {
|
|
126
126
|
e.series[0] && (e.series[0].displayPercentageOnTooltip = t);
|
|
127
127
|
}, ve = (t) => t.series?.[0]?.valuePrefix, Pe = (t, e) => {
|
|
128
128
|
e.series?.[0] && (e.series[0].valuePrefix = t);
|
|
@@ -130,9 +130,9 @@ const de = (t) => t.series?.[0]?.innerRadius, ue = (t, e) => {
|
|
|
130
130
|
e.series?.[0] && (e.series[0].valueSuffix = t);
|
|
131
131
|
}, xe = (t) => t.series?.[0]?.percentagePrefix, Ie = (t, e) => {
|
|
132
132
|
e.series?.[0] && (e.series[0].percentagePrefix = t);
|
|
133
|
-
}, Ne = (t) => t.series?.[0]?.percentageSuffix,
|
|
133
|
+
}, Ne = (t) => t.series?.[0]?.percentageSuffix, Me = (t, e) => {
|
|
134
134
|
e.series?.[0] && (e.series[0].percentageSuffix = t);
|
|
135
|
-
},
|
|
135
|
+
}, Fe = (t) => {
|
|
136
136
|
let e;
|
|
137
137
|
const i = t.series?.[0];
|
|
138
138
|
return i?.displayNumericValueOnDataLabel === !0 && i?.displayPercentageOnDataLabel === !0 ? e = c.Both : i?.displayNumericValueOnDataLabel === !0 ? e = c.Value : e = c.Percentage, e;
|
|
@@ -149,7 +149,7 @@ const de = (t) => t.series?.[0]?.innerRadius, ue = (t, e) => {
|
|
|
149
149
|
e.series[0] && (e.series[0].dataLabelsInside = t);
|
|
150
150
|
}, ze = (t) => t.series?.[0]?.dataLabelsOffset ?? 10, Be = (t, e) => {
|
|
151
151
|
e.series[0] && (e.series[0].dataLabelsOffset = t);
|
|
152
|
-
},
|
|
152
|
+
}, Ee = (t) => t.series?.[0]?.numericValueFormat?.intlOptions?.minimumFractionDigits, Re = (t, e) => {
|
|
153
153
|
e.series?.[0] && (e.series[0].numericValueFormat ??= b(), e.series[0].numericValueFormat.intlOptions.minimumFractionDigits = t, e.series[0].numericValueFormat.intlOptions.maximumFractionDigits = t, e.series[0].percentValueFormat ??= b(), e.series[0].percentValueFormat.intlOptions.minimumFractionDigits = t, e.series[0].percentValueFormat.intlOptions.maximumFractionDigits = t);
|
|
154
154
|
}, je = (t) => t.series?.[0]?.optimizeDataLabelsOverlapping ?? !1, Ue = (t, e) => {
|
|
155
155
|
e.series[0] && (e.series[0].optimizeDataLabelsOverlapping = t);
|
|
@@ -193,7 +193,7 @@ var nt = Object.defineProperty, gt = Object.getOwnPropertyDescriptor, a = (t, e,
|
|
|
193
193
|
(g = t[n]) && (l = g(e, i, l) || l);
|
|
194
194
|
return l && nt(e, i, l), l;
|
|
195
195
|
};
|
|
196
|
-
class r extends
|
|
196
|
+
class r extends F {
|
|
197
197
|
constructor() {
|
|
198
198
|
super(...arguments), this._chartType = p.PieSeries, this._mode = f.Category, this._groupedSliceIds = [];
|
|
199
199
|
}
|
|
@@ -216,7 +216,7 @@ class r extends M {
|
|
|
216
216
|
return _(this._config);
|
|
217
217
|
}
|
|
218
218
|
set category(e) {
|
|
219
|
-
(!
|
|
219
|
+
(!E(this._config) || e.trim() !== "") && (K({
|
|
220
220
|
newCategory: e,
|
|
221
221
|
config: this._config,
|
|
222
222
|
layerInfo: this.layerInfo,
|
|
@@ -237,7 +237,7 @@ class r extends M {
|
|
|
237
237
|
layerInfo: this.layerInfo,
|
|
238
238
|
commonStrings: this.commonStrings,
|
|
239
239
|
mode: this._mode
|
|
240
|
-
}), this.dispatchEvent(new CustomEvent("arcgisChartsModelDataChange"))) :
|
|
240
|
+
}), this.dispatchEvent(new CustomEvent("arcgisChartsModelDataChange"))) : M("error", "pie-chart-model", "Invalid `numericFields`");
|
|
241
241
|
}
|
|
242
242
|
/**
|
|
243
243
|
* Aggregation type for the pie chart.
|
|
@@ -271,10 +271,10 @@ class r extends M {
|
|
|
271
271
|
* List of category's values for custom sort
|
|
272
272
|
*/
|
|
273
273
|
get orderByList() {
|
|
274
|
-
return
|
|
274
|
+
return O(this._config, this._mode);
|
|
275
275
|
}
|
|
276
276
|
set orderByList(e) {
|
|
277
|
-
|
|
277
|
+
L({
|
|
278
278
|
values: e,
|
|
279
279
|
config: this._config,
|
|
280
280
|
mode: this._mode
|
|
@@ -304,8 +304,8 @@ class r extends M {
|
|
|
304
304
|
})), o;
|
|
305
305
|
}
|
|
306
306
|
moveCustomSortValuesInOrderByList(e, i) {
|
|
307
|
-
const o =
|
|
308
|
-
o.splice(i, 0, l),
|
|
307
|
+
const o = O(this._config, this._mode), [l] = o.splice(e, 1);
|
|
308
|
+
o.splice(i, 0, l), L({
|
|
309
309
|
values: o,
|
|
310
310
|
config: this._config,
|
|
311
311
|
mode: this._mode
|
|
@@ -384,16 +384,16 @@ class r extends M {
|
|
|
384
384
|
* Number of decimal places to display in the slice values.
|
|
385
385
|
*/
|
|
386
386
|
get decimalPlaces() {
|
|
387
|
-
return
|
|
387
|
+
return Ee(this._config) ?? 1;
|
|
388
388
|
}
|
|
389
389
|
set decimalPlaces(e) {
|
|
390
|
-
|
|
390
|
+
Re(e, this._config);
|
|
391
391
|
}
|
|
392
392
|
/**
|
|
393
393
|
* Display type for the pie chart slices. Specifies whether to display the slices as a percentage, value, or both.
|
|
394
394
|
*/
|
|
395
395
|
get displayType() {
|
|
396
|
-
return
|
|
396
|
+
return Fe(this._config);
|
|
397
397
|
}
|
|
398
398
|
set displayType(e) {
|
|
399
399
|
We(e, this._config);
|
|
@@ -403,7 +403,7 @@ class r extends M {
|
|
|
403
403
|
// ---------------------------------------------------------------------------------------------
|
|
404
404
|
/** @private */
|
|
405
405
|
generateDefaultConfig() {
|
|
406
|
-
const e =
|
|
406
|
+
const e = R(this.commonStrings);
|
|
407
407
|
return e.series = [j(this.commonStrings, U(this.layerInfo.layer).idField)], e;
|
|
408
408
|
}
|
|
409
409
|
// ---------------------------------------------------------------------------------------------
|
|
@@ -563,7 +563,7 @@ class r extends M {
|
|
|
563
563
|
* **Note:** If the setting is not found in the config, it will default to `true`.
|
|
564
564
|
*/
|
|
565
565
|
get displayPercentageOnDataLabel() {
|
|
566
|
-
return
|
|
566
|
+
return Oe(this._config);
|
|
567
567
|
}
|
|
568
568
|
set displayPercentageOnDataLabel(e) {
|
|
569
569
|
this.guardSetterFromAsyncOverwrite(() => {
|
|
@@ -576,7 +576,7 @@ class r extends M {
|
|
|
576
576
|
* **Note**: If the setting is not found in the config, it will default to `true`.
|
|
577
577
|
*/
|
|
578
578
|
get displayNumericValueOnTooltip() {
|
|
579
|
-
return
|
|
579
|
+
return Le(this._config);
|
|
580
580
|
}
|
|
581
581
|
set displayNumericValueOnTooltip(e) {
|
|
582
582
|
this._config.series[0].displayNumericValueOnTooltip = e;
|
|
@@ -626,7 +626,7 @@ class r extends M {
|
|
|
626
626
|
return Ne(this._config);
|
|
627
627
|
}
|
|
628
628
|
set percentageSuffix(e) {
|
|
629
|
-
|
|
629
|
+
Me(e, this._config);
|
|
630
630
|
}
|
|
631
631
|
/**
|
|
632
632
|
* Offset for the data labels.
|
|
@@ -5,7 +5,7 @@ import "luxon";
|
|
|
5
5
|
import "d3-array";
|
|
6
6
|
import "@arcgis/toolkit/type";
|
|
7
7
|
import { W as h } from "./series-types.js";
|
|
8
|
-
import {
|
|
8
|
+
import { bi as d, b6 as n, bM as o, aE as S, ar as c } from "./index.js";
|
|
9
9
|
import "@arcgis/core/Graphic.js";
|
|
10
10
|
import "@arcgis/core/renderers/support/jsonUtils.js";
|
|
11
11
|
import "@arcgis/core/symbols/support/symbolUtils.js";
|
|
@@ -26,14 +26,14 @@ import "./runtime.js";
|
|
|
26
26
|
import "@arcgis/toolkit/dom";
|
|
27
27
|
import { a as p } from "./utils.js";
|
|
28
28
|
import { S as y, s as g, a as u } from "./serial-chart-model.js";
|
|
29
|
-
import { s as b, a as v, b as I, c as _, d as
|
|
29
|
+
import { s as b, a as v, b as I, c as _, d as M, W as C } from "./negative-values-stacked-to-baseline.js";
|
|
30
30
|
import { g as m } from "./serial-chart-data.js";
|
|
31
31
|
import { m as k } from "./model-setter.js";
|
|
32
32
|
import { M as D } from "./model-with-line-marker-styling.js";
|
|
33
|
-
var
|
|
34
|
-
for (var i =
|
|
33
|
+
var F = Object.defineProperty, L = Object.getOwnPropertyDescriptor, x = (a, e, r, t) => {
|
|
34
|
+
for (var i = L(e, r), s = a.length - 1, l; s >= 0; s--)
|
|
35
35
|
(l = a[s]) && (i = l(e, r, i) || i);
|
|
36
|
-
return i &&
|
|
36
|
+
return i && F(e, r, i), i;
|
|
37
37
|
};
|
|
38
38
|
class f extends y {
|
|
39
39
|
constructor() {
|
|
@@ -80,7 +80,7 @@ class f extends y {
|
|
|
80
80
|
});
|
|
81
81
|
i !== o(this.layerInfo.layer).idField && u(i ?? t, e, this._config);
|
|
82
82
|
}
|
|
83
|
-
v(this.defaultSeries?.lineSymbol?.style, e, this._config), I(this.defaultSeries?.lineSymbol?.width, e, this._config), _(this.defaultSeries?.markerSymbol?.style, e, this._config),
|
|
83
|
+
v(this.defaultSeries?.lineSymbol?.style, e, this._config), I(this.defaultSeries?.lineSymbol?.width, e, this._config), _(this.defaultSeries?.markerSymbol?.style, e, this._config), M(this.defaultSeries?.markerSymbol?.size, e, this._config);
|
|
84
84
|
}
|
|
85
85
|
this._config.colorMatch = !0;
|
|
86
86
|
}
|
|
@@ -112,7 +112,7 @@ class f extends y {
|
|
|
112
112
|
x([
|
|
113
113
|
k
|
|
114
114
|
], f.prototype, "resetSeriesStyling");
|
|
115
|
-
const w = [
|
|
115
|
+
const w = [C, D];
|
|
116
116
|
p(f, w);
|
|
117
117
|
export {
|
|
118
118
|
f as RadarChartModel
|
|
@@ -5,7 +5,7 @@ import "luxon";
|
|
|
5
5
|
import "d3-array";
|
|
6
6
|
import "@arcgis/toolkit/type";
|
|
7
7
|
import "./series-types.js";
|
|
8
|
-
import {
|
|
8
|
+
import { cU as a } from "./index.js";
|
|
9
9
|
import "@arcgis/core/Graphic.js";
|
|
10
10
|
import "@arcgis/core/renderers/support/jsonUtils.js";
|
|
11
11
|
import "@arcgis/core/symbols/support/symbolUtils.js";
|
|
@@ -6,8 +6,8 @@ import "@arcgis/toolkit/intl";
|
|
|
6
6
|
import "luxon";
|
|
7
7
|
import "d3-array";
|
|
8
8
|
import "@arcgis/toolkit/type";
|
|
9
|
-
import { W as
|
|
10
|
-
import {
|
|
9
|
+
import { W as w } from "./series-types.js";
|
|
10
|
+
import { a_ as z, a$ as p, c_ as c, _ as T, bP as k, bl as E } from "./index.js";
|
|
11
11
|
import "@arcgis/core/Graphic.js";
|
|
12
12
|
import "@arcgis/core/renderers/support/jsonUtils.js";
|
|
13
13
|
import "@arcgis/core/symbols/support/symbolUtils.js";
|
|
@@ -28,24 +28,24 @@ import { g as V } from "./series-length.js";
|
|
|
28
28
|
import { g as b } from "./utils2.js";
|
|
29
29
|
import { C as j } from "./chart-model.js";
|
|
30
30
|
import { M as B, a as G, W as U, b as N } from "./model-with-tooltips.js";
|
|
31
|
-
import { W as
|
|
32
|
-
import { W as
|
|
31
|
+
import { W as q } from "./data-labels-symbol.js";
|
|
32
|
+
import { W as $, a as H, b as J } from "./axis-lines-symbol.js";
|
|
33
33
|
import { W as K, b as Q } from "./model-with-guides.js";
|
|
34
|
-
import { W as R, a as
|
|
34
|
+
import { W as R, a as Z, b as ee } from "./generate-x-axis-title.js";
|
|
35
35
|
import { m as d } from "./model-setter.js";
|
|
36
36
|
import { M as te, a as ie } from "./model-with-y-guides.js";
|
|
37
37
|
import { M as se } from "./model-with-x-guides.js";
|
|
38
38
|
const F = (t) => {
|
|
39
39
|
y({ config: t, value: null, axisIndex: 0, isMax: !1 }), y({ config: t, value: null, axisIndex: 0, isMax: !0 }), y({ config: t, value: null, axisIndex: 1, isMax: !1 }), y({ config: t, value: null, axisIndex: 1, isMax: !0 });
|
|
40
40
|
}, L = (t) => {
|
|
41
|
-
const { name: e, axisIndex: i, config: s, layerInfo: r } = t, { layerFieldsInfo: o } = r, n = o.find((h) => h.name === e), a = n !== void 0 &&
|
|
41
|
+
const { name: e, axisIndex: i, config: s, layerInfo: r } = t, { layerFieldsInfo: o } = r, n = o.find((h) => h.name === e), a = n !== void 0 && k(n);
|
|
42
42
|
X(s, i, a);
|
|
43
43
|
};
|
|
44
|
-
function
|
|
44
|
+
function _(t, e, i) {
|
|
45
45
|
const s = g(t, e, i), r = V(t), o = T(t);
|
|
46
46
|
return s === r || o;
|
|
47
47
|
}
|
|
48
|
-
function
|
|
48
|
+
function I(t, e) {
|
|
49
49
|
const { layerFieldsInfo: i } = e, s = c(i, u(t)), r = b(1, t), o = T(t);
|
|
50
50
|
return s === r || o;
|
|
51
51
|
}
|
|
@@ -61,7 +61,7 @@ const C = (t) => {
|
|
|
61
61
|
const { x: e, y: i, config: s, layerInfo: r, updateChartTitle: o, updateXAxisTitle: n, updateYAxisTitle: a, commonStrings: h } = t, { layerFieldsInfo: A } = r, W = c(A, e), P = c(A, i);
|
|
62
62
|
!x(e) && n && v(s, 0, W), !x(i) && a && v(s, 1, P), !x(e) && !x(i) && s.title && o && (s.title.content.text = g(s, r, h));
|
|
63
63
|
}, f = (t) => t.series[0]?.x ?? "", u = (t) => t.series[0]?.y ?? "", re = (t) => {
|
|
64
|
-
const { fieldName: e, config: i, layerInfo: s, commonStrings: r } = t, o =
|
|
64
|
+
const { fieldName: e, config: i, layerInfo: s, commonStrings: r } = t, o = _(i, s, r), n = M(i, s), a = I(i, s);
|
|
65
65
|
F(i), i.series[0] && (i.series[0].x = e), C({
|
|
66
66
|
x: e,
|
|
67
67
|
y: u(i),
|
|
@@ -78,7 +78,7 @@ const C = (t) => {
|
|
|
78
78
|
layerInfo: s
|
|
79
79
|
});
|
|
80
80
|
}, oe = (t) => {
|
|
81
|
-
const { fieldName: e, config: i, layerInfo: s, commonStrings: r } = t, o =
|
|
81
|
+
const { fieldName: e, config: i, layerInfo: s, commonStrings: r } = t, o = _(i, s, r), n = M(i, s), a = I(i, s);
|
|
82
82
|
F(i), i.series[0] && (i.series[0].y = e), C({
|
|
83
83
|
x: f(i),
|
|
84
84
|
y: e,
|
|
@@ -108,7 +108,7 @@ const C = (t) => {
|
|
|
108
108
|
e.series[0].overlays ??= p(), e.series[0].overlays.trendLine ??= p().trendLine, e.series[0].overlays.trendLine.visible = t;
|
|
109
109
|
}, pe = (t, e) => {
|
|
110
110
|
!(e.series[0]?.overlays?.trendLine?.created ?? !1) && t && (e.series[0].overlays ??= p(), e.series[0].overlays.trendLine ??= p().trendLine, e.series[0].overlays.trendLine.created = t), ce(t, e);
|
|
111
|
-
}, S = (t) => t.series[0]?.sizePolicy ??
|
|
111
|
+
}, S = (t) => t.series[0]?.sizePolicy ?? z(), ye = (t, e) => {
|
|
112
112
|
e.series[0] && (t !== void 0 && t.field?.trim() !== "" ? e.series[0].sizePolicy = { ...e.series[0].sizePolicy, ...t } : e.series[0].sizePolicy = void 0);
|
|
113
113
|
}, xe = (t) => t?.series?.[0]?.overlays, fe = (t, e) => {
|
|
114
114
|
e?.series[0] !== void 0 && (e.series[0].overlays = t);
|
|
@@ -124,7 +124,7 @@ var Te = Object.defineProperty, ge = Object.getOwnPropertyDescriptor, m = (t, e,
|
|
|
124
124
|
};
|
|
125
125
|
class l extends j {
|
|
126
126
|
constructor() {
|
|
127
|
-
super(...arguments), this._chartType =
|
|
127
|
+
super(...arguments), this._chartType = w.ScatterSeries;
|
|
128
128
|
}
|
|
129
129
|
async setup(e) {
|
|
130
130
|
await this.loadConfigFromLayer(e), typeof this.resolveSetup == "function" && this.resolveSetup();
|
|
@@ -261,14 +261,14 @@ const Ae = [
|
|
|
261
261
|
G,
|
|
262
262
|
U,
|
|
263
263
|
N,
|
|
264
|
-
|
|
264
|
+
q,
|
|
265
265
|
se,
|
|
266
266
|
ie,
|
|
267
267
|
R,
|
|
268
268
|
K,
|
|
269
|
-
|
|
269
|
+
Z,
|
|
270
270
|
Q,
|
|
271
|
-
|
|
271
|
+
$,
|
|
272
272
|
H,
|
|
273
273
|
J,
|
|
274
274
|
ee
|