Merge pull request #137640 in DEC/fineui from master to feature/x

* commit '65334a67fc3907d25c1130caa08c065e3d659671':
  KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一

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

@@ -16,7 +16,7 @@ Demo.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                 ref: function (_ref) {
                     self.tree = _ref;
                 },
-                text: "默认值",
+                defaultText: "请选择",
                 items: items,
                 width: 300,
                 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);

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

@@ -16,7 +16,7 @@ Demo.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 ref: function (_ref) {
                     self.tree = _ref;
                 },
-                text: "默认值",
+                defaultText: "请选择",
                 items: items,
                 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);

src/widget/multilayersingletree/multilayersingletree.combo.js

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