fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #380 in FUI/fineui from ~WINDY/fui:master to master 

* commit '6e8e43c8b5ea4255ce13ebc79788a07b1542fe49':
  update
  BI-19821
es6
guy 6 years ago
parent
7f57da816f 6e8e43c8b5
commit
72a3b0ce7b
17 changed files with 161 additions and 96 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. 36
      dist/_fineui.min.js
  2. 6
      dist/bundle.css
  3. 3
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 28
      dist/bundle.min.js
  6. 3
      dist/case.js
  7. 6
      dist/core.css
  8. 6
      dist/core_without_normalize.css
  9. 105
      dist/demo.js
  10. 6
      dist/fineui.css
  11. 3
      dist/fineui.js
  12. 2
      dist/fineui.min.css
  13. 36
      dist/fineui.min.js
  14. 1
      src/case/combo/textvaluecombo/popup.textvalue.js
  15. 2
      src/case/richeditor/richeditor.js
  16. 6
      src/css/core/utils/common.css
  17. 6
      src/less/core/utils/common.less

36
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/bundle.css vendored
Unescape View File

@ -394,12 +394,6 @@ 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;
}

3
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);
}
});
this.check();
BI.createWidget({
type: "bi.vertical",
@ -83998,13 +83999,11 @@ 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/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
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);
}
});
this.check();
BI.createWidget({
type: "bi.vertical",
@ -11542,13 +11543,11 @@ 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();
}

6
dist/core.css vendored
Unescape View File

@ -394,12 +394,6 @@ 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;
}

6
dist/core_without_normalize.css vendored
Unescape View File

@ -116,12 +116,6 @@ 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;
}

105
dist/demo.js vendored
Unescape View File

@ -11014,6 +11014,111 @@ BI.shortcut("demo.tmp", Demo.Func);
});
BI.shortcut("demo.fix_global_watcher", Demo.Fix);
}());(function () {
var State = BI.inherit(Fix.Model, {
state: function () {
return {
name: "原始属性",
info: {
age: 12,
sex: "male",
birth: {
year: 2018,
month: 9,
day: 11
}
},
career: [{
a: 1,
b: 2,
c: 3
}]
};
},
computed: {
b: function () {
return this.model.name + "-计算属性";
},
birth: function () {
return this.model.info.birth;
}
}
});
Demo.Fix = BI.inherit(BI.Widget, {
_store: function () {
return new State();
},
watch: {
b: function () {
this.button.setText(this.model.b);
},
"birth.**": function () {
console.log(123);
}
},
render: function () {
var self = this;
return {
type: "bi.vertical",
items: [{
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.name = "这是改变后的属性";
},
text: this.model.b
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.birth.year = 2019;
},
text: "birthYearButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career.push({
year: 2017,
month: 3,
day: 24
});
},
text: "careerAddButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career[0].a = 24;
},
text: "careerChangeButton"
}
}]
};
},
mounted: function () {
}
});
BI.shortcut("demo.fix_immutable", Demo.Fix);
}());/**
* @Author: Young
* @CreationDate 2017-11-06 10:32

6
dist/fineui.css vendored
Unescape View File

@ -394,12 +394,6 @@ 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;
}

3
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);
}
});
this.check();
BI.createWidget({
type: "bi.vertical",
@ -84241,13 +84242,11 @@ 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/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

36
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);
}
});
this.check();
BI.createWidget({
type: "bi.vertical",

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

@ -26,13 +26,11 @@ 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();
}

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

@ -116,12 +116,6 @@ 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;
}

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

@ -135,12 +135,6 @@ 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 {

Write Preview
Loading…
Cancel
Save