@boldreports/javascript-reporting-extensions 10.1.22 → 11.1.11

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.
@@ -25,8 +25,8 @@ var EJShape = (function () {
25
25
  };
26
26
  EJShape.prototype.initializeShape = function (isTablixCell) {
27
27
  var bgColor = (this.customJSON && this.customJSON.Style && this.customJSON.Style.BackgroundColor)
28
- ? this.customJSON.Style.BackgroundColor : 'Transparent';
29
- this.customItemDiv = ej.buildTag('div.customitem', '', {
28
+ ? ej.ReportUtil.convertColorFormat(this.customJSON.Style.BackgroundColor, true) : 'Transparent';
29
+ this.customItemDiv = ej.buildTag('div.customitem e-rptdesigner-shape', '', {
30
30
  'width': '100%', 'height': '100%', 'box-sizing': 'border-box', '-moz-box-sizing': 'border-box', 'background-color': bgColor,
31
31
  'border': isTablixCell ? '1px dotted gray' : '1px none gray',
32
32
  }, {
@@ -337,6 +337,8 @@ var EJShape = (function () {
337
337
  var graphics = document.createElementNS('http://www.w3.org/2000/svg', 'g');
338
338
  var shapePath = document.createElementNS('http://www.w3.org/2000/svg', 'path');
339
339
  var targetId = target.attr('id');
340
+ var fillColor = this.hasDesignerInstance(this.instance) ?
341
+ ej.ReportUtil.convertColorFormat(shapeInfo.fillColor, true) : shapeInfo.fillColor;
340
342
  this.setAttributes(svg, {
341
343
  'width': shapeInfo.svgWidth + "px", 'height': shapeInfo.svgHeight + "px",
342
344
  'viewBox': viewBox, 'id': targetId + "_svg", 'preserveAspectRatio': 'none'
@@ -345,7 +347,7 @@ var EJShape = (function () {
345
347
  this.setAttributes(clipPath, { 'id': targetId + "_clip_path", 'clipPathUnits': 'userSpaceOnUse' });
346
348
  this.setAttributes(shapePath, {
347
349
  'd': pathData, 'vector-effect': 'non-scaling-stroke',
348
- 'clip-path': "url(#" + targetId + "_clip_path)", 'id': targetId + "_shape_path", 'fill': shapeInfo.fillColor,
350
+ 'clip-path': "url(#" + targetId + "_clip_path)", 'id': targetId + "_shape_path", 'fill': fillColor,
349
351
  'stroke-dasharray': this.getStrokeStyle(shapeInfo.strokeStyle), 'stroke-width': "" + (parseFloat(shapeInfo.strokeWidth) + 1),
350
352
  'stroke': shapeInfo.strokeColor
351
353
  });
@@ -403,7 +405,7 @@ var EJShape = (function () {
403
405
  case 'fillcolor':
404
406
  if (!ej.ReportUtil.isEmptyString(newValue)) {
405
407
  this.updatePropertyVal(name, newValue);
406
- this.setAttributes(shapeElement[0], { 'fill': newValue });
408
+ this.setAttributes(shapeElement[0], { 'fill': ej.ReportUtil.convertColorFormat(newValue, true) });
407
409
  }
408
410
  break;
409
411
  case 'linewidth':
@@ -570,7 +572,7 @@ var EJShape = (function () {
570
572
  'Name': 'FillColor',
571
573
  'DisplayName': 'FillColor',
572
574
  'Value': shapeInfo.fillColor,
573
- 'EnableExpression': false,
575
+ 'EnableExpression': true,
574
576
  'ItemType': 'Color'
575
577
  },
576
578
  {
@@ -594,7 +596,9 @@ var EJShape = (function () {
594
596
  'DisplayName': 'colortooltip',
595
597
  'HeaderText': 'linecolor',
596
598
  'Value': shapeInfo.strokeColor,
597
- 'ItemType': 'Color'
599
+ 'ItemType': 'Color',
600
+ 'EnableOpacity': false,
601
+ 'EnableExpression': true,
598
602
  },
599
603
  {
600
604
  'ItemId': 'linewidth',
@@ -1315,7 +1319,7 @@ EJShape.Locale['tr-TR'] = {
1315
1319
  title: 'Şekil'
1316
1320
  }
1317
1321
  };
1318
- EJShape.Locale['zh-CN'] = {
1322
+ EJShape.Locale['zh-Hans'] = {
1319
1323
  basicSettings: {
1320
1324
  categoryName: '基本设置',
1321
1325
  shapeType: '形状',
@@ -1354,3 +1358,198 @@ EJShape.Locale['zh-CN'] = {
1354
1358
  title: '形状'
1355
1359
  }
1356
1360
  };
1361
+ EJShape.Locale['he-IL'] = {
1362
+ basicSettings: {
1363
+ categoryName: 'הגדרות בסיסיות',
1364
+ shapeType: 'צורות',
1365
+ rotationAngle: 'זווית סיבוב',
1366
+ starCount: 'מספר כוכבים',
1367
+ concavity: 'קיעור',
1368
+ arrowHeight: 'גובה חץ',
1369
+ arrowWidth: 'רוחב חץ',
1370
+ lineStyle: 'סגנון קו',
1371
+ fillColor: 'צבע מילוי',
1372
+ shapeTypes: {
1373
+ ellipse: 'אליפסה',
1374
+ triangle: 'משולש',
1375
+ rightAngleTriangle: 'משולש ישר זווית',
1376
+ rectangle: 'מלבן',
1377
+ hexagon: 'משושה',
1378
+ pentagon: 'מחומש',
1379
+ octagon: 'מתומן',
1380
+ star: 'כוכב',
1381
+ leftArrow: 'חץ שמאלה',
1382
+ rightArrow: 'חץ ימינה',
1383
+ upArrow: 'חץ למעלה',
1384
+ downArrow: 'חץ למטה'
1385
+ },
1386
+ lineStyles: {
1387
+ dashed: 'מקווקו',
1388
+ dotted: 'מנוקד',
1389
+ dashdotdot: 'קו מקו-נקודה-נקודה',
1390
+ dashdot: 'קו מקו-נקודה',
1391
+ solid: 'רציף'
1392
+ }
1393
+ },
1394
+ toolTip: {
1395
+ requirements: 'הצגת פריטים בצורות',
1396
+ description: 'הצגת נתונים באמצעות צורות מותאמות אישית.',
1397
+ title: 'צורה'
1398
+ }
1399
+ };
1400
+ EJShape.Locale['ja-JP'] = {
1401
+ basicSettings: {
1402
+ categoryName: '基本設定',
1403
+ shapeType: '図形',
1404
+ rotationAngle: '回転角度',
1405
+ starCount: '星の数',
1406
+ concavity: '凹み',
1407
+ arrowHeight: '矢印の高さ',
1408
+ arrowWidth: '矢印の幅',
1409
+ lineStyle: '線のスタイル',
1410
+ fillColor: '塗りつぶし色',
1411
+ shapeTypes: {
1412
+ ellipse: '楕円',
1413
+ triangle: '三角形',
1414
+ rightAngleTriangle: '直角三角形',
1415
+ rectangle: '長方形',
1416
+ hexagon: '六角形',
1417
+ pentagon: '五角形',
1418
+ octagon: '八角形',
1419
+ star: '星形',
1420
+ leftArrow: '左矢印',
1421
+ rightArrow: '右矢印',
1422
+ upArrow: '上矢印',
1423
+ downArrow: '下矢印'
1424
+ },
1425
+ lineStyles: {
1426
+ dashed: '破線',
1427
+ dotted: '点線',
1428
+ dashdotdot: 'ダッシュ・ドット・ドット',
1429
+ dashdot: 'ダッシュ・ドット',
1430
+ solid: '実線'
1431
+ }
1432
+ },
1433
+ toolTip: {
1434
+ requirements: '図形内の項目を表示',
1435
+ description: 'カスタマイズ可能な図形でデータを可視化します。',
1436
+ title: '図形'
1437
+ }
1438
+ };
1439
+ EJShape.Locale['pt-PT'] = {
1440
+ basicSettings: {
1441
+ categoryName: 'Configurações básicas',
1442
+ shapeType: 'Formas',
1443
+ rotationAngle: 'Ângulo de rotação',
1444
+ starCount: 'Contagem de estrelas',
1445
+ concavity: 'Concavidade',
1446
+ arrowHeight: 'Altura da seta',
1447
+ arrowWidth: 'Largura da seta',
1448
+ lineStyle: 'Estilo de linha',
1449
+ fillColor: 'Cor de preenchimento',
1450
+ shapeTypes: {
1451
+ ellipse: 'Elipse',
1452
+ triangle: 'Triângulo',
1453
+ rightAngleTriangle: 'Triângulo Retângulo',
1454
+ rectangle: 'Retângulo',
1455
+ hexagon: 'Hexágono',
1456
+ pentagon: 'Pentágono',
1457
+ octagon: 'Octógono',
1458
+ star: 'Estrela',
1459
+ leftArrow: 'Seta Esquerda',
1460
+ rightArrow: 'Seta Direita',
1461
+ upArrow: 'Seta Para Cima',
1462
+ downArrow: 'Seta Para Baixo'
1463
+ },
1464
+ lineStyles: {
1465
+ dashed: 'Tracejado',
1466
+ dotted: 'Pontilhado',
1467
+ dashdotdot: 'Traço Ponto Ponto',
1468
+ dashdot: 'Traço Ponto',
1469
+ solid: 'Sólido'
1470
+ }
1471
+ },
1472
+ toolTip: {
1473
+ requirements: 'Exibir itens em Formas',
1474
+ description: 'Visualize dados com formas personalizáveis.',
1475
+ title: 'Forma'
1476
+ }
1477
+ };
1478
+ EJShape.Locale['ru-RU'] = {
1479
+ basicSettings: {
1480
+ categoryName: 'Основные настройки',
1481
+ shapeType: 'Фигуры',
1482
+ rotationAngle: 'Угол вращения',
1483
+ starCount: 'Количество звезд',
1484
+ concavity: 'Вогнутость',
1485
+ arrowHeight: 'Высота стрелки',
1486
+ arrowWidth: 'Ширина стрелки',
1487
+ lineStyle: 'Стиль линии',
1488
+ fillColor: 'Цвет заливки',
1489
+ shapeTypes: {
1490
+ ellipse: 'Эллипс',
1491
+ triangle: 'Треугольник',
1492
+ rightAngleTriangle: 'Прямоугольный треугольник',
1493
+ rectangle: 'Прямоугольник',
1494
+ hexagon: 'Шестиугольник',
1495
+ pentagon: 'Пятиугольник',
1496
+ octagon: 'Восьмиугольник',
1497
+ star: 'Звезда',
1498
+ leftArrow: 'Левая стрелка',
1499
+ rightArrow: 'Правая стрелка',
1500
+ upArrow: 'Верхняя стрелка',
1501
+ downArrow: 'Нижняя стрелка'
1502
+ },
1503
+ lineStyles: {
1504
+ dashed: 'Пунктир',
1505
+ dotted: 'Точечная',
1506
+ dashdotdot: 'Тире точка точка',
1507
+ dashdot: 'Тире точка',
1508
+ solid: 'Сплошная'
1509
+ }
1510
+ },
1511
+ toolTip: {
1512
+ requirements: 'Показать элементы в фигурах',
1513
+ description: 'Визуализируйте данные с помощью настраиваемых фигур.',
1514
+ title: 'Фигура'
1515
+ }
1516
+ };
1517
+ EJShape.Locale['zh-Hant'] = {
1518
+ basicSettings: {
1519
+ categoryName: '基本設定',
1520
+ shapeType: '形狀',
1521
+ rotationAngle: '旋轉角度',
1522
+ starCount: '星數',
1523
+ concavity: '凹度',
1524
+ arrowHeight: '箭頭高度',
1525
+ arrowWidth: '箭頭寬度',
1526
+ lineStyle: '線條樣式',
1527
+ fillColor: '填充顏色',
1528
+ shapeTypes: {
1529
+ ellipse: '橢圓',
1530
+ triangle: '三角形',
1531
+ rightAngleTriangle: '直角三角形',
1532
+ rectangle: '長方形',
1533
+ hexagon: '六邊形',
1534
+ pentagon: '五邊形',
1535
+ octagon: '八邊形',
1536
+ star: '星形',
1537
+ leftArrow: '左箭頭',
1538
+ rightArrow: '右箭頭',
1539
+ upArrow: '上箭頭',
1540
+ downArrow: '下箭頭'
1541
+ },
1542
+ lineStyles: {
1543
+ dashed: '虛線',
1544
+ dotted: '點線',
1545
+ dashdotdot: '虛線點點',
1546
+ dashdot: '虛線點',
1547
+ solid: '實線'
1548
+ }
1549
+ },
1550
+ toolTip: {
1551
+ requirements: '顯示形狀中的項目',
1552
+ description: '使用可自訂的形狀來視覺化資料。',
1553
+ title: '形狀'
1554
+ }
1555
+ };
@@ -54,6 +54,10 @@
54
54
  width: 42px;
55
55
  }
56
56
 
57
+ .e-signDialog-cropIconDiv:focus, .e-signDialog-btn-clear:focus {
58
+ box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #4f46e5;
59
+ }
60
+
57
61
  .e-signDialog-canvas {
58
62
  cursor: default;
59
63
  background-color: transparent;
@@ -28,7 +28,7 @@ var SignatureDialog = (function () {
28
28
  var okBtn = this.buildElement('button', '', '', {}, { 'id': this.id + '_signDialog_okBtn', 'type': 'button' });
29
29
  var cancelBtn = this.buildElement('button', '', '', {}, { 'id': this.id + '_signDialog_cancelBtn' });
30
30
  this.container.append(bodyRootEle);
31
- $(document.body).append(this.container);
31
+ (this.instance.element).append(this.container);
32
32
  ejs.popups.createSpinner({
33
33
  target: this.container.find('.e-signDialog-browsingDiv')[0],
34
34
  cssClass: 'e-spin-overlay'
@@ -43,7 +43,7 @@ var SignatureDialog = (function () {
43
43
  enableResize: true,
44
44
  header: this.getLocale('title'),
45
45
  footerTemplate: '<div id="' + this.id + '_signDialog_foot"></div>',
46
- target: document.body,
46
+ target: '#' + this.instance._id,
47
47
  cssClass: 'e-signDialog-size',
48
48
  beforeOpen: $.proxy(this.onOpen, this),
49
49
  close: $.proxy(this.resetDialogValues, this),
@@ -100,7 +100,11 @@ var SignatureDialog = (function () {
100
100
  };
101
101
  SignatureDialog.prototype.renderOptions = function (target) {
102
102
  var holderDiv = this.buildElement('div', '', '', { 'display': 'flex', 'gap': '13px', 'justify-content': 'space-between', 'align-items': 'center' }, {});
103
- var labelDiv = this.buildElement('div', 'e-signDialog-firstRow', '', { width: '100%', 'height': '37px', display: 'flex', 'justify-content': 'space-between', 'gap': '5px', 'align-items': 'center' }, {});
103
+ var labelDiv = this.buildElement('div', 'e-signDialog-firstRow', '', {
104
+ width: '100%', height: '37px',
105
+ display: 'flex', 'justify-content': 'space-between',
106
+ gap: '5px', 'align-items': 'center', padding: '5px'
107
+ }, {});
104
108
  this.appendStrokeWidth(holderDiv);
105
109
  this.appendStrokeColor(holderDiv);
106
110
  this.appendCropButton(holderDiv);
@@ -109,8 +113,13 @@ var SignatureDialog = (function () {
109
113
  target.append(labelDiv);
110
114
  };
111
115
  SignatureDialog.prototype.appendCropButton = function (target) {
116
+ var _this = this;
112
117
  var cropBtn = this.buildElement('div', 'e-signDialog-cropIconDiv e-signDialog-cropIcon-disable', '', {}, { 'title': this.getLocale('crop'), 'aria-label': this.getLocale('arialabelcrop'), 'tabindex': '0', 'role': 'button', 'aria-disabled': 'true' });
113
- cropBtn.bind('click', $.proxy(this.updateCropState, this));
118
+ cropBtn.bind('click keydown', function (event) {
119
+ if (_this.isActionTriggered(event)) {
120
+ _this.updateCropState();
121
+ }
122
+ });
114
123
  target.append(cropBtn);
115
124
  };
116
125
  SignatureDialog.prototype.appendStrokeColor = function (target) {
@@ -125,7 +134,8 @@ var SignatureDialog = (function () {
125
134
  height: '37px',
126
135
  open: $.proxy(this.colorPickerOpen, this),
127
136
  onModeSwitch: $.proxy(this.colorPickerModeSwitch, this),
128
- change: $.proxy(this.onStrokeColorChange, this)
137
+ change: $.proxy(this.onStrokeColorChange, this),
138
+ enableOpacity: false
129
139
  });
130
140
  strokeColorTag.append(strokeColor);
131
141
  strokeColorDiv.append(strokeColorLabel, strokeColorTag);
@@ -155,8 +165,18 @@ var SignatureDialog = (function () {
155
165
  target.append(strokeWidth);
156
166
  };
157
167
  SignatureDialog.prototype.appendClearBtn = function (target) {
158
- var clearBtn = this.buildElement('div', 'e-rptdesigner-add-btn e-signDialog-btn-clear e-signDialog-text-span', this.getLocale('clear'), {}, { 'title': this.getLocale('clear'), 'aria-label': this.getLocale('arialabelclear'), 'tabindex': '0', 'role': 'button' });
159
- clearBtn.bind('click', $.proxy(this.clearSignature, this));
168
+ var _this = this;
169
+ var clearBtn = this.buildElement('div', 'e-rptdesigner-add-btn e-signDialog-btn-clear e-signDialog-text-span', this.getLocale('clear'), {
170
+ 'border-radius': '2px'
171
+ }, {
172
+ title: this.getLocale('clear'), 'aria-label': this.getLocale('arialabelclear'),
173
+ tabindex: '0', role: 'button'
174
+ });
175
+ clearBtn.bind('click keydown', function (event) {
176
+ if (_this.isActionTriggered(event)) {
177
+ _this.clearSignature();
178
+ }
179
+ });
160
180
  target.append(clearBtn);
161
181
  };
162
182
  SignatureDialog.prototype.renderContent = function (target) {
@@ -220,6 +240,9 @@ var SignatureDialog = (function () {
220
240
  cropBox.css('display', 'none');
221
241
  }
222
242
  };
243
+ SignatureDialog.prototype.isActionTriggered = function (event) {
244
+ return event && ((event.type === 'click') || (event.originalEvent instanceof KeyboardEvent && event.key === 'Enter'));
245
+ };
223
246
  SignatureDialog.prototype.updateCropState = function () {
224
247
  var cropBox = this.container.find('.e-signDialog-cropBox');
225
248
  if (cropBox && cropBox.length > 0) {
@@ -770,7 +793,7 @@ SignatureDialog.Locale['tr-TR'] = {
770
793
  ariaLabelCrop: 'İmzayı kırp',
771
794
  ariaLabelClear: 'İmzayı temizle'
772
795
  };
773
- SignatureDialog.Locale['zh-CN'] = {
796
+ SignatureDialog.Locale['zh-Hans'] = {
774
797
  cancel: '取消',
775
798
  closeToolTip: '关闭',
776
799
  ok: '确定',
@@ -783,3 +806,68 @@ SignatureDialog.Locale['zh-CN'] = {
783
806
  ariaLabelCrop: '裁剪签名',
784
807
  ariaLabelClear: '清除签名'
785
808
  };
809
+ SignatureDialog.Locale['he-IL'] = {
810
+ cancel: 'ביטול',
811
+ closeToolTip: 'סגור',
812
+ clear: 'נקה',
813
+ ok: 'אישור',
814
+ title: 'חתימה',
815
+ strokeColor: 'צבע קו',
816
+ strokeWidth: 'עובי קו',
817
+ crop: 'חיתוך',
818
+ ariaLabelCanvas: 'אזור הקנבס לציור חתימתך',
819
+ ariaLabelCrop: 'חתוך את החתימה',
820
+ ariaLabelClear: 'נקה את החתימה'
821
+ };
822
+ SignatureDialog.Locale['ja-JP'] = {
823
+ cancel: 'キャンセル',
824
+ closeToolTip: '閉じる',
825
+ clear: 'クリア',
826
+ ok: 'OK',
827
+ title: '署名',
828
+ strokeColor: '線の色',
829
+ strokeWidth: '線の太さ',
830
+ crop: '切り抜き',
831
+ ariaLabelCanvas: '署名を描くキャンバス領域',
832
+ ariaLabelCrop: '署名を切り抜く',
833
+ ariaLabelClear: '署名をクリア'
834
+ };
835
+ SignatureDialog.Locale['pt-PT'] = {
836
+ cancel: 'Cancelar',
837
+ closeToolTip: 'Fechar',
838
+ clear: 'Limpar',
839
+ ok: 'OK',
840
+ title: 'Assinatura',
841
+ strokeColor: 'Cor do traço',
842
+ strokeWidth: 'Largura do traço',
843
+ crop: 'Cortar',
844
+ ariaLabelCanvas: 'Área da tela para desenhar a sua assinatura',
845
+ ariaLabelCrop: 'Cortar a assinatura',
846
+ ariaLabelClear: 'Limpar a assinatura'
847
+ };
848
+ SignatureDialog.Locale['ru-RU'] = {
849
+ cancel: 'Отмена',
850
+ closeToolTip: 'Закрыть',
851
+ clear: 'Очистить',
852
+ ok: 'OK',
853
+ title: 'Подпись',
854
+ strokeColor: 'Цвет линии',
855
+ strokeWidth: 'Толщина линии',
856
+ crop: 'Обрезать',
857
+ ariaLabelCanvas: 'Область для рисования подписи',
858
+ ariaLabelCrop: 'Обрезать подпись',
859
+ ariaLabelClear: 'Очистить подпись'
860
+ };
861
+ SignatureDialog.Locale['zh-Hant'] = {
862
+ cancel: '取消',
863
+ closeToolTip: '關閉',
864
+ clear: '清除',
865
+ ok: '確定',
866
+ title: '簽名',
867
+ strokeColor: '筆劃顏色',
868
+ strokeWidth: '筆劃寬度',
869
+ crop: '裁剪',
870
+ ariaLabelCanvas: '簽名繪製區域',
871
+ ariaLabelCrop: '裁剪簽名',
872
+ ariaLabelClear: '清除簽名'
873
+ };
@@ -24,8 +24,9 @@ var EJSignature = (function () {
24
24
  }
25
25
  };
26
26
  EJSignature.prototype.renderSignature = function () {
27
- var bgColor = (this.customJSON && this.customJSON.Style) ? (this.customJSON.Style.BackgroundColor === 'Transparent' ?
28
- 'white' : this.customJSON.Style.BackgroundColor) : 'white';
27
+ var bgColor = (this.customJSON && this.customJSON.Style && this.customJSON.Style.BackgroundColor
28
+ && this.customJSON.Style.BackgroundColor !== 'Transparent' && this.customJSON.Style.BackgroundColor !== '#00ffffff')
29
+ ? ej.ReportUtil.convertColorFormat(this.customJSON.Style.BackgroundColor, true) : 'white';
29
30
  this.customItemDiv = this.buildElement('div', 'customitem e-rptdesigner-customItem-sign', '', { 'id': this.customJSON.Name + '_customItem' }, { 'background-color': bgColor });
30
31
  this.canvasTag = this.buildElement('canvas', '', '', { 'id': this.customJSON.Name + '_customItem_canvas' }, { width: '100%', height: '100%' });
31
32
  this.customItemDiv.append(this.canvasTag);
@@ -41,7 +42,7 @@ var EJSignature = (function () {
41
42
  }
42
43
  switch (name.toLowerCase()) {
43
44
  case 'backgroundcolor':
44
- var bgColor = newValue === 'Transparent' ? 'white' : newValue;
45
+ var bgColor = (newValue === 'Transparent' || newValue === '#ffffff00') ? 'white' : newValue;
45
46
  this.customItemDiv.css('background-color', bgColor);
46
47
  this.canvasTag.css('background-color', bgColor);
47
48
  break;
@@ -77,7 +78,7 @@ var EJSignature = (function () {
77
78
  width: width
78
79
  });
79
80
  }
80
- this.setSign(imgData, document.getElementById(this.customJSON.Name + '_customItem_canvas'), this.customJSON.Style.BackgroundColor === 'Transparent' ? 'white' : this.customJSON.Style.BackgroundColor);
81
+ this.setSign(imgData, document.getElementById(this.customJSON.Name + '_customItem_canvas'), (this.customJSON.Style.BackgroundColor === 'Transparent' || this.customJSON.Style.BackgroundColor === '#00ffffff') ? 'white' : ej.ReportUtil.convertColorFormat(this.customJSON.Style.BackgroundColor, true));
81
82
  };
82
83
  EJSignature.prototype.customAction = function (paramInfo) {
83
84
  var imgData = this.getPropertyVal('SignatureValue');
@@ -182,7 +183,7 @@ var EJSignature = (function () {
182
183
  if (imgData) {
183
184
  var base64String = imgData.replace('data:image/png;base64,', '');
184
185
  this.updatePropertyVal('SignatureValue', base64String);
185
- this.setSign(imgData, document.getElementById(this.customJSON.Name + '_customItem_canvas'), this.customJSON.Style.BackgroundColor === 'Transparent' ? 'white' : this.customJSON.Style.BackgroundColor);
186
+ this.setSign(imgData, document.getElementById(this.customJSON.Name + '_customItem_canvas'), (this.customJSON.Style.BackgroundColor === 'Transparent' || this.customJSON.Style.BackgroundColor === '#00ffffff') ? 'white' : ej.ReportUtil.convertColorFormat(this.customJSON.Style.BackgroundColor, true));
186
187
  }
187
188
  else {
188
189
  this.clearSign(document.getElementById(this.customJSON.Name + '_customItem_canvas'));
@@ -260,6 +261,10 @@ var EJSignature = (function () {
260
261
  this.customItemDiv = null;
261
262
  this.customJSON = null;
262
263
  this.rootElement = null;
264
+ var signDlgIns = window['SignatureDialog'] ? window['SignatureDialog'].Instance : null;
265
+ if (signDlgIns && signDlgIns.dlgInstance && signDlgIns.dlgInstance.visible) {
266
+ signDlgIns.closeDialog();
267
+ }
263
268
  };
264
269
  EJSignature.prototype.renderItemPreview = function (criModel, targetDiv, locale) {
265
270
  var canvas = this.buildElement('canvas', '', '', {}, { width: '100%', height: '100%' });
@@ -275,7 +280,7 @@ var EJSignature = (function () {
275
280
  $(targetDiv).bind('mouseenter', $.proxy(this.showEditIcon, this, editIcon));
276
281
  $(targetDiv).bind('mouseleave', $.proxy(this.hideEditIcon, this, editIcon));
277
282
  imgData = imgData && imgData.length > 0 ? 'data:image/png;base64,' + imgData : imgData;
278
- bgColor = bgColor === 'Transparent' ? 'white' : bgColor;
283
+ bgColor = (bgColor === 'Transparent' || bgColor === '#00ffffff') ? 'white' : bgColor;
279
284
  this.setSign(imgData, canvas[0], bgColor);
280
285
  canvas.attr('imageString', imgData);
281
286
  var dataInfo = {
@@ -427,7 +432,7 @@ EJSignature.Locale['tr-TR'] = {
427
432
  title: 'İmza'
428
433
  }
429
434
  };
430
- EJSignature.Locale['zh-CN'] = {
435
+ EJSignature.Locale['zh-Hans'] = {
431
436
  signatureLabel: '签名',
432
437
  categoryBasicSettings: '基本设置',
433
438
  btnText: '绘制签名',
@@ -437,3 +442,53 @@ EJSignature.Locale['zh-CN'] = {
437
442
  title: '签名'
438
443
  }
439
444
  };
445
+ EJSignature.Locale['he-IL'] = {
446
+ btnText: 'צייר',
447
+ categoryBasicSettings: 'הגדרות בסיסיות',
448
+ signatureLabel: 'חתימה',
449
+ toolTip: {
450
+ requirements: 'הצגת חתימה אלקטרונית לצורך חתימה.',
451
+ description: 'פריט דוח זה משמש להוספת חתימה גרפית',
452
+ title: 'חתימה'
453
+ }
454
+ };
455
+ EJSignature.Locale['ja-JP'] = {
456
+ btnText: '描画',
457
+ categoryBasicSettings: '基本設定',
458
+ signatureLabel: '署名',
459
+ toolTip: {
460
+ requirements: '署名用の電子署名を表示します。',
461
+ description: 'このレポート項目はグラフィック署名を追加するために使用されます',
462
+ title: '署名'
463
+ }
464
+ };
465
+ EJSignature.Locale['pt-PT'] = {
466
+ btnText: 'Desenhar',
467
+ categoryBasicSettings: 'Configurações básicas',
468
+ signatureLabel: 'Assinatura',
469
+ toolTip: {
470
+ requirements: 'Exibir qualquer assinatura eletrónica para assinar.',
471
+ description: 'Este item de relatório é usado para adicionar uma assinatura gráfica',
472
+ title: 'Assinatura'
473
+ }
474
+ };
475
+ EJSignature.Locale['ru-RU'] = {
476
+ btnText: 'Рисовать',
477
+ categoryBasicSettings: 'Основные настройки',
478
+ signatureLabel: 'Подпись',
479
+ toolTip: {
480
+ requirements: 'Показать любую электронную подпись для подписания.',
481
+ description: 'Этот элемент отчета используется для добавления графической подписи',
482
+ title: 'Подпись'
483
+ }
484
+ };
485
+ EJSignature.Locale['zh-Hant'] = {
486
+ btnText: '繪製',
487
+ categoryBasicSettings: '基本設定',
488
+ signatureLabel: '簽名',
489
+ toolTip: {
490
+ requirements: '顯示任何電子簽名以供簽署。',
491
+ description: '此報告項目用於新增圖形簽名',
492
+ title: '簽名'
493
+ }
494
+ };