@sapui5/sap.viz 1.142.0 → 1.143.0

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sapui5/sap.viz",
3
- "version": "1.142.0",
3
+ "version": "1.143.0",
4
4
  "description": "SAPUI5 Library sap.viz",
5
5
  "homepage": "https://ui5.github.io/cli/pages/SAPUI5/",
6
6
  "author": "SAP SE (https://www.sap.com)",
@@ -5,7 +5,7 @@
5
5
  <vendor>SAP SE</vendor>
6
6
  <copyright>SAPUI5
7
7
  * (c) Copyright 2025 SAP SE. All rights reserved.</copyright>
8
- <version>1.142.0</version>
8
+ <version>1.143.0</version>
9
9
 
10
10
  <documentation>Chart controls based on the SAP BI CVOM charting library</documentation>
11
11
 
@@ -283,7 +283,7 @@ sap.ui.define([
283
283
 
284
284
  //@@end generated-elements-list
285
285
  ],
286
- version: "1.142.0"
286
+ version: "1.143.0"
287
287
  });
288
288
 
289
289
  //@@begin generated-enums
@@ -2086,9 +2086,6 @@ sap.ui.define([
2086
2086
  // Set template to viz
2087
2087
  thisLib._changeTemplate('standard_fiori');
2088
2088
  var colorArray = [
2089
- // new parameter mapping list
2090
- // refer to JIRA BITSDC2-6338
2091
- // Qualitative color
2092
2089
  'sapUiChartPaletteQualitativeHue1',
2093
2090
  'sapUiChartPaletteQualitativeHue2',
2094
2091
  'sapUiChartPaletteQualitativeHue3',
@@ -2179,6 +2176,28 @@ sap.ui.define([
2179
2176
  'sapUiCriticalElement',
2180
2177
  'sapUiPositiveElement',
2181
2178
  'sapUiNeutralElement',
2179
+ // new parameter mapping list
2180
+ // refer to JIRA BITSDC2-6338
2181
+ // Qualitative color
2182
+ 'sapChart_OrderedColor_1',
2183
+ 'sapChart_OrderedColor_2',
2184
+ 'sapChart_OrderedColor_3',
2185
+ 'sapChart_OrderedColor_4',
2186
+ 'sapChart_OrderedColor_5',
2187
+ 'sapChart_OrderedColor_6',
2188
+ 'sapChart_OrderedColor_7',
2189
+ 'sapChart_OrderedColor_8',
2190
+ 'sapChart_OrderedColor_9',
2191
+ 'sapChart_OrderedColor_10',
2192
+ 'sapChart_OrderedColor_11',
2193
+ // sapUiChartPaletteQualitativeHue12,...sapUiChartPaletteQualitativeHue122
2194
+ // mapping to sapChart_Sequence_1_Minus2 ... sapChart_Sequence_11_Minus2
2195
+
2196
+ // Semantic color
2197
+ // sapUiChartPaletteNoSemDiv1 mapping to sapChart_Sequence_12_Minus2 ... sapChart_Sequence_12_Plus3
2198
+
2199
+ 'sapChart_ChoroplethRegion_Background',
2200
+ 'sapChart_LineColor_3',
2182
2201
 
2183
2202
  // extended colors
2184
2203
  // Semantic border styles
@@ -2190,6 +2209,8 @@ sap.ui.define([
2190
2209
 
2191
2210
  // New border colors
2192
2211
  'sapChart_Sequence_1_BorderColor',
2212
+ 'sapChart_Sequence_2_BorderColor',
2213
+ 'sapChart_Sequence_3_BorderColor',
2193
2214
  'sapChart_Sequence_6_BorderColor',
2194
2215
  'sapChart_Sequence_12_BorderColor',
2195
2216
 
@@ -2352,12 +2373,54 @@ sap.ui.define([
2352
2373
  'sapChart_Sequence_3',
2353
2374
  'sapChart_Sequence_3_Minus1',
2354
2375
  'sapChart_Sequence_3_Minus2',
2376
+ 'sapChart_Sequence_4_Plus3',
2377
+ 'sapChart_Sequence_4_Plus2',
2378
+ 'sapChart_Sequence_4_Plus1',
2379
+ 'sapChart_Sequence_4',
2380
+ 'sapChart_Sequence_4_Minus1',
2381
+ 'sapChart_Sequence_4_Minus2',
2382
+ 'sapChart_Sequence_5_Plus3',
2383
+ 'sapChart_Sequence_5_Plus2',
2384
+ 'sapChart_Sequence_5_Plus1',
2385
+ 'sapChart_Sequence_5',
2386
+ 'sapChart_Sequence_5_Minus1',
2387
+ 'sapChart_Sequence_5_Minus2',
2355
2388
  'sapChart_Sequence_6_Plus3',
2356
2389
  'sapChart_Sequence_6_Plus2',
2357
2390
  'sapChart_Sequence_6_Plus1',
2358
2391
  'sapChart_Sequence_6',
2359
2392
  'sapChart_Sequence_6_Minus1',
2360
2393
  'sapChart_Sequence_6_Minus2',
2394
+ 'sapChart_Sequence_7_Plus3',
2395
+ 'sapChart_Sequence_7_Plus2',
2396
+ 'sapChart_Sequence_7_Plus1',
2397
+ 'sapChart_Sequence_7',
2398
+ 'sapChart_Sequence_7_Minus1',
2399
+ 'sapChart_Sequence_7_Minus2',
2400
+ 'sapChart_Sequence_8_Plus3',
2401
+ 'sapChart_Sequence_8_Plus2',
2402
+ 'sapChart_Sequence_8_Plus1',
2403
+ 'sapChart_Sequence_8',
2404
+ 'sapChart_Sequence_8_Minus1',
2405
+ 'sapChart_Sequence_8_Minus2',
2406
+ 'sapChart_Sequence_9_Plus3',
2407
+ 'sapChart_Sequence_9_Plus2',
2408
+ 'sapChart_Sequence_9_Plus1',
2409
+ 'sapChart_Sequence_9',
2410
+ 'sapChart_Sequence_9_Minus1',
2411
+ 'sapChart_Sequence_9_Minus2',
2412
+ 'sapChart_Sequence_10_Plus3',
2413
+ 'sapChart_Sequence_10_Plus2',
2414
+ 'sapChart_Sequence_10_Plus1',
2415
+ 'sapChart_Sequence_10',
2416
+ 'sapChart_Sequence_10_Minus1',
2417
+ 'sapChart_Sequence_10_Minus2',
2418
+ 'sapChart_Sequence_11_Plus3',
2419
+ 'sapChart_Sequence_11_Plus2',
2420
+ 'sapChart_Sequence_11_Plus1',
2421
+ 'sapChart_Sequence_11',
2422
+ 'sapChart_Sequence_11_Minus1',
2423
+ 'sapChart_Sequence_11_Minus2',
2361
2424
  'sapChart_Sequence_12_Plus3',
2362
2425
  'sapChart_Sequence_12_Plus2',
2363
2426
  'sapChart_Sequence_12_Plus1',
@@ -18663,6 +18663,70 @@ define('sap/viz/chart/behavior/config/HighlightHelper',[
18663
18663
  return null;
18664
18664
  }
18665
18665
 
18666
+ function setRectCache(e, rectCache) {
18667
+ var dataId = DataPointUtils.getDataPointId(e);
18668
+ if (!rectCache[dataId]) {
18669
+ rectCache[dataId] = e.innerHTML;
18670
+ }
18671
+ }
18672
+ function getRectCache(e, rectCache) {
18673
+ var dataId = DataPointUtils.getDataPointId(e);
18674
+ return rectCache[dataId];
18675
+ }
18676
+ function resetRectCache(rectCache) {
18677
+ for (var key in rectCache) {
18678
+ if (rectCache.hasOwnProperty(key)) {
18679
+ delete rectCache[key];
18680
+ }
18681
+ }
18682
+ }
18683
+
18684
+ function mergeRectContent(e, rectCache) {
18685
+ var currentRectHTML = e.innerHTML;
18686
+ var cachedRectHTML = getRectCache(e, rectCache);
18687
+ var mergedHTML = mergeHTMLContent(cachedRectHTML, currentRectHTML);
18688
+ e.innerHTML = mergedHTML;
18689
+ }
18690
+
18691
+ function mergeHTMLContent(cachedHTML, currentHTML) {
18692
+ if (!cachedHTML) {
18693
+ return currentHTML;
18694
+ }
18695
+ var tempDiv = document.createElement('div');
18696
+ tempDiv.innerHTML = cachedHTML;
18697
+
18698
+ var currentDiv = document.createElement('div');
18699
+ currentDiv.innerHTML = currentHTML;
18700
+
18701
+ var cachedRect = tempDiv.querySelector('rect');
18702
+ var currentRect = currentDiv.querySelector('rect');
18703
+
18704
+ if (cachedRect && currentRect) {
18705
+ var mergedRect = cachedRect.cloneNode(true);
18706
+ var styleAttributes = ['stroke', 'stroke-width', 'fill', 'fill-opacity', 'stroke-opacity', 'opacity'];
18707
+ styleAttributes.forEach(function (attr) {
18708
+ if (currentRect.hasAttribute(attr)) {
18709
+ mergedRect.setAttribute(attr, currentRect.getAttribute(attr));
18710
+ }
18711
+ });
18712
+ tempDiv.replaceChild(mergedRect, cachedRect);
18713
+ }
18714
+ var cachedG = tempDiv.querySelector('g');
18715
+ var currentG = currentDiv.querySelector('g');
18716
+
18717
+ if (cachedG && currentG) {
18718
+ var mergedG = cachedG.cloneNode(true);
18719
+ var gStyleAttributes = ['fill-opacity'];
18720
+ gStyleAttributes.forEach(function (attr) {
18721
+ if (currentG.hasAttribute(attr)) {
18722
+ mergedG.setAttribute(attr, currentG.getAttribute(attr));
18723
+ }
18724
+ });
18725
+ tempDiv.replaceChild(mergedG, cachedG);
18726
+ }
18727
+ return tempDiv.innerHTML;
18728
+ }
18729
+
18666
18730
  var helper = {
18667
18731
  transformColor: transformColor,
18668
18732
  turnToArray: turnToArray,
@@ -18673,7 +18737,11 @@ define('sap/viz/chart/behavior/config/HighlightHelper',[
18673
18737
  getWidth : getWidth,
18674
18738
  getDeselAllExTargets: getDeselAllExTargets,
18675
18739
  getLayerCoord: getLayerCoord,
18676
- tryToFindNode: tryToFindNode
18740
+ tryToFindNode: tryToFindNode,
18741
+ setRectCache: setRectCache,
18742
+ getRectCache: getRectCache,
18743
+ resetRectCache: resetRectCache,
18744
+ mergeRectContent: mergeRectContent,
18677
18745
  };
18678
18746
 
18679
18747
  return helper;
@@ -20700,6 +20768,8 @@ define('sap/viz/chart/behavior/config/handler/DataPointBehaviorHandler',[
20700
20768
 
20701
20769
  var getColors = HighlightHelper.getColors;
20702
20770
 
20771
+ var rectCache = {};
20772
+
20703
20773
  function checkColorContrast(fill, bgcolor, threshold) {
20704
20774
  if (fill && bgcolor) {
20705
20775
  var ratioObj = ColorUtil.checkColorContrast(bgcolor, fill, threshold);
@@ -21780,6 +21850,7 @@ define('sap/viz/chart/behavior/config/handler/DataPointBehaviorHandler',[
21780
21850
  }else{
21781
21851
  var dataId = DataPointUtils.getDataPointId(e);
21782
21852
  var dataPoint = dataModel.getDataPoint(dataId);
21853
+ HighlightHelper.setRectCache(e, rectCache);
21783
21854
  if (dataPoint) {
21784
21855
  var shape = getShape(plot, dataPoint);
21785
21856
  if(shape === "line"){
@@ -21993,9 +22064,14 @@ define('sap/viz/chart/behavior/config/handler/DataPointBehaviorHandler',[
21993
22064
  HighlightHelper.drawStroke(service, e, 'rect', prop.stroke, width, undefined, extraData);
21994
22065
  }
21995
22066
  HighlightHelper.drawFill(service, e, 'rect, path', prop, isMarkerRendererExist);
22067
+ var hasInnerStroke = ACCStyleUtils.isTreeMapOrHeatMap(service._getChartType());
22068
+ if (hasInnerStroke) {
22069
+ HighlightHelper.mergeRectContent(e, rectCache);
22070
+ }
21996
22071
  }
21997
22072
  }
21998
22073
  });
22074
+ HighlightHelper.resetRectCache(rectCache);
21999
22075
  }
22000
22076
  };
22001
22077
 
@@ -51145,7 +51221,10 @@ define('sap/viz/chart/components/renderers/BarRenderer',[ "sap/viz/framework/com
51145
51221
  node.setAttribute('stroke', graphic.stroke);
51146
51222
  node.setAttribute('stroke-width', graphic.strokeWidth);
51147
51223
  }
51148
- }
51224
+ }
51225
+ if (graphic.innerStroke && graphic.innerStroke.visible) {
51226
+ node._innerStrokeConfig = config;
51227
+ }
51149
51228
  }
51150
51229
 
51151
51230
  DataGraphics.setCustomizationInfo(node, {'defaultRenderer' : true});
@@ -79159,7 +79238,8 @@ define('sap/viz/chart/components/plots/treemap/TreeMapPlot',[
79159
79238
  'sap/viz/chart/components/renderers/TreeMapDimensionLabelRenderer',
79160
79239
  "sap/viz/chart/components/accessibility/ChartComponentNavigatorFactory",
79161
79240
  "sap/viz/chart/components/accessibility/TreeMapDataPointNavigator",
79162
- "sap/viz/chart/components/util/ChartConstants"
79241
+ "sap/viz/chart/components/util/ChartConstants",
79242
+ "sap/viz/framework/common/util/ACCStyleUtils"
79163
79243
  ], function Setup(oo,
79164
79244
  TypeUtils,
79165
79245
  TextUtils,
@@ -79178,7 +79258,8 @@ define('sap/viz/chart/components/plots/treemap/TreeMapPlot',[
79178
79258
  TreeMapDimensionLabelRenderer,
79179
79259
  ChartNavigator,
79180
79260
  DataPointNavigator,
79181
- ChartConstants) {
79261
+ ChartConstants,
79262
+ ACCStyleUtils) {
79182
79263
 
79183
79264
  var m_className = "v-treemap",
79184
79265
  m_classNameItem = "v-treemapitem",
@@ -79335,6 +79416,24 @@ define('sap/viz/chart/components/plots/treemap/TreeMapPlot',[
79335
79416
  }
79336
79417
  };
79337
79418
 
79419
+ TreeMapPlot.prototype._buildWrapperConfig = function (data, position, context, option) {
79420
+ var config = TreeMapPlot.superclass._buildWrapperConfig.apply(this, arguments);
79421
+
79422
+ var enableAccUpdates = this._properties.origin.get('interaction.enableAccUpdates') || false;
79423
+ if (enableAccUpdates) {
79424
+ config.graphic.innerStroke = {
79425
+ color: ACCStyleUtils.getBorderColor(config.graphic.fill),
79426
+ width: ACCStyleUtils.getBorderWidth(),
79427
+ visible: true,
79428
+ rectDifference: 2,
79429
+ x: 0,
79430
+ y: 0
79431
+ };
79432
+ }
79433
+
79434
+ return config;
79435
+ };
79436
+
79338
79437
  function setupItems(gItems, plot, option){
79339
79438
  gItems.each(function(d) {
79340
79439
  var dpConfig = plot._buildWrapperConfig(d.rawdata, {width:d.width, height:d.height}, d.ctx, option);
@@ -79342,7 +79441,11 @@ define('sap/viz/chart/components/plots/treemap/TreeMapPlot',[
79342
79441
  d.color = dpData.color;
79343
79442
  DataGraphics.setData(this, dpData);
79344
79443
  DataPointUtils.setDataPointId(this, d.rawdata.dp.id);
79345
- });
79444
+ d.innerStrokeConfig = (dpConfig &&
79445
+ dpConfig.graphic &&
79446
+ dpConfig.graphic.innerStroke &&
79447
+ dpConfig.graphic.innerStroke.visible) ? dpConfig : null;
79448
+ });
79346
79449
  }
79347
79450
 
79348
79451
  TreeMapPlot.prototype._drawTreeMapItems = function(treeLevelRoot, rectObjs, redrawAll, iLevel,
@@ -79408,6 +79511,7 @@ define('sap/viz/chart/components/plots/treemap/TreeMapPlot',[
79408
79511
  });
79409
79512
  return rectRes;
79410
79513
  };
79514
+ var innerStrokeNodes = [];
79411
79515
  var drawRect = function(rect) {
79412
79516
  var rectRes = rect.attr("x", function(d) {
79413
79517
  return (isLeafItem) ? (0) : (d.left + padding);
@@ -79432,6 +79536,13 @@ define('sap/viz/chart/components/plots/treemap/TreeMapPlot',[
79432
79536
  .attr('stroke-width', function(d) {
79433
79537
  return isLeafItem ? d.strokeWidth : undefined;
79434
79538
  });
79539
+ rectRes.each(function (d) {
79540
+ var rectNode = this;
79541
+ if (isLeafItem && iLevel > 0 && d.innerStrokeConfig) {
79542
+ rectNode._innerStrokeConfig = d.innerStrokeConfig;
79543
+ innerStrokeNodes.push(rectNode);
79544
+ }
79545
+ });
79435
79546
  if (!isLeafItem) {
79436
79547
  rectRes.attr("fill-opacity", 1);
79437
79548
  }
@@ -79515,6 +79626,12 @@ define('sap/viz/chart/components/plots/treemap/TreeMapPlot',[
79515
79626
  }
79516
79627
  //add labels
79517
79628
  drawLabels(gItems, this._labelVisibility);
79629
+ innerStrokeNodes.forEach(function (rectNode) {
79630
+ if (rectNode._innerStrokeConfig) {
79631
+ ACCStyleUtils.renderInnerStroke(rectNode._innerStrokeConfig, rectNode);
79632
+ delete rectNode._innerStrokeConfig;
79633
+ }
79634
+ });
79518
79635
  }
79519
79636
 
79520
79637
  //draw children recursively
@@ -81696,6 +81813,7 @@ define('sap/viz/chart/behavior/config/DataPointBehaviorConfigForTreeMap',[
81696
81813
  var treeType = [
81697
81814
  "info/treemap"
81698
81815
  ];
81816
+ var rectCache = {};
81699
81817
  treeType = ChartTypeUtils.addTrellisType(treeType);
81700
81818
  var CSS_CLASS = Constants.CSS.CLASS;
81701
81819
 
@@ -81751,6 +81869,7 @@ define('sap/viz/chart/behavior/config/DataPointBehaviorConfigForTreeMap',[
81751
81869
  var elements = HighlightHelper.turnToArray(event.data.targets);
81752
81870
  var prop = service.getProperties().get('interaction.hover');
81753
81871
  elements.forEach(function(e) {
81872
+ HighlightHelper.setRectCache(e, rectCache);
81754
81873
  if (!event.data.byKeyboard) {
81755
81874
  HighlightHelper.drawStroke(service, e, 'rect', prop.stroke, 2);
81756
81875
  }
@@ -81782,7 +81901,9 @@ define('sap/viz/chart/behavior/config/DataPointBehaviorConfigForTreeMap',[
81782
81901
  HighlightHelper.drawStroke(service, e, 'rect', prop.stroke, 1);
81783
81902
  HighlightHelper.drawFill(service, e, 'rect', prop,
81784
81903
  TypeUtils.isExist(service.getProperties().get('plotArea.markerRenderer')));
81904
+ HighlightHelper.mergeRectContent(e, rectCache);
81785
81905
  });
81906
+ HighlightHelper.resetRectCache(rectCache);
81786
81907
  }
81787
81908
  }, {
81788
81909
  "id": "clearPlot_tree",
@@ -82463,6 +82584,17 @@ define('sap/viz/chart/components/plots/HeatMapPlot',[
82463
82584
  effectManager: this._effectManager,
82464
82585
  categoryAxis : dpConfig.categoryAxis
82465
82586
  };
82587
+ var enableAccUpdates = this._properties.origin.get('interaction.enableAccUpdates') || false;
82588
+ if (enableAccUpdates) {
82589
+ config.graphic.innerStroke = {
82590
+ color: ACCStyleUtils.getBorderColor(config.graphic.fill),
82591
+ width: ACCStyleUtils.getBorderWidth(),
82592
+ visible: true,
82593
+ rectDifference: 1,
82594
+ x: 0.5,
82595
+ y: 0.5
82596
+ };
82597
+ }
82466
82598
  if(this._strokeProp && this._strokeProp.visible && config.graphic) {
82467
82599
  config.graphic.stroke = this._strokeProp.color;
82468
82600
  config.graphic.strokeWidth = '1px';
@@ -82713,6 +82845,7 @@ define('sap/viz/chart/components/plots/HeatMapPlot',[
82713
82845
  var options = {
82714
82846
  disableSemantic: false
82715
82847
  };
82848
+ var innerStrokeNodes = [];
82716
82849
  for(dpNum = 0; dpNum < dpConfigArray.length; dpNum++){
82717
82850
  dpConfig = dpConfigArray[dpNum];
82718
82851
  dpConfig.options = options;
@@ -82728,8 +82861,18 @@ define('sap/viz/chart/components/plots/HeatMapPlot',[
82728
82861
  Constants.CSS.CLASS.MORPHABLEDATAPOINT + ' ' + Constants.CSS.CLASS.DATAPOINTDEFAULT);
82729
82862
  dpTranslateNode.setAttribute("transform", 'translate(' + dpConfig.x + "," + dpConfig.y + ')');
82730
82863
  dataPointG.appendChild(dpTranslateNode);
82864
+ var rectNode = dpTranslateNode.querySelector("rect");
82865
+ if (rectNode && rectNode._innerStrokeConfig) {
82866
+ innerStrokeNodes.push(rectNode);
82867
+ }
82731
82868
  }
82732
82869
  selection.node().appendChild(dataPointG);
82870
+ innerStrokeNodes.forEach(function(rectNode) {
82871
+ if (rectNode._innerStrokeConfig) {
82872
+ ACCStyleUtils.renderInnerStroke(rectNode._innerStrokeConfig, rectNode);
82873
+ delete rectNode._innerStrokeConfig;
82874
+ }
82875
+ });
82733
82876
  this._drawHeatMapDataLabels(selection);
82734
82877
  };
82735
82878
 
@@ -38164,7 +38164,6 @@ define('sap/viz/framework/common/util/ACCStyleUtils',['sap/viz/framework/common/
38164
38164
  var DEFAULT_BORDER_WIDTH_NAME = 'sapElement_BorderWidth';
38165
38165
 
38166
38166
  var colorMapping = {
38167
- // Semantic colors
38168
38167
  'sapUiChartPaletteSemanticBadLight3': 'sapChart_Sequence_Bad_Plus3',
38169
38168
  'sapUiChartPaletteSemanticBadLight2': 'sapChart_Sequence_Bad_Plus2',
38170
38169
  'sapUiChartPaletteSemanticBadLight1': 'sapChart_Sequence_Bad_Plus1',
@@ -38259,11 +38258,11 @@ define('sap/viz/framework/common/util/ACCStyleUtils',['sap/viz/framework/common/
38259
38258
  'sapUiChartPaletteQualitativeHue20': 'sapChart_Sequence_9_Minus2',
38260
38259
  'sapUiChartPaletteQualitativeHue21': 'sapChart_Sequence_10_Minus2',
38261
38260
  'sapUiChartPaletteQualitativeHue22': 'sapChart_Sequence_11_Minus2',
38262
-
38263
38261
  'sapUiNegativeElement': 'sapChart_Sequence_Bad',
38264
38262
  'sapUiCriticalElement': 'sapChart_Sequence_Critical',
38265
38263
  'sapUiPositiveElement': 'sapChart_Sequence_Good',
38266
38264
  'sapUiNeutralElement': 'sapChart_Sequence_Neutral',
38265
+ 'sapChart_ChoroplethRegion_Background': ''
38267
38266
  };
38268
38267
  var themeMapping = {
38269
38268
  "sap_horizon_fiori__merged_with_cvom_by_vizframe[]": "HORIZON",
@@ -38345,8 +38344,12 @@ define('sap/viz/framework/common/util/ACCStyleUtils',['sap/viz/framework/common/
38345
38344
  }
38346
38345
  if (colorMapping[lookupKey]) {
38347
38346
  return colorMapping[lookupKey];
38348
- } else if (stringIncludes(cssName, 'Sequence')) {
38347
+ } else if (stringIncludes(cssName, 'Sequence') ||
38348
+ stringIncludes(cssName, 'OrderedColor')) {
38349
38349
  return cssName;
38350
+ } else if (stringIncludes(lookupKey, 'Sequence') ||
38351
+ stringIncludes(lookupKey, 'OrderedColor')){
38352
+ return lookupKey;
38350
38353
  } else {
38351
38354
  return null;
38352
38355
  }
@@ -38371,7 +38374,10 @@ define('sap/viz/framework/common/util/ACCStyleUtils',['sap/viz/framework/common/
38371
38374
  getBorderColor: function (cssName) {
38372
38375
  var borderColorName = this.getBorderColorName(cssName);
38373
38376
 
38374
- if (!borderColorName || borderColorName === cssName) {
38377
+ if (!borderColorName) {
38378
+ return null;
38379
+ }
38380
+ if (borderColorName === cssName) {
38375
38381
  return cssName;
38376
38382
  }
38377
38383
 
@@ -38451,6 +38457,63 @@ define('sap/viz/framework/common/util/ACCStyleUtils',['sap/viz/framework/common/
38451
38457
  'info/100_dual_stacked_bar'
38452
38458
  ];
38453
38459
  return excludeChart.indexOf(chartType) >= 0 ? true : false;
38460
+ },
38461
+ isTreeMapOrHeatMap: function (chartType) {
38462
+ var charTypes = ['info/heatmap', 'info/treemap'];
38463
+ return charTypes.indexOf(chartType) >= 0 ? true : false;
38464
+ },
38465
+ renderInnerStroke: function (config, rectNode) {
38466
+ if (!config.graphic.innerStroke || !config.graphic.innerStroke.visible) {
38467
+ return;
38468
+ }
38469
+
38470
+ var innerStroke = config.graphic.innerStroke;
38471
+ var width = parseFloat(config.graphic.width);
38472
+ var height = parseFloat(config.graphic.height);
38473
+ var originalWidth = innerStroke.width;
38474
+ var numericWidth;
38475
+ if (typeof originalWidth === 'string') {
38476
+ numericWidth = parseFloat(originalWidth.replace(/[^\d.-]/g, ''));
38477
+ } else {
38478
+ numericWidth = parseFloat(originalWidth);
38479
+ }
38480
+
38481
+ var strokeWidth = isNaN(numericWidth) ? 4 : numericWidth * 4;
38482
+
38483
+ var dataId = Math.random().toString(36).slice(2);
38484
+ var clipId = "inner-stroke-clip-" + dataId;
38485
+
38486
+ var svg = rectNode.ownerSVGElement || rectNode.closest("svg");
38487
+ var defs = d3.select(svg).select("defs");
38488
+ if (defs.empty()) {
38489
+ defs = d3.select(svg).append("defs");
38490
+ }
38491
+
38492
+ var clipPath = defs.select("#" + clipId);
38493
+ if (clipPath.empty()) {
38494
+ clipPath = defs.append("clipPath").attr("id", clipId);
38495
+ clipPath.append("rect");
38496
+ }
38497
+ clipPath.select("rect")
38498
+ .attr("x", innerStroke.x)
38499
+ .attr("y", innerStroke.y)
38500
+ .attr("width", Math.max(0, width - innerStroke.rectDifference))
38501
+ .attr("height", Math.max(0, height - innerStroke.rectDifference));
38502
+
38503
+ d3.select(rectNode)
38504
+ .attr("stroke", innerStroke.color)
38505
+ .attr("stroke-width", strokeWidth)
38506
+ .attr("clip-path", "url(#" + clipId + ")");
38507
+ },
38508
+ extractRectDimensions: function (rectString) {
38509
+ var widthMatch = rectString.match(/width="([^"]+)"/);
38510
+ var width = widthMatch ? parseFloat(widthMatch[1]) : null;
38511
+ var heightMatch = rectString.match(/height="([^"]+)"/);
38512
+ var height = heightMatch ? parseFloat(heightMatch[1]) : null;
38513
+ return {
38514
+ width: width,
38515
+ height: height
38516
+ };
38454
38517
  }
38455
38518
  };
38456
38519
 
@@ -368,6 +368,26 @@ html[data-sap-ui-browser^=ed] .viz-controls-chartPopover .viz-controls-chartPopo
368
368
  content: "";
369
369
  }
370
370
 
371
+ .viz-controls-chartPopover .viz-controls-chartPopover-contentPanel .sapUiFormLblColon {
372
+ td:not(.sapUiGridLabelFull),
373
+ .sapUiRespGridMedia-Std-Phone.sapUiFormResGridCont > :not(.sapUiRespGridSpanS12),
374
+ .sapUiRespGridMedia-Std-Tablet.sapUiFormResGridCont > :not(.sapUiRespGridSpanM12),
375
+ .sapUiRespGridMedia-Std-Desktop.sapUiFormResGridCont > :not(.sapUiRespGridSpanL12),
376
+ .sapUiRespGridMedia-Std-LargeDesktop.sapUiFormResGridCont > :not(.sapUiRespGridSpanXL12),
377
+ .sapUiFormResLayout .sapUiRFLRow:first-child > .sapUiRFLContainer:first-child:not(.sapUiRFLFullLength) > .sapUiRFLContainerContent,
378
+ .sapUiFormCL.sapUiFormCLSmallColumns :not(.sapUiFormCLCellsS12),
379
+ .sapUiFormCL.sapUiFormCLWideColumns :not(.sapUiFormCLCellsL12) {
380
+ &.sapUiFormElementLbl > .sapMLabel {
381
+ .sapMLabelInner {
382
+ //related incident: DINC0668926
383
+ //overriding ui5 css selector which causes label to not be aligned correctly
384
+ justify-content: flex-start !important;
385
+ }
386
+ }
387
+ }
388
+ }
389
+
390
+
371
391
  html[dir=rtl] .viz-controls-chartPopover .viz-controls-chartPopover-measure-value{
372
392
  text-align: right !important;
373
393
  }
@@ -84,36 +84,36 @@ sap.ui.define(['sap/viz/ui5/format/ChartFormatter', 'sap/ui/Device', "sap/ui/thi
84
84
 
85
85
  var FIORI_DUAL_PROPS = {
86
86
  'plotArea': {
87
- 'primaryValuesColorPalette': ['sapUiChartPaletteSequentialHue1',
88
- 'sapUiChartPaletteSequentialHue1Light2',
89
- 'sapUiChartPaletteSequentialHue1Dark1'
87
+ 'primaryValuesColorPalette': ['sapChart_Sequence_1',
88
+ 'sapChart_Sequence_1_Plus2',
89
+ 'sapChart_Sequence_1_Minus1'
90
90
  ],
91
- 'secondaryValuesColorPalette': ['sapUiChartPaletteSequentialHue2',
92
- 'sapUiChartPaletteSequentialHue2Light2',
93
- 'sapUiChartPaletteSequentialHue2Dark1'
91
+ 'secondaryValuesColorPalette': ['sapChart_Sequence_2',
92
+ 'sapChart_Sequence_2_Plus2',
93
+ 'sapChart_Sequence_2_Minus1'
94
94
  ]
95
95
  },
96
96
  "valueAxis": {
97
97
  "title": {
98
98
  "style": {
99
- "color": "sapUiChartPaletteSequentialHue1Dark1"
99
+ "color": "sapChart_Sequence_1_Minus1"
100
100
  }
101
101
  },
102
102
  "axisLine": {
103
103
  "visible": false
104
104
  },
105
- "color": "sapUiChartPaletteSequentialHue1Dark1"
105
+ "color": "sapChart_Sequence_1_Minus1"
106
106
  },
107
107
  "valueAxis2": {
108
108
  "title": {
109
109
  "style": {
110
- "color": "sapUiChartPaletteSequentialHue2Dark1"
110
+ "color": "sapChart_Sequence_2_Minus1"
111
111
  }
112
112
  },
113
113
  "axisLine": {
114
114
  "visible": false
115
115
  },
116
- "color": "sapUiChartPaletteSequentialHue2Dark1"
116
+ "color": "sapChart_Sequence_2_Minus1"
117
117
  }
118
118
  };
119
119
 
@@ -213,49 +213,50 @@ sap.ui.define(['sap/viz/ui5/format/ChartFormatter', 'sap/ui/Device', "sap/ui/thi
213
213
  "dataUpdating": false,
214
214
  "resizing": false
215
215
  },
216
- 'colorPalette': ['sapUiChartPaletteQualitativeHue1',
217
- 'sapUiChartPaletteQualitativeHue2',
218
- 'sapUiChartPaletteQualitativeHue3',
219
- 'sapUiChartPaletteQualitativeHue4',
220
- 'sapUiChartPaletteQualitativeHue5',
221
- 'sapUiChartPaletteQualitativeHue6',
222
- 'sapUiChartPaletteQualitativeHue7',
223
- 'sapUiChartPaletteQualitativeHue8',
224
- 'sapUiChartPaletteQualitativeHue9',
225
- 'sapUiChartPaletteQualitativeHue10',
226
- 'sapUiChartPaletteQualitativeHue11',
227
- 'sapUiChartPaletteQualitativeHue12',
228
- 'sapUiChartPaletteQualitativeHue13',
229
- 'sapUiChartPaletteQualitativeHue14',
230
- 'sapUiChartPaletteQualitativeHue15',
231
- 'sapUiChartPaletteQualitativeHue16',
232
- 'sapUiChartPaletteQualitativeHue17',
233
- 'sapUiChartPaletteQualitativeHue18',
234
- 'sapUiChartPaletteQualitativeHue19',
235
- 'sapUiChartPaletteQualitativeHue20',
236
- 'sapUiChartPaletteQualitativeHue21',
237
- 'sapUiChartPaletteQualitativeHue22'
216
+ 'colorPalette': [
217
+ 'sapChart_OrderedColor_1',
218
+ 'sapChart_OrderedColor_2',
219
+ 'sapChart_OrderedColor_3',
220
+ 'sapChart_OrderedColor_4',
221
+ 'sapChart_OrderedColor_5',
222
+ 'sapChart_OrderedColor_6',
223
+ 'sapChart_OrderedColor_7',
224
+ 'sapChart_OrderedColor_8',
225
+ 'sapChart_OrderedColor_9',
226
+ 'sapChart_OrderedColor_10',
227
+ 'sapChart_OrderedColor_11',
228
+ 'sapChart_Sequence_1_Minus2',
229
+ 'sapChart_Sequence_2_Minus2',
230
+ 'sapChart_Sequence_3_Minus2',
231
+ 'sapChart_Sequence_4_Minus2',
232
+ 'sapChart_Sequence_5_Minus2',
233
+ 'sapChart_Sequence_6_Minus2',
234
+ 'sapChart_Sequence_7_Minus2',
235
+ 'sapChart_Sequence_8_Minus2',
236
+ 'sapChart_Sequence_9_Minus2',
237
+ 'sapChart_Sequence_10_Minus2',
238
+ 'sapChart_Sequence_11_Minus2'
238
239
  ],
239
- 'primaryValuesColorPalette': ['sapUiChartPaletteSequentialHue1Light1',
240
- 'sapUiChartPaletteSequentialHue1',
241
- 'sapUiChartPaletteSequentialHue1Dark1'
240
+ 'primaryValuesColorPalette': ['sapChart_Sequence_1_Plus1',
241
+ 'sapChart_Sequence_1',
242
+ 'sapChart_Sequence_1_Minus1'
242
243
  ],
243
- 'secondaryValuesColorPalette': ['sapUiChartPaletteSequentialHue2Light1',
244
- 'sapUiChartPaletteSequentialHue2',
245
- 'sapUiChartPaletteSequentialHue2Dark1'
244
+ 'secondaryValuesColorPalette': ['sapChart_Sequence_2_Plus1',
245
+ 'sapChart_Sequence_2',
246
+ 'sapChart_Sequence_2_Minus1'
246
247
  ]
247
248
  }
248
249
  };
249
250
 
250
251
  var heatmapProp = {
251
252
  "plotArea": {
252
- "nullColor": "sapUiChoroplethRegionBG",
253
+ "nullColor": "sapChart_ChoroplethRegion_Background",
253
254
  "colorPalette": [
254
- "sapUiChartPaletteSequentialHue1Light2",
255
- "sapUiChartPaletteSequentialHue1Light1",
256
- "sapUiChartPaletteSequentialHue1",
257
- "sapUiChartPaletteSequentialHue1Dark1",
258
- "sapUiChartPaletteSequentialHue1Dark2"
255
+ "sapChart_Sequence_1_Plus2",
256
+ "sapChart_Sequence_1_Plus1",
257
+ "sapChart_Sequence_1",
258
+ "sapChart_Sequence_1_Minus1",
259
+ "sapChart_Sequence_1_Minus2"
259
260
  ]
260
261
  }
261
262
  };
@@ -115,56 +115,58 @@ sap.ui.define(["sap/ui/thirdparty/jquery"], function(jQuery) {
115
115
 
116
116
  if (bOldStyle || (!bHasColor && primaryNum < 2) || otherNum === 0){
117
117
  if (!plotArea.additionalColor){
118
- plotArea.additionalColor = ["sapUiChartPaletteSequentialHue2Light1"];
118
+ plotArea.additionalColor = ["sapChart_Sequence_2_Plus1"];
119
119
  }
120
120
 
121
121
  if (!plotArea.forecastColor){
122
- plotArea.forecastColor = ["sapUiChartPaletteSequentialNeutralLight3"];
122
+ plotArea.forecastColor = ["sapChart_Sequence_Neutral_Plus3"];
123
123
  }
124
124
 
125
125
  if (!plotArea.actualColor){
126
- plotArea.actualColor = ["sapUiChartPaletteSequentialHue1Light1",
127
- "sapUiChartPaletteQualitativeHue2",
128
- "sapUiChartPaletteQualitativeHue3",
129
- "sapUiChartPaletteQualitativeHue4",
130
- "sapUiChartPaletteQualitativeHue5",
131
- "sapUiChartPaletteQualitativeHue6",
132
- "sapUiChartPaletteQualitativeHue7",
133
- "sapUiChartPaletteQualitativeHue8",
134
- "sapUiChartPaletteQualitativeHue9",
135
- "sapUiChartPaletteQualitativeHue10",
136
- "sapUiChartPaletteQualitativeHue11",
137
- "sapUiChartPaletteQualitativeHue12",
138
- "sapUiChartPaletteQualitativeHue13",
139
- "sapUiChartPaletteQualitativeHue14",
140
- "sapUiChartPaletteQualitativeHue15",
141
- "sapUiChartPaletteQualitativeHue16",
142
- "sapUiChartPaletteQualitativeHue17",
143
- "sapUiChartPaletteQualitativeHue18",
144
- "sapUiChartPaletteQualitativeHue19",
145
- "sapUiChartPaletteQualitativeHue20",
146
- "sapUiChartPaletteQualitativeHue21",
147
- "sapUiChartPaletteQualitativeHue22"];
126
+ plotArea.actualColor = [
127
+ 'sapChart_OrderedColor_1',
128
+ 'sapChart_OrderedColor_2',
129
+ 'sapChart_OrderedColor_3',
130
+ 'sapChart_OrderedColor_4',
131
+ 'sapChart_OrderedColor_5',
132
+ 'sapChart_OrderedColor_6',
133
+ 'sapChart_OrderedColor_7',
134
+ 'sapChart_OrderedColor_8',
135
+ 'sapChart_OrderedColor_9',
136
+ 'sapChart_OrderedColor_10',
137
+ 'sapChart_OrderedColor_11',
138
+ 'sapChart_Sequence_1_Minus2',
139
+ 'sapChart_Sequence_2_Minus2',
140
+ 'sapChart_Sequence_3_Minus2',
141
+ 'sapChart_Sequence_4_Minus2',
142
+ 'sapChart_Sequence_5_Minus2',
143
+ 'sapChart_Sequence_6_Minus2',
144
+ 'sapChart_Sequence_7_Minus2',
145
+ 'sapChart_Sequence_8_Minus2',
146
+ 'sapChart_Sequence_9_Minus2',
147
+ 'sapChart_Sequence_10_Minus2',
148
+ 'sapChart_Sequence_11_Minus2'
149
+ ];
148
150
  }
149
151
 
150
152
  } else {
151
153
  if (!plotArea.additionalColor){
152
- plotArea.additionalColor = ["sapUiChartPaletteSequentialHue1Light2",
153
- "sapUiChartPaletteSequentialHue2Light2",
154
- "sapUiChartPaletteSequentialHue3Light2",
155
- "sapUiChartPaletteSequentialNeutralLight2"];
154
+ plotArea.additionalColor = ["sapChart_Sequence_2_Plus2",
155
+ "sapChart_Sequence_2_Plus2",
156
+ "sapChart_Sequence_3_Plus2",
157
+ "sapChart_Sequence_Neutral_Plus2"];
156
158
  }
157
159
 
158
160
  if (!plotArea.forecastColor){
159
- plotArea.forecastColor = ["sapUiChartPaletteSequentialHue1Light2",
160
- "sapUiChartPaletteSequentialHue2Light2",
161
- "sapUiChartPaletteSequentialHue3Light2",
162
- "sapUiChartPaletteSequentialNeutralLight2"];
161
+ plotArea.forecastColor = ["sapChart_Sequence_2_Plus2",
162
+ "sapChart_Sequence_2_Plus2",
163
+ "sapChart_Sequence_3_Plus2",
164
+ "sapChart_Sequence_Neutral_Plus2"];
163
165
  }
164
166
  if (!plotArea.actualColor){
165
- plotArea.actualColor = ["sapUiChartPaletteSequentialHue1",
166
- "sapUiChartPaletteSequentialHue2",
167
- "sapUiChartPaletteSequentialHue3",
167
+ plotArea.actualColor = ["sapChart_Sequence_1",
168
+ "sapChart_Sequence_2",
169
+ "sapChart_Sequence_3",
168
170
  "sapUiChartPaletteSequentialNeutral"];
169
171
  }
170
172
  }
@@ -182,17 +184,17 @@ sap.ui.define(["sap/ui/thirdparty/jquery"], function(jQuery) {
182
184
  jQuery.extend(true, options.properties, {plotArea:{}});
183
185
  var plotArea = options.properties.plotArea;
184
186
  if (!plotArea.actualColor) {
185
- plotArea.actualColor = ["sapUiChartPaletteSequentialHue1",
186
- "sapUiChartPaletteSequentialHue2",
187
- "sapUiChartPaletteSequentialHue3",
187
+ plotArea.actualColor = ["sapChart_Sequence_1",
188
+ "sapChart_Sequence_2",
189
+ "sapChart_Sequence_3",
188
190
  "sapUiChartPaletteSequentialNeutral"];
189
191
  }
190
192
 
191
193
  if (!plotArea.additionalColor) {
192
- plotArea.additionalColor = ["sapUiChartPaletteSequentialHue1Light2",
193
- "sapUiChartPaletteSequentialHue2Light2",
194
- "sapUiChartPaletteSequentialHue3Light2",
195
- "sapUiChartPaletteSequentialNeutralLight2"];
194
+ plotArea.additionalColor = ["sapChart_Sequence_2_Plus2",
195
+ "sapChart_Sequence_2_Plus2",
196
+ "sapChart_Sequence_3_Plus2",
197
+ "sapChart_Sequence_Neutral_Plus2"];
196
198
  }
197
199
  };
198
200
 
@@ -17,7 +17,7 @@ sap.ui.define(['sap/ui/core/ElementMetadata'],
17
17
  *
18
18
  * @class
19
19
  * @author SAP SE
20
- * @version 1.142.0
20
+ * @version 1.143.0
21
21
  * @since 1.30.0
22
22
  * @alias sap.viz.ui5.core.BaseChartMetadata
23
23
  */
@@ -132,7 +132,7 @@ sap.ui.define([
132
132
  "sizeLegend.label.style.fontSize"
133
133
  ],
134
134
  "sapUiChartPaletteUndefinedColor": "plotArea.defaultOthersStyle.color",
135
- "sapUiChartPaletteSemanticBadLight1": "general.defaultTimePeriodColor",
135
+ "sapChart_Sequence_Bad_Plus1": "general.defaultTimePeriodColor",
136
136
  "sapUiChartGridlineColor": "plotArea.dataLabel.line.color",
137
137
  "sapChart_LineColor_1": [
138
138
  "plotArea.gridline.color",
@@ -252,9 +252,9 @@ sap.ui.define([
252
252
  "sapUiChartLegendHoverBackground": ["legend.hoverShadow.color"],
253
253
  "sapUiChartLegendSelectionBackground": ["legend.mouseDownShadow.color"],
254
254
  "sapUiChartLegendSelectionHoverBackground": ["legend.hoverSelectedShadow.color"],
255
- "sapUiChartPaletteSemanticNeutral": ["plotArea.dataPoint.color.total"],
256
- "sapUiChartPaletteQualitativeHue1": ["plotArea.dataPoint.color.positive"],
257
- "sapUiChartPaletteQualitativeHue2": ["plotArea.dataPoint.color.negative"],
255
+ "sapChart_Sequence_Neutral": ["plotArea.dataPoint.color.total"],
256
+ "sapChart_OrderedColor_1": ["plotArea.dataPoint.color.positive"],
257
+ "sapChart_OrderedColor_2": ["plotArea.dataPoint.color.negative"],
258
258
  "sapUiChartLightText": ["timeAxis.label.style.parentColor"],
259
259
  "sapUiChartDataLabelFontColor": ["plotArea.dataLabel.style.color"],
260
260
  "sapUiChartFocusWidth": ["interaction.keyboard.width"],