diff --git a/demo/config.js b/demo/config.js index 71893d1b28..d82b30363f 100644 --- a/demo/config.js +++ b/demo/config.js @@ -1535,8 +1535,7 @@ Demo.CONSTANTS = { {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, {id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"}, {id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"}, - {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}, - {id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}], + {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}], LEVELTREE: [{ id: 1, text: "第一项", diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index d8e37f4a6b..b734939f67 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -15149,7 +15149,7 @@ BI.Layout = BI.inherit(BI.Widget, { } } if (oldStartIdx > oldEndIdx) { - before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; + before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1]; addVnodes(before, newCh, newStartIdx, newEndIdx); } else if (newStartIdx > newEndIdx) { removeVnodes(oldCh, oldStartIdx, oldEndIdx); @@ -72008,6 +72008,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { self._setComboValueChangedEvent(self.smallCombo); self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.smallEditor); + + self._checkValidation(); }, _checkValidation: function () { @@ -72285,6 +72287,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { } self.bigCombo.setValue(combo_value); } + + this._checkValidation(); }, diff --git a/dist/bundle.js b/dist/bundle.js index 375794e9ac..3b31bc0754 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -15149,7 +15149,7 @@ BI.Layout = BI.inherit(BI.Widget, { } } if (oldStartIdx > oldEndIdx) { - before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; + before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1]; addVnodes(before, newCh, newStartIdx, newEndIdx); } else if (newStartIdx > newEndIdx) { removeVnodes(oldCh, oldStartIdx, oldEndIdx); @@ -72547,6 +72547,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { self._setComboValueChangedEvent(self.smallCombo); self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.smallEditor); + + self._checkValidation(); }, _checkValidation: function () { @@ -72824,6 +72826,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { } self.bigCombo.setValue(combo_value); } + + this._checkValidation(); }, diff --git a/dist/core.js b/dist/core.js index 336e1890dd..b4b8f58cc0 100644 --- a/dist/core.js +++ b/dist/core.js @@ -15149,7 +15149,7 @@ BI.Layout = BI.inherit(BI.Widget, { } } if (oldStartIdx > oldEndIdx) { - before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; + before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1]; addVnodes(before, newCh, newStartIdx, newEndIdx); } else if (newStartIdx > newEndIdx) { removeVnodes(oldCh, oldStartIdx, oldEndIdx); diff --git a/dist/demo.js b/dist/demo.js index 29f067c2a9..3b6dcb8bca 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -13297,8 +13297,7 @@ Demo.CONSTANTS = { {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, {id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"}, {id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"}, - {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}, - {id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}], + {id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}], LEVELTREE: [{ id: 1, text: "第一项", diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index f9fa3a9eb7..a069f95b73 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -15391,7 +15391,7 @@ BI.Layout = BI.inherit(BI.Widget, { } } if (oldStartIdx > oldEndIdx) { - before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; + before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1]; addVnodes(before, newCh, newStartIdx, newEndIdx); } else if (newStartIdx > newEndIdx) { removeVnodes(oldCh, oldStartIdx, oldEndIdx); @@ -72250,6 +72250,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { self._setComboValueChangedEvent(self.smallCombo); self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.smallEditor); + + self._checkValidation(); }, _checkValidation: function () { @@ -72527,6 +72529,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { } self.bigCombo.setValue(combo_value); } + + this._checkValidation(); }, diff --git a/dist/fineui.js b/dist/fineui.js index 6c6d7e98d3..dddd490418 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -15391,7 +15391,7 @@ BI.Layout = BI.inherit(BI.Widget, { } } if (oldStartIdx > oldEndIdx) { - before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; + before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1]; addVnodes(before, newCh, newStartIdx, newEndIdx); } else if (newStartIdx > newEndIdx) { removeVnodes(oldCh, oldStartIdx, oldEndIdx); @@ -72789,6 +72789,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { self._setComboValueChangedEvent(self.smallCombo); self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.smallEditor); + + self._checkValidation(); }, _checkValidation: function () { @@ -73066,6 +73068,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { } self.bigCombo.setValue(combo_value); } + + this._checkValidation(); }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 02fea59fd9..017b84cb73 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -14895,7 +14895,7 @@ BI.Layout = BI.inherit(BI.Widget, { } } if (oldStartIdx > oldEndIdx) { - before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; + before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1]; addVnodes(before, newCh, newStartIdx, newEndIdx); } else if (newStartIdx > newEndIdx) { removeVnodes(oldCh, oldStartIdx, oldEndIdx); @@ -55671,6 +55671,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { self._setComboValueChangedEvent(self.smallCombo); self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.smallEditor); + + self._checkValidation(); }, _checkValidation: function () { @@ -55948,6 +55950,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { } self.bigCombo.setValue(combo_value); } + + this._checkValidation(); }, diff --git a/dist/widget.js b/dist/widget.js index 11f7808449..663ccabde9 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -13852,6 +13852,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { self._setComboValueChangedEvent(self.smallCombo); self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.smallEditor); + + self._checkValidation(); }, _checkValidation: function () { @@ -14129,6 +14131,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { } self.bigCombo.setValue(combo_value); } + + this._checkValidation(); }, diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index b689fc57af..ec1be241b6 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -427,7 +427,7 @@ BI.Layout = BI.inherit(BI.Widget, { } } if (oldStartIdx > oldEndIdx) { - before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm; + before = BI.isNull(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1]; addVnodes(before, newCh, newStartIdx, newEndIdx); } else if (newStartIdx > newEndIdx) { removeVnodes(oldCh, oldStartIdx, oldEndIdx); diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js index ded3aa37f1..5a689681c0 100644 --- a/src/widget/numberinterval/numberinterval.js +++ b/src/widget/numberinterval/numberinterval.js @@ -240,6 +240,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { self._setComboValueChangedEvent(self.smallCombo); self._setEditorValueChangedEvent(self.bigEditor); self._setEditorValueChangedEvent(self.smallEditor); + + self._checkValidation(); }, _checkValidation: function () { @@ -517,6 +519,8 @@ BI.NumberInterval = BI.inherit(BI.Single, { } self.bigCombo.setValue(combo_value); } + + this._checkValidation(); },