From 72aa1a5beb3a27dde55833c0211fe8d8fedf225a Mon Sep 17 00:00:00 2001 From: young Date: Tue, 11 Apr 2017 16:49:56 +0800 Subject: [PATCH 1/2] columnSize --- bi/base.js | 2 +- bi/case.js | 4 ++-- docs/base.js | 2 +- docs/case.js | 4 ++-- src/case/table/table.dynamicsummarytree.js | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bi/base.js b/bi/base.js index 887230249..ee98ff7a1 100644 --- a/bi/base.js +++ b/bi/base.js @@ -18301,7 +18301,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/** if (199 < xhr.status && xhr.status < 400) { upload["onload"]({}); var attachO = BI.jsonDecode(xhr.responseText); - attachO.filename = BI.cjkDecode(handler.file.fileName); + attachO.filename = handler.file.fileName; if (handler.file.type.indexOf('image') != -1) { attachO.attach_type = "image"; } diff --git a/bi/case.js b/bi/case.js index d0c7eff60..546c49b20 100644 --- a/bi/case.js +++ b/bi/case.js @@ -9752,7 +9752,7 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, { var columnSize = this.getColumnSize(); var length = o.columnSize.length - columnSize.length; o.columnSize = columnSize.slice(); - o.columnSize.splice(columnSize.length, length, ""); + o.columnSize = o.columnSize.concat(BI.makeArray(length, 0)); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_REGION_RESIZE, arguments); }); this.table.on(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, function () { @@ -9760,7 +9760,7 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, { var columnSize = this.getColumnSize(); var length = o.columnSize.length - columnSize.length; o.columnSize = columnSize.slice(); - o.columnSize.splice(columnSize.length, length, ""); + o.columnSize = o.columnSize.concat(BI.makeArray(length, 0)); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, arguments); }); }, diff --git a/docs/base.js b/docs/base.js index 887230249..ee98ff7a1 100644 --- a/docs/base.js +++ b/docs/base.js @@ -18301,7 +18301,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/** if (199 < xhr.status && xhr.status < 400) { upload["onload"]({}); var attachO = BI.jsonDecode(xhr.responseText); - attachO.filename = BI.cjkDecode(handler.file.fileName); + attachO.filename = handler.file.fileName; if (handler.file.type.indexOf('image') != -1) { attachO.attach_type = "image"; } diff --git a/docs/case.js b/docs/case.js index d0c7eff60..546c49b20 100644 --- a/docs/case.js +++ b/docs/case.js @@ -9752,7 +9752,7 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, { var columnSize = this.getColumnSize(); var length = o.columnSize.length - columnSize.length; o.columnSize = columnSize.slice(); - o.columnSize.splice(columnSize.length, length, ""); + o.columnSize = o.columnSize.concat(BI.makeArray(length, 0)); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_REGION_RESIZE, arguments); }); this.table.on(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, function () { @@ -9760,7 +9760,7 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, { var columnSize = this.getColumnSize(); var length = o.columnSize.length - columnSize.length; o.columnSize = columnSize.slice(); - o.columnSize.splice(columnSize.length, length, ""); + o.columnSize = o.columnSize.concat(BI.makeArray(length, 0)); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, arguments); }); }, diff --git a/src/case/table/table.dynamicsummarytree.js b/src/case/table/table.dynamicsummarytree.js index f53b8c49b..a621fc098 100644 --- a/src/case/table/table.dynamicsummarytree.js +++ b/src/case/table/table.dynamicsummarytree.js @@ -94,7 +94,7 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, { var columnSize = this.getColumnSize(); var length = o.columnSize.length - columnSize.length; o.columnSize = columnSize.slice(); - o.columnSize.splice(columnSize.length, length, ""); + o.columnSize = o.columnSize.concat(BI.makeArray(length, 0)); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_REGION_RESIZE, arguments); }); this.table.on(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, function () { @@ -102,7 +102,7 @@ BI.DynamicSummaryTreeTable = BI.inherit(BI.Widget, { var columnSize = this.getColumnSize(); var length = o.columnSize.length - columnSize.length; o.columnSize = columnSize.slice(); - o.columnSize.splice(columnSize.length, length, ""); + o.columnSize = o.columnSize.concat(BI.makeArray(length, 0)); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_COLUMN_RESIZE, arguments); }); }, From 6011b302be4f60a13680f3230a8af9808af2b3b6 Mon Sep 17 00:00:00 2001 From: young Date: Tue, 11 Apr 2017 16:53:25 +0800 Subject: [PATCH 2/2] update --- bi/base.js | 2 +- docs/base.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bi/base.js b/bi/base.js index ee98ff7a1..887230249 100644 --- a/bi/base.js +++ b/bi/base.js @@ -18301,7 +18301,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/** if (199 < xhr.status && xhr.status < 400) { upload["onload"]({}); var attachO = BI.jsonDecode(xhr.responseText); - attachO.filename = handler.file.fileName; + attachO.filename = BI.cjkDecode(handler.file.fileName); if (handler.file.type.indexOf('image') != -1) { attachO.attach_type = "image"; } diff --git a/docs/base.js b/docs/base.js index ee98ff7a1..887230249 100644 --- a/docs/base.js +++ b/docs/base.js @@ -18301,7 +18301,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/** if (199 < xhr.status && xhr.status < 400) { upload["onload"]({}); var attachO = BI.jsonDecode(xhr.responseText); - attachO.filename = handler.file.fileName; + attachO.filename = BI.cjkDecode(handler.file.fileName); if (handler.file.type.indexOf('image') != -1) { attachO.attach_type = "image"; }