Browse Source

Pull request #2985: KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'b3049e16d02963dbf5d98a05348a50638f623f0c':
  KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
es6
Dailer 2 years ago
parent
commit
65334a67fc
  1. 4
      demo/js/widget/selecttree/demo.multilayer_select_tree_combo.js
  2. 4
      demo/js/widget/singletree/demo.multilayer_single_tree_combo.js
  3. 4
      src/widget/multilayersingletree/multilayersingletree.combo.js

4
demo/js/widget/selecttree/demo.multilayer_select_tree_combo.js

@ -16,7 +16,7 @@ Demo.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.tree = _ref; self.tree = _ref;
}, },
text: "默认值", defaultText: "请选择",
items: items, items: items,
width: 300, width: 300,
value: ["第五级文件1"] value: ["第五级文件1"]
@ -40,4 +40,4 @@ Demo.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
} }
}); });
BI.shortcut("demo.multilayer_select_tree_combo", Demo.MultiLayerSelectTreeCombo); BI.shortcut("demo.multilayer_select_tree_combo", Demo.MultiLayerSelectTreeCombo);

4
demo/js/widget/singletree/demo.multilayer_single_tree_combo.js

@ -16,7 +16,7 @@ Demo.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.tree = _ref; self.tree = _ref;
}, },
text: "默认值", defaultText: "请选择",
items: items, items: items,
width: 300 width: 300
}, { }, {
@ -39,4 +39,4 @@ Demo.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
} }
}); });
BI.shortcut("demo.multilayer_single_tree_combo", Demo.MultiLayerSingleTreeCombo); BI.shortcut("demo.multilayer_single_tree_combo", Demo.MultiLayerSingleTreeCombo);

4
src/widget/multilayersingletree/multilayersingletree.combo.js

@ -13,6 +13,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
isDefaultInit: false, isDefaultInit: false,
height: 24, height: 24,
text: "", text: "",
defaultText: "",
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
items: [], items: [],
value: "", value: "",
@ -177,6 +178,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
self.textTrigger = _ref; self.textTrigger = _ref;
}, },
text: o.text, text: o.text,
defaultText: o.defaultText,
height: o.height, height: o.height,
items: o.items, items: o.items,
value: o.value, value: o.value,
@ -259,4 +261,4 @@ BI.MultiLayerSingleTreeCombo.EVENT_FOCUS = "EVENT_FOCUS";
BI.MultiLayerSingleTreeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.MultiLayerSingleTreeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.MultiLayerSingleTreeCombo.EVENT_STOP = "EVENT_STOP"; BI.MultiLayerSingleTreeCombo.EVENT_STOP = "EVENT_STOP";
BI.MultiLayerSingleTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.MultiLayerSingleTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.multilayer_single_tree_combo", BI.MultiLayerSingleTreeCombo); BI.shortcut("bi.multilayer_single_tree_combo", BI.MultiLayerSingleTreeCombo);

Loading…
Cancel
Save