Browse Source

Merge pull request #232 in FUI/fineui from ~GUY/fineui:master to master

* commit '04798e3959e52cf83b7fdc94f8507f42a7276aa8':
  defaultShowIndex改成showIndex
es6
guy 7 years ago
parent
commit
21e6312ff5
  1. 2
      demo/js/center.js
  2. 2
      demo/js/core/abstract/combination/demo.navigation.js
  3. 2
      demo/js/fix-2.0/scene.js
  4. 2
      demo/js/widget/table/demo.responsive_table.js
  5. 12
      dist/base.js
  6. 14
      dist/bundle.js
  7. 8
      dist/demo.js
  8. 14
      dist/fineui.js
  9. 2
      dist/widget.js
  10. 2
      docs/_book/core/combination/navigation.html
  11. 2
      docs/_book/core/combination/navigation.md
  12. 2
      docs/_book/core/combination/tab.html
  13. 2
      docs/_book/core/combination/tab.md
  14. 2
      docs/_book/search_index.json
  15. 2
      docs/core/combination/navigation.md
  16. 2
      docs/core/combination/tab.md
  17. 6
      src/base/combination/navigation.js
  18. 6
      src/base/combination/tab.js
  19. 2
      src/widget/switchtree/switchtree.js

2
demo/js/center.js

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

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

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

2
demo/js/fix-2.0/scene.js

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

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

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

12
dist/base.js vendored

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

14
dist/bundle.js vendored

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

8
dist/demo.js vendored

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

14
dist/fineui.js vendored

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

2
dist/widget.js vendored

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

2
docs/_book/core/combination/navigation.html

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

2
docs/_book/core/combination/navigation.md

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

2
docs/_book/core/combination/tab.html

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

2
docs/_book/core/combination/tab.md

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

2
docs/_book/search_index.json

File diff suppressed because one or more lines are too long

2
docs/core/combination/navigation.md

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

2
docs/core/combination/tab.md

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

6
src/base/combination/navigation.js

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

6
src/base/combination/tab.js

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

2
src/widget/switchtree/switchtree.js

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

Loading…
Cancel
Save