Merge pull request 'feature/visio' (#461) from feature/visio into rel…

…ease/v8.3.0 Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/sdkjs/pulls/461
ONLYOFFICE · Dec 27, 2024 · 29f1e81 · 29f1e81
2 parents 4ee5bad + 021fde8
commit 29f1e81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/visio/api.js b/visio/api.js
@@ -200,7 +200,7 @@
 								    <div id=\"id_buttonPrevPage\" class=\"block_elem buttonPrevPage\"></div>\
 								    <div id=\"id_buttonNextPage\" class=\"block_elem buttonNextPage\"></div>\
                                 </div>\
-                                <div id=\"id_horscrollpanel\" class=\"block_elem\" style=\"margin-bottom:1px;background-color:" + AscCommon.GlobalSkin.BackgroundColor + ";\">\
+                                <div id=\"id_horscrollpanel\" class=\"block_elem\" style=\"margin-bottom:1px;background-color:" + AscCommon.GlobalSkin.BackgroundColor + ";z-index:0;\">\
                                     <div id=\"id_horizontal_scroll\" style=\"left:0;top:0;height:14px;overflow:hidden;position:absolute;width:100%;\">\
                                     </div>\
                                 </div>\

diff --git a/visio/model/ooxmlApi/convertFunctions.js b/visio/model/ooxmlApi/convertFunctions.js
@@ -1580,7 +1580,13 @@
 				let shift = 11;
 				let dashTypeName = oStroke.GetDashByCode(linePatternNumber + shift);
 				if (dashTypeName !== null) {
-					oStroke.setPrstDash(linePatternNumber + shift);
+					if ("vsdxTransparent" === dashTypeName && oStroke.Fill) {
+						//todo реализовать прозрачный тип через отдельную настройку или разделить fill для линий и наконечников
+						//в vsdx может быть прозрачная линия с видимыми наконечниками
+						oStroke.Fill.fill = new AscFormat.CNoFill();
+					} else {
+						oStroke.setPrstDash(linePatternNumber + shift);
+					}
 				} else {
 					oStroke.setPrstDash(oStroke.GetDashCode("vsdxDash"));
 				}