wizport 0.0.9 → 0.1.0

data/lib/wizport/document/Rtf/table.rb

@@ -48,7 +48,7 @@ module Wizport
         elsif row_spanned? @col_offset
           cmd :clvmrg
           @row_spans[@col_offset][:rowspan] -= 1
-          colspan = @row_spans[@col_offset][:colspan]
+          colspan = @row_spans[@col_offset][:colspan] || colspan
         end
         colspan.times do
           @right_width += column_width(@col_offset)

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/wizport/document/rtf/document_spec.rb

@@ -13,10 +13,14 @@ describe Wizport::Rtf::Document do
         #  add_row [1,1,1]
         #end
 
-        table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],
-              ["民族", {content: "{Core}", colspan: 2}, "入队(团)时间", {content: '', colspan: 5}],
-              ["家庭住址", {content: "person", colspan: 8}]]
+        #table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],
+        #      ["民族", {content: "{Core}", colspan: 2}, "入队(团)时间", {content: '', colspan: 5}],
+        #      ["家庭住址", {content: "person", colspan: 8}]]
 
+
+        table [["入学身高", "", "体重", "", "视力", "左", "", "右", "", "血型", ""],
+              [{content:"简历", rowspan: 3}, {content:"日期", colspan: 2}, {content: "升(入)学前所在学校", colspan: 6}, {content: "担任何职务", colspan: 2}],
+              [{content:"", colspan: 2}, {content:"", colspan: 6}, {content:"", colspan: 2}]]
       end
 
       rtf.save('c:/r.rtf')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: