|
@@ -140,7 +140,7 @@ func NewTD(Goquery *goquery.Selection, tr *TR, table *Table) *TD {
|
|
|
for _, bl := range ub {
|
|
|
//冒号kv
|
|
|
for bl_ck, bl_cv := range bl.ColonKV.Kv {
|
|
|
- if td.SortKV.Map[bl_ck] == nil || bl.ColonKV.KvTag[bl_ck].Weight >= td.SortKVWeight[bl_ck] {
|
|
|
+ if bl_cv != "" && (td.SortKV.Map[bl_ck] == nil || bl.ColonKV.KvTag[bl_ck].Weight >= td.SortKVWeight[bl_ck]) {
|
|
|
td.SortKV.AddKey(bl_ck, bl_cv)
|
|
|
td.SortKVWeight[bl_ck] = bl.ColonKV.KvTag[bl_ck].Weight
|
|
|
}
|
|
@@ -235,12 +235,12 @@ func (td *TD) tdHasTable(bsontable *bool, tr *TR) {
|
|
|
if td.TR.Table.TableResult == nil {
|
|
|
td.TR.Table.TableResult = NewTableResult(sonts.Id, sonts.Toptype, sonts.BlockTag, sonts.Html, sonts.Itype, sonts.RuleBlock)
|
|
|
}
|
|
|
- if td.TR.Table.TableResult.SortKVWeight[k] < sonts.SortKVWeight[k]{
|
|
|
+ if td.TR.Table.TableResult.SortKVWeight[k] < sonts.SortKVWeight[k] {
|
|
|
td.TR.Table.TableResult.SortKV.AddKey(k, v)
|
|
|
td.TR.Table.TableResult.SortKVWeight[k] = sonts.SortKVWeight[k]
|
|
|
- }else {
|
|
|
- td.SortKV.AddKey(k,v)
|
|
|
- td.SortKVWeight[k]=sonts.SortKVWeight[k]
|
|
|
+ } else {
|
|
|
+ td.SortKV.AddKey(k, v)
|
|
|
+ td.SortKVWeight[k] = sonts.SortKVWeight[k]
|
|
|
}
|
|
|
}
|
|
|
td.SonTableResult = sonts
|