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

BI-19821

master
windy 7 years ago
parent
7b9e432862
commit
56fed8ca67
17 changed files with 130 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      dist/_fineui.min.js
  2. 11
      dist/bundle.css
  3. 7
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 38
      dist/bundle.min.js
  6. 7
      dist/case.js
  7. 11
      dist/core.css
  8. 11
      dist/core_without_normalize.css
  9. 11
      dist/fineui.css
  10. 7
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 38
      dist/fineui.min.js
  13. 1
      src/case/combo/textvaluecombo/popup.textvalue.js
  14. 2
      src/case/richeditor/niceditor/niceditor.js
  15. 4
      src/case/richeditor/richeditor.js
  16. 11
      src/css/core/utils/common.css
  17. 9
      src/less/core/utils/common.less

38
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/bundle.css vendored
Unescape View File

@ -394,11 +394,18 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border.bi-editor-focus { .bi-border.bi-nic-editor:hover,
.bi-border.bi-rich-editor:hover,
.bi-border.bi-nic-editor.hover,
.bi-border.bi-rich-editor.hover {
border: 1px solid #3685f2; border: 1px solid #3685f2;
} }
.bi-border.niceditor-focus { .bi-border.bi-rich-editor-focus,
.bi-border.bi-nic-editor-focus {
border: 1px solid #3685f2; border: 1px solid #3685f2;
-webkit-box-shadow: 0 0 0 2px #3685f2;
-moz-box-shadow: 0 0 0 2px #3685f2;
box-shadow: 0 0 0 2px #3685f2;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;

7
dist/bundle.js vendored
Unescape View File

@ -79195,6 +79195,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj); self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
} }
}); });
this.check();
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
@ -83317,6 +83318,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
this.ne.fireEvent("selected", e); this.ne.fireEvent("selected", e);
this.isFocused = true; this.isFocused = true;
this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
this.elm.element.addClass(prefix + "selected"); this.elm.element.addClass(prefix + "selected");
} }
// return false; // return false;
@ -83328,6 +83330,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
blur: function () { blur: function () {
this.isFocused = false; this.isFocused = false;
this.ne.element.removeClass("bi-nic-editor-focus");
this.elm.element.removeClass(prefix + "selected"); this.elm.element.removeClass(prefix + "selected");
}, },
@ -83998,13 +84001,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
listeners: [{ listeners: [{
eventName: BI.NicEditor.EVENT_BLUR, eventName: BI.NicEditor.EVENT_BLUR,
action: function () { action: function () {
self.element.removeClass("bi-editor-focus"); self.element.removeClass("bi-rich-editor-focus");
self.fireEvent(BI.RichEditor.EVENT_CONFIRM); self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
} }
}, { }, {
eventName: BI.NicEditor.EVENT_FOCUS, eventName: BI.NicEditor.EVENT_FOCUS,
action: function () { action: function () {
self.element.addClass("bi-editor-focus"); self.element.addClass("bi-rich-editor-focus");
if (!o.readOnly && !self.combo.isViewVisible()) { if (!o.readOnly && !self.combo.isViewVisible()) {
self.combo.showView(); self.combo.showView();
} }

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

38
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/case.js vendored
Unescape View File

@ -6739,6 +6739,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj); self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
} }
}); });
this.check();
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
@ -10861,6 +10862,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
this.ne.fireEvent("selected", e); this.ne.fireEvent("selected", e);
this.isFocused = true; this.isFocused = true;
this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
this.elm.element.addClass(prefix + "selected"); this.elm.element.addClass(prefix + "selected");
} }
// return false; // return false;
@ -10872,6 +10874,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
blur: function () { blur: function () {
this.isFocused = false; this.isFocused = false;
this.ne.element.removeClass("bi-nic-editor-focus");
this.elm.element.removeClass(prefix + "selected"); this.elm.element.removeClass(prefix + "selected");
}, },
@ -11542,13 +11545,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
listeners: [{ listeners: [{
eventName: BI.NicEditor.EVENT_BLUR, eventName: BI.NicEditor.EVENT_BLUR,
action: function () { action: function () {
self.element.removeClass("bi-editor-focus"); self.element.removeClass("bi-rich-editor-focus");
self.fireEvent(BI.RichEditor.EVENT_CONFIRM); self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
} }
}, { }, {
eventName: BI.NicEditor.EVENT_FOCUS, eventName: BI.NicEditor.EVENT_FOCUS,
action: function () { action: function () {
self.element.addClass("bi-editor-focus"); self.element.addClass("bi-rich-editor-focus");
if (!o.readOnly && !self.combo.isViewVisible()) { if (!o.readOnly && !self.combo.isViewVisible()) {
self.combo.showView(); self.combo.showView();
} }

11
dist/core.css vendored
Unescape View File

@ -394,11 +394,18 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border.bi-editor-focus { .bi-border.bi-nic-editor:hover,
.bi-border.bi-rich-editor:hover,
.bi-border.bi-nic-editor.hover,
.bi-border.bi-rich-editor.hover {
border: 1px solid #3685f2; border: 1px solid #3685f2;
} }
.bi-border.niceditor-focus { .bi-border.bi-rich-editor-focus,
.bi-border.bi-nic-editor-focus {
border: 1px solid #3685f2; border: 1px solid #3685f2;
-webkit-box-shadow: 0 0 0 2px #3685f2;
-moz-box-shadow: 0 0 0 2px #3685f2;
box-shadow: 0 0 0 2px #3685f2;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;

11
dist/core_without_normalize.css vendored
Unescape View File

@ -116,11 +116,18 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border.bi-editor-focus { .bi-border.bi-nic-editor:hover,
.bi-border.bi-rich-editor:hover,
.bi-border.bi-nic-editor.hover,
.bi-border.bi-rich-editor.hover {
border: 1px solid #3685f2; border: 1px solid #3685f2;
} }
.bi-border.niceditor-focus { .bi-border.bi-rich-editor-focus,
.bi-border.bi-nic-editor-focus {
border: 1px solid #3685f2; border: 1px solid #3685f2;
-webkit-box-shadow: 0 0 0 2px #3685f2;
-moz-box-shadow: 0 0 0 2px #3685f2;
box-shadow: 0 0 0 2px #3685f2;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;

11
dist/fineui.css vendored
Unescape View File

@ -394,11 +394,18 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border.bi-editor-focus { .bi-border.bi-nic-editor:hover,
.bi-border.bi-rich-editor:hover,
.bi-border.bi-nic-editor.hover,
.bi-border.bi-rich-editor.hover {
border: 1px solid #3685f2; border: 1px solid #3685f2;
} }
.bi-border.niceditor-focus { .bi-border.bi-rich-editor-focus,
.bi-border.bi-nic-editor-focus {
border: 1px solid #3685f2; border: 1px solid #3685f2;
-webkit-box-shadow: 0 0 0 2px #3685f2;
-moz-box-shadow: 0 0 0 2px #3685f2;
box-shadow: 0 0 0 2px #3685f2;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;

7
dist/fineui.js vendored
Unescape View File

@ -79438,6 +79438,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj); self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
} }
}); });
this.check();
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
@ -83560,6 +83561,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
this.ne.fireEvent("selected", e); this.ne.fireEvent("selected", e);
this.isFocused = true; this.isFocused = true;
this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
this.elm.element.addClass(prefix + "selected"); this.elm.element.addClass(prefix + "selected");
} }
// return false; // return false;
@ -83571,6 +83573,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
blur: function () { blur: function () {
this.isFocused = false; this.isFocused = false;
this.ne.element.removeClass("bi-nic-editor-focus");
this.elm.element.removeClass(prefix + "selected"); this.elm.element.removeClass(prefix + "selected");
}, },
@ -84241,13 +84244,13 @@ BI.RichEditor = BI.inherit(BI.Widget, {
listeners: [{ listeners: [{
eventName: BI.NicEditor.EVENT_BLUR, eventName: BI.NicEditor.EVENT_BLUR,
action: function () { action: function () {
self.element.removeClass("bi-editor-focus"); self.element.removeClass("bi-rich-editor-focus");
self.fireEvent(BI.RichEditor.EVENT_CONFIRM); self.fireEvent(BI.RichEditor.EVENT_CONFIRM);
} }
}, { }, {
eventName: BI.NicEditor.EVENT_FOCUS, eventName: BI.NicEditor.EVENT_FOCUS,
action: function () { action: function () {
self.element.addClass("bi-editor-focus"); self.element.addClass("bi-rich-editor-focus");
if (!o.readOnly && !self.combo.isViewVisible()) { if (!o.readOnly && !self.combo.isViewVisible()) {
self.combo.showView(); self.combo.showView();
} }

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

38
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/case/combo/textvaluecombo/popup.textvalue.js
Unescape View File

@ -29,6 +29,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj); self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
} }
}); });
this.check();
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",

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

@ -247,6 +247,7 @@
} }
this.ne.fireEvent("selected", e); this.ne.fireEvent("selected", e);
this.isFocused = true; this.isFocused = true;
this.ne.element.removeClass("bi-nic-editor-focus").addClass("bi-nic-editor-focus");
this.elm.element.addClass(prefix + "selected"); this.elm.element.addClass(prefix + "selected");
} }
// return false; // return false;
@ -258,6 +259,7 @@
blur: function () { blur: function () {
this.isFocused = false; this.isFocused = false;
this.ne.element.removeClass("bi-nic-editor-focus");
this.elm.element.removeClass(prefix + "selected"); this.elm.element.removeClass(prefix + "selected");
}, },

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

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

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

@ -116,11 +116,18 @@ textarea {
.bi-border { .bi-border {
border: 1px solid #d4dadd; border: 1px solid #d4dadd;
} }
.bi-border.bi-editor-focus { .bi-border.bi-nic-editor:hover,
.bi-border.bi-rich-editor:hover,
.bi-border.bi-nic-editor.hover,
.bi-border.bi-rich-editor.hover {
border: 1px solid #3685f2; border: 1px solid #3685f2;
} }
.bi-border.niceditor-focus { .bi-border.bi-rich-editor-focus,
.bi-border.bi-nic-editor-focus {
border: 1px solid #3685f2; border: 1px solid #3685f2;
-webkit-box-shadow: 0 0 0 2px #3685f2;
-moz-box-shadow: 0 0 0 2px #3685f2;
box-shadow: 0 0 0 2px #3685f2;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #525466; border: 1px solid #525466;

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

@ -135,11 +135,14 @@ textarea {
//边框 //边框
.bi-border { .bi-border {
border: 1px solid @color-bi-border-line; border: 1px solid @color-bi-border-line;
&.bi-editor-focus { &.bi-nic-editor, &.bi-rich-editor {
border: 1px solid @color-bi-border-highlight; &:hover, &.hover{
border: 1px solid @color-bi-border-highlight;
}
} }
&.niceditor-focus { &.bi-rich-editor-focus, &.bi-nic-editor-focus {
border: 1px solid @color-bi-border-highlight; border: 1px solid @color-bi-border-highlight;
.box-shadow(0 0 0 2px, @color-bi-border-highlight);
} }
} }

Write Preview
Loading…
Cancel
Save