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

6 years ago · 3a6dda3524
16 changed files with 21 additions and 20 deletions
--- a/demo/js/case/combo/demo.bubble_combo.js
+++ b/demo/js/case/combo/demo.bubble_combo.js
@ -100,7 +100,7 @@ Demo.Func = BI.inherit(BI.Widget, {
            element: this,
            items: [{
                el: combo1,
-                left: 10,
+                left: 150,
                top: 10
            }, {
                el: combo2,
--- a/public/css/font.css
+++ b/public/css/font.css
@ -8,7 +8,6 @@
  font-family: 'fineui';
  font-style: normal;
  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
  -moz-osx-font-smoothing: grayscale;
 }
 .close-font .b-font {
--- a/src/base/single/editor/editor.js
+++ b/src/base/single/editor/editor.js
@ -240,7 +240,7 @@ BI.Editor = BI.inherit(BI.Single, {
        var o = this.options;
        var errorText = o.errorText;
        if (BI.isFunction(errorText)) {
-            errorText = errorText(this.editor.getValue());
+            errorText = errorText(BI.trim(this.editor.getValue()));
        }
        if (!this.disabledError && BI.isKey(errorText)) {
            BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
--- a/src/base/single/editor/editor.textarea.js
+++ b/src/base/single/editor/editor.textarea.js
@ -30,9 +30,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                    type: "bi.adaptive",
                    items: [this.content]
                },
-                left: 10,
+                left: 4,
                right: 10,
-                top: 8,
+                top: 4,
                bottom: 8
            }]
        });
@ -81,9 +81,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                if (!this.watermark) {
                    this.watermark = BI.createWidget({
                        type: "bi.text_button",
-                        cls: "bi-water-mark",
+                        cls: "bi-water-mark cursor-default",
                        textAlign: "left",
-                        height: 30,
+                        height: 20,
                        text: o.watermark,
                        invalid: o.invalid,
                        disabled: o.disabled
@ -96,7 +96,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                        element: this,
                        items: [{
                            el: this.watermark,
-                            left: 10,
+                            left: 4,
                            top: 4,
                            right: 0
                        }]
--- a/src/css/core/normalize2.css
+++ b/src/css/core/normalize2.css
@ -46,6 +46,5 @@ li {
 }
 i {
  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
  -moz-osx-font-smoothing: grayscale;
 }
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@ -8,7 +8,6 @@
  font-family: 'fineui';
  font-style: normal;
  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
  -moz-osx-font-smoothing: grayscale;
 }
 .close-font .b-font {
--- a/src/less/core/normalize2.less
+++ b/src/less/core/normalize2.less
@ -59,6 +59,5 @@ li {
 i {
  //font-style: normal;
  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
  -moz-osx-font-smoothing: grayscale;
 }
--- a/src/less/image.less
+++ b/src/less/image.less
@ -342,7 +342,6 @@
  @baseProperty: {
    font-style: normal;
    -webkit-font-smoothing: antialiased;
-    -webkit-text-stroke-width: 0.2px;
    -moz-osx-font-smoothing: grayscale;
  };

--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/src/widget/dynamicdate/dynamicdate.combo.js
@ -52,6 +52,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                            max: opts.maxDate,
                            format: opts.format,
                            allowEdit: opts.allowEdit,
+                            watermark: opts.watermark,
                            height: opts.height,
                            value: opts.value,
                            ref: function () {
--- a/src/widget/dynamicdate/dynamicdate.trigger.js
+++ b/src/widget/dynamicdate/dynamicdate.trigger.js
@ -14,7 +14,8 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
        max: "2099-12-31", // 最大日期
        height: 24,
        format: "", // 显示的日期格式化方式
-        allowEdit: true // 是否允许编辑
+        allowEdit: true, // 是否允许编辑
+        watermark: ""
    },

    _init: function () {
@ -40,11 +41,11 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
            hgap: c.hgap,
            vgap: c.vgap,
            allowBlank: true,
-            watermark: BI.i18nText("BI-Basic_Unrestricted"),
+            watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
            errorText: function () {
                var str = "";
                if (!BI.isKey(o.format)) {
-                    str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text");
+                    str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
                }
                return str;
            },
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@ -51,6 +51,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                            min: opts.minDate,
                            max: opts.maxDate,
                            allowEdit: opts.allowEdit,
+                            watermark: opts.watermark,
                            format: opts.format,
                            height: opts.height,
                            value: opts.value,
--- a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
@ -14,7 +14,8 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
        max: "2099-12-31", // 最大日期
        height: 24,
        format: "", // 显示的日期格式化方式
-        allowEdit: true // 是否允许编辑
+        allowEdit: true, // 是否允许编辑
+        watermark: ""
    },

    _init: function () {
@ -40,7 +41,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
            hgap: c.hgap,
            vgap: c.vgap,
            allowBlank: true,
-            watermark: BI.i18nText("BI-Basic_Unrestricted"),
+            watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
            errorText: function () {
                var str = "";
                if (!BI.isKey(o.format)) {
--- a/src/widget/selecttree/selecttree.combo.js
+++ b/src/widget/selecttree/selecttree.combo.js
@ -7,7 +7,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
            baseCls: "bi-select-tree-combo",
-            height: 30,
+            height: 24,
            text: "",
            items: [],
            value: "",
--- a/src/widget/time/time.combo.js
+++ b/src/widget/time/time.combo.js
@ -66,6 +66,7 @@
                            el: {
                                type: "bi.time_trigger",
                                allowEdit: opts.allowEdit,
+                                watermark: opts.watermark,
                                format: opts.format,
                                value: opts.value,
                                ref: function (_ref) {
@ -212,6 +213,8 @@

    BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
    BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
+    BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
+    BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
    BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
    BI.shortcut("bi.time_combo", BI.TimeCombo);
 })();
--- a/src/widget/time/time.trigger.js
+++ b/src/widget/time/time.trigger.js
@ -49,7 +49,7 @@
                        value: this._formatValue(o.value),
                        hgap: 4,
                        allowBlank: true,
-                        watermark: BI.i18nText("BI-Basic_Unrestricted"),
+                        watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
                        title: BI.bind(this._getTitle, this),
                        listeners: [{
                            eventName: "EVENT_KEY_DOWN",
--- a/ui/css/font.css
+++ b/ui/css/font.css
@ -8,7 +8,6 @@
  font-family: 'fineui';
  font-style: normal;
  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
  -moz-osx-font-smoothing: grayscale;
 }
 .close-font .b-font {