Merge pull request #305 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '7264db6c0c1668b71912558003f1f9c5c3ef9b46':
  defaultShowIndex改成showIndex

demo/js/center.js

@@ -10,7 +10,7 @@ Demo.Center = BI.inherit(BI.Widget, {
                 self.tab = this;
             },
             single: true,
-            defaultShowIndex: "demo.face",
+            showIndex: "demo.face",
             cardCreator: function (v) {
                 return BI.createWidget({
                     type: v

demo/js/core/abstract/combination/demo.navigation.js

@@ -13,7 +13,7 @@ Demo.Func = BI.inherit(BI.Widget, {
     render: function () {
         return {
             type: "bi.navigation",
-            defaultShowIndex: 0,
+            showIndex: 0,
             tab: {
                 height: 30,
                 items: [{

demo/js/fix-2.0/scene.js

@@ -138,7 +138,7 @@
             var self = this;
             return {
                 type: "bi.tab",
-                defaultShowIndex: this.constant.TAB1,
+                showIndex: this.constant.TAB1,
                 single: true,
                 tab: {
                     type: "bi.button_group",

demo/js/widget/table/demo.responsive_table.js

@@ -138,7 +138,7 @@ Demo.Func = BI.inherit(BI.Widget, {
             items: [{
                 el: {
                     type: "bi.tab",
-                    defaultShowIndex: 1,
+                    showIndex: 1,
                     cardCreator: function (v) {
                         switch (v) {
                             case 1:

dist/base.js

@@ -4122,7 +4122,7 @@ BI.Navigation = BI.inherit(BI.Widget, {
                 dynamic: false
             },
             single: false,
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -4166,8 +4166,8 @@ BI.Navigation = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 
@@ -4874,7 +4874,7 @@ BI.Tab = BI.inherit(BI.Widget, {
             logic: {
                 dynamic: false
             },
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -4941,8 +4941,8 @@ BI.Tab = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 

dist/bundle.js

@@ -29995,7 +29995,7 @@ BI.Navigation = BI.inherit(BI.Widget, {
                 dynamic: false
             },
             single: false,
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -30039,8 +30039,8 @@ BI.Navigation = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 
@@ -30747,7 +30747,7 @@ BI.Tab = BI.inherit(BI.Widget, {
             logic: {
                 dynamic: false
             },
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -30814,8 +30814,8 @@ BI.Tab = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 
@@ -96927,7 +96927,7 @@ BI.SwitchTree = BI.inherit(BI.Widget, {
             type: "bi.tab",
             element: this,
             tab: null,
-            defaultShowIndex: BI.SwitchTree.SelectType.SingleSelect,
+            showIndex: BI.SwitchTree.SelectType.SingleSelect,
             cardCreator: BI.bind(this._createTree, this)
         });
     },

dist/demo.js

@@ -4617,7 +4617,7 @@ BI.shortcut("demo.sort_tree", Demo.SortTree);Demo.Center = BI.inherit(BI.Widget,
                 self.tab = this;
             },
             single: true,
-            defaultShowIndex: "demo.face",
+            showIndex: "demo.face",
             cardCreator: function (v) {
                 return BI.createWidget({
                     type: v
@@ -6564,7 +6564,7 @@ BI.shortcut("demo.loader", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
     render: function () {
         return {
             type: "bi.navigation",
-            defaultShowIndex: 0,
+            showIndex: 0,
             tab: {
                 height: 30,
                 items: [{
@@ -10772,7 +10772,7 @@ BI.shortcut("demo.tmp", Demo.Func);
             var self = this;
             return {
                 type: "bi.tab",
-                defaultShowIndex: this.constant.TAB1,
+                showIndex: this.constant.TAB1,
                 single: true,
                 tab: {
                     type: "bi.button_group",
@@ -14316,7 +14316,7 @@ BI.shortcut("demo.preview_table", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
             items: [{
                 el: {
                     type: "bi.tab",
-                    defaultShowIndex: 1,
+                    showIndex: 1,
                     cardCreator: function (v) {
                         switch (v) {
                             case 1:

dist/fineui.js

@@ -31689,7 +31689,7 @@ BI.Navigation = BI.inherit(BI.Widget, {
                 dynamic: false
             },
             single: false,
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -31733,8 +31733,8 @@ BI.Navigation = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 
@@ -32441,7 +32441,7 @@ BI.Tab = BI.inherit(BI.Widget, {
             logic: {
                 dynamic: false
             },
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -32508,8 +32508,8 @@ BI.Tab = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 
@@ -98621,7 +98621,7 @@ BI.SwitchTree = BI.inherit(BI.Widget, {
             type: "bi.tab",
             element: this,
             tab: null,
-            defaultShowIndex: BI.SwitchTree.SelectType.SingleSelect,
+            showIndex: BI.SwitchTree.SelectType.SingleSelect,
             cardCreator: BI.bind(this._createTree, this)
         });
     },

dist/widget.js

@@ -20505,7 +20505,7 @@ BI.SwitchTree = BI.inherit(BI.Widget, {
             type: "bi.tab",
             element: this,
             tab: null,
-            defaultShowIndex: BI.SwitchTree.SelectType.SingleSelect,
+            showIndex: BI.SwitchTree.SelectType.SingleSelect,
             cardCreator: BI.bind(this._createTree, this)
         });
     },

docs/_book/core/combination/navigation.html

@@ -2930,7 +2930,7 @@ BI.createWidget({
 <td style="text-align:left">true</td>
 </tr>
 <tr>
-<td style="text-align:left">defaultShowIndex</td>
+<td style="text-align:left">showIndex</td>
 <td style="text-align:left">&#x9ED8;&#x8BA4;&#x663E;&#x793A;&#x9875;&#x7801;</td>
 <td style="text-align:left">number,false</td>
 <td style="text-align:left">number,false</td>

docs/_book/core/combination/navigation.md

@@ -46,7 +46,7 @@ BI.createWidget({
 | :------ |:-------------  | :-----| :----|:----
 | direction | 控件位置 | string | top,bottom,left,right,custom | "bottom"|
 | single | 是否为单页 | boolean | true,false | true |
-| defaultShowIndex | 默认显示页码 |number,false | number,false | false |
+| showIndex | 默认显示页码 |number,false | number,false | false |
 | tab | tab页元素 | object | — | — |
 | logic | 布局逻辑 | object | — | {dynamic:false} |
 | cardCreator | 面板构造器 | function | — | v |

docs/_book/core/combination/tab.html

@@ -2937,7 +2937,7 @@ BI.createWidget({
 <td style="text-align:left">false</td>
 </tr>
 <tr>
-<td style="text-align:left">defaultShowIndex</td>
+<td style="text-align:left">showIndex</td>
 <td style="text-align:left">&#x662F;&#x5426;&#x9ED8;&#x8BA4;&#x663E;&#x793A;tab&#x9875;</td>
 <td style="text-align:left">number,falser</td>
 <td style="text-align:left">number,false</td>

docs/_book/core/combination/tab.md

@@ -55,7 +55,7 @@ BI.createWidget({
 | :------ |:-------------  | :-----| :----|:----
 | direction | 控件位置 | string | top,bottom,left,right,custom | "bottom"|
 | single | 是否为单页 | boolean | true,false | false |
-| defaultShowIndex | 是否默认显示tab页 | number,falser | number,false | false |
+| showIndex | 是否默认显示tab页 | number,falser | number,false | false |
 | tab | tab标签页 | object | — | { } |
 | logic | 布局逻辑 | object | — | {dynamic:false} |
 | cardCreator | 面板构造器| function | — | function (v) {return BI.createWidget();} |

docs/core/combination/navigation.md

@@ -46,7 +46,7 @@ BI.createWidget({
 | :------ |:-------------  | :-----| :----|:----
 | direction | 控件位置 | string | top,bottom,left,right,custom | "bottom"|
 | single | 是否为单页 | boolean | true,false | true |
-| defaultShowIndex | 默认显示页码 |number,false | number,false | false |
+| showIndex | 默认显示页码 |number,false | number,false | false |
 | tab | tab页元素 | object | — | — |
 | logic | 布局逻辑 | object | — | {dynamic:false} |
 | cardCreator | 面板构造器 | function | — | v |

docs/core/combination/tab.md

@@ -55,7 +55,7 @@ BI.createWidget({
 | :------ |:-------------  | :-----| :----|:----
 | direction | 控件位置 | string | top,bottom,left,right,custom | "bottom"|
 | single | 是否为单页 | boolean | true,false | false |
-| defaultShowIndex | 是否默认显示tab页 | number,falser | number,false | false |
+| showIndex | 是否默认显示tab页 | number,falser | number,false | false |
 | tab | tab标签页 | object | — | { } |
 | logic | 布局逻辑 | object | — | {dynamic:false} |
 | cardCreator | 面板构造器| function | — | function (v) {return BI.createWidget();} |

src/base/combination/navigation.js

@@ -10,7 +10,7 @@ BI.Navigation = BI.inherit(BI.Widget, {
                 dynamic: false
             },
             single: false,
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -54,8 +54,8 @@ BI.Navigation = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 

src/base/combination/tab.js

@@ -11,7 +11,7 @@ BI.Tab = BI.inherit(BI.Widget, {
             logic: {
                 dynamic: false
             },
-            defaultShowIndex: false,
+            showIndex: false,
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
@@ -78,8 +78,8 @@ BI.Tab = BI.inherit(BI.Widget, {
 
     mounted: function () {
         var o = this.options;
-        if (o.defaultShowIndex !== false) {
-            this.setSelect(o.defaultShowIndex);
+        if (o.showIndex !== false) {
+            this.setSelect(o.showIndex);
         }
     },
 

src/widget/switchtree/switchtree.js

@@ -21,7 +21,7 @@ BI.SwitchTree = BI.inherit(BI.Widget, {
             type: "bi.tab",
             element: this,
             tab: null,
-            defaultShowIndex: BI.SwitchTree.SelectType.SingleSelect,
+            showIndex: BI.SwitchTree.SelectType.SingleSelect,
             cardCreator: BI.bind(this._createTree, this)
         });
     },