Browse Source

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

* commit '93201d038adee44b34542fd084a23660809cd39d':
  灰化
es6
windy 7 years ago
parent
commit
892fad4fd6
  1. 1
      demo/js/widget/relationview/demo.relationview.js
  2. 2
      dist/bundle.js
  3. 4
      dist/bundle.min.js
  4. 1
      dist/demo.js
  5. 2
      dist/widget.js
  6. 1
      src/widget/relationview/relationview.js
  7. 1
      src/widget/relationview/relationview.region.container.js

1
demo/js/widget/relationview/demo.relationview.js

@ -18,6 +18,7 @@ Demo.RelationView = BI.inherit(BI.Widget, {
isPrimary: true, isPrimary: true,
title: "b2...", title: "b2...",
value: "b2", value: "b2",
//disabled: true,
handler: function () { handler: function () {
alert("d"); alert("d");
} }

2
dist/bundle.js vendored

@ -91117,6 +91117,7 @@ BI.RelationView = BI.inherit(BI.Widget, {
text: items.length > 0 ? items[0].regionText : "", text: items.length > 0 ? items[0].regionText : "",
handler: items.length > 0 ? items[0].regionHandler : BI.emptyFn, handler: items.length > 0 ? items[0].regionHandler : BI.emptyFn,
items: items, items: items,
disabled: items[0].disabled,
belongPackage: items.length > 0 ? items[0].belongPackage : true belongPackage: items.length > 0 ? items[0].belongPackage : true
}); });
if (BI.isNotNull(items[0]) && BI.isNotNull(items[0].keyword)) { if (BI.isNotNull(items[0]) && BI.isNotNull(items[0].keyword)) {
@ -91286,6 +91287,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
header: o.header, header: o.header,
text: o.text, text: o.text,
handler: o.handler, handler: o.handler,
disabled: o.disabled,
items: o.items, items: o.items,
belongPackage: o.belongPackage belongPackage: o.belongPackage
}); });

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/demo.js vendored

@ -13079,6 +13079,7 @@ Demo.RelationView = BI.inherit(BI.Widget, {
isPrimary: true, isPrimary: true,
title: "b2...", title: "b2...",
value: "b2", value: "b2",
//disabled: true,
handler: function () { handler: function () {
alert("d"); alert("d");
} }

2
dist/widget.js vendored

@ -15063,6 +15063,7 @@ BI.RelationView = BI.inherit(BI.Widget, {
text: items.length > 0 ? items[0].regionText : "", text: items.length > 0 ? items[0].regionText : "",
handler: items.length > 0 ? items[0].regionHandler : BI.emptyFn, handler: items.length > 0 ? items[0].regionHandler : BI.emptyFn,
items: items, items: items,
disabled: items[0].disabled,
belongPackage: items.length > 0 ? items[0].belongPackage : true belongPackage: items.length > 0 ? items[0].belongPackage : true
}); });
if (BI.isNotNull(items[0]) && BI.isNotNull(items[0].keyword)) { if (BI.isNotNull(items[0]) && BI.isNotNull(items[0].keyword)) {
@ -15232,6 +15233,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
header: o.header, header: o.header,
text: o.text, text: o.text,
handler: o.handler, handler: o.handler,
disabled: o.disabled,
items: o.items, items: o.items,
belongPackage: o.belongPackage belongPackage: o.belongPackage
}); });

1
src/widget/relationview/relationview.js

@ -173,6 +173,7 @@ BI.RelationView = BI.inherit(BI.Widget, {
text: items.length > 0 ? items[0].regionText : "", text: items.length > 0 ? items[0].regionText : "",
handler: items.length > 0 ? items[0].regionHandler : BI.emptyFn, handler: items.length > 0 ? items[0].regionHandler : BI.emptyFn,
items: items, items: items,
disabled: items[0].disabled,
belongPackage: items.length > 0 ? items[0].belongPackage : true belongPackage: items.length > 0 ? items[0].belongPackage : true
}); });
if (BI.isNotNull(items[0]) && BI.isNotNull(items[0].keyword)) { if (BI.isNotNull(items[0]) && BI.isNotNull(items[0].keyword)) {

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

@ -18,6 +18,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, {
header: o.header, header: o.header,
text: o.text, text: o.text,
handler: o.handler, handler: o.handler,
disabled: o.disabled,
items: o.items, items: o.items,
belongPackage: o.belongPackage belongPackage: o.belongPackage
}); });

Loading…
Cancel
Save