diff --git a/changelog.md b/changelog.md index 5bc8e600e..0d84d3b1b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2019-08) +- 修复valueChooser系列不支持value属性的问题 - 更新了若干icon-font的样式 - 修复了单选树同步搜索状态下父节点前可能没有展开符号的问题 - 单选树可展示并选中不存在的值 diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index ef3d7742b..b56d2a2ff 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -54754,6 +54754,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { ref: function (_ref) { self.changeIcon = _ref; }, + disableSelected: true, iconCls: "auto-color-icon", width: 24, iconWidth: 16, @@ -88537,6 +88538,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -88624,6 +88626,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -88712,6 +88715,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -88942,6 +88946,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89036,6 +89041,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89124,6 +89130,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 7f1f7b5e3..3be2bd50c 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -55158,6 +55158,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { ref: function (_ref) { self.changeIcon = _ref; }, + disableSelected: true, iconCls: "auto-color-icon", width: 24, iconWidth: 16, @@ -88941,6 +88942,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -89028,6 +89030,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -89116,6 +89119,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -89346,6 +89350,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89440,6 +89445,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89528,6 +89534,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index ef3d7742b..b56d2a2ff 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -54754,6 +54754,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { ref: function (_ref) { self.changeIcon = _ref; }, + disableSelected: true, iconCls: "auto-color-icon", width: 24, iconWidth: 16, @@ -88537,6 +88538,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -88624,6 +88626,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -88712,6 +88715,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -88942,6 +88946,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89036,6 +89041,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89124,6 +89130,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/dist/bundle.js b/dist/bundle.js index 7f1f7b5e3..3be2bd50c 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -55158,6 +55158,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { ref: function (_ref) { self.changeIcon = _ref; }, + disableSelected: true, iconCls: "auto-color-icon", width: 24, iconWidth: 16, @@ -88941,6 +88942,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -89028,6 +89030,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -89116,6 +89119,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -89346,6 +89350,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89440,6 +89445,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89528,6 +89534,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/dist/case.js b/dist/case.js index 76304cf00..3f6f8c41d 100644 --- a/dist/case.js +++ b/dist/case.js @@ -2730,6 +2730,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { ref: function (_ref) { self.changeIcon = _ref; }, + disableSelected: true, iconCls: "auto-color-icon", width: 24, iconWidth: 16, diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 0dcd4d2d3..36310d834 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -54999,6 +54999,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { ref: function (_ref) { self.changeIcon = _ref; }, + disableSelected: true, iconCls: "auto-color-icon", width: 24, iconWidth: 16, @@ -88782,6 +88783,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -88869,6 +88871,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -88957,6 +88960,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -89187,6 +89191,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89281,6 +89286,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89369,6 +89375,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/dist/fineui.js b/dist/fineui.js index 0d4d63c4f..79c1c1d00 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -55403,6 +55403,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { ref: function (_ref) { self.changeIcon = _ref; }, + disableSelected: true, iconCls: "auto-color-icon", width: 24, iconWidth: 16, @@ -89186,6 +89187,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -89273,6 +89275,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -89361,6 +89364,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -89591,6 +89595,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89685,6 +89690,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -89773,6 +89779,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 466eb1ea0..3c51d538b 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -71486,6 +71486,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -71573,6 +71574,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -71661,6 +71663,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -71891,6 +71894,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -71985,6 +71989,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -72073,6 +72078,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/dist/widget.js b/dist/widget.js index ad6aa5d23..4b3828e12 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -26597,6 +26597,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -26684,6 +26685,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -26772,6 +26774,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), @@ -27002,6 +27005,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -27096,6 +27100,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, @@ -27184,6 +27189,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) }); diff --git a/src/component/treevaluechooser/combo.listtreevaluechooser.js b/src/component/treevaluechooser/combo.listtreevaluechooser.js index c817cd939..383b3184b 100644 --- a/src/component/treevaluechooser/combo.listtreevaluechooser.js +++ b/src/component/treevaluechooser/combo.listtreevaluechooser.js @@ -27,6 +27,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, type: "bi.multi_tree_list_combo", element: this, text: o.text, + value: o.value, watermark: o.watermark, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), diff --git a/src/component/treevaluechooser/combo.treevaluechooser.insert.js b/src/component/treevaluechooser/combo.treevaluechooser.insert.js index e8314110f..2a8b0ca54 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.insert.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.insert.js @@ -26,6 +26,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js index 84b93f876..662f22385 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.js @@ -26,6 +26,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + value: o.value, watermark: o.watermark, element: this, itemsCreator: BI.bind(this._itemsCreator, this), diff --git a/src/component/valuechooser/combo.valuechooser.insert.js b/src/component/valuechooser/combo.valuechooser.insert.js index 0c155ea1a..c1f290c3a 100644 --- a/src/component/valuechooser/combo.valuechooser.insert.js +++ b/src/component/valuechooser/combo.valuechooser.insert.js @@ -25,6 +25,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_insert_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, diff --git a/src/component/valuechooser/combo.valuechooser.js b/src/component/valuechooser/combo.valuechooser.js index d8c3454da..312f4c0e4 100644 --- a/src/component/valuechooser/combo.valuechooser.js +++ b/src/component/valuechooser/combo.valuechooser.js @@ -29,6 +29,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { type: "bi.multi_select_combo", element: this, text: o.text, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, diff --git a/src/component/valuechooser/pane.valuechooser.js b/src/component/valuechooser/pane.valuechooser.js index 9e7a9e096..143f8f8c9 100644 --- a/src/component/valuechooser/pane.valuechooser.js +++ b/src/component/valuechooser/pane.valuechooser.js @@ -23,6 +23,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { this.list = BI.createWidget({ type: "bi.multi_select_list", element: this, + value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this) });