Merge pull request #1199 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'ec771c01161d69e315c55fe41af7a61e3881fd2e':
  REPORT-24691 fix: 多选下拉树是否可编辑
  REPORT-24696 fix: 不影响父节点勾选状态的复选树支持自定义水印和默认值
  BI-56649 fix: 原文搜索的少改了

changelog.md

@@ -1,4 +1,7 @@
 # 更新日志
+2.0(2019-12)
+- 不影响父节点勾选状态的复选树支持自定义水印和默认值
+
 2.0(2019-11)
 - 日期系列新增setMinDate和setMaxDate接口
 - 修复了同步复选树设置节点默认open后, 叶子节点无法选中的问题

src/component/treevaluechooser/combo.treevaluechooser.insert.js

@@ -25,6 +25,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
         }
         this.combo = BI.createWidget({
             type: "bi.multi_tree_insert_combo",
+            allowEdit: o.allowEdit,
             text: o.text,
             value: o.value,
             watermark: o.watermark,

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,
+            allowEdit: o.allowEdit,
             value: o.value,
             watermark: o.watermark,
             element: this,

src/component/valuechooser/combo.valuechooser.insert.js

@@ -24,6 +24,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, {
         this.combo = BI.createWidget({
             type: "bi.multi_select_insert_combo",
             element: this,
+            allowEdit: o.allowEdit,
             text: o.text,
             value: o.value,
             itemsCreator: BI.bind(this._itemsCreator, this),

src/component/valuechooser/combo.valuechooser.js

@@ -28,6 +28,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
             element: this,
+            allowEdit: o.allowEdit,
             text: o.text,
             value: o.value,
             itemsCreator: BI.bind(this._itemsCreator, this),

src/core/platform/web/jquery/fn.js

@@ -106,7 +106,10 @@ if (BI.jQuery) {
 
                     textLeft = textLeft.substr(tidx + keyword.length);
                     if (py != null) {
-                        py = py.substr(tidx + keyword.length);
+                        // 每一组拼音都应该前进，而不是只是当前的
+                        py = BI.map(py.split("\u200b"), function (idx, ps) {
+                            return ps.slice(tidx + keyword.length);
+                        }).join("\u200b");
                     }
                 } else if (pidx != null && pidx >= 0) {
                     // BI-56386 这边两个pid / text.length是为了防止截取的首字符串不是完整的，但光这样做还不够，即时错位了，也不能说明就不符合条件

src/widget/multiselect/multiselect.combo.js

@@ -127,7 +127,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            toggle: false,
+            toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
             adjustLength: 1,

src/widget/multiselect/multiselect.insert.combo.js

@@ -121,7 +121,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            toggle: false,
+            toggle: !o.allowEdit,
             el: this.trigger,
             adjustLength: 1,
             container: o.container,

src/widget/multiselect/trigger/searcher.multiselect.js

@@ -26,6 +26,7 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
             type: "bi.multi_select_editor",
             height: o.height,
             text: o.text,
+            watermark: o.watermark,
             listeners: [{
                 eventName: BI.MultiSelectEditor.EVENT_FOCUS,
                 action: function () {

src/widget/multitree/multi.tree.combo.js

@@ -20,7 +20,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             baseCls: "bi-multi-tree-combo",
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
-            height: 24
+            height: 24,
+            allowEdit: true
         });
     },
 
@@ -36,6 +37,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
+            allowEdit: o.allowEdit,
             height: o.height,
             valueFormatter: o.valueFormatter,
             text: o.text,
@@ -53,7 +55,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            toggle: false,
+            toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
             adjustLength: 1,

src/widget/multitree/multi.tree.insert.combo.js

@@ -70,7 +70,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            toggle: false,
+            toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
             adjustLength: 1,

src/widget/multitree/multi.tree.list.combo.js

@@ -86,7 +86,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            toggle: false,
+            toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,
             adjustLength: 1,

src/widget/multitree/trigger/searcher.list.multi.tree.js

@@ -26,6 +26,8 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget({
             type: "bi.multi_select_editor",
             height: o.height,
+            text: o.text,
+            watermark: o.watermark,
             el: {
                 type: "bi.simple_state_editor",
                 height: o.height