@solidpepper/solidpepper-solidgeneration 0.2.3 → 0.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1387,7 +1387,14 @@ class DataSheetSVG {
|
|
|
1387
1387
|
if (!blockGuid || blockGuid === '00000000-0000-0000-0000-000000000000') {
|
|
1388
1388
|
blockGuid = this.getAttributeFromSvg(gabarit?.svgImage, 'data-blockGuid');
|
|
1389
1389
|
}
|
|
1390
|
-
|
|
1390
|
+
const sanitizedRef = (skuRef || '')
|
|
1391
|
+
.toString()
|
|
1392
|
+
.trim()
|
|
1393
|
+
.replace(/[\s\W]+/g, '-');
|
|
1394
|
+
const groupId = sanitizedRef
|
|
1395
|
+
? `group_${nbBlock + 1}_${sanitizedRef}`
|
|
1396
|
+
: `group_${nbBlock + 1}`;
|
|
1397
|
+
return `<g data-type="template" id="${groupId}" data-skuGuid="${skuGuid}" data-sku="${skuRef}" data-assetGuid="${assetGuid}" data-templateGuid="${templateGuid}" data-blockGuid="${blockGuid}">${tplGroup}</g>`;
|
|
1391
1398
|
}
|
|
1392
1399
|
CleanMissingFilters(svgContent) {
|
|
1393
1400
|
const filterRegex = /filter="url\(#([^"]+)\)"/g;
|
|
@@ -2666,6 +2673,14 @@ class DataSheetSVG {
|
|
|
2666
2673
|
newValWithoutStyle += '<tbody>';
|
|
2667
2674
|
let skus = [];
|
|
2668
2675
|
skus = jRowSku['skus'] && jRowSku['skus'][0] ? jRowSku['skus'][0] : [];
|
|
2676
|
+
const variantAttr = tag?.XmlTag?.getAttribute('data-variant');
|
|
2677
|
+
if (variantAttr != null && variantAttr !== '') {
|
|
2678
|
+
const vIndex = parseInt(variantAttr, 10);
|
|
2679
|
+
if (!isNaN(vIndex) && vIndex >= 1) {
|
|
2680
|
+
const targetSku = skus[vIndex - 1];
|
|
2681
|
+
skus = targetSku ? [targetSku] : [];
|
|
2682
|
+
}
|
|
2683
|
+
}
|
|
2669
2684
|
let currentRow = '';
|
|
2670
2685
|
let currentRowWithoutStyle = '';
|
|
2671
2686
|
let startWithNewPage = jRowSku['splitVariantTable'] === false ? true : false;
|
|
@@ -3319,6 +3334,19 @@ class DataSheetSVG {
|
|
|
3319
3334
|
}
|
|
3320
3335
|
getNewVal(field, jRowSku, idVal = '', tag = null, showText = true, showPicto = false, separator = ', ', keepAttributes = false) {
|
|
3321
3336
|
let newVal = '';
|
|
3337
|
+
// Handle variant targeting if data-variant attribute is present
|
|
3338
|
+
if (jRowSku != null && tag != null && tag.XmlTag != null) {
|
|
3339
|
+
const variantAttr = tag.XmlTag.getAttribute('data-variant');
|
|
3340
|
+
if (variantAttr != null && variantAttr !== '') {
|
|
3341
|
+
const vIndex = parseInt(variantAttr, 10);
|
|
3342
|
+
if (!isNaN(vIndex) && vIndex >= 1) {
|
|
3343
|
+
const skus = jRowSku['skus'] && jRowSku['skus'][0] ? jRowSku['skus'][0] : [];
|
|
3344
|
+
if (skus[vIndex - 1]) {
|
|
3345
|
+
jRowSku = skus[vIndex - 1];
|
|
3346
|
+
}
|
|
3347
|
+
}
|
|
3348
|
+
}
|
|
3349
|
+
}
|
|
3322
3350
|
if (jRowSku == null ||
|
|
3323
3351
|
(Object.keys(jRowSku).length === 0 && keepAttributes)) {
|
|
3324
3352
|
if (keepAttributes) {
|
|
@@ -4326,7 +4354,20 @@ class DataSheetSVG {
|
|
|
4326
4354
|
const showPicto = tspan.getAttribute('data-show-picto') || 'false';
|
|
4327
4355
|
const separator = tspan.getAttribute('data-separator') || ', ';
|
|
4328
4356
|
const textTransform = tspan.getAttribute('data-text-transform');
|
|
4329
|
-
let
|
|
4357
|
+
let rowToUse = jRowSku;
|
|
4358
|
+
const tspanVariant = tspan.getAttribute('data-variant');
|
|
4359
|
+
if (tspanVariant != null && tspanVariant !== '') {
|
|
4360
|
+
const vIndex = parseInt(tspanVariant, 10);
|
|
4361
|
+
if (!isNaN(vIndex) && vIndex >= 1) {
|
|
4362
|
+
const skus = jRowSku['skus'] && jRowSku['skus'][0]
|
|
4363
|
+
? jRowSku['skus'][0]
|
|
4364
|
+
: [];
|
|
4365
|
+
if (skus[vIndex - 1]) {
|
|
4366
|
+
rowToUse = skus[vIndex - 1];
|
|
4367
|
+
}
|
|
4368
|
+
}
|
|
4369
|
+
}
|
|
4370
|
+
let valueToInsert = this.getNewVal(field, rowToUse, idVal, tag, showText === 'true', showPicto === 'true', separator, keepAttributes);
|
|
4330
4371
|
valueToInsert = this.applyTextTransform(valueToInsert, textTransform);
|
|
4331
4372
|
if (valueToInsert != null &&
|
|
4332
4373
|
innerHTML.includes(placeholder)) {
|
|
@@ -5061,8 +5102,8 @@ class DataSheetSVG {
|
|
|
5061
5102
|
}
|
|
5062
5103
|
}
|
|
5063
5104
|
});
|
|
5064
|
-
// Traiter le masquage conditionnel (data-hide-if-attribute)
|
|
5065
|
-
let hideIfElements = domSVG.querySelectorAll('[data-hide-if-attribute]');
|
|
5105
|
+
// Traiter le masquage conditionnel (data-hide-if-attribute ou data-hide-if-operator)
|
|
5106
|
+
let hideIfElements = domSVG.querySelectorAll('[data-hide-if-attribute], [data-hide-if-operator]');
|
|
5066
5107
|
const cleanValueForHide = (val) => {
|
|
5067
5108
|
if (val === null || val === undefined)
|
|
5068
5109
|
return '';
|
|
@@ -5091,64 +5132,89 @@ class DataSheetSVG {
|
|
|
5091
5132
|
let attrName = element.getAttribute('data-hide-if-attribute') || '';
|
|
5092
5133
|
let op = element.getAttribute('data-hide-if-operator') || 'is_null';
|
|
5093
5134
|
let compareVal = element.getAttribute('data-hide-if-value') || '';
|
|
5094
|
-
let
|
|
5095
|
-
let
|
|
5096
|
-
let
|
|
5097
|
-
|
|
5098
|
-
|
|
5099
|
-
|
|
5100
|
-
|
|
5101
|
-
|
|
5102
|
-
|
|
5103
|
-
|
|
5104
|
-
|
|
5105
|
-
|
|
5106
|
-
|
|
5107
|
-
|
|
5108
|
-
|
|
5109
|
-
return String(val).toLowerCase().trim();
|
|
5110
|
-
};
|
|
5111
|
-
const matchedAttr = allAttrs.find((a) => (a && a.id && getAttrString(a.id) === normAttr) ||
|
|
5112
|
-
(a && a.attributeId && getAttrString(a.attributeId) === normAttr) ||
|
|
5113
|
-
(a && a.guid && getAttrString(a.guid) === normAttr) ||
|
|
5114
|
-
(a && a.attributeGuid && getAttrString(a.attributeGuid) === normAttr) ||
|
|
5115
|
-
(a && a.attributeName && getAttrString(a.attributeName) === normAttr) ||
|
|
5116
|
-
(a && a.code && getAttrString(a.code) === normAttr) ||
|
|
5117
|
-
(a && a.attributeCode && getAttrString(a.attributeCode) === normAttr));
|
|
5118
|
-
const isMultiSelectAttr = !!(matchedAttr &&
|
|
5119
|
-
(matchedAttr.attributeType === 'multiSelect' || matchedAttr.type === 'multiSelect'));
|
|
5120
|
-
let actualValues = [];
|
|
5121
|
-
if (isMultiSelectAttr) {
|
|
5122
|
-
if (Array.isArray(actualValue)) {
|
|
5123
|
-
actualValues = actualValue.map((v) => cleanValueForHide(v).toLowerCase().trim());
|
|
5124
|
-
}
|
|
5125
|
-
else if (cleanActual) {
|
|
5126
|
-
actualValues = cleanActual
|
|
5127
|
-
.split(/[#;,\n|]+/)
|
|
5128
|
-
.map((item) => item.trim())
|
|
5129
|
-
.filter((item) => item.length > 0);
|
|
5135
|
+
let variantAttr = element.getAttribute('data-hide-if-variant') || element.getAttribute('data-variant');
|
|
5136
|
+
let rowToUse = jRowSku;
|
|
5137
|
+
let variantExists = false;
|
|
5138
|
+
if (variantAttr != null && variantAttr !== '') {
|
|
5139
|
+
const vIndex = parseInt(variantAttr, 10);
|
|
5140
|
+
if (!isNaN(vIndex) && vIndex >= 1) {
|
|
5141
|
+
const skus = jRowSku['skus'] && jRowSku['skus'][0] ? jRowSku['skus'][0] : [];
|
|
5142
|
+
if (skus[vIndex - 1] != null) {
|
|
5143
|
+
rowToUse = skus[vIndex - 1];
|
|
5144
|
+
variantExists = true;
|
|
5145
|
+
}
|
|
5146
|
+
else {
|
|
5147
|
+
rowToUse = null;
|
|
5148
|
+
variantExists = false;
|
|
5149
|
+
}
|
|
5130
5150
|
}
|
|
5131
5151
|
}
|
|
5152
|
+
let shouldHide = false;
|
|
5153
|
+
if (op === 'variant_exists') {
|
|
5154
|
+
shouldHide = variantExists;
|
|
5155
|
+
}
|
|
5156
|
+
else if (op === 'variant_not_exists') {
|
|
5157
|
+
shouldHide = !variantExists;
|
|
5158
|
+
}
|
|
5132
5159
|
else {
|
|
5133
|
-
|
|
5134
|
-
|
|
5135
|
-
|
|
5136
|
-
|
|
5137
|
-
|
|
5138
|
-
|
|
5139
|
-
|
|
5140
|
-
|
|
5141
|
-
|
|
5142
|
-
|
|
5143
|
-
|
|
5144
|
-
|
|
5145
|
-
|
|
5146
|
-
|
|
5147
|
-
|
|
5148
|
-
|
|
5149
|
-
|
|
5150
|
-
|
|
5151
|
-
|
|
5160
|
+
let field = this.getPropertyOfField(attrName) || '';
|
|
5161
|
+
let actualValue = this.getNewVal(field, rowToUse, attrName);
|
|
5162
|
+
let cleanActual = cleanValueForHide(actualValue).toLowerCase();
|
|
5163
|
+
let cleanCompare = cleanValueForHide(compareVal).toLowerCase();
|
|
5164
|
+
// Vérifier si l'attribut est de type multiSelect
|
|
5165
|
+
const normAttr = attrName.toLowerCase().trim();
|
|
5166
|
+
const allAttrs = (this.DataSheet && this.DataSheet.attributes) || DataSheetSingleton.getInstance().attributes || [];
|
|
5167
|
+
const getAttrString = (val) => {
|
|
5168
|
+
if (!val)
|
|
5169
|
+
return '';
|
|
5170
|
+
if (typeof val === 'string')
|
|
5171
|
+
return val.toLowerCase().trim();
|
|
5172
|
+
if (typeof val === 'object' && val.fr)
|
|
5173
|
+
return String(val.fr).toLowerCase().trim();
|
|
5174
|
+
return String(val).toLowerCase().trim();
|
|
5175
|
+
};
|
|
5176
|
+
const matchedAttr = allAttrs.find((a) => (a && a.id && getAttrString(a.id) === normAttr) ||
|
|
5177
|
+
(a && a.attributeId && getAttrString(a.attributeId) === normAttr) ||
|
|
5178
|
+
(a && a.guid && getAttrString(a.guid) === normAttr) ||
|
|
5179
|
+
(a && a.attributeGuid && getAttrString(a.attributeGuid) === normAttr) ||
|
|
5180
|
+
(a && a.attributeName && getAttrString(a.attributeName) === normAttr) ||
|
|
5181
|
+
(a && a.code && getAttrString(a.code) === normAttr) ||
|
|
5182
|
+
(a && a.attributeCode && getAttrString(a.attributeCode) === normAttr));
|
|
5183
|
+
const isMultiSelectAttr = !!(matchedAttr &&
|
|
5184
|
+
(matchedAttr.attributeType === 'multiSelect' || matchedAttr.type === 'multiSelect'));
|
|
5185
|
+
let actualValues = [];
|
|
5186
|
+
if (isMultiSelectAttr) {
|
|
5187
|
+
if (Array.isArray(actualValue)) {
|
|
5188
|
+
actualValues = actualValue.map((v) => cleanValueForHide(v).toLowerCase().trim());
|
|
5189
|
+
}
|
|
5190
|
+
else if (cleanActual) {
|
|
5191
|
+
actualValues = cleanActual
|
|
5192
|
+
.split(/[#;,\n|]+/)
|
|
5193
|
+
.map((item) => item.trim())
|
|
5194
|
+
.filter((item) => item.length > 0);
|
|
5195
|
+
}
|
|
5196
|
+
}
|
|
5197
|
+
else {
|
|
5198
|
+
actualValues = [cleanActual];
|
|
5199
|
+
}
|
|
5200
|
+
switch (op) {
|
|
5201
|
+
case 'is_null':
|
|
5202
|
+
shouldHide = cleanActual === '';
|
|
5203
|
+
break;
|
|
5204
|
+
case 'is_not_null':
|
|
5205
|
+
shouldHide = cleanActual !== '';
|
|
5206
|
+
break;
|
|
5207
|
+
case 'equals':
|
|
5208
|
+
shouldHide = isMultiSelectAttr
|
|
5209
|
+
? actualValues.includes(cleanCompare)
|
|
5210
|
+
: cleanActual === cleanCompare;
|
|
5211
|
+
break;
|
|
5212
|
+
case 'not_equals':
|
|
5213
|
+
shouldHide = isMultiSelectAttr
|
|
5214
|
+
? !actualValues.includes(cleanCompare)
|
|
5215
|
+
: cleanActual !== cleanCompare;
|
|
5216
|
+
break;
|
|
5217
|
+
}
|
|
5152
5218
|
}
|
|
5153
5219
|
if (shouldHide) {
|
|
5154
5220
|
element.remove();
|
|
@@ -5623,54 +5689,147 @@ class DataSheetSVG {
|
|
|
5623
5689
|
}
|
|
5624
5690
|
}
|
|
5625
5691
|
getBackgroundSectionForPreview(section) {
|
|
5692
|
+
if (!this.DataSheet.backgrounds || this.DataSheet.backgrounds.length === 0) {
|
|
5693
|
+
return null;
|
|
5694
|
+
}
|
|
5626
5695
|
let defaultBackground = this.DataSheet.backgrounds.find((background) => background.guid == this.DataSheet.defaultBackgroundGuid);
|
|
5627
|
-
|
|
5628
|
-
|
|
5629
|
-
|
|
5696
|
+
if (!defaultBackground) {
|
|
5697
|
+
defaultBackground = this.DataSheet.backgrounds[0];
|
|
5698
|
+
}
|
|
5699
|
+
let background = null;
|
|
5700
|
+
if (section) {
|
|
5701
|
+
const bgIdentifier = section.background ||
|
|
5702
|
+
section.backgroundGuid ||
|
|
5703
|
+
section.spreadName ||
|
|
5704
|
+
section.spreadGuid ||
|
|
5705
|
+
section.publicationPageBackground ||
|
|
5706
|
+
section.pageBackground ||
|
|
5707
|
+
section.publicationTemplateGuid ||
|
|
5708
|
+
section.templateGuid;
|
|
5709
|
+
if (bgIdentifier &&
|
|
5710
|
+
typeof bgIdentifier === 'string' &&
|
|
5711
|
+
bgIdentifier.trim() !== '' &&
|
|
5712
|
+
bgIdentifier !== '00000000-0000-0000-0000-000000000000') {
|
|
5713
|
+
const idLower = bgIdentifier.trim().toLowerCase();
|
|
5714
|
+
const idClean = idLower.replace(/\.svg$/i, '');
|
|
5715
|
+
background = this.DataSheet.backgrounds.find((bg) => {
|
|
5716
|
+
if (!bg)
|
|
5717
|
+
return false;
|
|
5718
|
+
const guidLower = (bg.guid || bg.backgroundGuid || '')
|
|
5719
|
+
.toString()
|
|
5720
|
+
.toLowerCase();
|
|
5721
|
+
if (guidLower && (guidLower === idLower || guidLower === idClean)) {
|
|
5722
|
+
return true;
|
|
5723
|
+
}
|
|
5724
|
+
const nameLower = (bg.name || bg.backgroundName || '')
|
|
5725
|
+
.toString()
|
|
5726
|
+
.toLowerCase();
|
|
5727
|
+
const nameClean = nameLower.replace(/\.svg$/i, '');
|
|
5728
|
+
if (nameLower &&
|
|
5729
|
+
(nameLower === idLower ||
|
|
5730
|
+
nameClean === idClean ||
|
|
5731
|
+
nameLower === idClean + '.svg')) {
|
|
5732
|
+
return true;
|
|
5733
|
+
}
|
|
5734
|
+
const nameNoSvgLower = (bg.nameNoSvg || '').toString().toLowerCase();
|
|
5735
|
+
if (nameNoSvgLower && nameNoSvgLower === idClean) {
|
|
5736
|
+
return true;
|
|
5737
|
+
}
|
|
5738
|
+
const formatNameLower = (bg.formatName ||
|
|
5739
|
+
bg.backgroundFormatName ||
|
|
5740
|
+
'')
|
|
5741
|
+
.toString()
|
|
5742
|
+
.toLowerCase();
|
|
5743
|
+
if (formatNameLower && formatNameLower === idClean) {
|
|
5744
|
+
return true;
|
|
5745
|
+
}
|
|
5746
|
+
return false;
|
|
5747
|
+
});
|
|
5748
|
+
}
|
|
5749
|
+
}
|
|
5750
|
+
if (background == null || background == undefined) {
|
|
5630
5751
|
background = defaultBackground;
|
|
5631
5752
|
}
|
|
5632
5753
|
if (background == null || background == undefined) {
|
|
5633
5754
|
background = this.DataSheet.backgrounds[0];
|
|
5634
5755
|
}
|
|
5635
|
-
|
|
5636
|
-
|
|
5637
|
-
|
|
5638
|
-
|
|
5639
|
-
|
|
5640
|
-
|
|
5641
|
-
|
|
5642
|
-
|
|
5643
|
-
|
|
5644
|
-
|
|
5645
|
-
|
|
5646
|
-
|
|
5647
|
-
|
|
5648
|
-
|
|
5649
|
-
|
|
5650
|
-
|
|
5651
|
-
|
|
5652
|
-
|
|
5653
|
-
|
|
5654
|
-
|
|
5655
|
-
|
|
5656
|
-
|
|
5657
|
-
|
|
5658
|
-
|
|
5659
|
-
|
|
5660
|
-
|
|
5661
|
-
|
|
5662
|
-
this.DataSheet.
|
|
5663
|
-
|
|
5664
|
-
|
|
5665
|
-
|
|
5666
|
-
|
|
5667
|
-
|
|
5668
|
-
this.DataSheet.
|
|
5756
|
+
if (background) {
|
|
5757
|
+
// Update data for the background (remove later)
|
|
5758
|
+
this.DataSheet.backgroundWidth = background.width;
|
|
5759
|
+
this.DataSheet.backgroundHeight = background.height;
|
|
5760
|
+
this.DataSheet.backgroundMarginTop = background.headerHeight;
|
|
5761
|
+
this.DataSheet.backgroundMarginLeft = background.leftMargin;
|
|
5762
|
+
this.DataSheet.backgroundMarginRight = background.rightMargin;
|
|
5763
|
+
this.DataSheet.backgroundMarginBottom = background.footerHeight;
|
|
5764
|
+
this.DataSheet.backgroundBleedMarginTop = background.bleedMarginTop
|
|
5765
|
+
? background.bleedMarginTop
|
|
5766
|
+
: 0;
|
|
5767
|
+
this.DataSheet.backgroundBleedMarginBottom = background.bleedMarginBottom
|
|
5768
|
+
? background.bleedMarginBottom
|
|
5769
|
+
: 0;
|
|
5770
|
+
this.DataSheet.backgroundBleedMarginLeft = background.bleedMarginLeft
|
|
5771
|
+
? background.bleedMarginLeft
|
|
5772
|
+
: 0;
|
|
5773
|
+
this.DataSheet.backgroundBleedMarginRight = background.bleedMarginRight
|
|
5774
|
+
? background.bleedMarginRight
|
|
5775
|
+
: 0;
|
|
5776
|
+
// new
|
|
5777
|
+
this.DataSheet.publicationTemplateWidth = background.width;
|
|
5778
|
+
this.DataSheet.publicationTemplateHeight = background.height;
|
|
5779
|
+
this.DataSheet.publicationTemplateBackgroundHeightHeader =
|
|
5780
|
+
background.headerHeight;
|
|
5781
|
+
this.DataSheet.publicationTemplateBackgroundHeightFooter =
|
|
5782
|
+
background.footerHeight;
|
|
5783
|
+
this.DataSheet.publicationTemplateBackgroundFooterY =
|
|
5784
|
+
this.DataSheet.publicationTemplateHeight - background.footerHeight;
|
|
5785
|
+
this.DataSheet.publicationTemplateBackgroundLeftMargin =
|
|
5786
|
+
background.leftMargin;
|
|
5787
|
+
this.DataSheet.publicationTemplateBackgroundRightMargin =
|
|
5788
|
+
background.rightMargin;
|
|
5789
|
+
this.DataSheet.publicationTemplateBackgroundMarginX =
|
|
5790
|
+
this.DataSheet.publicationTemplateWidth - background.rightMargin;
|
|
5791
|
+
}
|
|
5669
5792
|
return background;
|
|
5670
5793
|
}
|
|
5671
5794
|
getMarketingSectionForPreview(section) {
|
|
5672
|
-
|
|
5673
|
-
|
|
5795
|
+
if (!this.DataSheet.marketing || this.DataSheet.marketing.length === 0 || !section) {
|
|
5796
|
+
return null;
|
|
5797
|
+
}
|
|
5798
|
+
const identifier = section.gabaritName ||
|
|
5799
|
+
section.marketingName ||
|
|
5800
|
+
section.gabaritGuid ||
|
|
5801
|
+
section.guid ||
|
|
5802
|
+
section.name;
|
|
5803
|
+
if (!identifier || typeof identifier !== 'string' || identifier.trim() === '') {
|
|
5804
|
+
return null;
|
|
5805
|
+
}
|
|
5806
|
+
const idLower = identifier.trim().toLowerCase();
|
|
5807
|
+
const idClean = idLower.replace(/\.svg$/i, '');
|
|
5808
|
+
let mark = this.DataSheet.marketing.find((m) => {
|
|
5809
|
+
if (!m)
|
|
5810
|
+
return false;
|
|
5811
|
+
const mGuidLower = (m.guid || '').toString().toLowerCase();
|
|
5812
|
+
if (mGuidLower && (mGuidLower === idLower || mGuidLower === idClean)) {
|
|
5813
|
+
return true;
|
|
5814
|
+
}
|
|
5815
|
+
const mMarketingNameLower = (m.marketingName || '').toString().toLowerCase();
|
|
5816
|
+
const mMarketingClean = mMarketingNameLower.replace(/\.svg$/i, '');
|
|
5817
|
+
if (mMarketingNameLower &&
|
|
5818
|
+
(mMarketingNameLower === idLower ||
|
|
5819
|
+
mMarketingClean === idClean ||
|
|
5820
|
+
mMarketingNameLower === idClean + '.svg')) {
|
|
5821
|
+
return true;
|
|
5822
|
+
}
|
|
5823
|
+
const mNameLower = (m.name || '').toString().toLowerCase();
|
|
5824
|
+
const mNameClean = mNameLower.replace(/\.svg$/i, '');
|
|
5825
|
+
if (mNameLower &&
|
|
5826
|
+
(mNameLower === idLower ||
|
|
5827
|
+
mNameClean === idClean ||
|
|
5828
|
+
mNameLower === idClean + '.svg')) {
|
|
5829
|
+
return true;
|
|
5830
|
+
}
|
|
5831
|
+
return false;
|
|
5832
|
+
});
|
|
5674
5833
|
if (mark == undefined || mark == null) {
|
|
5675
5834
|
return null;
|
|
5676
5835
|
}
|
|
@@ -6576,7 +6735,7 @@ class DataSheetSku {
|
|
|
6576
6735
|
this.DataSheet.maxSkusSection = lstSkuObjects.length;
|
|
6577
6736
|
let pages = [];
|
|
6578
6737
|
let background = this.DataSheetSVG.getBackgroundSectionForPreview(section);
|
|
6579
|
-
let backgroundTpl = background
|
|
6738
|
+
let backgroundTpl = background?.svgImage || '';
|
|
6580
6739
|
let allBackgroundTags = this.DataSheetSVG.GetSvgGroupToReplace(backgroundTpl);
|
|
6581
6740
|
let allElements = this.DataSheetSVG.GetAllTags(backgroundTpl);
|
|
6582
6741
|
let group = false;
|
|
@@ -6584,7 +6743,9 @@ class DataSheetSku {
|
|
|
6584
6743
|
const tagName = element.tagName?.toLowerCase();
|
|
6585
6744
|
if (tagName === 'svg') {
|
|
6586
6745
|
// HEADER HEIGHT
|
|
6587
|
-
const attrHeader = element.getAttribute('data-margin-top') ||
|
|
6746
|
+
const attrHeader = element.getAttribute('data-margin-top') ||
|
|
6747
|
+
element.getAttribute('data-header-height') ||
|
|
6748
|
+
element.getAttribute('data-margin-vertical');
|
|
6588
6749
|
const parsedHeader = parseFloat(attrHeader);
|
|
6589
6750
|
if (!isNaN(parsedHeader)) {
|
|
6590
6751
|
this.DataSheet.publicationTemplateBackgroundHeightHeader =
|
|
@@ -6594,7 +6755,9 @@ class DataSheetSku {
|
|
|
6594
6755
|
this.DataSheet.publicationTemplateBackgroundHeightHeader = 0;
|
|
6595
6756
|
}
|
|
6596
6757
|
// FOOTER HEIGHT
|
|
6597
|
-
const attrFooter = element.getAttribute('data-margin-bottom') ||
|
|
6758
|
+
const attrFooter = element.getAttribute('data-margin-bottom') ||
|
|
6759
|
+
element.getAttribute('data-footer-height') ||
|
|
6760
|
+
element.getAttribute('data-margin-vertical');
|
|
6598
6761
|
const parsedFooter = parseFloat(attrFooter);
|
|
6599
6762
|
if (!isNaN(parsedFooter)) {
|
|
6600
6763
|
this.DataSheet.publicationTemplateBackgroundHeightFooter =
|
|
@@ -6608,8 +6771,10 @@ class DataSheetSku {
|
|
|
6608
6771
|
this.DataSheet.publicationTemplateHeight;
|
|
6609
6772
|
}
|
|
6610
6773
|
// MARGIN
|
|
6611
|
-
const attrMarginLeft = element.getAttribute('data-margin-left') ||
|
|
6612
|
-
|
|
6774
|
+
const attrMarginLeft = element.getAttribute('data-margin-left') ||
|
|
6775
|
+
element.getAttribute('data-margin-horizontal');
|
|
6776
|
+
const attrMarginRight = element.getAttribute('data-margin-right') ||
|
|
6777
|
+
element.getAttribute('data-margin-horizontal');
|
|
6613
6778
|
const parsedMarginLeft = parseFloat(attrMarginLeft);
|
|
6614
6779
|
if (!isNaN(parsedMarginLeft)) {
|
|
6615
6780
|
this.DataSheet.publicationTemplateBackgroundLeftMargin =
|
|
@@ -6699,7 +6864,7 @@ class DataSheetSku {
|
|
|
6699
6864
|
let currentBackgroundTpl = backgroundTpl;
|
|
6700
6865
|
if (pageConfig) {
|
|
6701
6866
|
if (pageConfig.backgroundGuid) {
|
|
6702
|
-
const bg = this.DataSheet.backgrounds.find((b) => b.
|
|
6867
|
+
const bg = this.DataSheet.backgrounds.find((b) => b.guid === pageConfig.backgroundGuid);
|
|
6703
6868
|
if (bg && bg.svgImage) {
|
|
6704
6869
|
currentBackgroundTpl = bg.svgImage;
|
|
6705
6870
|
}
|
|
@@ -6921,8 +7086,12 @@ class DataSheetPublication {
|
|
|
6921
7086
|
return;
|
|
6922
7087
|
const lang = this.languagePreviewSelected.toLowerCase();
|
|
6923
7088
|
let val = null;
|
|
6924
|
-
if (attr.attributeValue &&
|
|
6925
|
-
|
|
7089
|
+
if (attr.attributeValue &&
|
|
7090
|
+
typeof attr.attributeValue === 'object') {
|
|
7091
|
+
val =
|
|
7092
|
+
attr.attributeValue[lang] ||
|
|
7093
|
+
attr.attributeValue[this.languagePreviewSelected] ||
|
|
7094
|
+
'';
|
|
6926
7095
|
}
|
|
6927
7096
|
else {
|
|
6928
7097
|
val = attr.attributeValue || '';
|
|
@@ -7056,7 +7225,9 @@ class DataSheetPublication {
|
|
|
7056
7225
|
const tagName = element.tagName?.toLowerCase();
|
|
7057
7226
|
if (tagName === 'svg') {
|
|
7058
7227
|
// HEADER HEIGHT
|
|
7059
|
-
const attrHeader = element.getAttribute('data-margin-top') ||
|
|
7228
|
+
const attrHeader = element.getAttribute('data-margin-top') ||
|
|
7229
|
+
element.getAttribute('data-header-height') ||
|
|
7230
|
+
element.getAttribute('data-margin-vertical');
|
|
7060
7231
|
const parsedHeader = Number.parseFloat(attrHeader);
|
|
7061
7232
|
if (Number.isNaN(parsedHeader)) {
|
|
7062
7233
|
this.DataSheet.publicationTemplateBackgroundHeightHeader = 0;
|
|
@@ -7066,7 +7237,9 @@ class DataSheetPublication {
|
|
|
7066
7237
|
parsedHeader;
|
|
7067
7238
|
}
|
|
7068
7239
|
// FOOTER HEIGHT
|
|
7069
|
-
const attrFooter = element.getAttribute('data-margin-bottom') ||
|
|
7240
|
+
const attrFooter = element.getAttribute('data-margin-bottom') ||
|
|
7241
|
+
element.getAttribute('data-footer-height') ||
|
|
7242
|
+
element.getAttribute('data-margin-vertical');
|
|
7070
7243
|
const parsedFooter = Number.parseFloat(attrFooter);
|
|
7071
7244
|
if (Number.isNaN(parsedFooter)) {
|
|
7072
7245
|
this.DataSheet.publicationTemplateBackgroundHeightFooter = 0;
|
|
@@ -7080,23 +7253,30 @@ class DataSheetPublication {
|
|
|
7080
7253
|
this.DataSheet.publicationTemplateHeight - parsedFooter;
|
|
7081
7254
|
}
|
|
7082
7255
|
// MARGIN
|
|
7083
|
-
const attrMarginLeft = element.getAttribute('data-margin-left') ||
|
|
7084
|
-
|
|
7256
|
+
const attrMarginLeft = element.getAttribute('data-margin-left') ||
|
|
7257
|
+
element.getAttribute('data-margin-horizontal');
|
|
7258
|
+
const attrMarginRight = element.getAttribute('data-margin-right') ||
|
|
7259
|
+
element.getAttribute('data-margin-horizontal');
|
|
7085
7260
|
const parsedMarginLeft = Number.parseFloat(attrMarginLeft);
|
|
7086
7261
|
if (Number.isNaN(parsedMarginLeft)) {
|
|
7087
7262
|
this.DataSheet.publicationTemplateBackgroundLeftMargin = 0;
|
|
7088
7263
|
}
|
|
7089
7264
|
else {
|
|
7090
|
-
this.DataSheet.publicationTemplateBackgroundLeftMargin =
|
|
7265
|
+
this.DataSheet.publicationTemplateBackgroundLeftMargin =
|
|
7266
|
+
parsedMarginLeft;
|
|
7091
7267
|
}
|
|
7092
7268
|
const parsedMarginRight = Number.parseFloat(attrMarginRight);
|
|
7093
7269
|
if (Number.isNaN(parsedMarginRight)) {
|
|
7094
7270
|
this.DataSheet.publicationTemplateBackgroundRightMargin = 0;
|
|
7095
|
-
this.DataSheet.publicationTemplateBackgroundMarginX =
|
|
7271
|
+
this.DataSheet.publicationTemplateBackgroundMarginX =
|
|
7272
|
+
this.DataSheet.publicationTemplateWidth;
|
|
7096
7273
|
}
|
|
7097
7274
|
else {
|
|
7098
|
-
this.DataSheet.publicationTemplateBackgroundRightMargin =
|
|
7099
|
-
|
|
7275
|
+
this.DataSheet.publicationTemplateBackgroundRightMargin =
|
|
7276
|
+
parsedMarginRight;
|
|
7277
|
+
this.DataSheet.publicationTemplateBackgroundMarginX =
|
|
7278
|
+
this.DataSheet.publicationTemplateWidth -
|
|
7279
|
+
parsedMarginRight;
|
|
7100
7280
|
}
|
|
7101
7281
|
}
|
|
7102
7282
|
// GROUPE <g>
|
|
@@ -7168,7 +7348,7 @@ class DataSheetPublication {
|
|
|
7168
7348
|
}
|
|
7169
7349
|
else {
|
|
7170
7350
|
let background = this.DataSheetSVG.getBackgroundSectionForPreview(section);
|
|
7171
|
-
let backgroundTpl = background
|
|
7351
|
+
let backgroundTpl = background?.svgImage || '';
|
|
7172
7352
|
let allBackgroundTags = this.DataSheetSVG.GetSvgGroupToReplace(backgroundTpl);
|
|
7173
7353
|
// Get the backgroundTpl left page (= 1st g) and right page (= 2nd g if exist else the first g) for double page layout, the idea is to remove left/right g for each page
|
|
7174
7354
|
let backgroundTplLeft = this.DataSheetSVG.keepOnlySideRegex(backgroundTpl, 'left');
|
|
@@ -7180,7 +7360,10 @@ class DataSheetPublication {
|
|
|
7180
7360
|
const tagName = element.tagName?.toLowerCase();
|
|
7181
7361
|
if (tagName === 'svg') {
|
|
7182
7362
|
// HEADER HEIGHT
|
|
7183
|
-
const attrHeader = element.getAttribute('data-margin-top') ||
|
|
7363
|
+
const attrHeader = element.getAttribute('data-margin-top') ||
|
|
7364
|
+
element.getAttribute('data-header-height') ||
|
|
7365
|
+
element.getAttribute('data-margin-vertical') ||
|
|
7366
|
+
'0';
|
|
7184
7367
|
const parsedHeader = Number.parseFloat(attrHeader);
|
|
7185
7368
|
if (Number.isNaN(parsedHeader)) {
|
|
7186
7369
|
this.DataSheet.publicationTemplateBackgroundHeightHeader = 0;
|
|
@@ -7190,7 +7373,10 @@ class DataSheetPublication {
|
|
|
7190
7373
|
parsedHeader;
|
|
7191
7374
|
}
|
|
7192
7375
|
// FOOTER HEIGHT
|
|
7193
|
-
const attrFooter = element.getAttribute('data-margin-bottom') ||
|
|
7376
|
+
const attrFooter = element.getAttribute('data-margin-bottom') ||
|
|
7377
|
+
element.getAttribute('data-footer-height') ||
|
|
7378
|
+
element.getAttribute('data-margin-vertical') ||
|
|
7379
|
+
'0';
|
|
7194
7380
|
const parsedFooter = Number.parseFloat(attrFooter);
|
|
7195
7381
|
if (Number.isNaN(parsedFooter)) {
|
|
7196
7382
|
this.DataSheet.publicationTemplateBackgroundHeightFooter = 0;
|
|
@@ -7204,23 +7390,31 @@ class DataSheetPublication {
|
|
|
7204
7390
|
this.DataSheet.publicationTemplateHeight - parsedFooter;
|
|
7205
7391
|
}
|
|
7206
7392
|
// MARGIN
|
|
7207
|
-
const attrMarginLeft = element.getAttribute('data-margin-left') ||
|
|
7208
|
-
|
|
7393
|
+
const attrMarginLeft = element.getAttribute('data-margin-left') ||
|
|
7394
|
+
element.getAttribute('data-margin-horizontal') ||
|
|
7395
|
+
'0';
|
|
7396
|
+
const attrMarginRight = element.getAttribute('data-margin-right') ||
|
|
7397
|
+
element.getAttribute('data-margin-horizontal') ||
|
|
7398
|
+
'0';
|
|
7209
7399
|
const parsedMarginLeft = Number.parseFloat(attrMarginLeft);
|
|
7210
7400
|
if (Number.isNaN(parsedMarginLeft)) {
|
|
7211
7401
|
this.DataSheet.publicationTemplateBackgroundLeftMargin = 0;
|
|
7212
7402
|
}
|
|
7213
7403
|
else {
|
|
7214
|
-
this.DataSheet.publicationTemplateBackgroundLeftMargin =
|
|
7404
|
+
this.DataSheet.publicationTemplateBackgroundLeftMargin =
|
|
7405
|
+
parsedMarginLeft;
|
|
7215
7406
|
}
|
|
7216
7407
|
const parsedMarginRight = Number.parseFloat(attrMarginRight);
|
|
7217
7408
|
if (Number.isNaN(parsedMarginRight)) {
|
|
7218
7409
|
this.DataSheet.publicationTemplateBackgroundRightMargin = 0;
|
|
7219
|
-
this.DataSheet.publicationTemplateBackgroundMarginX =
|
|
7410
|
+
this.DataSheet.publicationTemplateBackgroundMarginX =
|
|
7411
|
+
this.DataSheet.publicationTemplateWidth;
|
|
7220
7412
|
}
|
|
7221
7413
|
else {
|
|
7222
|
-
this.DataSheet.publicationTemplateBackgroundRightMargin =
|
|
7223
|
-
|
|
7414
|
+
this.DataSheet.publicationTemplateBackgroundRightMargin =
|
|
7415
|
+
parsedMarginRight;
|
|
7416
|
+
this.DataSheet.publicationTemplateBackgroundMarginX =
|
|
7417
|
+
this.DataSheet.publicationTemplateWidth - parsedMarginRight;
|
|
7224
7418
|
}
|
|
7225
7419
|
}
|
|
7226
7420
|
// GROUPE <g>
|