diff --git a/changelog.md b/changelog.md index db9203c9ef..4555f53dab 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2020-07) +- 修复了grid_view执行_unMount时不调用子组件的_unMount的问题 - combo新增belowMouse属性,允许popup在点击处弹出 - combo新增hideWhenAnotherComboOpen属性,开启则其他combo下拉时当前combo收起 - 修复了datePicker在setValue的时候没有动态刷新可用月份的问题 diff --git a/src/base/grid/grid.js b/src/base/grid/grid.js index b6ff6d65ab..056983b236 100644 --- a/src/base/grid/grid.js +++ b/src/base/grid/grid.js @@ -150,7 +150,8 @@ BI.GridView = BI.inherit(BI.Widget, { if (this.renderedCells[index]._top !== rowDatum.offset + verticalOffsetAdjustment) { this.renderedCells[index].el.element.css("top", (rowDatum.offset + verticalOffsetAdjustment) + "px"); } - renderedCells.push(child = this.renderedCells[index]); + child = this.renderedCells[index].el; + renderedCells.push(this.renderedCells[index]); } else { child = BI.createWidget(BI.extend({ type: "bi.label", diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index 94edd62d76..628d2fe410 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -118,7 +118,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { var fatherValue = BI.deepClone(item.el.value); var childValue = BI.deepClone(child.value); self.singleValues.push(child.value); - child.type = "bi.down_list_item"; + child.type = child.type || "bi.down_list_item"; child.extraCls = " child-down-list-item"; child.title = child.title || child.text; child.textRgap = 10;