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

* commit '149f1ea42527cebe473827f5fd9b2e7a507bc0aa':
  BI-24611 && BI-25107

demo/js/case/combo/demo.icon_text_value_combo.js

@@ -13,7 +13,7 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
                 type: "bi.icon_text_value_combo",
                 text: "默认值",
                 // defaultIconCls: "next-page-h-font",
-                value: 23,
+                value: 1,
                 width: 300,
                 iconHeight: 16,
                 iconWidth: 16,

demo/js/case/combo/demo.text_value_combo.js

@@ -8,7 +8,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
     render: function () {
         var combo;
         return {
-            type: "bi.horizontal_auto",
+            type: "bi.vertical",
             items: [{
                 type: "bi.text_value_combo",
                 ref: function () {
@@ -39,12 +39,15 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
                     value: ["1", "2", "3"]
                 }
             }, {
-                type: "bi.button",
+                type: "bi.popup_view",
                 width: 90,
                 height: 25,
                 handler: function () {
                     combo.setValue(3);
                 }
+            }, {
+                type: 'bi.label',
+                height: 1000
             }],
             vgap: 20
         };

dist/base.js

@@ -14648,7 +14648,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + field + "\u200b");
         var to = this.editor.getCursor();
         this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 
@@ -15594,7 +15593,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
         BI.PopupView.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         var fn = function (e) {
-                e.stopPropagation();
+                e.stopEvent();
             }, stop = function (e) {
                 e.stopEvent();
                 return false;

dist/bundle.css

@@ -394,6 +394,11 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
+.bi-border-radius {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;
 }
@@ -741,7 +746,6 @@ textarea {
 }
 .bi-list-item-active.active {
   color: #3685f2;
-  background-color: #ffffff;
 }
 .bi-list-item-active.active .bi-input {
   color: #3685f2;

dist/bundle.js

@@ -50418,7 +50418,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + field + "\u200b");
         var to = this.editor.getCursor();
         this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 
@@ -51364,7 +51363,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
         BI.PopupView.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         var fn = function (e) {
-                e.stopPropagation();
+                e.stopEvent();
             }, stop = function (e) {
                 e.stopEvent();
                 return false;
@@ -87288,7 +87287,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
             items: [{
                 el: {
                     type: "bi.icon_change_button",
-                    cls: "icon-combo-trigger-icon " + o.iconCls,
+                    cls: "icon-combo-trigger-icon",
+                    iconCls: o.iconCls,
                     ref: function (_ref) {
                         self.icon = _ref;
                     },

dist/case.js

@@ -14804,7 +14804,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
             items: [{
                 el: {
                     type: "bi.icon_change_button",
-                    cls: "icon-combo-trigger-icon " + o.iconCls,
+                    cls: "icon-combo-trigger-icon",
+                    iconCls: o.iconCls,
                     ref: function (_ref) {
                         self.icon = _ref;
                     },

dist/core.css

@@ -394,6 +394,11 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
+.bi-border-radius {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;
 }
@@ -741,7 +746,6 @@ textarea {
 }
 .bi-list-item-active.active {
   color: #3685f2;
-  background-color: #ffffff;
 }
 .bi-list-item-active.active .bi-input {
   color: #3685f2;

dist/core_without_normalize.css

@@ -116,6 +116,11 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
+.bi-border-radius {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;
 }
@@ -463,7 +468,6 @@ textarea {
 }
 .bi-list-item-active.active {
   color: #3685f2;
-  background-color: #ffffff;
 }
 .bi-list-item-active.active .bi-input {
   color: #3685f2;

dist/demo.js

@@ -2030,7 +2030,7 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
                 type: "bi.icon_text_value_combo",
                 text: "默认值",
                 // defaultIconCls: "next-page-h-font",
-                value: 23,
+                value: 1,
                 width: 300,
                 iconHeight: 16,
                 iconWidth: 16,
@@ -2191,7 +2191,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
     render: function () {
         var combo;
         return {
-            type: "bi.horizontal_auto",
+            type: "bi.vertical",
             items: [{
                 type: "bi.text_value_combo",
                 ref: function () {
@@ -2222,12 +2222,15 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
                     value: ["1", "2", "3"]
                 }
             }, {
-                type: "bi.button",
+                type: "bi.popup_view",
                 width: 90,
                 height: 25,
                 handler: function () {
                     combo.setValue(3);
                 }
+            }, {
+                type: 'bi.label',
+                height: 1000
             }],
             vgap: 20
         };

dist/fineui.css

@@ -394,6 +394,11 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
+.bi-border-radius {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;
 }
@@ -741,7 +746,6 @@ textarea {
 }
 .bi-list-item-active.active {
   color: #3685f2;
-  background-color: #ffffff;
 }
 .bi-list-item-active.active .bi-input {
   color: #3685f2;

dist/fineui.js

@@ -50661,7 +50661,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + field + "\u200b");
         var to = this.editor.getCursor();
         this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 
@@ -51607,7 +51606,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
         BI.PopupView.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         var fn = function (e) {
-                e.stopPropagation();
+                e.stopEvent();
             }, stop = function (e) {
                 e.stopEvent();
                 return false;
@@ -87531,7 +87530,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
             items: [{
                 el: {
                     type: "bi.icon_change_button",
-                    cls: "icon-combo-trigger-icon " + o.iconCls,
+                    cls: "icon-combo-trigger-icon",
+                    iconCls: o.iconCls,
                     ref: function (_ref) {
                         self.icon = _ref;
                     },

src/base/formula/formulaeditor.js

@@ -125,7 +125,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + field + "\u200b");
         var to = this.editor.getCursor();
         this.editor.markText(from, to, {className: "fieldName", atomic: true, startStyle: "start", endStyle: "end"});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 

src/base/layer/layer.popup.js

@@ -44,7 +44,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
         BI.PopupView.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         var fn = function (e) {
-                e.stopPropagation();
+                e.stopEvent();
             }, stop = function (e) {
                 e.stopEvent();
                 return false;

src/case/trigger/trigger.icon.text.js

@@ -44,7 +44,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
             items: [{
                 el: {
                     type: "bi.icon_change_button",
-                    cls: "icon-combo-trigger-icon " + o.iconCls,
+                    cls: "icon-combo-trigger-icon",
+                    iconCls: o.iconCls,
                     ref: function (_ref) {
                         self.icon = _ref;
                     },

src/css/core/utils/common.css

@@ -116,6 +116,11 @@ textarea {
 .bi-border {
   border: 1px solid #d4dadd;
 }
+.bi-border-radius {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
 .bi-theme-dark .bi-border {
   border: 1px solid #525466;
 }
@@ -463,7 +468,6 @@ textarea {
 }
 .bi-list-item-active.active {
   color: #3685f2;
-  background-color: #ffffff;
 }
 .bi-list-item-active.active .bi-input {
   color: #3685f2;

src/less/core/utils/common.less

@@ -137,6 +137,10 @@ textarea {
   border: 1px solid @color-bi-border-line;
 }
 
+.bi-border-radius {
+  .border-radius(2px);
+}
+
 .bi-theme-dark {
   .bi-border {
     border: 1px solid @color-bi-border-line-theme-dark;
@@ -510,7 +514,6 @@ textarea {
     & .bi-textarea {
       color: @color-bi-text-highlight;
     }
-    background-color: @color-bi-background-default;
   }
   &.disabled {
     &, &:hover, &:active {