Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

update

master
windy 7 years ago
parent
f3524fa194
commit
0877c9c4c0
19 changed files with 73 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      demo/js/base/editor/demo.editor.js
  2. 4
      dist/base.css
  3. 1
      dist/base.js
  4. 16
      dist/bundle.css
  5. 3
      dist/bundle.js
  6. 2
      dist/case.js
  7. 10
      dist/core.css
  8. 10
      dist/core_without_normalize.css
  9. 2
      dist/demo.js
  10. 16
      dist/fineui.css
  11. 3
      dist/fineui.js
  12. 2
      dist/widget.css
  13. 1
      src/base/single/editor/editor.js
  14. 2
      src/case/richeditor/richeditor.js
  15. 4
      src/css/base/single/button/button.css
  16. 10
      src/css/core/utils/common.css
  17. 2
      src/css/widget/filter/abstractitem/filter.css
  18. 6
      src/less/core/utils/common.less
  19. 2
      src/less/lib/constant.less

2
demo/js/base/editor/demo.editor.js
Unescape View File

@ -5,7 +5,7 @@ Demo.Editor = BI.inherit(BI.Widget, {
render: function () {
var editor1 = BI.createWidget({
type: "bi.editor",
cls: "mvc-border",
cls: "bi-border",
watermark: "alert信息显示在下面",
errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
width: 200,

4
dist/base.css vendored
Unescape View File

@ -1003,7 +1003,7 @@ body .bi-button,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
border: 1px solid #178cdf;
border: 1px solid #3685f2;
background-color: #3f8ce8;
text-align: center;
vertical-align: middle;
@ -1069,7 +1069,7 @@ body .bi-button.button-common.ghost:active,
body .bi-button.button-ignore,
#body .bi-button.button-ignore {
background-color: #ffffff;
border-color: #178cdf;
border-color: #3685f2;
}
body .bi-button.button-ignore,
#body .bi-button.button-ignore,

1
dist/base.js vendored
Unescape View File

@ -18398,6 +18398,7 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});

16
dist/bundle.css vendored
Unescape View File

@ -394,6 +394,12 @@ textarea {
.bi-border {
border: 1px solid #d4dadd;
}
.bi-border.bi-editor-focus {
border: 1px solid #3685f2;
}
.bi-border.niceditor-focus {
border: 1px solid #3685f2;
}
.bi-theme-dark .bi-border {
border: 1px solid #525466;
}
@ -450,7 +456,7 @@ textarea {
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
@ -578,7 +584,7 @@ textarea {
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
border: 1px solid #3685f2;
}
.bi-list-item-simple:hover,
.bi-list-item-simple.hover {
@ -3049,7 +3055,7 @@ body .bi-button,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
border: 1px solid #178cdf;
border: 1px solid #3685f2;
background-color: #3f8ce8;
text-align: center;
vertical-align: middle;
@ -3115,7 +3121,7 @@ body .bi-button.button-common.ghost:active,
body .bi-button.button-ignore,
#body .bi-button.button-ignore {
background-color: #ffffff;
border-color: #178cdf;
border-color: #3685f2;
}
body .bi-button.button-ignore,
#body .bi-button.button-ignore,
@ -4597,7 +4603,7 @@ ul.ztree.zTreeDragUL {
color: #999999;
}
.bi-filter-item .filter-item-empty-item .empty-filter-item-leaf {
border: 1px dashed #178cdf;
border: 1px dashed #3685f2;
background: #eaf2fd;
}
.bi-filter-expander {

3
dist/bundle.js vendored
Unescape View File

@ -54164,6 +54164,7 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -83997,11 +83998,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.NicEditor.EVENT_BLUR,
action: function () {
self.element.removeClass("bi-editor-focus");
self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
}
}, {
eventName: BI.NicEditor.EVENT_FOCUS,
action: function () {
self.element.addClass("bi-editor-focus");
if (!o.readOnly && !self.combo.isViewVisible()) {
self.combo.showView();
}

2
dist/case.js vendored
Unescape View File

@ -11542,11 +11542,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.NicEditor.EVENT_BLUR,
action: function () {
self.element.removeClass("bi-editor-focus");
self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
}
}, {
eventName: BI.NicEditor.EVENT_FOCUS,
action: function () {
self.element.addClass("bi-editor-focus");
if (!o.readOnly && !self.combo.isViewVisible()) {
self.combo.showView();
}

10
dist/core.css vendored
Unescape View File

@ -394,6 +394,12 @@ textarea {
.bi-border {
border: 1px solid #d4dadd;
}
.bi-border.bi-editor-focus {
border: 1px solid #3685f2;
}
.bi-border.niceditor-focus {
border: 1px solid #3685f2;
}
.bi-theme-dark .bi-border {
border: 1px solid #525466;
}
@ -450,7 +456,7 @@ textarea {
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
@ -578,7 +584,7 @@ textarea {
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
border: 1px solid #3685f2;
}
.bi-list-item-simple:hover,
.bi-list-item-simple.hover {

10
dist/core_without_normalize.css vendored
Unescape View File

@ -116,6 +116,12 @@ textarea {
.bi-border {
border: 1px solid #d4dadd;
}
.bi-border.bi-editor-focus {
border: 1px solid #3685f2;
}
.bi-border.niceditor-focus {
border: 1px solid #3685f2;
}
.bi-theme-dark .bi-border {
border: 1px solid #525466;
}
@ -172,7 +178,7 @@ textarea {
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
@ -300,7 +306,7 @@ textarea {
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
border: 1px solid #3685f2;
}
.bi-list-item-simple:hover,
.bi-list-item-simple.hover {

2
dist/demo.js vendored
Unescape View File

@ -717,7 +717,7 @@ BI.shortcut("demo.code_editor", Demo.CodeEditor);Demo.Editor = BI.inherit(BI.Wid
render: function () {
var editor1 = BI.createWidget({
type: "bi.editor",
cls: "mvc-border",
cls: "bi-border",
watermark: "alert信息显示在下面",
errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
width: 200,

16
dist/fineui.css vendored
Unescape View File

@ -394,6 +394,12 @@ textarea {
.bi-border {
border: 1px solid #d4dadd;
}
.bi-border.bi-editor-focus {
border: 1px solid #3685f2;
}
.bi-border.niceditor-focus {
border: 1px solid #3685f2;
}
.bi-theme-dark .bi-border {
border: 1px solid #525466;
}
@ -450,7 +456,7 @@ textarea {
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
@ -578,7 +584,7 @@ textarea {
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
border: 1px solid #3685f2;
}
.bi-list-item-simple:hover,
.bi-list-item-simple.hover {
@ -3049,7 +3055,7 @@ body .bi-button,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
border: 1px solid #178cdf;
border: 1px solid #3685f2;
background-color: #3f8ce8;
text-align: center;
vertical-align: middle;
@ -3115,7 +3121,7 @@ body .bi-button.button-common.ghost:active,
body .bi-button.button-ignore,
#body .bi-button.button-ignore {
background-color: #ffffff;
border-color: #178cdf;
border-color: #3685f2;
}
body .bi-button.button-ignore,
#body .bi-button.button-ignore,
@ -4597,7 +4603,7 @@ ul.ztree.zTreeDragUL {
color: #999999;
}
.bi-filter-item .filter-item-empty-item .empty-filter-item-leaf {
border: 1px dashed #178cdf;
border: 1px dashed #3685f2;
background: #eaf2fd;
}
.bi-filter-expander {

3
dist/fineui.js vendored
Unescape View File

@ -54407,6 +54407,7 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -84240,11 +84241,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.NicEditor.EVENT_BLUR,
action: function () {
self.element.removeClass("bi-editor-focus");
self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
}
}, {
eventName: BI.NicEditor.EVENT_FOCUS,
action: function () {
self.element.addClass("bi-editor-focus");
if (!o.readOnly && !self.combo.isViewVisible()) {
self.combo.showView();
}

2
dist/widget.css vendored
Unescape View File

@ -108,7 +108,7 @@
color: #999999;
}
.bi-filter-item .filter-item-empty-item .empty-filter-item-leaf {
border: 1px dashed #178cdf;
border: 1px dashed #3685f2;
background: #eaf2fd;
}
.bi-filter-expander {

1
src/base/single/editor/editor.js
Unescape View File

@ -98,6 +98,7 @@ BI.Editor = BI.inherit(BI.Single, {
element: this,
items: items
});
this.element[0].tabIndex = -1;
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});

2
src/case/richeditor/richeditor.js
Unescape View File

@ -26,11 +26,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.NicEditor.EVENT_BLUR,
action: function () {
self.element.removeClass("bi-editor-focus");
self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
}
}, {
eventName: BI.NicEditor.EVENT_FOCUS,
action: function () {
self.element.addClass("bi-editor-focus");
if (!o.readOnly && !self.combo.isViewVisible()) {
self.combo.showView();
}

4
src/css/base/single/button/button.css
Unescape View File

@ -3,7 +3,7 @@ body .bi-button,
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
border: 1px solid #178cdf;
border: 1px solid #3685f2;
background-color: #3f8ce8;
text-align: center;
vertical-align: middle;
@ -69,7 +69,7 @@ body .bi-button.button-common.ghost:active,
body .bi-button.button-ignore,
#body .bi-button.button-ignore {
background-color: #ffffff;
border-color: #178cdf;
border-color: #3685f2;
}
body .bi-button.button-ignore,
#body .bi-button.button-ignore,

10
src/css/core/utils/common.css
Unescape View File

@ -116,6 +116,12 @@ textarea {
.bi-border {
border: 1px solid #d4dadd;
}
.bi-border.bi-editor-focus {
border: 1px solid #3685f2;
}
.bi-border.niceditor-focus {
border: 1px solid #3685f2;
}
.bi-theme-dark .bi-border {
border: 1px solid #525466;
}
@ -172,7 +178,7 @@ textarea {
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
@ -300,7 +306,7 @@ textarea {
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
border: 1px solid #3685f2;
}
.bi-list-item-simple:hover,
.bi-list-item-simple.hover {

2
src/css/widget/filter/abstractitem/filter.css
Unescape View File

@ -1,4 +1,4 @@
.bi-filter-item .filter-item-empty-item .empty-filter-item-leaf {
border: 1px dashed #178cdf;
border: 1px dashed #3685f2;
background: #eaf2fd;
}

6
src/less/core/utils/common.less
Unescape View File

@ -135,6 +135,12 @@ textarea {
//边框
.bi-border {
border: 1px solid @color-bi-border-line;
&.bi-editor-focus {
border: 1px solid @color-bi-border-highlight;
}
&.niceditor-focus {
border: 1px solid @color-bi-border-highlight;
}
}
.bi-theme-dark {

2
src/less/lib/constant.less
Unescape View File

@ -56,7 +56,7 @@
@border-color-black: #1a1a1a;
@border-color-line: #d4dadd;
@border-color-line-theme-dark: #525466;
@border-color-highlight: #178cdf;
@border-color-highlight: #3685f2;
@border-color-warning: #fbb03b;
@border-color-negative: #e85050;

Write Preview
Loading…
Cancel
Save