From 588d64e7b0d40952a754681a94b776114bef643a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 5 Jan 2018 11:07:48 +0800 Subject: [PATCH] update --- demo/js/widget/relationview/demo.relationview.js | 2 +- dist/bundle.js | 5 ++++- dist/demo.js | 2 +- dist/widget.js | 5 ++++- src/widget/relationview/relationview.region.container.js | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/demo/js/widget/relationview/demo.relationview.js b/demo/js/widget/relationview/demo.relationview.js index 3a42bfb66a..61af7cf740 100644 --- a/demo/js/widget/relationview/demo.relationview.js +++ b/demo/js/widget/relationview/demo.relationview.js @@ -51,7 +51,7 @@ Demo.RelationView = BI.inherit(BI.Widget, { foreign: {region: "B", value: "b1", text: "b1字段"} }, { - primary: {region: "X33", value: "x233", text: "x233字段"} + primary: {region: "X33"} } ] }); diff --git a/dist/bundle.js b/dist/bundle.js index 979c337718..42a3bd4f11 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -79518,6 +79518,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, { direction: "bottom", trigger: "click", container: null, + stopPropagation: false, el: {} }); }, @@ -79550,6 +79551,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, { container: o.container, adjustLength: o.adjustLength, direction: o.direction, + stopPropagation: o.stopPropagation, el: BI.createWidget(o.el, { type: "bi.icon_trigger", extraCls: o.iconCls ? o.iconCls : "pull-down-font", @@ -91274,7 +91276,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-relation-view-region-container", - width: 150 + width: 200 }); }, @@ -91284,6 +91286,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { this.region = BI.createWidget({ type: "bi.relation_view_region", value: o.value, + width: o.width, header: o.header, text: o.text, handler: o.handler, diff --git a/dist/demo.js b/dist/demo.js index 8986142c43..4070c4cca2 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -13112,7 +13112,7 @@ Demo.RelationView = BI.inherit(BI.Widget, { foreign: {region: "B", value: "b1", text: "b1字段"} }, { - primary: {region: "X33", value: "x233", text: "x233字段"} + primary: {region: "X33"} } ] }); diff --git a/dist/widget.js b/dist/widget.js index 596b6c63e7..c12088338a 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -3464,6 +3464,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, { direction: "bottom", trigger: "click", container: null, + stopPropagation: false, el: {} }); }, @@ -3496,6 +3497,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, { container: o.container, adjustLength: o.adjustLength, direction: o.direction, + stopPropagation: o.stopPropagation, el: BI.createWidget(o.el, { type: "bi.icon_trigger", extraCls: o.iconCls ? o.iconCls : "pull-down-font", @@ -15220,7 +15222,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-relation-view-region-container", - width: 150 + width: 200 }); }, @@ -15230,6 +15232,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { this.region = BI.createWidget({ type: "bi.relation_view_region", value: o.value, + width: o.width, header: o.header, text: o.text, handler: o.handler, diff --git a/src/widget/relationview/relationview.region.container.js b/src/widget/relationview/relationview.region.container.js index ad8350348d..12180e871b 100644 --- a/src/widget/relationview/relationview.region.container.js +++ b/src/widget/relationview/relationview.region.container.js @@ -5,7 +5,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-relation-view-region-container", - width: 150 + width: 200 }); }, @@ -15,6 +15,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { this.region = BI.createWidget({ type: "bi.relation_view_region", value: o.value, + width: o.width, header: o.header, text: o.text, handler: o.handler,