Merge pull request #504 in VISUAL/fineui from ~LEI.WANG/fineui:master to master

* commit 'e76c47dd5ac51cd66bda07aa0d3c0456418e50c7':
  no message
  BI-26355 表格中存在可预测的风险: _getItems中使用了this.options.header 如果未更新this.options.header,可能存在item和header不匹配的的情况，因此此时计算的时候使用的是上一个状态的header

dist/base.js

@@ -31453,13 +31453,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
     },
 
     populate: function (items, header) {
-        if (items && this.options.items !== items) {
+        var headerChanged = this.options.header !== header;
+        var itemsChanged = this.options.items !== items;
+        if(header && headerChanged) {
+            this.options.header = header;
+        }
+        if(items && itemsChanged) {
             this.options.items = items;
+        }
+        if (items && itemsChanged) {
             this.items = this._getItems();
             this._restore();
         }
-        if (header && this.options.header !== header) {
-            this.options.header = header;
+        if (header && headerChanged) {
             this.header = this._getHeader();
             this._restore();
         }
@@ -31477,7 +31483,8 @@ BI.GridTable = BI.inherit(BI.Widget, {
         this._restore();
     }
 });
-BI.shortcut("bi.grid_table", BI.GridTable);/**
+BI.shortcut("bi.grid_table", BI.GridTable);
+/**
  * QuickGridTable
  *
  * Created by GUY on 2016/1/12.

dist/bundle.js

@@ -67224,13 +67224,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
     },
 
     populate: function (items, header) {
-        if (items && this.options.items !== items) {
+        var headerChanged = this.options.header !== header;
+        var itemsChanged = this.options.items !== items;
+        if(header && headerChanged) {
+            this.options.header = header;
+        }
+        if(items && itemsChanged) {
             this.options.items = items;
+        }
+        if (items && itemsChanged) {
             this.items = this._getItems();
             this._restore();
         }
-        if (header && this.options.header !== header) {
-            this.options.header = header;
+        if (header && headerChanged) {
             this.header = this._getHeader();
             this._restore();
         }
@@ -67248,7 +67254,8 @@ BI.GridTable = BI.inherit(BI.Widget, {
         this._restore();
     }
 });
-BI.shortcut("bi.grid_table", BI.GridTable);/**
+BI.shortcut("bi.grid_table", BI.GridTable);
+/**
  * QuickGridTable
  *
  * Created by GUY on 2016/1/12.

dist/fineui.js

@@ -67473,13 +67473,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
     },
 
     populate: function (items, header) {
-        if (items && this.options.items !== items) {
+        var headerChanged = this.options.header !== header;
+        var itemsChanged = this.options.items !== items;
+        if(header && headerChanged) {
+            this.options.header = header;
+        }
+        if(items && itemsChanged) {
             this.options.items = items;
+        }
+        if (items && itemsChanged) {
             this.items = this._getItems();
             this._restore();
         }
-        if (header && this.options.header !== header) {
-            this.options.header = header;
+        if (header && headerChanged) {
             this.header = this._getHeader();
             this._restore();
         }
@@ -67497,7 +67503,8 @@ BI.GridTable = BI.inherit(BI.Widget, {
         this._restore();
     }
 });
-BI.shortcut("bi.grid_table", BI.GridTable);/**
+BI.shortcut("bi.grid_table", BI.GridTable);
+/**
  * QuickGridTable
  *
  * Created by GUY on 2016/1/12.

src/base/table/table.grid.js

@@ -455,13 +455,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
     },
 
     populate: function (items, header) {
-        if (items && this.options.items !== items) {
+        var headerChanged = this.options.header !== header;
+        var itemsChanged = this.options.items !== items;
+        if(header && headerChanged) {
+            this.options.header = header;
+        }
+        if(items && itemsChanged) {
             this.options.items = items;
+        }
+        if (items && itemsChanged) {
             this.items = this._getItems();
             this._restore();
         }
-        if (header && this.options.header !== header) {
-            this.options.header = header;
+        if (header && headerChanged) {
             this.header = this._getHeader();
             this._restore();
         }
@@ -479,4 +485,4 @@ BI.GridTable = BI.inherit(BI.Widget, {
         this._restore();
     }
 });
-BI.shortcut("bi.grid_table", BI.GridTable);
+BI.shortcut("bi.grid_table", BI.GridTable);