Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

dist/2.0/fineui.css

@@ -3454,6 +3454,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   cursor: pointer;
   font-size: 100px;
   z-index: 2;
+  margin-left: -5px;
 }
 
 .bi-textarea-editor {

dist/base.css

@@ -1244,6 +1244,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   cursor: pointer;
   font-size: 100px;
   z-index: 2;
+  margin-left: -5px;
 }
 
 .bi-textarea-editor {

dist/bundle.css

@@ -3454,6 +3454,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   cursor: pointer;
   font-size: 100px;
   z-index: 2;
+  margin-left: -5px;
 }
 
 .bi-textarea-editor {

dist/case.js

@@ -5297,159 +5297,6 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
 });
 BI.TextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.text_value_combo_popup", BI.TextValueComboPopup);/**
- * @class BI.TextValueDownListCombo
- * @extend BI.Widget
- */
-BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
-    _defaultConfig: function () {
-        return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-down-list-combo",
-            height: 24,
-            attributes: {
-                tabIndex: 0
-            }
-        });
-    },
-
-    _init: function () {
-        BI.TextValueDownListCombo.superclass._init.apply(this, arguments);
-        var self = this, o = this.options;
-
-        this._createValueMap();
-
-        var value;
-        if(BI.isNotNull(o.value)) {
-            value = this._digest(o.value);
-        }
-        this.trigger = BI.createWidget({
-            type: "bi.down_list_select_text_trigger",
-            cls: "text-value-down-list-trigger",
-            height: o.height,
-            items: o.items,
-            text: o.text,
-            value: value
-        });
-
-        this.combo = BI.createWidget({
-            type: "bi.down_list_combo",
-            element: this,
-            chooseType: BI.Selection.Single,
-            adjustLength: 2,
-            height: o.height,
-            el: this.trigger,
-            value: BI.isNull(value) ? [] : [value],
-            items: BI.deepClone(o.items)
-        });
-
-        this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
-            var currentVal = self.combo.getValue()[0].value;
-            if (currentVal !== self.value) {
-                self.setValue(currentVal);
-                self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
-            }
-        });
-
-        this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
-            var currentVal = self.combo.getValue()[0].childValue;
-            if (currentVal !== self.value) {
-                self.setValue(currentVal);
-                self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
-            }
-        });
-    },
-
-    _createValueMap: function () {
-        var self = this;
-        this.valueMap = {};
-        BI.each(BI.flatten(this.options.items), function (idx, item) {
-            if (BI.has(item, "el")) {
-                BI.each(item.children, function (id, it) {
-                    self.valueMap[it.value] = {value: item.el.value, childValue: it.value};
-                });
-            } else {
-                self.valueMap[item.value] = {value: item.value};
-            }
-        });
-    },
-
-    _digest: function (v) {
-        this.value = v;
-        return this.valueMap[v];
-    },
-
-    setValue: function (v) {
-        v = this._digest(v);
-        this.combo.setValue([v]);
-        this.trigger.setValue(v);
-    },
-
-    getValue: function () {
-        var v = this.combo.getValue()[0];
-        return [v.childValue || v.value];
-    },
-
-    populate: function (items) {
-        this.options.items = BI.flatten(items);
-        this.combo.populate(items);
-        this._createValueMap();
-    }
-});
-BI.TextValueDownListCombo.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.text_value_down_list_combo", BI.TextValueDownListCombo);/**
- * 选择字段trigger, downlist专用
- * 显示形式为 父亲值(儿子值)
- *
- * @class BI.DownListSelectTextTrigger
- * @extends BI.Trigger
- */
-BI.DownListSelectTextTrigger = BI.inherit(BI.Trigger, {
-
-    _defaultConfig: function () {
-        return BI.extend(BI.DownListSelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-down-list-select-text-trigger",
-            height: 24,
-            text: ""
-        });
-    },
-
-    _init: function () {
-        BI.DownListSelectTextTrigger.superclass._init.apply(this, arguments);
-        var o = this.options;
-        this.trigger = BI.createWidget({
-            type: "bi.select_text_trigger",
-            element: this,
-            height: o.height,
-            items: this._formatItemArray(o.items),
-            text: o.text,
-            value: BI.isNull(o.value) ? "" : o.value.childValue || o.value.value
-        });
-    },
-
-    _formatItemArray: function () {
-        var sourceArray = BI.flatten(BI.deepClone(this.options.items));
-        var targetArray = [];
-        BI.each(sourceArray, function (idx, item) {
-            if(BI.has(item, "el")) {
-                BI.each(item.children, function (id, it) {
-                    it.text = item.el.text + "(" + it.text + ")";
-                });
-                targetArray = BI.concat(targetArray, item.children);
-            }else{
-                targetArray.push(item);
-            }
-        });
-        return targetArray;
-    },
-
-    setValue: function (vals) {
-        this.trigger.setValue(vals.childValue || vals.value);
-    },
-
-    populate: function (items) {
-        this.trigger.populate(this._formatItemArray(items));
-    }
-});
-BI.shortcut("bi.down_list_select_text_trigger", BI.DownListSelectTextTrigger);/**
  * 有清楚按钮的文本框
  * Created by GUY on 2015/9/29.
  * @class BI.SmallTextEditor

dist/fineui.css

@@ -3454,6 +3454,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   cursor: pointer;
   font-size: 100px;
   z-index: 2;
+  margin-left: -5px;
 }
 
 .bi-textarea-editor {

dist/fix/fix.compact.js

@@ -13,10 +13,15 @@
         }
     }
 
-    function createWatcher (vm, keyOrFn, handler) {
+    function createWatcher(vm, keyOrFn, cb, options) {
-        return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
+        if (BI.isPlainObject(cb)) {
+            options = cb;
+            cb = cb.handler;
+        }
+        options = options || {};
+        return Fix.watch(vm.model, keyOrFn, _.bind(cb, vm), BI.extend(options, {
             store: vm.store
-        });
+        }));
     }
 
     var target = null;