Merge pull request #445 in FUI/fineui from ~WINDY/fui:master to master

* commit '4ff0e0aab3dd399523f09ef8e4248c5cf9595196': 更新同步4.1
6 years ago · 9995f5f94d
17 changed files with 107 additions and 69 deletions
--- a/demo/version.js
+++ b/demo/version.js
@ -165,5 +165,6 @@ BI.i18n = {
    "BI-More_Than": "大于",
    "BI-More_And_Equal": "大于等于",
    "BI-Please_Enter_SQL": "请输入SQL",
-    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
+    "BI-Basic_Please_Select": "请选择"
 };
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.js
+++ b/dist/base.js
@ -18106,14 +18106,16 @@ BI.CodeEditor = BI.inherit(BI.Single, {
    _init: function () {
        BI.CodeEditor.superclass._init.apply(this, arguments);
        var o = this.options, self = this;
-        this.editor = CodeMirror(this.element[0], {
+        var conf = {
            textWrapping: true,
            lineWrapping: true,
-            lineNumbers: o.lineNumbers,
+            lineNumbers: false,
            readOnly: o.readOnly,
-            // 解决插入字段由括号或其他特殊字符包围时分裂的bug
+            //解决插入字段由括号或其他特殊字符包围时分裂的bug
            specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
-        });
+        };
+        o.readOnly && (conf.cursorBlinkRate = -1);
+        this.editor = CodeMirror(this.element[0], conf);
        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
        this.editor.on("change", function (cm, change) {
            BI.nextTick(function () {
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -53876,14 +53876,16 @@ BI.CodeEditor = BI.inherit(BI.Single, {
    _init: function () {
        BI.CodeEditor.superclass._init.apply(this, arguments);
        var o = this.options, self = this;
-        this.editor = CodeMirror(this.element[0], {
+        var conf = {
            textWrapping: true,
            lineWrapping: true,
-            lineNumbers: o.lineNumbers,
+            lineNumbers: false,
            readOnly: o.readOnly,
-            // 解决插入字段由括号或其他特殊字符包围时分裂的bug
+            //解决插入字段由括号或其他特殊字符包围时分裂的bug
            specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
-        });
+        };
+        o.readOnly && (conf.cursorBlinkRate = -1);
+        this.editor = CodeMirror(this.element[0], conf);
        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
        this.editor.on("change", function (cm, change) {
            BI.nextTick(function () {
@ -97512,6 +97514,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -97895,6 +97898,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -98261,6 +98265,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -99161,6 +99166,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.multi_select_searcher",
            height: o.height,
+            text: o.text,
            itemsCreator: o.itemsCreator,
            valueFormatter: o.valueFormatter,
            popup: {},
@ -99702,7 +99708,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
            popup: {},
            valueFormatter: BI.emptyFn,
            adapter: null,
-            masker: {}
+            masker: {},
+            text: BI.i18nText("BI-Basic_Please_Select")
        });
    },

@ -99711,7 +99718,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
        var self = this, o = this.options;
        this.editor = BI.createWidget(o.el, {
            type: "bi.multi_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
        });

        this.searcher = BI.createWidget({
@ -114241,5 +114249,6 @@ BI.i18n = {
    "BI-More_Than": "大于",
    "BI-More_And_Equal": "大于等于",
    "BI-Please_Enter_SQL": "请输入SQL",
-    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
+    "BI-Basic_Please_Select": "请选择"
 };
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/config.js
+++ b/dist/config.js
@ -165,5 +165,6 @@ BI.i18n = {
    "BI-More_Than": "大于",
    "BI-More_And_Equal": "大于等于",
    "BI-Please_Enter_SQL": "请输入SQL",
-    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
+    "BI-Basic_Please_Select": "请选择"
 };
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -54119,14 +54119,16 @@ BI.CodeEditor = BI.inherit(BI.Single, {
    _init: function () {
        BI.CodeEditor.superclass._init.apply(this, arguments);
        var o = this.options, self = this;
-        this.editor = CodeMirror(this.element[0], {
+        var conf = {
            textWrapping: true,
            lineWrapping: true,
-            lineNumbers: o.lineNumbers,
+            lineNumbers: false,
            readOnly: o.readOnly,
-            // 解决插入字段由括号或其他特殊字符包围时分裂的bug
+            //解决插入字段由括号或其他特殊字符包围时分裂的bug
            specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
-        });
+        };
+        o.readOnly && (conf.cursorBlinkRate = -1);
+        this.editor = CodeMirror(this.element[0], conf);
        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
        this.editor.on("change", function (cm, change) {
            BI.nextTick(function () {
@ -97755,6 +97757,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -98138,6 +98141,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -98504,6 +98508,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -99404,6 +99409,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.multi_select_searcher",
            height: o.height,
+            text: o.text,
            itemsCreator: o.itemsCreator,
            valueFormatter: o.valueFormatter,
            popup: {},
@ -99945,7 +99951,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
            popup: {},
            valueFormatter: BI.emptyFn,
            adapter: null,
-            masker: {}
+            masker: {},
+            text: BI.i18nText("BI-Basic_Please_Select")
        });
    },

@ -99954,7 +99961,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
        var self = this, o = this.options;
        this.editor = BI.createWidget(o.el, {
            type: "bi.multi_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
        });

        this.searcher = BI.createWidget({
@ -114484,5 +114492,6 @@ BI.i18n = {
    "BI-More_Than": "大于",
    "BI-More_And_Equal": "大于等于",
    "BI-Please_Enter_SQL": "请输入SQL",
-    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
+    "BI-Basic_Please_Select": "请选择"
 };
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
@ -9893,6 +9893,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -10276,6 +10277,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -10642,6 +10644,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
@ -11542,6 +11545,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.multi_select_searcher",
            height: o.height,
+            text: o.text,
            itemsCreator: o.itemsCreator,
            valueFormatter: o.valueFormatter,
            popup: {},
@ -12083,7 +12087,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
            popup: {},
            valueFormatter: BI.emptyFn,
            adapter: null,
-            masker: {}
+            masker: {},
+            text: BI.i18nText("BI-Basic_Please_Select")
        });
    },

@ -12092,7 +12097,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
        var self = this, o = this.options;
        this.editor = BI.createWidget(o.el, {
            type: "bi.multi_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
        });

        this.searcher = BI.createWidget({
--- a/public/js/index.js
+++ b/public/js/index.js
@ -165,5 +165,6 @@ BI.i18n = {
    "BI-More_Than": "大于",
    "BI-More_And_Equal": "大于等于",
    "BI-Please_Enter_SQL": "请输入SQL",
-    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
+    "BI-Basic_Please_Select": "请选择"
 };
--- a/src/base/single/editor/editor.code.js
+++ b/src/base/single/editor/editor.code.js
@ -22,14 +22,16 @@ BI.CodeEditor = BI.inherit(BI.Single, {
    _init: function () {
        BI.CodeEditor.superclass._init.apply(this, arguments);
        var o = this.options, self = this;
-        this.editor = CodeMirror(this.element[0], {
+        var conf = {
            textWrapping: true,
            lineWrapping: true,
-            lineNumbers: o.lineNumbers,
+            lineNumbers: false,
            readOnly: o.readOnly,
-            // 解决插入字段由括号或其他特殊字符包围时分裂的bug
+            //解决插入字段由括号或其他特殊字符包围时分裂的bug
            specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
-        });
+        };
+        o.readOnly && (conf.cursorBlinkRate = -1);
+        this.editor = CodeMirror(this.element[0], conf);
        o.lineHeight === 1 ? this.element.addClass("codemirror-low-line-height") : this.element.addClass("codemirror-high-line-height");
        this.editor.on("change", function (cm, change) {
            BI.nextTick(function () {
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@ -33,6 +33,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
--- a/src/widget/multiselect/multiselect.insert.combo.js
+++ b/src/widget/multiselect/multiselect.insert.combo.js
@ -30,6 +30,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
--- a/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js
@ -33,6 +33,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
        this.trigger = BI.createWidget({
            type: "bi.multi_select_trigger",
            height: o.height,
+            text: o.text,
            // adapter: this.popup,
            masker: {
                offset: {
--- a/src/widget/multiselect/multiselect.trigger.js
+++ b/src/widget/multiselect/multiselect.trigger.js
@ -37,6 +37,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.multi_select_searcher",
            height: o.height,
+            text: o.text,
            itemsCreator: o.itemsCreator,
            valueFormatter: o.valueFormatter,
            popup: {},
--- a/src/widget/multiselect/trigger/searcher.multiselect.js
+++ b/src/widget/multiselect/trigger/searcher.multiselect.js
@ -14,7 +14,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
            popup: {},
            valueFormatter: BI.emptyFn,
            adapter: null,
-            masker: {}
+            masker: {},
+            text: BI.i18nText("BI-Basic_Please_Select")
        });
    },

@ -23,7 +24,8 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
        var self = this, o = this.options;
        this.editor = BI.createWidget(o.el, {
            type: "bi.multi_select_editor",
-            height: o.height
+            height: o.height,
+            text: o.text
        });

        this.searcher = BI.createWidget({
--- a/ui/js/index.js
+++ b/ui/js/index.js
@ -165,5 +165,6 @@ BI.i18n = {
    "BI-More_Than": "大于",
    "BI-More_And_Equal": "大于等于",
    "BI-Please_Enter_SQL": "请输入SQL",
-    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
+    "BI-Basic_Please_Select": "请选择"
 };