Merge pull request #65 in FUI/fineui from ~GUY/fineui:master to master

* commit '61d380d6bb24e20b929a2445b8caead8dd67951f':
  add
  update
  update
  update
  sign_initial_editor
  样式&sign inital editor title

bi/case.js

@@ -6903,9 +6903,7 @@ BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
 BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
 
 BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
- * sign是新值（初始value值）形式的自适应宽度的输入框
+ * Created by User on 2017/7/28.
- * @class BI.SignInitialEditor
- * @extends BI.Single
  */
 BI.SignInitialEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
@@ -6934,8 +6932,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         BI.SignInitialEditor.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.editor = BI.createWidget({
-            type: "bi.sign_editor",
+            type: "bi.editor",
-            element: this,
             height: o.height,
             hgap: o.hgap,
             vgap: o.vgap,
@@ -6943,7 +6940,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
-            value: o.value || o.text,
+            value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
             mouseOut: o.mouseOut,
@@ -6951,67 +6948,163 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             errorText: o.errorText
         });
-        if(BI.isNotNull(o.value)){
+        this.text = BI.createWidget({
-            this.setState(o.value);
+            type: "bi.text_button",
+            cls: "sign-editor-text",
+            title: o.title,
+            warningTitle: o.warningTitle,
+            tipType: o.tipType,
+            textAlign: "left",
+            height: o.height,
+            hgap: 4,
+            handler: function () {
+                self._showInput();
+                self.editor.focus();
+                self.editor.selectAll();
             }
+        });
+        this.text.on(BI.TextButton.EVENT_CHANGE, function () {
+            BI.nextTick(function () {
+                self.fireEvent(BI.SignInitialEditor.EVENT_CLICK_LABEL)
+            });
+        });
+        BI.createWidget({
+            type: "bi.absolute",
+            element: this,
+            items: [{
+                el: this.text,
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            }]
+        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+        this.editor.on(BI.Editor.EVENT_FOCUS, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS);
+            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_BLUR, function () {
+        this.editor.on(BI.Editor.EVENT_BLUR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR);
+            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CLICK, function () {
+        this.editor.on(BI.Editor.EVENT_CLICK, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CHANGE, function () {
+        this.editor.on(BI.Editor.EVENT_CHANGE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function (v) {
+        this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) {
-            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN);
+            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN, arguments);
         });
 
-        this.editor.on(BI.SignEditor.EVENT_VALID, function () {
+        this.editor.on(BI.Editor.EVENT_VALID, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_VALID);
+            self.fireEvent(BI.SignInitialEditor.EVENT_VALID, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CONFIRM, function () {
+        this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
-            self.setState(self.editor.getValue());
+            self._showHint();
-            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_START, function () {
+        this.editor.on(BI.Editor.EVENT_START, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_START);
+            self.fireEvent(BI.SignInitialEditor.EVENT_START, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_PAUSE, function () {
+        this.editor.on(BI.Editor.EVENT_PAUSE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_STOP, function () {
+        this.editor.on(BI.Editor.EVENT_STOP, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_STOP);
+            self.fireEvent(BI.SignInitialEditor.EVENT_STOP, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_SPACE, function () {
+        this.editor.on(BI.Editor.EVENT_SPACE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ERROR, function () {
+        this.editor.on(BI.Editor.EVENT_ERROR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ENTER, function () {
+        this.editor.on(BI.Editor.EVENT_ENTER, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER);
+            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER, arguments);
+        });
+        this.editor.on(BI.Editor.EVENT_RESTRICT, function () {
+            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_RESTRICT, function () {
+        this.editor.on(BI.Editor.EVENT_EMPTY, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT);
+            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_EMPTY, function () {
+        BI.createWidget({
-            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY);
+            type: "bi.vertical",
+            scrolly: false,
+            element: this,
+            items: [this.editor]
         });
+        this._showHint();
+        self._checkText();
+    },
+
+    _checkText: function () {
+        var o = this.options;
+        BI.nextTick(BI.bind(function () {
+            if (this.editor.getValue() === "") {
+                this.text.setValue(o.watermark || "");
+                this.text.element.addClass("bi-water-mark");
+            } else {
+                var v = this.editor.getValue();
+                v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
+                this.text.setValue(v);
+                this.text.element.removeClass("bi-water-mark");
+            }
+        }, this));
+    },
+
+    _showInput: function () {
+        this.editor.visible();
+        this.text.invisible();
+    },
+
+    _showHint: function () {
+        this.editor.invisible();
+        this.text.visible();
+    },
+
+    setTitle: function (title) {
+        this.text.setTitle(title);
+    },
+
+    setWarningTitle: function (title) {
+        this.text.setWarningTitle(title);
     },
 
     focus: function () {
+        this._showInput();
         this.editor.focus();
     },
 
     blur: function () {
         this.editor.blur();
+        this._showHint();
+        this._checkText();
+    },
+
+    doRedMark: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doRedMark.apply(this.text, arguments);
+    },
+
+    unRedMark: function () {
+        this.text.unRedMark.apply(this.text, arguments);
+    },
+
+    doHighLight: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doHighLight.apply(this.text, arguments);
+    },
+
+    unHighLight: function () {
+        this.text.unHighLight.apply(this.text, arguments);
     },
 
     isValid: function () {
@@ -7026,9 +7119,19 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         return this.editor.getErrorText();
     },
 
+    isEditing: function () {
+        return this.editor.isEditing();
+    },
+
+    getLastValidValue: function () {
+        return this.editor.getLastValidValue();
+    },
+
     setValue: function (v) {
+        var o = this.options;
         this.editor.setValue(v.value);
-        this.setState(v.value);
+        o.text = v.text || o.text;
+        this._checkText();
     },
 
     getValue: function () {
@@ -7039,13 +7142,13 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
     },
 
     getState: function () {
-        return this.editor.getState();
+        return this.text.getValue();
     },
 
     setState: function (v) {
-        var o = this.options;
+        this._showHint();
         v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
-        this.editor.setState(v);
+        this.text.setValue(v);
     }
 });
 BI.SignInitialEditor.EVENT_CHANGE = "EVENT_CHANGE";

bi/widget.js

@@ -5306,7 +5306,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, {
 
     _const: {
         normal_color: "#ffffff",
-        select_color: "#f4f4f4"
+        select_color: "#eff1f4"
     },
     _defaultConfig: function () {
         return BI.extend(BI.FileManagerNavButton.superclass._defaultConfig.apply(this, arguments), {

demo/js/case/editor/demo.sign_initial_editor.js

@@ -5,14 +5,23 @@ Demo.SignInitialEditor = BI.inherit(BI.Widget, {
     props: {
         baseCls: ""
     },
+    mounted: function () {
+        this.editor.setValue({
+            value: "123",
+            text: "sdga"
+        })
+    },
     render: function () {
+        var self = this;
         return {
             type: "bi.horizontal_adapt",
             items: [{
                 type: "bi.sign_initial_editor",
+                ref: function () {
+                    self.editor = this;
+                },
                 cls: "layout-bg5",
-                value:"123",
+                text: "原始值",
-                text:"456",
                 width: 300
             }],
             vgap: 20

demo/js/case/editor/demo.state_editor.js

@@ -10,7 +10,6 @@ Demo.StateEditor = BI.inherit(BI.Widget, {
             type: "bi.horizontal_adapt",
             items: [{
                 type: "bi.state_editor",
-                cls:"bi-border",
                 value: "123",
                 text: "456",
                 width: 300

demo/js/config/case.js

@@ -6,10 +6,6 @@ Demo.CASE_CONFIG = [{
     pId: 3,
     id: 301,
     text: "editors"
-}, {
-    pId: 301,
-    text: "bi.record_editor",
-    value: "demo.record_editor"
 }, {
     pId: 301,
     text: "bi.shelter_editor",
@@ -18,6 +14,10 @@ Demo.CASE_CONFIG = [{
     pId: 301,
     text: "bi.sign_editor",
     value: "demo.sign_editor"
+}, {
+    pId: 301,
+    text: "bi.sign_initial_editor",
+    value: "demo.sign_initial_editor"
 }, {
     pId: 301,
     text: "bi.state_editor",

demo/js/config/widget.js

@@ -107,36 +107,11 @@ Demo.WIDGET_CONFIG = [{
     pId: 406,
     text: "bi.search_editor",
     value: "demo.search_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_editor",
-        value: "demo.sign_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_initial_editor",
-        value: "demo.sign_initial_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_style_editor",
-        value: "demo.sign_style_editor"
-    }, {
-        pId: 406,
-        text: "bi.state_editor",
-        value: "demo.state_editor"
 }, {
     pId: 406,
     text: "bi.clear_editor",
     value: "demo.clear_editor"
 }, {
-        pId: 406,
-        text: "bi.record_editor",
-        value: "demo.record_editor"
-    }, {
-        pId: 406,
-        text: "bi.shelter_editor",
-        value: "demo.shelter_editor"
-    },
-    {
     pId: 4,
     id: 407,
     text: "下拉框控件",
@@ -165,22 +140,6 @@ Demo.WIDGET_CONFIG = [{
     pId: 407,
     text: "bi.formula_combo",
     value: "demo.formula_combo"
-    }, {
-        pId: 4,
-        id: 408,
-        text: "选择字段列表",
-        open: false
-    }, {
-        pId: 408,
-        text: "bi.placeholder"
-    }, {
-        pId: 4,
-        id: 409,
-        text: "公式编辑器",
-        open: false
-    }, {
-        pId: 409,
-        text: "bi.placeholder"
 }, {
     pId: 4,
     id: 410,
@@ -291,7 +250,7 @@ Demo.WIDGET_CONFIG = [{
     text: "文件管理"
 }, {
     pId: 419,
-        text: "demo.file_manager",
+    text: "bi.file_manager",
     value: "demo.file_manager"
 }
 ];

demo/js/widget/editor/demo.record_editor.js

@@ -1,22 +0,0 @@
-/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.RecordEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.record_editor",
-                cls: "bi-border",
-                width: 300,
-                watermark: "这个是可以记录输入的"
-            }],
-            vgap: 20
-        }
-    }
-})
-
-BI.shortcut("demo.record_editor", Demo.RecordEditor);

demo/js/widget/editor/demo.sign_style_editor.js

@@ -1,22 +0,0 @@
-/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.SignStyleEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-exceltable"
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_adapt",
-            items: [{
-                type: "bi.sign_style_editor",
-                cls:"layout-bg5",
-                value:"12313",
-                width: 300
-            }],
-            vgap:20
-        }
-    }
-})
-
-BI.shortcut("demo.sign_style_editor", Demo.SignStyleEditor);

docs/case.js

@@ -6903,9 +6903,7 @@ BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
 BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
 
 BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
- * sign是新值（初始value值）形式的自适应宽度的输入框
+ * Created by User on 2017/7/28.
- * @class BI.SignInitialEditor
- * @extends BI.Single
  */
 BI.SignInitialEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
@@ -6934,8 +6932,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         BI.SignInitialEditor.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.editor = BI.createWidget({
-            type: "bi.sign_editor",
+            type: "bi.editor",
-            element: this,
             height: o.height,
             hgap: o.hgap,
             vgap: o.vgap,
@@ -6943,7 +6940,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
-            value: o.value || o.text,
+            value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
             mouseOut: o.mouseOut,
@@ -6951,67 +6948,163 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             errorText: o.errorText
         });
-        if(BI.isNotNull(o.value)){
+        this.text = BI.createWidget({
-            this.setState(o.value);
+            type: "bi.text_button",
+            cls: "sign-editor-text",
+            title: o.title,
+            warningTitle: o.warningTitle,
+            tipType: o.tipType,
+            textAlign: "left",
+            height: o.height,
+            hgap: 4,
+            handler: function () {
+                self._showInput();
+                self.editor.focus();
+                self.editor.selectAll();
             }
+        });
+        this.text.on(BI.TextButton.EVENT_CHANGE, function () {
+            BI.nextTick(function () {
+                self.fireEvent(BI.SignInitialEditor.EVENT_CLICK_LABEL)
+            });
+        });
+        BI.createWidget({
+            type: "bi.absolute",
+            element: this,
+            items: [{
+                el: this.text,
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            }]
+        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+        this.editor.on(BI.Editor.EVENT_FOCUS, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS);
+            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_BLUR, function () {
+        this.editor.on(BI.Editor.EVENT_BLUR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR);
+            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CLICK, function () {
+        this.editor.on(BI.Editor.EVENT_CLICK, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CHANGE, function () {
+        this.editor.on(BI.Editor.EVENT_CHANGE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function (v) {
+        this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) {
-            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN);
+            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN, arguments);
         });
 
-        this.editor.on(BI.SignEditor.EVENT_VALID, function () {
+        this.editor.on(BI.Editor.EVENT_VALID, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_VALID);
+            self.fireEvent(BI.SignInitialEditor.EVENT_VALID, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CONFIRM, function () {
+        this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
-            self.setState(self.editor.getValue());
+            self._showHint();
-            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_START, function () {
+        this.editor.on(BI.Editor.EVENT_START, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_START);
+            self.fireEvent(BI.SignInitialEditor.EVENT_START, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_PAUSE, function () {
+        this.editor.on(BI.Editor.EVENT_PAUSE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_STOP, function () {
+        this.editor.on(BI.Editor.EVENT_STOP, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_STOP);
+            self.fireEvent(BI.SignInitialEditor.EVENT_STOP, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_SPACE, function () {
+        this.editor.on(BI.Editor.EVENT_SPACE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ERROR, function () {
+        this.editor.on(BI.Editor.EVENT_ERROR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ENTER, function () {
+        this.editor.on(BI.Editor.EVENT_ENTER, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER);
+            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER, arguments);
+        });
+        this.editor.on(BI.Editor.EVENT_RESTRICT, function () {
+            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_RESTRICT, function () {
+        this.editor.on(BI.Editor.EVENT_EMPTY, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT);
+            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_EMPTY, function () {
+        BI.createWidget({
-            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY);
+            type: "bi.vertical",
+            scrolly: false,
+            element: this,
+            items: [this.editor]
         });
+        this._showHint();
+        self._checkText();
+    },
+
+    _checkText: function () {
+        var o = this.options;
+        BI.nextTick(BI.bind(function () {
+            if (this.editor.getValue() === "") {
+                this.text.setValue(o.watermark || "");
+                this.text.element.addClass("bi-water-mark");
+            } else {
+                var v = this.editor.getValue();
+                v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
+                this.text.setValue(v);
+                this.text.element.removeClass("bi-water-mark");
+            }
+        }, this));
+    },
+
+    _showInput: function () {
+        this.editor.visible();
+        this.text.invisible();
+    },
+
+    _showHint: function () {
+        this.editor.invisible();
+        this.text.visible();
+    },
+
+    setTitle: function (title) {
+        this.text.setTitle(title);
+    },
+
+    setWarningTitle: function (title) {
+        this.text.setWarningTitle(title);
     },
 
     focus: function () {
+        this._showInput();
         this.editor.focus();
     },
 
     blur: function () {
         this.editor.blur();
+        this._showHint();
+        this._checkText();
+    },
+
+    doRedMark: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doRedMark.apply(this.text, arguments);
+    },
+
+    unRedMark: function () {
+        this.text.unRedMark.apply(this.text, arguments);
+    },
+
+    doHighLight: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doHighLight.apply(this.text, arguments);
+    },
+
+    unHighLight: function () {
+        this.text.unHighLight.apply(this.text, arguments);
     },
 
     isValid: function () {
@@ -7026,9 +7119,19 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         return this.editor.getErrorText();
     },
 
+    isEditing: function () {
+        return this.editor.isEditing();
+    },
+
+    getLastValidValue: function () {
+        return this.editor.getLastValidValue();
+    },
+
     setValue: function (v) {
+        var o = this.options;
         this.editor.setValue(v.value);
-        this.setState(v.value);
+        o.text = v.text || o.text;
+        this._checkText();
     },
 
     getValue: function () {
@@ -7039,13 +7142,13 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
     },
 
     getState: function () {
-        return this.editor.getState();
+        return this.text.getValue();
     },
 
     setState: function (v) {
-        var o = this.options;
+        this._showHint();
         v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
-        this.editor.setState(v);
+        this.text.setValue(v);
     }
 });
 BI.SignInitialEditor.EVENT_CHANGE = "EVENT_CHANGE";

docs/demo.js

@@ -1838,7 +1838,124 @@ BI.shortcut("demo.color_chooser", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
         })
     }
 });
-BI.shortcut("demo.complex_canvas", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
+BI.shortcut("demo.complex_canvas", Demo.Func);/**
+ * Created by Dailer on 2017/7/11.
+ */
+Demo.ClearEditor = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: ""
+    },
+    render: function () {
+        var editor;
+        return {
+            type: "bi.horizontal_auto",
+            items: [{
+                type: "bi.shelter_editor",
+                cls: "bi-border",
+                ref:function(_ref){
+                    editor=_ref;
+                },
+                width: 300,
+                watermark: "这个是带标记的"
+            },{
+                type:"bi.button",
+                text:"setValue",
+                width:300,
+                handler:function(){
+                    editor.setValue("凛冬将至");
+                }
+            },{
+                type:"bi.button",
+                text:"doHighLight",
+                width:300,
+                handler:function(){
+                    editor.doHighLight();
+                    console.log(editor.getState());
+                }
+            }],
+            vgap: 20
+        }
+    }
+})
+
+BI.shortcut("demo.shelter_editor", Demo.ClearEditor);/**
+ * Created by Dailer on 2017/7/14.
+ */
+Demo.SignEditor = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: ""
+    },
+    render: function () {
+        return {
+            type: "bi.horizontal_adapt",
+            items: [{
+                type: "bi.sign_editor",
+                //  cls:"layout-bg5",
+                value: "123",
+                text: "456",
+                width: 300
+            }],
+            vgap: 20
+
+        }
+    }
+})
+
+BI.shortcut("demo.sign_editor", Demo.SignEditor);/**
+ * Created by Dailer on 2017/7/11.
+ */
+Demo.SignInitialEditor = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: ""
+    },
+    mounted: function () {
+        this.editor.setValue({
+            value: "123",
+            text: "sdga"
+        })
+    },
+    render: function () {
+        var self = this;
+        return {
+            type: "bi.horizontal_adapt",
+            items: [{
+                type: "bi.sign_initial_editor",
+                ref: function () {
+                    self.editor = this;
+                },
+                cls: "layout-bg5",
+                text: "原始值",
+                width: 300
+            }],
+            vgap: 20
+
+        }
+    }
+})
+
+BI.shortcut("demo.sign_initial_editor", Demo.SignInitialEditor);/**
+ * Created by Dailer on 2017/7/11.
+ */
+Demo.StateEditor = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: ""
+    },
+    render: function () {
+        return {
+            type: "bi.horizontal_adapt",
+            items: [{
+                type: "bi.state_editor",
+                value: "123",
+                text: "456",
+                width: 300
+            }],
+            vgap: 20
+
+        }
+    }
+})
+
+BI.shortcut("demo.state_editor", Demo.StateEditor);Demo.Func = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-func"
     },
@@ -3038,10 +3155,6 @@ BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.BASE_CONFIG =
     pId: 3,
     id: 301,
     text: "editors"
-}, {
-    pId: 301,
-    text: "bi.record_editor",
-    value: "demo.record_editor"
 }, {
     pId: 301,
     text: "bi.shelter_editor",
@@ -3050,6 +3163,10 @@ BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.BASE_CONFIG =
     pId: 301,
     text: "bi.sign_editor",
     value: "demo.sign_editor"
+}, {
+    pId: 301,
+    text: "bi.sign_initial_editor",
+    value: "demo.sign_initial_editor"
 }, {
     pId: 301,
     text: "bi.state_editor",
@@ -3455,36 +3572,11 @@ Demo.COMPONENT_CONFIG = [{
     pId: 406,
     text: "bi.search_editor",
     value: "demo.search_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_editor",
-        value: "demo.sign_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_initial_editor",
-        value: "demo.sign_initial_editor"
-    }, {
-        pId: 406,
-        text: "bi.sign_style_editor",
-        value: "demo.sign_style_editor"
-    }, {
-        pId: 406,
-        text: "bi.state_editor",
-        value: "demo.state_editor"
 }, {
     pId: 406,
     text: "bi.clear_editor",
     value: "demo.clear_editor"
 }, {
-        pId: 406,
-        text: "bi.record_editor",
-        value: "demo.record_editor"
-    }, {
-        pId: 406,
-        text: "bi.shelter_editor",
-        value: "demo.shelter_editor"
-    },
-    {
     pId: 4,
     id: 407,
     text: "下拉框控件",
@@ -3513,22 +3605,6 @@ Demo.COMPONENT_CONFIG = [{
     pId: 407,
     text: "bi.formula_combo",
     value: "demo.formula_combo"
-    }, {
-        pId: 4,
-        id: 408,
-        text: "选择字段列表",
-        open: false
-    }, {
-        pId: 408,
-        text: "bi.placeholder"
-    }, {
-        pId: 4,
-        id: 409,
-        text: "公式编辑器",
-        open: false
-    }, {
-        pId: 409,
-        text: "bi.placeholder"
 }, {
     pId: 4,
     id: 410,
@@ -3639,7 +3715,7 @@ Demo.COMPONENT_CONFIG = [{
     text: "文件管理"
 }, {
     pId: 419,
-        text: "demo.file_manager",
+    text: "bi.file_manager",
     value: "demo.file_manager"
 }
 ];Demo.Func = BI.inherit(BI.Widget, {
@@ -7453,27 +7529,6 @@ Demo.ClearEditor = BI.inherit(BI.Widget, {
 BI.shortcut("demo.clear_editor", Demo.ClearEditor);/**
  * Created by Dailer on 2017/7/11.
  */
-Demo.RecordEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.record_editor",
-                cls: "bi-border",
-                width: 300,
-                watermark: "这个是可以记录输入的"
-            }],
-            vgap: 20
-        }
-    }
-})
-
-BI.shortcut("demo.record_editor", Demo.RecordEditor);/**
- * Created by Dailer on 2017/7/11.
- */
 Demo.SearchEditor = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-exceltable"
@@ -7502,136 +7557,6 @@ Demo.SearchEditor = BI.inherit(BI.Widget, {
 BI.shortcut("demo.search_editor", Demo.SearchEditor);/**
  * Created by Dailer on 2017/7/11.
  */
-Demo.ClearEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-        var editor;
-        return {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.shelter_editor",
-                cls: "bi-border",
-                ref:function(_ref){
-                    editor=_ref;
-                },
-                width: 300,
-                watermark: "这个是带标记的"
-            },{
-                type:"bi.button",
-                text:"setValue",
-                width:300,
-                handler:function(){
-                    editor.setValue("凛冬将至");
-                }
-            },{
-                type:"bi.button",
-                text:"doHighLight",
-                width:300,
-                handler:function(){
-                    editor.doHighLight();
-                    console.log(editor.getState());
-                }
-            }],
-            vgap: 20
-        }
-    }
-})
-
-BI.shortcut("demo.shelter_editor", Demo.ClearEditor);/**
- * Created by Dailer on 2017/7/14.
- */
-Demo.SignEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_adapt",
-            items: [{
-                type: "bi.sign_editor",
-                //  cls:"layout-bg5",
-                value: "123",
-                text: "456",
-                width: 300
-            }],
-            vgap: 20
-
-        }
-    }
-})
-
-BI.shortcut("demo.sign_editor", Demo.SignEditor);/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.SignInitialEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_adapt",
-            items: [{
-                type: "bi.sign_initial_editor",
-                cls:"layout-bg5",
-                value:"123",
-                text:"456",
-                width: 300
-            }],
-            vgap:20
-
-        }
-    }
-})
-
-BI.shortcut("demo.sign_initial_editor", Demo.SignInitialEditor);/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.SignStyleEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: "demo-exceltable"
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_adapt",
-            items: [{
-                type: "bi.sign_style_editor",
-                cls:"layout-bg5",
-                value:"12313",
-                width: 300
-            }],
-            vgap:20
-        }
-    }
-})
-
-BI.shortcut("demo.sign_style_editor", Demo.SignStyleEditor);/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.StateEditor = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-    render: function () {
-        return {
-            type: "bi.horizontal_adapt",
-            items: [{
-                type: "bi.state_editor",
-                cls:"bi-border",
-                value:"123",
-                text:"456",
-                width: 300
-            }],
-            vgap:20
-
-        }
-    }
-})
-
-BI.shortcut("demo.state_editor", Demo.StateEditor);/**
- * Created by Dailer on 2017/7/11.
- */
 Demo.TextEditor = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-exceltable"

docs/resource.css

@@ -818,6 +818,52 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e600";
   color: #f07d0a;
 }
+.less-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.less-font .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-font:hover .b-font:before,
+.less-font:focus .b-font:before,
+.less-font.hover .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-font:active .b-font:before,
+.less-font.active .b-font:before {
+  content: "\e633";
+  color: #3f8ce8;
+}
+.less-font.native .b-font:before,
+.less-font.disabled .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-equal-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.less-equal-font .b-font:before {
+  content: "\e636";
+  color: inherit;
+}
+.less-equal-font:hover .b-font:before,
+.less-equal-font:focus .b-font:before,
+.less-equal-font.hover .b-font:before {
+  content: "\e636";
+  color: inherit;
+}
+.less-equal-font:active .b-font:before,
+.less-equal-font.active .b-font:before {
+  content: "\e636";
+  color: #3f8ce8;
+}
+.less-equal-font.native .b-font:before,
+.less-equal-font.disabled .b-font:before {
+  content: "\e636";
+  color: inherit;
+}
 .tree-collapse-icon-type1 .x-icon,
 .tree-collapse-icon-type1:hover .x-icon,
 .tree-collapse-icon-type1:active .x-icon {

docs/widget.js

@@ -5306,7 +5306,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, {
 
     _const: {
         normal_color: "#ffffff",
-        select_color: "#f4f4f4"
+        select_color: "#eff1f4"
     },
     _defaultConfig: function () {
         return BI.extend(BI.FileManagerNavButton.superclass._defaultConfig.apply(this, arguments), {

src/case/editor/editor.sign.initial.js

@@ -1,7 +1,5 @@
 /**
- * sign是新值（初始value值）形式的自适应宽度的输入框
+ * Created by User on 2017/7/28.
- * @class BI.SignInitialEditor
- * @extends BI.Single
  */
 BI.SignInitialEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
@@ -30,8 +28,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         BI.SignInitialEditor.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.editor = BI.createWidget({
-            type: "bi.sign_editor",
+            type: "bi.editor",
-            element: this,
             height: o.height,
             hgap: o.hgap,
             vgap: o.vgap,
@@ -39,7 +36,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
-            value: o.value || o.text,
+            value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
             mouseOut: o.mouseOut,
@@ -47,67 +44,163 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             errorText: o.errorText
         });
-        if(BI.isNotNull(o.value)){
+        this.text = BI.createWidget({
-            this.setState(o.value);
+            type: "bi.text_button",
+            cls: "sign-editor-text",
+            title: o.title,
+            warningTitle: o.warningTitle,
+            tipType: o.tipType,
+            textAlign: "left",
+            height: o.height,
+            hgap: 4,
+            handler: function () {
+                self._showInput();
+                self.editor.focus();
+                self.editor.selectAll();
             }
+        });
+        this.text.on(BI.TextButton.EVENT_CHANGE, function () {
+            BI.nextTick(function () {
+                self.fireEvent(BI.SignInitialEditor.EVENT_CLICK_LABEL)
+            });
+        });
+        BI.createWidget({
+            type: "bi.absolute",
+            element: this,
+            items: [{
+                el: this.text,
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            }]
+        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+        this.editor.on(BI.Editor.EVENT_FOCUS, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS);
+            self.fireEvent(BI.SignInitialEditor.EVENT_FOCUS, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_BLUR, function () {
+        this.editor.on(BI.Editor.EVENT_BLUR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR);
+            self.fireEvent(BI.SignInitialEditor.EVENT_BLUR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CLICK, function () {
+        this.editor.on(BI.Editor.EVENT_CLICK, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CLICK, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CHANGE, function () {
+        this.editor.on(BI.Editor.EVENT_CHANGE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_CHANGE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function (v) {
+        this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) {
-            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN);
+            self.fireEvent(BI.SignInitialEditor.EVENT_KEY_DOWN, arguments);
         });
 
-        this.editor.on(BI.SignEditor.EVENT_VALID, function () {
+        this.editor.on(BI.Editor.EVENT_VALID, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_VALID);
+            self.fireEvent(BI.SignInitialEditor.EVENT_VALID, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_CONFIRM, function () {
+        this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
-            self.setState(self.editor.getValue());
+            self._showHint();
-            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_CONFIRM, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_START, function () {
+        this.editor.on(BI.Editor.EVENT_START, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_START);
+            self.fireEvent(BI.SignInitialEditor.EVENT_START, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_PAUSE, function () {
+        this.editor.on(BI.Editor.EVENT_PAUSE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_PAUSE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_STOP, function () {
+        this.editor.on(BI.Editor.EVENT_STOP, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_STOP);
+            self.fireEvent(BI.SignInitialEditor.EVENT_STOP, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_SPACE, function () {
+        this.editor.on(BI.Editor.EVENT_SPACE, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE);
+            self.fireEvent(BI.SignInitialEditor.EVENT_SPACE, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ERROR, function () {
+        this.editor.on(BI.Editor.EVENT_ERROR, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR);
+            self._checkText();
+            self.fireEvent(BI.SignInitialEditor.EVENT_ERROR, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_ENTER, function () {
+        this.editor.on(BI.Editor.EVENT_ENTER, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER);
+            self.fireEvent(BI.SignInitialEditor.EVENT_ENTER, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_RESTRICT, function () {
+        this.editor.on(BI.Editor.EVENT_RESTRICT, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT);
+            self.fireEvent(BI.SignInitialEditor.EVENT_RESTRICT, arguments);
         });
-        this.editor.on(BI.SignEditor.EVENT_EMPTY, function () {
+        this.editor.on(BI.Editor.EVENT_EMPTY, function () {
-            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY);
+            self.fireEvent(BI.SignInitialEditor.EVENT_EMPTY, arguments);
+        });
+        BI.createWidget({
+            type: "bi.vertical",
+            scrolly: false,
+            element: this,
+            items: [this.editor]
         });
+        this._showHint();
+        self._checkText();
+    },
+
+    _checkText: function () {
+        var o = this.options;
+        BI.nextTick(BI.bind(function () {
+            if (this.editor.getValue() === "") {
+                this.text.setValue(o.watermark || "");
+                this.text.element.addClass("bi-water-mark");
+            } else {
+                var v = this.editor.getValue();
+                v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
+                this.text.setValue(v);
+                this.text.element.removeClass("bi-water-mark");
+            }
+        }, this));
+    },
+
+    _showInput: function () {
+        this.editor.visible();
+        this.text.invisible();
+    },
+
+    _showHint: function () {
+        this.editor.invisible();
+        this.text.visible();
+    },
+
+    setTitle: function (title) {
+        this.text.setTitle(title);
+    },
+
+    setWarningTitle: function (title) {
+        this.text.setWarningTitle(title);
     },
 
     focus: function () {
+        this._showInput();
         this.editor.focus();
     },
 
     blur: function () {
         this.editor.blur();
+        this._showHint();
+        this._checkText();
+    },
+
+    doRedMark: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doRedMark.apply(this.text, arguments);
+    },
+
+    unRedMark: function () {
+        this.text.unRedMark.apply(this.text, arguments);
+    },
+
+    doHighLight: function () {
+        if (this.editor.getValue() === "" && BI.isKey(this.options.watermark)) {
+            return;
+        }
+        this.text.doHighLight.apply(this.text, arguments);
+    },
+
+    unHighLight: function () {
+        this.text.unHighLight.apply(this.text, arguments);
     },
 
     isValid: function () {
@@ -122,9 +215,19 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
         return this.editor.getErrorText();
     },
 
+    isEditing: function () {
+        return this.editor.isEditing();
+    },
+
+    getLastValidValue: function () {
+        return this.editor.getLastValidValue();
+    },
+
     setValue: function (v) {
+        var o = this.options;
         this.editor.setValue(v.value);
-        this.setState(v.value);
+        o.text = v.text || o.text;
+        this._checkText();
     },
 
     getValue: function () {
@@ -135,13 +238,13 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
     },
 
     getState: function () {
-        return this.editor.getState();
+        return this.text.getValue();
     },
 
     setState: function (v) {
-        var o = this.options;
+        this._showHint();
         v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
-        this.editor.setState(v);
+        this.text.setValue(v);
     }
 });
 BI.SignInitialEditor.EVENT_CHANGE = "EVENT_CHANGE";

src/css/resource/font.css

@@ -684,3 +684,49 @@
   content: "\e600";
   color: #f07d0a;
 }
+.less-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.less-font .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-font:hover .b-font:before,
+.less-font:focus .b-font:before,
+.less-font.hover .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-font:active .b-font:before,
+.less-font.active .b-font:before {
+  content: "\e633";
+  color: #3f8ce8;
+}
+.less-font.native .b-font:before,
+.less-font.disabled .b-font:before {
+  content: "\e633";
+  color: inherit;
+}
+.less-equal-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.less-equal-font .b-font:before {
+  content: "\e636";
+  color: inherit;
+}
+.less-equal-font:hover .b-font:before,
+.less-equal-font:focus .b-font:before,
+.less-equal-font.hover .b-font:before {
+  content: "\e636";
+  color: inherit;
+}
+.less-equal-font:active .b-font:before,
+.less-equal-font.active .b-font:before {
+  content: "\e636";
+  color: #3f8ce8;
+}
+.less-equal-font.native .b-font:before,
+.less-equal-font.disabled .b-font:before {
+  content: "\e636";
+  color: inherit;
+}

src/less/resource/font.less

@@ -80,3 +80,7 @@
 .font-hover(primary-key-font, @font-key);
 
 .font(drag-tag-font, @font-cross, @color-bi-text-redmark);
+
+//数值区间
+.font-hover-active(less-font, @font-less);
+.font-hover-active(less-equal-font, @font-less-equal);

src/widget/filemanager/nav/button/button.nav.filemanager.js

@@ -9,7 +9,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, {
 
     _const: {
         normal_color: "#ffffff",
-        select_color: "#f4f4f4"
+        select_color: "#eff1f4"
     },
     _defaultConfig: function () {
         return BI.extend(BI.FileManagerNavButton.superclass._defaultConfig.apply(this, arguments), {