mirror of
https://github.com/xiaoqidun/ofdgo.git
synced 2026-10-29 08:46:55 +08:00
1 parent
c64bc9d594
commit
35631cdf98
13 files changed
+1188
-76
No files matched your search
+6
-3
@@ -656,7 +656,7 @@ func (x *ofdXML) object(object GraphicObject, root bool) {
|
||||
attrs.add("xmlns:ofd", ofdNamespace)
|
||||
}
|
||||
switch object.Type {
|
||||
case "TextObject":
|
||||
case "TextObject", "Text":
|
||||
obj := object.TextObject
|
||||
attrs.add("ID", obj.ID)
|
||||
attrs.add("DrawParam", obj.DrawParam)
|
||||
@@ -746,7 +746,7 @@ func (x *ofdXML) object(object GraphicObject, root bool) {
|
||||
x.color("StrokeColor", stroke)
|
||||
x.color("FillColor", fill)
|
||||
x.text("AbbreviatedData", object.PathObject.AbbreviatedData)
|
||||
} else if object.Type == "TextObject" {
|
||||
} else if object.Type == "TextObject" || object.Type == "Text" {
|
||||
x.clips(object.TextObject.Clips)
|
||||
x.color("FillColor", fill)
|
||||
x.color("StrokeColor", stroke)
|
||||
@@ -777,7 +777,7 @@ func (x *ofdXML) object(object GraphicObject, root bool) {
|
||||
x.end(object.Type)
|
||||
}
|
||||
|
||||
// clips 写出对象路径裁剪,保留裁剪集合、区域及路径的变换
|
||||
// clips 写出对象裁剪,保留区域内的路径与文字
|
||||
// 入参: clips 裁剪集合,nil不输出节点
|
||||
func (x *ofdXML) clips(clips *Clips) {
|
||||
if clips == nil {
|
||||
@@ -796,6 +796,9 @@ func (x *ofdXML) clips(clips *Clips) {
|
||||
for _, path := range area.Path {
|
||||
x.object(GraphicObject{Type: "Path", PathObject: path}, false)
|
||||
}
|
||||
for _, text := range area.Text {
|
||||
x.object(GraphicObject{Type: "Text", TextObject: text}, false)
|
||||
}
|
||||
x.end("Area")
|
||||
}
|
||||
x.end("Clip")
|
||||
|
||||
Reference in new issue
Block a user