[dev] add style and size attributes for borders

Author: a-shpak

example/datasets.js

@@ -177,70 +177,70 @@ var example = {
  "fontFamily": "Calibri",
  "fontSize": "16px",
  "color": "rgba(0,0,0,1)",
- "borderRight": "1px solid #000",
- "borderLeft": "1px solid #000",
+ "borderRight": "2px solid #34e343",
+ "borderLeft": "2px solid #34e343",
  "format": "General",
- "borderTop": "1px solid #000",
- "borderBottom": "1px solid #000"
+ "borderTop": "2px solid #34e343",
+ "borderBottom": "2px solid #34e343"
  },
  {
  "fontSize": "16px",
  "fontFamily": "Calibri",
- "borderLeft": "1px solid #000",
- "borderTop": "1px solid #000",
- "borderRight": "1px solid #000",
+ "borderLeft": "0.5px solid #000",
+ "borderTop": "0.5px solid #000",
+ "borderRight": "0.5px solid #000",
  "format": "General",
- "borderBottom": "1px solid #000"
+ "borderBottom": "0.5px solid #000"
  },
  {
  "fontWeight": "bold",
- "borderBottom": "1px solid #000",
+ "borderBottom": "1px dashed #701243",
  "verticalAlign": "top",
  "background": "rgba(234,234,234,1)",
  "fontSize": "15px",
  "fontFamily": "PT Sans",
- "borderTop": "1px solid #000",
+ "borderTop": "1px dashed #701243",
  "format": "General",
  "color": "rgba(129,129,129,1)",
- "borderLeft": "1px solid #000",
- "borderRight": "1px solid #000",
+ "borderLeft": "1px dashed #701243",
+ "borderRight": "1px dashed #701243",
  "textAlign": "center"
  },
  {
  "color": "rgba(129,129,129,1)",
- "borderBottom": "1px solid #000",
+ "borderBottom": "1px dotted #000",
  "fontSize": "15px",
  "fontFamily": "PT Sans",
  "verticalAlign": "center",
  "format": "General",
  "textAlign": "center",
- "borderTop": "1px solid #000",
+ "borderTop": "1px dotted #000",
  "fontWeight": "bold",
- "borderRight": "1px solid #000",
- "borderLeft": "1px solid #000"
+ "borderRight": "1px dotted #000",
+ "borderLeft": "1px dotted #000"
  },
  {
  "fontFamily": "PT Sans",
- "borderBottom": "1px solid #000",
- "borderTop": "1px solid #000",
+ "borderBottom": "1px double #000",
+ "borderTop": "1px double #000",
  "fontSize": "15px",
  "verticalAlign": "center",
  "color": "rgba(129,129,129,1)",
  "fontWeight": "bold",
  "textAlign": "right",
  "format": "General",
- "borderLeft": "1px solid #000",
- "borderRight": "1px solid #000"
+ "borderLeft": "1px double #000",
+ "borderRight": "1px double #000"
  },
  {
  "format": "General",
- "borderBottom": "1px solid #000",
+ "borderBottom": "1px solid #94ff4d",
  "background": "rgba(234,234,234,1)",
  "verticalAlign": "top",
  "textAlign": "center",
- "borderTop": "1px solid #000",
- "borderLeft": "1px solid #000",
- "borderRight": "1px solid #000",
+ "borderTop": "1px solid #94ff4d",
+ "borderLeft": "1px solid #94ff4d",
+ "borderRight": "1px solid #94ff4d",
  "color": "rgba(129,129,129,1)",
  "fontSize": "15px",
  "fontFamily": "PT Sans"

index.html

@@ -23,7 +23,7 @@
  let $ = document.querySelector.bind(document);
 
  const dataArea = $(".spreadsheet-data");
- dataArea.value = JSON.stringify(example2, undefined, 2);
+ dataArea.value = JSON.stringify(example, undefined, 2);
 
  $("#convert-button").addEventListener("click", function(e){
  import("./js/module").then(({ convert }) => {

src/lib.rs

@@ -254,7 +254,7 @@ fn get_styles_data(style_table: StyleTable) -> String {
  match font.size {
  Some(ref size) => {
  let mut sz = Element::new("sz");
- sz.add_attr("val", size);
+ sz.add_attr("val", size.to_string());
  font_children.push(sz);
  },
  None => ()
@@ -296,48 +296,17 @@ fn get_styles_data(style_table: StyleTable) -> String {
  let mut border_element = Element::new("border");
  let mut children: Vec<Element> = vec![];
 
- if let Some(top) = &border.top {
- let mut el = Element::new("top");
- el.add_attr("style", "thin");
-
- if let Some(color) = &top.color {
- let mut color_element = Element::new("color");
- color_element.add_attr("rgb", color); 
- children.push(el);
- }
+ if let Some(b) = &border.top {
+ children.push(b.to_xml_el())
  }
-
- if let Some(right) = &border.right {
- let mut el = Element::new("right");
- el.add_attr("style", "thin");
-
- if let Some(color) = &right.color {
- let mut color_element = Element::new("color");
- color_element.add_attr("rgb", color); 
- children.push(el);
- }
+ if let Some(b) = &border.right {
+ children.push(b.to_xml_el())
  }
-
- if let Some(bottom) = &border.bottom {
- let mut el = Element::new("bottom");
- el.add_attr("style", "thin");
-
- if let Some(color) = &bottom.color {
- let mut color_element = Element::new("color");
- color_element.add_attr("rgb", color); 
- children.push(el);
- }
+ if let Some(b) = &border.bottom {
+ children.push(b.to_xml_el())
  }
-
- if let Some(left) = &border.left {
- let mut el = Element::new("left");
- el.add_attr("style", "thin");
-
- if let Some(color) = &left.color {
- let mut color_element = Element::new("color");
- color_element.add_attr("rgb", color); 
- children.push(el);
- }
+ if let Some(b) = &border.left {
+ children.push(b.to_xml_el())
  }
 
  border_element.add_children(children);