Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221123105406",
+  "version": "2.0.20221129152444",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -260,11 +260,11 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
     },
 
     focus: function () {
-        this.trigger.focus();
+        this.trigger ? this.trigger.focus() : this.textTrigger.focus();
     },
 
     blur: function () {
-        this.trigger.blur();
+        this.trigger ? this.trigger.blur() : this.textTrigger.blur();
     },
 
     showView: function () {
@@ -272,7 +272,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
     },
 
     setWaterMark: function (v) {
-        this.trigger.setWaterMark(v);
+        this.trigger ? this.trigger.setWaterMark(v) : this.textTrigger.setWaterMark(v);
     }
 });