Browse Source

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

* commit 'c60c44803658d4f599058b1e6ed9a098aafbb642':
  update
es6
windy 7 years ago
parent
commit
ccf20dd019
  1. 2
      demo/js/widget/relationview/demo.relationview.js
  2. 3
      dist/bundle.js
  3. 2
      dist/demo.js
  4. 3
      dist/widget.js
  5. 3
      src/widget/relationview/relationview.region.container.js

2
demo/js/widget/relationview/demo.relationview.js

@ -51,7 +51,7 @@ Demo.RelationView = BI.inherit(BI.Widget, {
foreign: {region: "B", value: "b1", text: "b1字段"} foreign: {region: "B", value: "b1", text: "b1字段"}
}, },
{ {
primary: {region: "X33", value: "x233", text: "x233字段"} primary: {region: "X33"}
} }
] ]
}); });

3
dist/bundle.js vendored

@ -91276,7 +91276,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-relation-view-region-container", baseCls: "bi-relation-view-region-container",
width: 150 width: 200
}); });
}, },
@ -91286,6 +91286,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
this.region = BI.createWidget({ this.region = BI.createWidget({
type: "bi.relation_view_region", type: "bi.relation_view_region",
value: o.value, value: o.value,
width: o.width,
header: o.header, header: o.header,
text: o.text, text: o.text,
handler: o.handler, handler: o.handler,

2
dist/demo.js vendored

@ -13112,7 +13112,7 @@ Demo.RelationView = BI.inherit(BI.Widget, {
foreign: {region: "B", value: "b1", text: "b1字段"} foreign: {region: "B", value: "b1", text: "b1字段"}
}, },
{ {
primary: {region: "X33", value: "x233", text: "x233字段"} primary: {region: "X33"}
} }
] ]
}); });

3
dist/widget.js vendored

@ -15222,7 +15222,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-relation-view-region-container", baseCls: "bi-relation-view-region-container",
width: 150 width: 200
}); });
}, },
@ -15232,6 +15232,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
this.region = BI.createWidget({ this.region = BI.createWidget({
type: "bi.relation_view_region", type: "bi.relation_view_region",
value: o.value, value: o.value,
width: o.width,
header: o.header, header: o.header,
text: o.text, text: o.text,
handler: o.handler, handler: o.handler,

3
src/widget/relationview/relationview.region.container.js

@ -5,7 +5,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-relation-view-region-container", baseCls: "bi-relation-view-region-container",
width: 150 width: 200
}); });
}, },
@ -15,6 +15,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
this.region = BI.createWidget({ this.region = BI.createWidget({
type: "bi.relation_view_region", type: "bi.relation_view_region",
value: o.value, value: o.value,
width: o.width,
header: o.header, header: o.header,
text: o.text, text: o.text,
handler: o.handler, handler: o.handler,

Loading…
Cancel
Save