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

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
8148233f90 c58f649b07
commit
e1fb957a10
11 changed files with 2255 additions and 2235 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
      bi/base.js
  2. 15
      demo/js/category/canvasTable/large.table.canvas.js
  3. 0
      demo/js/category/canvasTable/new.canvas.js
  4. 15
      demo/js/category/largeTable/largeTable.js
  5. 2
      dist/base.js
  6. 2
      dist/bundle.js
  7. 2
      dist/bundle.min.js
  8. 30
      dist/demo.js
  9. 2
      src/base/single/editor/editor.code.js

2
bi/base.js
Unescape View File

@ -19023,7 +19023,7 @@ BI.shortcut("bi.text_node", BI.TextNode);/**
BI.CodeEditor = BI.inherit(BI.Single, {
_defaultConfig: function () {
return $.extend(BI.CodeEditor.superclass._defaultConfig.apply(), {
baseCls: 'bi-code-editor bi-card',
baseCls: 'bi-code-editor',
value: '',
watermark: "",
lineHeight: 2,

15
demo/js/category/canvasTable/largeTableCanvas.js → demo/js/category/canvasTable/large.table.canvas.js
Unescape View File

@ -72,8 +72,13 @@ Demo.CanvasTable = BI.inherit(BI.Widget, {
mounted: function () {
var self = this;
var tableItems = this._expandData(TABLE_ITEMS, 3),
headItems = this._expandHeadData(TABLE_HEADER, 3);
if (BI.isNull(BI.isExpanded)) {
BI.isExpanded = false;
} else if (!BI.isExpanded) {
TABLE_ITEMS = this._expandData(TABLE_ITEMS, 3);
TABLE_HEADER = this._expandHeadData(TABLE_HEADER, 3);
BI.isExpanded = true;
}
this._resizeHandler = BI.debounce(function () {
var width = self.element.width(), height = self.element.height();
if (self.table.getWidth() !== width || self.table.getHeight() !== height) {
@ -87,14 +92,14 @@ Demo.CanvasTable = BI.inherit(BI.Widget, {
});
this.table.setWidth(this.element.width());
this.table.setHeight(this.element.height());
this.table.attr("columnSize", BI.makeArray(headItems[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(headItems[0].length, 60));
this.table.attr("columnSize", BI.makeArray(TABLE_HEADER[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(TABLE_HEADER[0].length, 60));
this.table.attr("isNeedFreeze", true);
this.table.attr("freezeCols", []);
this.table.attr("showSequence", true);
this.table.attr("headerRowSize", 15);
this.table.attr("rowSize", 15);
this.table.populate(tableItems, headItems);
this.table.populate(TABLE_ITEMS, TABLE_HEADER);
},
_expandData: function (items, times) {

0
demo/js/category/canvasTable/newCanvas.js → demo/js/category/canvasTable/new.canvas.js
Unescape View File

15
demo/js/category/largeTable/largeTable.js
Unescape View File

@ -72,8 +72,13 @@ Demo.Face = BI.inherit(BI.Widget, {
mounted: function () {
var self = this;
var tableItems = this._expandData(TABLE_ITEMS, 3),
headItems = this._expandHeadData(TABLE_HEADER, 3);
if (BI.isNull(BI.isExpanded)) {
BI.isExpanded = false;
} else if (!BI.isExpanded) {
TABLE_ITEMS = this._expandData(TABLE_ITEMS, 3);
TABLE_HEADER = this._expandHeadData(TABLE_HEADER, 3);
BI.isExpanded = true;
}
this._resizeHandler = BI.debounce(function () {
var width = self.element.width(), height = self.element.height();
if (self.table.getWidth() !== width || self.table.getHeight() !== height) {
@ -87,14 +92,14 @@ Demo.Face = BI.inherit(BI.Widget, {
});
this.table.setWidth(this.element.width());
this.table.setHeight(this.element.height());
this.table.attr("columnSize", BI.makeArray(headItems[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(headItems[0].length, 60));
this.table.attr("columnSize", BI.makeArray(TABLE_HEADER[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(TABLE_HEADER[0].length, 60));
this.table.attr("isNeedFreeze", true);
this.table.attr("freezeCols", []);
this.table.attr("showSequence", true);
this.table.attr("headerRowSize", 15);
this.table.attr("rowSize", 15);
this.table.populate(tableItems, headItems);
this.table.populate(TABLE_ITEMS, TABLE_HEADER);
},
_expandData: function (items, times) {

2
dist/base.js vendored
Unescape View File

@ -19023,7 +19023,7 @@ BI.shortcut("bi.text_node", BI.TextNode);/**
BI.CodeEditor = BI.inherit(BI.Single, {
_defaultConfig: function () {
return $.extend(BI.CodeEditor.superclass._defaultConfig.apply(), {
baseCls: 'bi-code-editor bi-card',
baseCls: 'bi-code-editor',
value: '',
watermark: "",
lineHeight: 2,

2
dist/bundle.js vendored
Unescape View File

@ -48052,7 +48052,7 @@ BI.shortcut("bi.text_node", BI.TextNode);/**
BI.CodeEditor = BI.inherit(BI.Single, {
_defaultConfig: function () {
return $.extend(BI.CodeEditor.superclass._defaultConfig.apply(), {
baseCls: 'bi-code-editor bi-card',
baseCls: 'bi-code-editor',
value: '',
watermark: "",
lineHeight: 2,

2
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

30
dist/demo.js vendored
Unescape View File

@ -4003,8 +4003,13 @@ BI.shortcut("demo.text_trigger", Demo.Func);Demo.CanvasTable = BI.inherit(BI.Wid
mounted: function () {
var self = this;
var tableItems = this._expandData(TABLE_ITEMS, 3),
headItems = this._expandHeadData(TABLE_HEADER, 3);
if (BI.isNull(BI.isExpanded)) {
BI.isExpanded = false;
} else if (!BI.isExpanded) {
TABLE_ITEMS = this._expandData(TABLE_ITEMS, 3);
TABLE_HEADER = this._expandHeadData(TABLE_HEADER, 3);
BI.isExpanded = true;
}
this._resizeHandler = BI.debounce(function () {
var width = self.element.width(), height = self.element.height();
if (self.table.getWidth() !== width || self.table.getHeight() !== height) {
@ -4018,14 +4023,14 @@ BI.shortcut("demo.text_trigger", Demo.Func);Demo.CanvasTable = BI.inherit(BI.Wid
});
this.table.setWidth(this.element.width());
this.table.setHeight(this.element.height());
this.table.attr("columnSize", BI.makeArray(headItems[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(headItems[0].length, 60));
this.table.attr("columnSize", BI.makeArray(TABLE_HEADER[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(TABLE_HEADER[0].length, 60));
this.table.attr("isNeedFreeze", true);
this.table.attr("freezeCols", []);
this.table.attr("showSequence", true);
this.table.attr("headerRowSize", 15);
this.table.attr("rowSize", 15);
this.table.populate(tableItems, headItems);
this.table.populate(TABLE_ITEMS, TABLE_HEADER);
},
_expandData: function (items, times) {
@ -4657,8 +4662,13 @@ BI.shortcut("bi.detail_table_header", BI.DetailTableHeader);Demo.Face = BI.inher
mounted: function () {
var self = this;
var tableItems = this._expandData(TABLE_ITEMS, 3),
headItems = this._expandHeadData(TABLE_HEADER, 3);
if (BI.isNull(BI.isExpanded)) {
BI.isExpanded = false;
} else if (!BI.isExpanded) {
TABLE_ITEMS = this._expandData(TABLE_ITEMS, 3);
TABLE_HEADER = this._expandHeadData(TABLE_HEADER, 3);
BI.isExpanded = true;
}
this._resizeHandler = BI.debounce(function () {
var width = self.element.width(), height = self.element.height();
if (self.table.getWidth() !== width || self.table.getHeight() !== height) {
@ -4672,14 +4682,14 @@ BI.shortcut("bi.detail_table_header", BI.DetailTableHeader);Demo.Face = BI.inher
});
this.table.setWidth(this.element.width());
this.table.setHeight(this.element.height());
this.table.attr("columnSize", BI.makeArray(headItems[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(headItems[0].length, 60));
this.table.attr("columnSize", BI.makeArray(TABLE_HEADER[0].length, ""));
this.table.attr("minColumnSize", BI.makeArray(TABLE_HEADER[0].length, 60));
this.table.attr("isNeedFreeze", true);
this.table.attr("freezeCols", []);
this.table.attr("showSequence", true);
this.table.attr("headerRowSize", 15);
this.table.attr("rowSize", 15);
this.table.populate(tableItems, headItems);
this.table.populate(TABLE_ITEMS, TABLE_HEADER);
},
_expandData: function (items, times) {

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

@ -7,7 +7,7 @@
BI.CodeEditor = BI.inherit(BI.Single, {
_defaultConfig: function () {
return $.extend(BI.CodeEditor.superclass._defaultConfig.apply(), {
baseCls: 'bi-code-editor bi-card',
baseCls: 'bi-code-editor',
value: '',
watermark: "",
lineHeight: 2,

Write Preview
Loading…
Cancel
Save