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

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

* commit '0968433b26988e399ab6c26d5dfbd5a72183d4fe':
  DEC-6957 fix: 去掉内联
es6
windy 6 years ago
parent
83ba6e76c6 0968433b26
commit
55c08ca274
17 changed files with 143 additions and 47 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. 2
      dist/2.0/fineui.ie.js
  2. 12
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.js
  4. 12
      dist/2.0/fineui.min.js
  5. 2
      dist/base.js
  6. 2
      dist/bundle.ie.js
  7. 12
      dist/bundle.ie.min.js
  8. 2
      dist/bundle.js
  9. 12
      dist/bundle.min.js
  10. 98
      dist/demo.js
  11. 2
      dist/fineui.ie.js
  12. 12
      dist/fineui.ie.min.js
  13. 2
      dist/fineui.js
  14. 12
      dist/fineui.min.js
  15. 2
      dist/fineui_without_jquery_polyfill.js
  16. 2
      dist/utils.min.js
  17. 2
      src/base/single/editor/editor.textarea.js

2
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -44317,7 +44317,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

12
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.js vendored
Unescape View File

@ -44721,7 +44721,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

12
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/base.js vendored
Unescape View File

@ -8932,7 +8932,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

2
dist/bundle.ie.js vendored
Unescape View File

@ -44317,7 +44317,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

12
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/bundle.js vendored
Unescape View File

@ -44721,7 +44721,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

12
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

98
dist/demo.js vendored
Unescape View File

@ -6183,7 +6183,103 @@ Demo.VtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.vtape", Demo.VtapeLayout);/** BI.shortcut("demo.vtape", Demo.VtapeLayout);// !(function () {
// BI.constant("bi.constant.report.server.param_setting", {
// TAB: [{
// text: BI.i18"分页预览设置",
// value: "SPLIT_PAGE_PREVIEW_SETTING"
// }, {
// text: "填报页面设置",
// value
// }, {
// text: "数据分析设置"
// }, {
// text: ""
// }, {
//
// }, {
//
// }]
// SPLIT_PAGE_PREVIEW_SETTING: 1,
// FORM_PAGE_SETTING: 2,
// DATA_ANALYSIS_SETTING: 3,
// IMPORT_CSS: 4,
// IMPORT_JS: 5,
// ERROR_TEMPLATE_DEFINE: 6,
// PRINT_SETTING: 7
// });
// })();// !(function () {
//
// var constants = {
// SPLIT_PAGE_PREVIEW_SETTING: 1,
// FORM_PAGE_SETTING: 2,
// DATA_ANALYSIS_SETTING: 3,
// IMPORT_CSS: 4,
// IMPORT_JS: 5,
// ERROR_TEMPLATE_DEFINE: 6,
// PRINT_SETTING: 7
// };
//
// var Tab = BI.inherit(BI.Widget, {
//
// props: {
// baseCls: "bi-report-server-param-setting"
// },
//
// render: function () {
// return {
// type: "bi.vtape",
// items: [{
// type: "bi.vertical_adapt",
// cls: "tab-group",
// items: [{
// type: "bi.button_group",
// items: [],
// layouts: [{
// type: "bi.left"
// }],
// listeners: [{
// eventName: BI.ButtonGroup.EVENT_CHANGE,
// action: function (v) {
//
// }
// }],
// ref: function (_ref) {
// // self.buttons = _ref;
// }
// }],
// height: 24
// }, {
// type: "bi.tab",
// cls: "bi-card",
// cardCreator: BI.bind(this._createCard, this),
// ref: function (ref) {
// // self.tableTab = ref;
// }
// }]
// };
// },
//
// _createTabItem: function() {
// return BI.map()
// },
//
// _createCard: function (v) {
// switch (v) {
// case SPLIT_PAGE_PREVIEW_SETTING:
// case FORM_PAGE_SETTING:
// case DATA_ANALYSIS_SETTING: 3,
// case IMPORT_CSS: 4,
// case IMPORT_JS: 5,
// case ERROR_TEMPLATE_DEFINE: 6,
// case PRINT_SETTING: 7
// }
// }
//
// });
//
// BI.shortcut("bi.report.server.param_setting", Tab);
/** })(); **//**
* Created by Windy on 2017/12/13. * Created by Windy on 2017/12/13.
*/ */
Demo.Func = BI.inherit(BI.Widget, { Demo.Func = BI.inherit(BI.Widget, {

2
dist/fineui.ie.js vendored
Unescape View File

@ -44562,7 +44562,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

12
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored
Unescape View File

@ -44966,7 +44966,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

12
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -32497,7 +32497,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/base/single/editor/editor.textarea.js
Unescape View File

@ -21,7 +21,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none", whiteSpace: "normal"}); this.content.element.css({resize: "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

Write Preview
Loading…
Cancel
Save