@design.estate/dees-catalog 3.55.4 → 3.55.6

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.
@@ -173630,34 +173630,45 @@ var light = themeDefaults.colors.light;
173630
173630
  var dark2 = themeDefaults.colors.dark;
173631
173631
  var SERIES_COLORS = {
173632
173632
  dark: [
173633
- dark2.accentPrimary,
173634
- // blue
173635
- "hsl(173.4 80.4% 40%)",
173636
- // teal (no token yet)
173637
- "hsl(280.3 87.4% 66.7%)",
173638
- // purple (no token yet)
173639
- dark2.accentWarning,
173640
- // orange/amber
173641
- dark2.accentSuccess,
173642
- // green
173643
- dark2.accentError
173644
- // rose/red
173633
+ "#60a5fa",
173634
+ // blue-400 — softer in dark mode
173635
+ "#2dd4bf",
173636
+ // teal-400
173637
+ "#a78bfa",
173638
+ // violet-400
173639
+ "#fbbf24",
173640
+ // amber-400
173641
+ "#34d399",
173642
+ // emerald-400
173643
+ "#fb7185"
173644
+ // rose-400
173645
173645
  ],
173646
173646
  light: [
173647
- light.accentPrimary,
173648
- "hsl(142.1 76.2% 36.3%)",
173649
- // teal (no token yet)
173650
- "hsl(280.3 47.7% 50.2%)",
173651
- // purple (no token yet)
173652
- light.accentWarning,
173653
- light.accentSuccess,
173654
- light.accentError
173647
+ "#3b82f6",
173648
+ // blue-500
173649
+ "#14b8a6",
173650
+ // teal-500
173651
+ "#8b5cf6",
173652
+ // violet-500
173653
+ "#f59e0b",
173654
+ // amber-500
173655
+ "#10b981",
173656
+ // emerald-500
173657
+ "#f43f5e"
173658
+ // rose-500
173655
173659
  ]
173656
173660
  };
173657
173661
  function getEchartsSeriesColors(goBright) {
173658
173662
  return goBright ? SERIES_COLORS.light : SERIES_COLORS.dark;
173659
173663
  }
173660
173664
  __name(getEchartsSeriesColors, "getEchartsSeriesColors");
173665
+ function hexToRgba(hex2, alpha2) {
173666
+ const r11 = parseInt(hex2.slice(1, 3), 16);
173667
+ const g4 = parseInt(hex2.slice(3, 5), 16);
173668
+ const b5 = parseInt(hex2.slice(5, 7), 16);
173669
+ return `rgba(${r11}, ${g4}, ${b5}, ${alpha2})`;
173670
+ }
173671
+ __name(hexToRgba, "hexToRgba");
173661
173672
  function getEchartsThemeOptions(goBright) {
173662
173673
  const colors8 = goBright ? light : dark2;
173663
173674
  return {
@@ -173667,7 +173678,8 @@ function getEchartsThemeOptions(goBright) {
173667
173678
  fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif',
173668
173679
  fontSize: 12
173669
173680
  },
173670
- color: goBright ? SERIES_COLORS.light : SERIES_COLORS.dark,
173681
+ // No global `color` array each component sets per-item/per-series
173682
+ // colors explicitly to avoid conflicts during emphasis animations.
173671
173683
  tooltip: {
173672
173684
  backgroundColor: colors8.bgPrimary,
173673
173685
  borderColor: colors8.borderDefault,
@@ -173736,7 +173748,7 @@ var _DeesChartEchartsBase = class _DeesChartEchartsBase extends (_a55 = DeesElem
173736
173748
  const chartContainer = this.shadowRoot.querySelector(".chartContainer");
173737
173749
  if (!chartContainer) return;
173738
173750
  try {
173739
- this.chartInstance = this.echartsBundle.init(chartContainer);
173751
+ this.chartInstance = this.echartsBundle.init(chartContainer, null, { renderer: "svg" });
173740
173752
  this.updateChart();
173741
173753
  this.resizeObserver = new ResizeObserver(() => {
173742
173754
  this.chartInstance?.resize();
@@ -173760,7 +173772,12 @@ var _DeesChartEchartsBase = class _DeesChartEchartsBase extends (_a55 = DeesElem
173760
173772
  ...themeOptions,
173761
173773
  ...chartOption,
173762
173774
  textStyle: { ...themeOptions.textStyle, ...chartOption.textStyle || {} },
173763
- tooltip: { ...themeOptions.tooltip, ...chartOption.tooltip || {} }
173775
+ tooltip: { ...themeOptions.tooltip, ...chartOption.tooltip || {} },
173776
+ legend: {
173777
+ ...themeOptions.legend,
173778
+ ...chartOption.legend || {},
173779
+ textStyle: { ...themeOptions.legend?.textStyle || {}, ...chartOption.legend?.textStyle || {} }
173780
+ }
173764
173781
  };
173765
173782
  this.chartInstance.setOption(merged, true);
173766
173783
  }
@@ -173992,26 +174009,38 @@ var _DeesChartBar = class _DeesChartBar extends (_a56 = DeesChartEchartsBase, _c
173992
174009
  },
173993
174010
  splitLine: { lineStyle: { color: colors8.borderSubtle } }
173994
174011
  };
173995
- const seriesData = this.series.map((s10, index3) => ({
173996
- name: s10.name,
173997
- type: "bar",
173998
- data: s10.data,
173999
- stack: this.stacked ? "total" : void 0,
174000
- itemStyle: {
174001
- color: s10.color || seriesColors[index3 % seriesColors.length],
174002
- borderRadius: this.stacked ? [0, 0, 0, 0] : this.horizontal ? [0, 4, 4, 0] : [4, 4, 0, 0]
174003
- },
174004
- barMaxWidth: 40,
174005
- emphasis: {
174012
+ const fillAlpha = this.goBright ? 0.15 : 0.25;
174013
+ const borderRadius = this.horizontal ? [0, 4, 4, 0] : [4, 4, 0, 0];
174014
+ const noBorderRadius = [0, 0, 0, 0];
174015
+ const legendData = [];
174016
+ const seriesData = this.series.map((s10, index3) => {
174017
+ const color2 = s10.color || seriesColors[index3 % seriesColors.length];
174018
+ legendData.push({ name: s10.name, itemStyle: { color: color2 } });
174019
+ return {
174020
+ name: s10.name,
174021
+ type: "bar",
174022
+ data: s10.data,
174023
+ stack: this.stacked ? "total" : void 0,
174006
174024
  itemStyle: {
174007
- shadowBlur: 6,
174008
- shadowColor: "rgba(0, 0, 0, 0.15)"
174025
+ color: hexToRgba(color2, fillAlpha),
174026
+ borderColor: color2,
174027
+ borderWidth: 1,
174028
+ borderRadius: this.stacked ? noBorderRadius : borderRadius
174029
+ },
174030
+ barMaxWidth: 40,
174031
+ barGap: "20%",
174032
+ emphasis: {
174033
+ itemStyle: {
174034
+ color: hexToRgba(color2, fillAlpha + 0.15),
174035
+ borderColor: color2,
174036
+ borderWidth: 1.5
174037
+ }
174009
174038
  }
174010
- }
174011
- }));
174039
+ };
174040
+ });
174012
174041
  if (this.stacked && seriesData.length > 0) {
174013
174042
  const last3 = seriesData[seriesData.length - 1];
174014
- last3.itemStyle.borderRadius = this.horizontal ? [0, 4, 4, 0] : [4, 4, 0, 0];
174043
+ last3.itemStyle.borderRadius = borderRadius;
174015
174044
  }
174016
174045
  return {
174017
174046
  tooltip: {
@@ -174021,12 +174050,14 @@ var _DeesChartBar = class _DeesChartBar extends (_a56 = DeesChartEchartsBase, _c
174021
174050
  const items = Array.isArray(params2) ? params2 : [params2];
174022
174051
  let result = `<strong>${items[0].axisValueLabel}</strong><br/>`;
174023
174052
  for (const p7 of items) {
174024
- result += `${p7.marker} ${p7.seriesName}: <strong>${formatter2(p7.value)}</strong><br/>`;
174053
+ const solidColor = p7.borderColor || p7.color;
174054
+ const marker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${solidColor};"></span>`;
174055
+ result += `${marker}${p7.seriesName}: <strong>${formatter2(p7.value)}</strong><br/>`;
174025
174056
  }
174026
174057
  return result;
174027
174058
  }, "formatter")
174028
174059
  },
174029
- legend: this.showLegend && this.series.length > 1 ? { bottom: 8, itemWidth: 10, itemHeight: 10 } : { show: false },
174060
+ legend: this.showLegend && this.series.length > 1 ? { bottom: 8, itemWidth: 10, itemHeight: 10, data: legendData } : { show: false },
174030
174061
  grid: {
174031
174062
  left: 16,
174032
174063
  right: 16,
@@ -174189,6 +174220,9 @@ var donutStyles = [
174189
174220
  :host {
174190
174221
  height: 360px;
174191
174222
  }
174223
+ .chartContainer {
174224
+ inset: 12px 0;
174225
+ }
174192
174226
  `
174193
174227
  ];
174194
174228
 
@@ -174228,19 +174262,38 @@ var _DeesChartDonut = class _DeesChartDonut extends (_a57 = DeesChartEchartsBase
174228
174262
  }
174229
174263
  }
174230
174264
  buildOption() {
174231
- const colors8 = getThemeColors(this.goBright);
174265
+ const themeColors = getThemeColors(this.goBright);
174232
174266
  const seriesColors = getEchartsSeriesColors(this.goBright);
174233
- const data = this.data.map((item, index3) => ({
174234
- name: item.name,
174235
- value: item.value,
174236
- itemStyle: item.color ? { color: item.color } : { color: seriesColors[index3 % seriesColors.length] }
174237
- }));
174267
+ const fillAlpha = this.goBright ? 0.15 : 0.2;
174268
+ const legendData = [];
174269
+ const data = this.data.map((item, index3) => {
174270
+ const color2 = item.color || seriesColors[index3 % seriesColors.length];
174271
+ legendData.push({ name: item.name, itemStyle: { color: color2 } });
174272
+ return {
174273
+ name: item.name,
174274
+ value: item.value,
174275
+ itemStyle: {
174276
+ color: hexToRgba(color2, fillAlpha),
174277
+ borderColor: color2,
174278
+ borderWidth: 1
174279
+ },
174280
+ emphasis: {
174281
+ itemStyle: {
174282
+ color: hexToRgba(color2, fillAlpha + 0.15),
174283
+ borderColor: color2,
174284
+ borderWidth: 1.5
174285
+ }
174286
+ }
174287
+ };
174288
+ });
174238
174289
  const formatter2 = this.valueFormatter;
174239
174290
  return {
174240
174291
  tooltip: {
174241
174292
  trigger: "item",
174242
174293
  formatter: /* @__PURE__ */ __name((params2) => {
174243
- return `${params2.marker} ${params2.name}: <strong>${formatter2(params2.value)}</strong> (${params2.percent}%)`;
174294
+ const solidColor = params2.data?.itemStyle?.borderColor || params2.color;
174295
+ const marker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${solidColor};"></span>`;
174296
+ return `${marker}${params2.name}: <strong>${formatter2(params2.value)}</strong> (${params2.percent}%)`;
174244
174297
  }, "formatter")
174245
174298
  },
174246
174299
  legend: this.showLegend ? {
@@ -174250,6 +174303,7 @@ var _DeesChartDonut = class _DeesChartDonut extends (_a57 = DeesChartEchartsBase
174250
174303
  itemWidth: 10,
174251
174304
  itemHeight: 10,
174252
174305
  itemGap: 12,
174306
+ data: legendData,
174253
174307
  formatter: /* @__PURE__ */ __name((name) => {
174254
174308
  const item = this.data.find((d6) => d6.name === name);
174255
174309
  return item ? `${name} ${formatter2(item.value)}` : name;
@@ -174261,29 +174315,17 @@ var _DeesChartDonut = class _DeesChartDonut extends (_a57 = DeesChartEchartsBase
174261
174315
  radius: [this.innerRadiusPercent, "85%"],
174262
174316
  center: this.showLegend ? ["35%", "50%"] : ["50%", "50%"],
174263
174317
  avoidLabelOverlap: true,
174318
+ padAngle: 2,
174264
174319
  itemStyle: {
174265
- borderRadius: 4,
174266
- borderColor: "transparent",
174267
- borderWidth: 2
174320
+ borderRadius: 4
174268
174321
  },
174269
174322
  label: this.showLabels ? {
174270
174323
  show: true,
174271
174324
  formatter: "{b}: {d}%",
174272
174325
  fontSize: 11,
174273
- color: colors8.textSecondary,
174326
+ color: themeColors.textSecondary,
174274
174327
  textBorderColor: "transparent"
174275
174328
  } : { show: false },
174276
- emphasis: {
174277
- itemStyle: {
174278
- shadowBlur: 10,
174279
- shadowOffsetX: 0,
174280
- shadowColor: "rgba(0, 0, 0, 0.2)"
174281
- },
174282
- label: {
174283
- show: true,
174284
- fontWeight: "bold"
174285
- }
174286
- },
174287
174329
  data
174288
174330
  }
174289
174331
  ]
@@ -175776,16 +175818,17 @@ var _DeesChartRadar = class _DeesChartRadar extends (_a60 = DeesChartEchartsBase
175776
175818
  buildOption() {
175777
175819
  const colors8 = getThemeColors(this.goBright);
175778
175820
  const seriesColors = getEchartsSeriesColors(this.goBright);
175821
+ const fillAlpha = this.goBright ? 0.1 : 0.15;
175779
175822
  const seriesData = this.series.map((s10, index3) => {
175780
175823
  const color2 = s10.color || seriesColors[index3 % seriesColors.length];
175781
175824
  return {
175782
175825
  name: s10.name,
175783
175826
  value: s10.values,
175784
- itemStyle: { color: color2 },
175785
- lineStyle: { color: color2, width: 2 },
175786
- areaStyle: this.fillArea ? { color: color2, opacity: 0.15 } : void 0,
175827
+ itemStyle: { color: color2, borderColor: color2, borderWidth: 1 },
175828
+ lineStyle: { color: color2, width: 1.5 },
175829
+ areaStyle: this.fillArea ? { color: hexToRgba(color2, fillAlpha) } : void 0,
175787
175830
  symbol: "circle",
175788
- symbolSize: 6
175831
+ symbolSize: 5
175789
175832
  };
175790
175833
  });
175791
175834
  return {
@@ -184492,7 +184535,7 @@ __publicField(_DeesHeading, "styles", [
184492
184535
  align-items: center;
184493
184536
  text-align: center;
184494
184537
  margin: 16px 0;
184495
- color: ${cssManager.bdTheme("#000", "#fff")};
184538
+ color: ${cssManager.bdTheme("#999", "#555")};
184496
184539
  }
184497
184540
  /* Fade lines toward and away from text for hr style */
184498
184541
  .heading-hr::before {
@@ -198404,7 +198447,7 @@ init_group_runtime();
198404
198447
  // ts_web/00_commitinfo_data.ts
198405
198448
  var commitinfo = {
198406
198449
  name: "@design.estate/dees-catalog",
198407
- version: "3.55.4",
198450
+ version: "3.55.6",
198408
198451
  description: "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript."
198409
198452
  };
198410
198453
  export {
@@ -200375,4 +200418,4 @@ ibantools/jsnext/ibantools.js:
200375
200418
  * @preferred
200376
200419
  *)
200377
200420
  */
200378
- //# sourceMappingURL=bundle-1775301934130.js.map
200421
+ //# sourceMappingURL=bundle-1775334048944.js.map
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@design.estate/dees-catalog',
6
- version: '3.55.4',
6
+ version: '3.55.6',
7
7
  description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsNkJBQTZCO0lBQ25DLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSxzSkFBc0o7Q0FDcEssQ0FBQSJ9
@@ -37,7 +37,7 @@ import { DeesChartEchartsBase } from '../dees-chart-echarts-base.js';
37
37
  import { demoFunc } from './demo.js';
38
38
  import { barStyles } from './styles.js';
39
39
  import { renderChartBar } from './template.js';
40
- import { getEchartsSeriesColors, getThemeColors } from '../dees-chart-echarts-theme.js';
40
+ import { getEchartsSeriesColors, getThemeColors, hexToRgba } from '../dees-chart-echarts-theme.js';
41
41
  let DeesChartBar = (() => {
42
42
  let _classDecorators = [customElement('dees-chart-bar')];
43
43
  let _classDescriptor;
@@ -136,27 +136,39 @@ let DeesChartBar = (() => {
136
136
  },
137
137
  splitLine: { lineStyle: { color: colors.borderSubtle } },
138
138
  };
139
- const seriesData = this.series.map((s, index) => ({
140
- name: s.name,
141
- type: 'bar',
142
- data: s.data,
143
- stack: this.stacked ? 'total' : undefined,
144
- itemStyle: {
145
- color: s.color || seriesColors[index % seriesColors.length],
146
- borderRadius: this.stacked ? [0, 0, 0, 0] : this.horizontal ? [0, 4, 4, 0] : [4, 4, 0, 0],
147
- },
148
- barMaxWidth: 40,
149
- emphasis: {
139
+ const fillAlpha = this.goBright ? 0.15 : 0.25;
140
+ const borderRadius = this.horizontal ? [0, 4, 4, 0] : [4, 4, 0, 0];
141
+ const noBorderRadius = [0, 0, 0, 0];
142
+ const legendData = [];
143
+ const seriesData = this.series.map((s, index) => {
144
+ const color = s.color || seriesColors[index % seriesColors.length];
145
+ legendData.push({ name: s.name, itemStyle: { color } });
146
+ return {
147
+ name: s.name,
148
+ type: 'bar',
149
+ data: s.data,
150
+ stack: this.stacked ? 'total' : undefined,
150
151
  itemStyle: {
151
- shadowBlur: 6,
152
- shadowColor: 'rgba(0, 0, 0, 0.15)',
152
+ color: hexToRgba(color, fillAlpha),
153
+ borderColor: color,
154
+ borderWidth: 1,
155
+ borderRadius: this.stacked ? noBorderRadius : borderRadius,
153
156
  },
154
- },
155
- }));
157
+ barMaxWidth: 40,
158
+ barGap: '20%',
159
+ emphasis: {
160
+ itemStyle: {
161
+ color: hexToRgba(color, fillAlpha + 0.15),
162
+ borderColor: color,
163
+ borderWidth: 1.5,
164
+ },
165
+ },
166
+ };
167
+ });
156
168
  // For stacked bars, round the top corners of the last visible series
157
169
  if (this.stacked && seriesData.length > 0) {
158
170
  const last = seriesData[seriesData.length - 1];
159
- last.itemStyle.borderRadius = this.horizontal ? [0, 4, 4, 0] : [4, 4, 0, 0];
171
+ last.itemStyle.borderRadius = borderRadius;
160
172
  }
161
173
  return {
162
174
  tooltip: {
@@ -166,13 +178,15 @@ let DeesChartBar = (() => {
166
178
  const items = Array.isArray(params) ? params : [params];
167
179
  let result = `<strong>${items[0].axisValueLabel}</strong><br/>`;
168
180
  for (const p of items) {
169
- result += `${p.marker} ${p.seriesName}: <strong>${formatter(p.value)}</strong><br/>`;
181
+ const solidColor = p.borderColor || p.color;
182
+ const marker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${solidColor};"></span>`;
183
+ result += `${marker}${p.seriesName}: <strong>${formatter(p.value)}</strong><br/>`;
170
184
  }
171
185
  return result;
172
186
  },
173
187
  },
174
188
  legend: this.showLegend && this.series.length > 1
175
- ? { bottom: 8, itemWidth: 10, itemHeight: 10 }
189
+ ? { bottom: 8, itemWidth: 10, itemHeight: 10, data: legendData }
176
190
  : { show: false },
177
191
  grid: {
178
192
  left: 16,
@@ -197,4 +211,4 @@ let DeesChartBar = (() => {
197
211
  return DeesChartBar = _classThis;
198
212
  })();
199
213
  export { DeesChartBar };
200
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHNfd2ViL2VsZW1lbnRzLzAwZ3JvdXAtY2hhcnQvZGVlcy1jaGFydC1iYXIvY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsYUFBYSxFQUNiLFFBQVEsR0FFVCxNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQy9DLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztJQWUzRSxZQUFZOzRCQUR4QixhQUFhLENBQUMsZ0JBQWdCLENBQUM7Ozs7c0JBQ0Usb0JBQW9COzs7Ozs7Ozs7Ozs7Ozs7Ozs7OzRCQUE1QixTQUFRLFdBQW9COzs7O3NDQUluRCxRQUFRLENBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUM7a0NBR3pCLFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQztzQ0FHekIsUUFBUSxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO21DQUczQixRQUFRLENBQUMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUM7c0NBRzNCLFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQzswQ0FHM0IsUUFBUSxDQUFDLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDO1lBZC9CLG1MQUFTLFVBQVUsNkJBQVYsVUFBVSwrRkFBZ0I7WUFHbkMsdUtBQVMsTUFBTSw2QkFB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
214
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHNfd2ViL2VsZW1lbnRzLzAwZ3JvdXAtY2hhcnQvZGVlcy1jaGFydC1iYXIvY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsYUFBYSxFQUNiLFFBQVEsR0FFVCxNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQy9DLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxjQUFjLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7SUFldEYsWUFBWTs0QkFEeEIsYUFBYSxDQUFDLGdCQUFnQixDQUFDOzs7O3NCQUNFLG9CQUFvQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs0QkFBNUIsU0FBUSxXQUFvQjs7OztzQ0FJbkQsUUFBUSxDQUFDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO2tDQUd6QixRQUFRLENBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUM7c0NBR3pCLFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQzttQ0FHM0IsUUFBUSxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO3NDQUczQixRQUFRLENBQUMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUM7MENBRzNCLFFBQVEsQ0FBQyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FBQztZQWQvQixtTEFBUyxVQUFVLDZCQUFWLFVBQVUsK0ZBQWdCO1lBR25DLHVLQUFT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
@@ -37,7 +37,7 @@ import { DeesChartEchartsBase } from '../dees-chart-echarts-base.js';
37
37
  import { demoFunc } from './demo.js';
38
38
  import { donutStyles } from './styles.js';
39
39
  import { renderChartDonut } from './template.js';
40
- import { getEchartsSeriesColors, getThemeColors } from '../dees-chart-echarts-theme.js';
40
+ import { getEchartsSeriesColors, getThemeColors, hexToRgba } from '../dees-chart-echarts-theme.js';
41
41
  let DeesChartDonut = (() => {
42
42
  let _classDecorators = [customElement('dees-chart-donut')];
43
43
  let _classDescriptor;
@@ -109,19 +109,38 @@ let DeesChartDonut = (() => {
109
109
  }
110
110
  }
111
111
  buildOption() {
112
- const colors = getThemeColors(this.goBright);
112
+ const themeColors = getThemeColors(this.goBright);
113
113
  const seriesColors = getEchartsSeriesColors(this.goBright);
114
- const data = this.data.map((item, index) => ({
115
- name: item.name,
116
- value: item.value,
117
- itemStyle: item.color ? { color: item.color } : { color: seriesColors[index % seriesColors.length] },
118
- }));
114
+ const fillAlpha = this.goBright ? 0.15 : 0.2;
115
+ const legendData = [];
116
+ const data = this.data.map((item, index) => {
117
+ const color = item.color || seriesColors[index % seriesColors.length];
118
+ legendData.push({ name: item.name, itemStyle: { color } });
119
+ return {
120
+ name: item.name,
121
+ value: item.value,
122
+ itemStyle: {
123
+ color: hexToRgba(color, fillAlpha),
124
+ borderColor: color,
125
+ borderWidth: 1,
126
+ },
127
+ emphasis: {
128
+ itemStyle: {
129
+ color: hexToRgba(color, fillAlpha + 0.15),
130
+ borderColor: color,
131
+ borderWidth: 1.5,
132
+ },
133
+ },
134
+ };
135
+ });
119
136
  const formatter = this.valueFormatter;
120
137
  return {
121
138
  tooltip: {
122
139
  trigger: 'item',
123
140
  formatter: (params) => {
124
- return `${params.marker} ${params.name}: <strong>${formatter(params.value)}</strong> (${params.percent}%)`;
141
+ const solidColor = params.data?.itemStyle?.borderColor || params.color;
142
+ const marker = `<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${solidColor};"></span>`;
143
+ return `${marker}${params.name}: <strong>${formatter(params.value)}</strong> (${params.percent}%)`;
125
144
  },
126
145
  },
127
146
  legend: this.showLegend
@@ -132,6 +151,7 @@ let DeesChartDonut = (() => {
132
151
  itemWidth: 10,
133
152
  itemHeight: 10,
134
153
  itemGap: 12,
154
+ data: legendData,
135
155
  formatter: (name) => {
136
156
  const item = this.data.find((d) => d.name === name);
137
157
  return item ? `${name} ${formatter(item.value)}` : name;
@@ -144,31 +164,19 @@ let DeesChartDonut = (() => {
144
164
  radius: [this.innerRadiusPercent, '85%'],
145
165
  center: this.showLegend ? ['35%', '50%'] : ['50%', '50%'],
146
166
  avoidLabelOverlap: true,
167
+ padAngle: 2,
147
168
  itemStyle: {
148
169
  borderRadius: 4,
149
- borderColor: 'transparent',
150
- borderWidth: 2,
151
170
  },
152
171
  label: this.showLabels
153
172
  ? {
154
173
  show: true,
155
174
  formatter: '{b}: {d}%',
156
175
  fontSize: 11,
157
- color: colors.textSecondary,
176
+ color: themeColors.textSecondary,
158
177
  textBorderColor: 'transparent',
159
178
  }
160
179
  : { show: false },
161
- emphasis: {
162
- itemStyle: {
163
- shadowBlur: 10,
164
- shadowOffsetX: 0,
165
- shadowColor: 'rgba(0, 0, 0, 0.2)',
166
- },
167
- label: {
168
- show: true,
169
- fontWeight: 'bold',
170
- },
171
- },
172
180
  data,
173
181
  },
174
182
  ],
@@ -185,4 +193,4 @@ let DeesChartDonut = (() => {
185
193
  return DeesChartDonut = _classThis;
186
194
  })();
187
195
  export { DeesChartDonut };
188
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHNfd2ViL2VsZW1lbnRzLzAwZ3JvdXAtY2hhcnQvZGVlcy1jaGFydC1kb251dC9jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFDTCxhQUFhLEVBQ2IsUUFBUSxHQUVULE1BQU0sNkJBQTZCLENBQUM7QUFFckMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDckUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNqRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7SUFlM0UsY0FBYzs0QkFEMUIsYUFBYSxDQUFDLGtCQUFrQixDQUFDOzs7O3NCQUNFLG9CQUFvQjs7Ozs7Ozs7Ozs7Ozs7Ozs4QkFBNUIsU0FBUSxXQUFvQjs7OztnQ0FJckQsUUFBUSxDQUFDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO3NDQUd6QixRQUFRLENBQUMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUM7c0NBRzNCLFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQzs4Q0FHM0IsUUFBUSxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDOzBDQUcxQixRQUFRLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7WUFYL0IsaUtBQVMsSUFBSSw2QkFBSixJQUFJLG1GQUF3QjtZQUdyQyxtTEFBUyxVQUFVLDZCQUFWLFVBQVUsK0ZBQWlCO1lBR3BDLG1MQUFTLFVBQVUsNkJBQVYsVUFBVSwrRkFB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
196
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHNfd2ViL2VsZW1lbnRzLzAwZ3JvdXAtY2hhcnQvZGVlcy1jaGFydC1kb251dC9jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFDTCxhQUFhLEVBQ2IsUUFBUSxHQUVULE1BQU0sNkJBQTZCLENBQUM7QUFFckMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDckUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNqRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsY0FBYyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0lBZXRGLGNBQWM7NEJBRDFCLGFBQWEsQ0FBQyxrQkFBa0IsQ0FBQzs7OztzQkFDRSxvQkFBb0I7Ozs7Ozs7Ozs7Ozs7Ozs7OEJBQTVCLFNBQVEsV0FBb0I7Ozs7Z0NBSXJELFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQztzQ0FHekIsUUFBUSxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO3NDQUczQixRQUFRLENBQUMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUM7OENBRzNCLFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQzswQ0FHMUIsUUFBUSxDQUFDLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDO1lBWC9CLGlLQUFTLElBQUksNkJBQUosSUFBSSxtRkFBd0I7WUFHckMsbUxBQVMsVUFBVSw2QkFBVixVQUFVLCtGQUFpQjtZQUdwQyxtTEFBUyxVQUFVLDZCQUFW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
@@ -6,6 +6,9 @@ export const donutStyles = [
6
6
  :host {
7
7
  height: 360px;
8
8
  }
9
+ .chartContainer {
10
+ inset: 12px 0;
11
+ }
9
12
  `,
10
13
  ];
11
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHNfd2ViL2VsZW1lbnRzLzAwZ3JvdXAtY2hhcnQvZGVlcy1jaGFydC1kb251dC9zdHlsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVwRSxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUc7SUFDekIsR0FBRyxpQkFBaUI7SUFDcEIsR0FBRyxDQUFBOzs7O0dBSUY7Q0FDRixDQUFDIn0=
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R5bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHNfd2ViL2VsZW1lbnRzLzAwZ3JvdXAtY2hhcnQvZGVlcy1jaGFydC1kb251dC9zdHlsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVwRSxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUc7SUFDekIsR0FBRyxpQkFBaUI7SUFDcEIsR0FBRyxDQUFBOzs7Ozs7O0dBT0Y7Q0FDRixDQUFDIn0=
@@ -97,7 +97,7 @@ let DeesChartEchartsBase = (() => {
97
97
  if (!chartContainer)
98
98
  return;
99
99
  try {
100
- this.chartInstance = this.echartsBundle.init(chartContainer);
100
+ this.chartInstance = this.echartsBundle.init(chartContainer, null, { renderer: 'svg' });
101
101
  this.updateChart();
102
102
  this.resizeObserver = new ResizeObserver(() => {
103
103
  this.chartInstance?.resize();
@@ -119,12 +119,17 @@ let DeesChartEchartsBase = (() => {
119
119
  return;
120
120
  const themeOptions = getEchartsThemeOptions(this.goBright);
121
121
  const chartOption = this.buildOption();
122
- // Merge theme defaults with chart-specific options
122
+ // Deep-merge theme defaults with chart-specific options for nested objects
123
123
  const merged = {
124
124
  ...themeOptions,
125
125
  ...chartOption,
126
126
  textStyle: { ...themeOptions.textStyle, ...(chartOption.textStyle || {}) },
127
127
  tooltip: { ...themeOptions.tooltip, ...(chartOption.tooltip || {}) },
128
+ legend: {
129
+ ...themeOptions.legend,
130
+ ...(chartOption.legend || {}),
131
+ textStyle: { ...(themeOptions.legend?.textStyle || {}), ...(chartOption.legend?.textStyle || {}) },
132
+ },
128
133
  };
129
134
  this.chartInstance.setOption(merged, true);
130
135
  }
@@ -137,4 +142,4 @@ let DeesChartEchartsBase = (() => {
137
142
  };
138
143
  })();
139
144
  export { DeesChartEchartsBase };
140
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVlcy1jaGFydC1lY2hhcnRzLWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90c193ZWIvZWxlbWVudHMvMDBncm91cC1jaGFydC9kZWVzLWNoYXJ0LWVjaGFydHMtYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLFdBQVcsRUFDWCxRQUFRLEVBQ1IsSUFBSSxHQUVMLE1BQU0sNkJBQTZCLENBQUM7QUFFckMsT0FBTyxLQUFLLFFBQVEsTUFBTSw4QkFBOEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsb0JBQW9CLEVBQThDLE1BQU0seUJBQXlCLENBQUM7QUFDM0csT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDdkUsT0FBTywwQ0FBMEMsQ0FBQztBQUVsRDs7OztHQUlHO0lBQ21CLG9CQUFvQjtzQkFBUyxXQUFXOzs7O2lCQUF4QyxvQkFBcUIsU0FBUSxXQUFXOzs7aUNBQzNELFFBQVEsRUFBRTtZQUNYLG9LQUFTLEtBQUssNkJBQUwsS0FBSyxxRkFBNEI7OztRQUExQyx1RUFBeUIsZ0JBQWdCLEVBQUM7UUFBMUMsSUFBUyxLQUFLLDJDQUE0QjtRQUExQyxJQUFTLEtBQUssaURBQTRCO1FBRWhDLGFBQWEsdURBQTRCLElBQUksRUFBQztRQUM5QyxhQUFhLEdBQTBCLElBQUksQ0FBQztRQUM5QyxjQUFjLEdBQTBCLElBQUksQ0FBQztRQUVyRDtZQUNFLEtBQUssRUFBRSxDQUFDO1lBQ1IsUUFBUSxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUM5QixJQUFJLENBQUMsdUJBQXVCLENBQUMsS0FBSyxJQUFJLEVBQUU7Z0JBQ3RDLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO29CQUN4QixJQUFJLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxDQUFDO29CQUNqQyxJQUFJLENBQUMsY0FBYyxH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
145
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVlcy1jaGFydC1lY2hhcnRzLWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90c193ZWIvZWxlbWVudHMvMDBncm91cC1jaGFydC9kZWVzLWNoYXJ0LWVjaGFydHMtYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLFdBQVcsRUFDWCxRQUFRLEVBQ1IsSUFBSSxHQUVMLE1BQU0sNkJBQTZCLENBQUM7QUFFckMsT0FBTyxLQUFLLFFBQVEsTUFBTSw4QkFBOEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsb0JBQW9CLEVBQThDLE1BQU0seUJBQXlCLENBQUM7QUFDM0csT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDdkUsT0FBTywwQ0FBMEMsQ0FBQztBQUVsRDs7OztHQUlHO0lBQ21CLG9CQUFvQjtzQkFBUyxXQUFXOzs7O2lCQUF4QyxvQkFBcUIsU0FBUSxXQUFXOzs7aUNBQzNELFFBQVEsRUFBRTtZQUNYLG9LQUFTLEtBQUssNkJBQUwsS0FBSyxxRkFBNEI7OztRQUExQyx1RUFBeUIsZ0JBQWdCLEVBQUM7UUFBMUMsSUFBUyxLQUFLLDJDQUE0QjtRQUExQyxJQUFTLEtBQUssaURBQTRCO1FBRWhDLGFBQWEsdURBQTRCLElBQUksRUFBQztRQUM5QyxhQUFhLEdBQTBCLElBQUksQ0FBQztRQUM5QyxjQUFjLEdBQTBCLElBQUksQ0FBQztRQUVyRDtZQUNFLEtBQUssRUFBRSxDQUFDO1lBQ1IsUUFBUSxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUM5QixJQUFJLENBQUMsdUJBQXVCLENBQUMsS0FBSyxJQUFJLEVBQUU7Z0JBQ3RDLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO29CQUN4QixJQUFJLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxDQUFDO29CQUNqQyxJQUFJLENBQUMsY0FBYyxH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