Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
306cd39760
2 changed files with 8 additions and 0 deletions
|
@ -1087,6 +1087,10 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
|
|||
if nil != tableCell.Value && nil != tableCell.Value.Relation {
|
||||
tableCell.Value.Relation.Contents = nil
|
||||
}
|
||||
case av.KeyTypeText: // 渲染文本列
|
||||
if nil != tableCell.Value && nil != tableCell.Value.Text {
|
||||
tableCell.Value.Text.Content = util.EscapeHTML(tableCell.Value.Text.Content)
|
||||
}
|
||||
}
|
||||
|
||||
treenode.FillAttributeViewTableCellNilValue(tableCell, rowID, col.ID)
|
||||
|
|
|
@ -722,6 +722,10 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
|
|||
if nil != tableCell.Value && nil != tableCell.Value.Relation {
|
||||
tableCell.Value.Relation.Contents = nil
|
||||
}
|
||||
case av.KeyTypeText: // 渲染文本列
|
||||
if nil != tableCell.Value && nil != tableCell.Value.Text {
|
||||
tableCell.Value.Text.Content = util.EscapeHTML(tableCell.Value.Text.Content)
|
||||
}
|
||||
}
|
||||
|
||||
FillAttributeViewTableCellNilValue(tableCell, rowID, col.ID)
|
||||
|
|
Loading…
Add table
Reference in a new issue