wizport 0.0.9 → 0.1.0
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.
|
@@ -48,7 +48,7 @@ module Wizport
|
|
|
48
48
|
elsif row_spanned? @col_offset
|
|
49
49
|
cmd :clvmrg
|
|
50
50
|
@row_spans[@col_offset][:rowspan] -= 1
|
|
51
|
-
colspan = @row_spans[@col_offset][:colspan]
|
|
51
|
+
colspan = @row_spans[@col_offset][:colspan] || colspan
|
|
52
52
|
end
|
|
53
53
|
colspan.times do
|
|
54
54
|
@right_width += column_width(@col_offset)
|
data/lib/wizport/version.rb
CHANGED
|
@@ -13,10 +13,14 @@ describe Wizport::Rtf::Document do
|
|
|
13
13
|
# add_row [1,1,1]
|
|
14
14
|
#end
|
|
15
15
|
|
|
16
|
-
table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
#table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],
|
|
17
|
+
# ["民族", {content: "{Core}", colspan: 2}, "入队(团)时间", {content: '', colspan: 5}],
|
|
18
|
+
# ["家庭住址", {content: "person", colspan: 8}]]
|
|
19
19
|
|
|
20
|
+
|
|
21
|
+
table [["入学身高", "", "体重", "", "视力", "左", "", "右", "", "血型", ""],
|
|
22
|
+
[{content:"简历", rowspan: 3}, {content:"日期", colspan: 2}, {content: "升(入)学前所在学校", colspan: 6}, {content: "担任何职务", colspan: 2}],
|
|
23
|
+
[{content:"", colspan: 2}, {content:"", colspan: 6}, {content:"", colspan: 2}]]
|
|
20
24
|
end
|
|
21
25
|
|
|
22
26
|
rtf.save('c:/r.rtf')
|