Browse Source

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

* commit '1c79394691827ca287d3441529d7fefba81c4757':
  merge: build一下
  merge
  BI-41691 refactor: checkbox默认宽高和Event报错
es6
guy 6 years ago
parent
commit
77c7e279f1
  1. 2
      dist/2.0/fineui.css
  2. 7
      dist/2.0/fineui.ie.js
  3. 6
      dist/2.0/fineui.ie.min.js
  4. 7
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.min.css
  6. 6
      dist/2.0/fineui.min.js
  7. 2
      dist/base.css
  8. 4
      dist/base.js
  9. 2
      dist/bundle.css
  10. 7
      dist/bundle.ie.js
  11. 6
      dist/bundle.ie.min.js
  12. 7
      dist/bundle.js
  13. 2
      dist/bundle.min.css
  14. 6
      dist/bundle.min.js
  15. 3
      dist/case.js
  16. 2
      dist/fineui.css
  17. 7
      dist/fineui.ie.js
  18. 6
      dist/fineui.ie.min.js
  19. 7
      dist/fineui.js
  20. 2
      dist/fineui.min.css
  21. 6
      dist/fineui.min.js
  22. 7
      dist/fineui_without_jquery_polyfill.js
  23. 2
      dist/utils.min.js
  24. 4
      src/base/single/input/checkbox/checkbox.js
  25. 1
      src/case/editor/editor.sign.js
  26. 2
      src/case/editor/editor.state.js
  27. 2
      src/css/base/single/input/checkbox.css
  28. 2
      src/less/base/single/input/checkbox.less

2
dist/2.0/fineui.css vendored

@ -3542,7 +3542,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
left: 22%; left: 20%;
border: 2px solid transparent; border: 2px solid transparent;
border-top: 0; border-top: 0;
border-left: 0; border-left: 0;

7
dist/2.0/fineui.ie.js vendored

@ -44736,8 +44736,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },
@ -55741,6 +55741,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56007,7 +56008,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

6
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/2.0/fineui.js vendored

@ -45140,8 +45140,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },
@ -56145,6 +56145,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56411,7 +56412,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/base.css vendored

@ -1386,7 +1386,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
left: 22%; left: 20%;
border: 2px solid transparent; border: 2px solid transparent;
border-top: 0; border-top: 0;
border-left: 0; border-left: 0;

4
dist/base.js vendored

@ -9351,8 +9351,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },

2
dist/bundle.css vendored

@ -3542,7 +3542,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
left: 22%; left: 20%;
border: 2px solid transparent; border: 2px solid transparent;
border-top: 0; border-top: 0;
border-left: 0; border-left: 0;

7
dist/bundle.ie.js vendored

@ -44736,8 +44736,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },
@ -55741,6 +55741,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56007,7 +56008,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -45140,8 +45140,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },
@ -56145,6 +56145,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56411,7 +56412,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/case.js vendored

@ -6092,6 +6092,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -6358,7 +6359,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

2
dist/fineui.css vendored

@ -3542,7 +3542,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
left: 22%; left: 20%;
border: 2px solid transparent; border: 2px solid transparent;
border-top: 0; border-top: 0;
border-left: 0; border-left: 0;

7
dist/fineui.ie.js vendored

@ -44981,8 +44981,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },
@ -55986,6 +55986,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56252,7 +56253,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.js vendored

@ -45385,8 +45385,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },
@ -56390,6 +56390,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -56656,7 +56657,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui_without_jquery_polyfill.js vendored

@ -32916,8 +32916,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },
@ -39424,6 +39424,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {
@ -39690,7 +39691,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
src/base/single/input/checkbox/checkbox.js

@ -25,8 +25,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context bi-border", cls: "checkbox-context bi-border",
width: o.iconWidth, width: o.iconWidth - 2,
height: o.iconHeight height: o.iconHeight - 2
}] }]
}; };
}, },

1
src/case/editor/editor.sign.js

@ -134,6 +134,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();
this.text.doRedMark(o.keyword);
}, },
_checkText: function () { _checkText: function () {

2
src/case/editor/editor.state.js

@ -142,7 +142,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
items: [this.editor] items: [this.editor]
}); });
this._showHint(); this._showHint();
if(BI.isNotNull(o.text)){ if (BI.isNotNull(o.text)) {
this.setState(o.text); this.setState(o.text);
} }
}, },

2
src/css/base/single/input/checkbox.css

@ -7,7 +7,7 @@
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
left: 22%; left: 20%;
border: 2px solid transparent; border: 2px solid transparent;
border-top: 0; border-top: 0;
border-left: 0; border-left: 0;

2
src/less/base/single/input/checkbox.less

@ -7,7 +7,7 @@
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
left: 22%; left: 20%;
border: 2px solid transparent; border: 2px solid transparent;
border-top: 0; border-top: 0;
border-left: 0; border-left: 0;

Loading…
Cancel
Save