From edd304900e5b214ab80d3e54d9c0c165a5af58d7 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 23 Jan 2018 11:27:24 +0800 Subject: [PATCH] =?UTF-8?q?relationView=20=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.css | 18 +++++ dist/bundle.js | 74 ++++++++++--------- dist/fineui.css | 18 +++++ dist/fineui.js | 74 ++++++++++--------- dist/widget.css | 18 +++++ dist/widget.js | 74 ++++++++++--------- src/css/widget/relationview/relationview.css | 9 +++ .../widget/relationview/relationview.item.css | 3 + .../relationview/relationview.region.css | 6 ++ .../relationview/relationview.item.less | 3 + .../relationview/relationview.region.less | 7 ++ src/widget/relationview/relationview.item.js | 50 ++++++------- .../relationview.region.container.js | 2 +- .../relationview/relationview.region.js | 22 +++--- 14 files changed, 234 insertions(+), 144 deletions(-) create mode 100644 src/css/widget/relationview/relationview.item.css diff --git a/dist/bundle.css b/dist/bundle.css index f813436deb..12dab84524 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -4479,6 +4479,9 @@ ul.ztree.zTreeDragUL { -moz-border-radius: 2px; border-radius: 2px; } +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} .bi-relation-view-region .relation-view-region-container { z-index: 1; @@ -4489,6 +4492,15 @@ ul.ztree.zTreeDragUL { .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} .bi-relation-view-region .relation-view-region-container { z-index: 1; -webkit-border-radius: 2px; @@ -4498,6 +4510,12 @@ ul.ztree.zTreeDragUL { .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} .bi-sequence-table-dynamic-number .sequence-table-title-cell { overflow: hidden; overflow-x: hidden; diff --git a/dist/bundle.js b/dist/bundle.js index 8fe8fb5b2e..14819c74fc 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -91449,36 +91449,34 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, { var body = []; var header = { type: "bi.vertical_adapt", - cls: "primary-key-font", - items: [] + items: [{ + type: "bi.center_adapt", + cls: o.isPrimary ? "primary-key-region primary-key-font" : "", + items: [{ + type: "bi.icon", + title: o.isPrimary ? BI.i18nText("BI-Primary_Key") : "" + }], + width: 36, + height: 16 + }, { + type: "bi.label", + text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], + value: o.value, + height: 24, + textAlign: "left" + }] }; - if (o.isPrimary) { - header.items.push({ - type: "bi.icon", - width: 12, - height: 16, - title: BI.i18nText("BI-Primary_Key") - }); - } - header.items.push({ - type: "bi.label", - text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], - value: o.value, - height: 25, - textAlign: "left", - width: o.isPrimary ? 70 : 90, - lgap: o.isPrimary ? 0 : 10 - }); if(o.text.length > 1){ body = BI.map(o.text, function (idx, text) { return { - type: "bi.label", - text: text, - value: o.value, - height: 25, - textAlign: "left", - width: 70, - lgap: 15 + el: { + type: "bi.label", + text: text, + value: o.value, + height: 24, + textAlign: "left" + }, + lgap: 49 } }) } @@ -91831,7 +91829,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: 200 + width: 210 }); }, @@ -91946,9 +91944,9 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.preview = BI.createWidget({ type: "bi.icon_button", - cls: "relation-table-preview-font", - width: 25, - height: 25, + cls: "eye relation-table-preview-font", + width: 36, + height: 24, stopPropagation: true }); this.preview.on(BI.IconButton.EVENT_CHANGE, function () { @@ -91957,11 +91955,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.title = BI.createWidget({ type: "bi.label", - height: 25, + height: 24, width: 70, text: o.text, value: o.value, - textAlign: "left" + textAlign: "left", + disabled: o.disabled }); // title放body上 if (BI.isKey(o.header)) { @@ -92001,7 +92000,8 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { var texts = BI.isArray(item.text) ? item.text : [item.text]; return BI.extend(item, { type: "bi.relation_view_item", - height: texts.length > 1 ? (texts.length + 1) * 25 : 25, + height: texts.length > 1 ? (texts.length + 1) * 24 : 24, + cls: i === items.length - 1 ? "" : "split-line", hoverIn: function () { self.setValue(item.value); self.fireEvent(BI.RelationViewRegion.EVENT_HOVER_IN, item.value); @@ -92028,10 +92028,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { getHeight: function () { var height = 0; - BI.each(this.button_group.getAllButtons(), function (idx, button) { - height += button.getHeight(); + var buttons = this.button_group.getAllButtons(); + BI.each(buttons, function (idx, button) { + //获取item高度的时候加上边框 + height += button.getHeight() + (idx === buttons.length - 1 ? 0 : 1); }); - return height + 25 + 2 * 20 + 3; + return height + 24 + 2 * 20 + 3; }, // 获取上方开始划线的位置 diff --git a/dist/fineui.css b/dist/fineui.css index 42d4d9c64c..1932eee4f7 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -4479,6 +4479,9 @@ ul.ztree.zTreeDragUL { -moz-border-radius: 2px; border-radius: 2px; } +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} .bi-relation-view-region .relation-view-region-container { z-index: 1; @@ -4489,6 +4492,15 @@ ul.ztree.zTreeDragUL { .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} .bi-relation-view-region .relation-view-region-container { z-index: 1; -webkit-border-radius: 2px; @@ -4498,6 +4510,12 @@ ul.ztree.zTreeDragUL { .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} .bi-sequence-table-dynamic-number .sequence-table-title-cell { overflow: hidden; overflow-x: hidden; diff --git a/dist/fineui.js b/dist/fineui.js index 54e6bed30f..0422f64b0f 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -93203,36 +93203,34 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, { var body = []; var header = { type: "bi.vertical_adapt", - cls: "primary-key-font", - items: [] + items: [{ + type: "bi.center_adapt", + cls: o.isPrimary ? "primary-key-region primary-key-font" : "", + items: [{ + type: "bi.icon", + title: o.isPrimary ? BI.i18nText("BI-Primary_Key") : "" + }], + width: 36, + height: 16 + }, { + type: "bi.label", + text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], + value: o.value, + height: 24, + textAlign: "left" + }] }; - if (o.isPrimary) { - header.items.push({ - type: "bi.icon", - width: 12, - height: 16, - title: BI.i18nText("BI-Primary_Key") - }); - } - header.items.push({ - type: "bi.label", - text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], - value: o.value, - height: 25, - textAlign: "left", - width: o.isPrimary ? 70 : 90, - lgap: o.isPrimary ? 0 : 10 - }); if(o.text.length > 1){ body = BI.map(o.text, function (idx, text) { return { - type: "bi.label", - text: text, - value: o.value, - height: 25, - textAlign: "left", - width: 70, - lgap: 15 + el: { + type: "bi.label", + text: text, + value: o.value, + height: 24, + textAlign: "left" + }, + lgap: 49 } }) } @@ -93585,7 +93583,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: 200 + width: 210 }); }, @@ -93700,9 +93698,9 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.preview = BI.createWidget({ type: "bi.icon_button", - cls: "relation-table-preview-font", - width: 25, - height: 25, + cls: "eye relation-table-preview-font", + width: 36, + height: 24, stopPropagation: true }); this.preview.on(BI.IconButton.EVENT_CHANGE, function () { @@ -93711,11 +93709,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.title = BI.createWidget({ type: "bi.label", - height: 25, + height: 24, width: 70, text: o.text, value: o.value, - textAlign: "left" + textAlign: "left", + disabled: o.disabled }); // title放body上 if (BI.isKey(o.header)) { @@ -93755,7 +93754,8 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { var texts = BI.isArray(item.text) ? item.text : [item.text]; return BI.extend(item, { type: "bi.relation_view_item", - height: texts.length > 1 ? (texts.length + 1) * 25 : 25, + height: texts.length > 1 ? (texts.length + 1) * 24 : 24, + cls: i === items.length - 1 ? "" : "split-line", hoverIn: function () { self.setValue(item.value); self.fireEvent(BI.RelationViewRegion.EVENT_HOVER_IN, item.value); @@ -93782,10 +93782,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { getHeight: function () { var height = 0; - BI.each(this.button_group.getAllButtons(), function (idx, button) { - height += button.getHeight(); + var buttons = this.button_group.getAllButtons(); + BI.each(buttons, function (idx, button) { + //获取item高度的时候加上边框 + height += button.getHeight() + (idx === buttons.length - 1 ? 0 : 1); }); - return height + 25 + 2 * 20 + 3; + return height + 24 + 2 * 20 + 3; }, // 获取上方开始划线的位置 diff --git a/dist/widget.css b/dist/widget.css index f66a4ef9ac..0c7883eac7 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -379,6 +379,9 @@ -moz-border-radius: 2px; border-radius: 2px; } +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} .bi-relation-view-region .relation-view-region-container { z-index: 1; @@ -389,6 +392,15 @@ .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} .bi-relation-view-region .relation-view-region-container { z-index: 1; -webkit-border-radius: 2px; @@ -398,6 +410,12 @@ .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} .bi-sequence-table-dynamic-number .sequence-table-title-cell { overflow: hidden; overflow-x: hidden; diff --git a/dist/widget.js b/dist/widget.js index f2df6eb8fa..5d65e0f1a6 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -14939,36 +14939,34 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, { var body = []; var header = { type: "bi.vertical_adapt", - cls: "primary-key-font", - items: [] + items: [{ + type: "bi.center_adapt", + cls: o.isPrimary ? "primary-key-region primary-key-font" : "", + items: [{ + type: "bi.icon", + title: o.isPrimary ? BI.i18nText("BI-Primary_Key") : "" + }], + width: 36, + height: 16 + }, { + type: "bi.label", + text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], + value: o.value, + height: 24, + textAlign: "left" + }] }; - if (o.isPrimary) { - header.items.push({ - type: "bi.icon", - width: 12, - height: 16, - title: BI.i18nText("BI-Primary_Key") - }); - } - header.items.push({ - type: "bi.label", - text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], - value: o.value, - height: 25, - textAlign: "left", - width: o.isPrimary ? 70 : 90, - lgap: o.isPrimary ? 0 : 10 - }); if(o.text.length > 1){ body = BI.map(o.text, function (idx, text) { return { - type: "bi.label", - text: text, - value: o.value, - height: 25, - textAlign: "left", - width: 70, - lgap: 15 + el: { + type: "bi.label", + text: text, + value: o.value, + height: 24, + textAlign: "left" + }, + lgap: 49 } }) } @@ -15321,7 +15319,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: 200 + width: 210 }); }, @@ -15436,9 +15434,9 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.preview = BI.createWidget({ type: "bi.icon_button", - cls: "relation-table-preview-font", - width: 25, - height: 25, + cls: "eye relation-table-preview-font", + width: 36, + height: 24, stopPropagation: true }); this.preview.on(BI.IconButton.EVENT_CHANGE, function () { @@ -15447,11 +15445,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.title = BI.createWidget({ type: "bi.label", - height: 25, + height: 24, width: 70, text: o.text, value: o.value, - textAlign: "left" + textAlign: "left", + disabled: o.disabled }); // title放body上 if (BI.isKey(o.header)) { @@ -15491,7 +15490,8 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { var texts = BI.isArray(item.text) ? item.text : [item.text]; return BI.extend(item, { type: "bi.relation_view_item", - height: texts.length > 1 ? (texts.length + 1) * 25 : 25, + height: texts.length > 1 ? (texts.length + 1) * 24 : 24, + cls: i === items.length - 1 ? "" : "split-line", hoverIn: function () { self.setValue(item.value); self.fireEvent(BI.RelationViewRegion.EVENT_HOVER_IN, item.value); @@ -15518,10 +15518,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { getHeight: function () { var height = 0; - BI.each(this.button_group.getAllButtons(), function (idx, button) { - height += button.getHeight(); + var buttons = this.button_group.getAllButtons(); + BI.each(buttons, function (idx, button) { + //获取item高度的时候加上边框 + height += button.getHeight() + (idx === buttons.length - 1 ? 0 : 1); }); - return height + 25 + 2 * 20 + 3; + return height + 24 + 2 * 20 + 3; }, // 获取上方开始划线的位置 diff --git a/src/css/widget/relationview/relationview.css b/src/css/widget/relationview/relationview.css index 504e7d0078..be0232d278 100644 --- a/src/css/widget/relationview/relationview.css +++ b/src/css/widget/relationview/relationview.css @@ -1,3 +1,6 @@ +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} .bi-relation-view-region .relation-view-region-container { z-index: 1; @@ -8,3 +11,9 @@ .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} diff --git a/src/css/widget/relationview/relationview.item.css b/src/css/widget/relationview/relationview.item.css new file mode 100644 index 0000000000..bad78eb2f8 --- /dev/null +++ b/src/css/widget/relationview/relationview.item.css @@ -0,0 +1,3 @@ +.bi-relation-view-item .primary-key-region { + font-size: 16px; +} diff --git a/src/css/widget/relationview/relationview.region.css b/src/css/widget/relationview/relationview.region.css index 66700cd65c..fe150f5621 100644 --- a/src/css/widget/relationview/relationview.region.css +++ b/src/css/widget/relationview/relationview.region.css @@ -7,3 +7,9 @@ .bi-relation-view-region .relation-view-region-container.other-package { border-style: dashed; } +.bi-relation-view-region .relation-view-region-container .relation-view-region-title .eye { + font-size: 16px; +} +.bi-relation-view-region .relation-view-region-container .split-line { + border-bottom: 1px solid #cccccc; +} diff --git a/src/less/widget/relationview/relationview.item.less b/src/less/widget/relationview/relationview.item.less index faf45ddbf2..ed31f2c1d5 100644 --- a/src/less/widget/relationview/relationview.item.less +++ b/src/less/widget/relationview/relationview.item.less @@ -1,4 +1,7 @@ @import "../../index"; .bi-relation-view-item{ + & .primary-key-region{ + font-size: 16px; + } } \ No newline at end of file diff --git a/src/less/widget/relationview/relationview.region.less b/src/less/widget/relationview/relationview.region.less index c5de6b3f9d..82082265aa 100644 --- a/src/less/widget/relationview/relationview.region.less +++ b/src/less/widget/relationview/relationview.region.less @@ -8,6 +8,13 @@ z-index: 1; .border-radius(2px); & .relation-view-region-title { + & .eye{ + font-size: 16px; + } + } + + & .split-line{ + border-bottom: 1px solid @color-bi-border-disabled } } } \ No newline at end of file diff --git a/src/widget/relationview/relationview.item.js b/src/widget/relationview/relationview.item.js index a5da6af040..51c8aee2cf 100644 --- a/src/widget/relationview/relationview.item.js +++ b/src/widget/relationview/relationview.item.js @@ -23,36 +23,34 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, { var body = []; var header = { type: "bi.vertical_adapt", - cls: "primary-key-font", - items: [] + items: [{ + type: "bi.center_adapt", + cls: o.isPrimary ? "primary-key-region primary-key-font" : "", + items: [{ + type: "bi.icon", + title: o.isPrimary ? BI.i18nText("BI-Primary_Key") : "" + }], + width: 36, + height: 16 + }, { + type: "bi.label", + text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], + value: o.value, + height: 24, + textAlign: "left" + }] }; - if (o.isPrimary) { - header.items.push({ - type: "bi.icon", - width: 12, - height: 16, - title: BI.i18nText("BI-Primary_Key") - }); - } - header.items.push({ - type: "bi.label", - text: o.text.length > 1 ? BI.i18nText("BI-Basic_Union_Relation") : o.text[0], - value: o.value, - height: 25, - textAlign: "left", - width: o.isPrimary ? 70 : 90, - lgap: o.isPrimary ? 0 : 10 - }); if(o.text.length > 1){ body = BI.map(o.text, function (idx, text) { return { - type: "bi.label", - text: text, - value: o.value, - height: 25, - textAlign: "left", - width: 70, - lgap: 15 + el: { + type: "bi.label", + text: text, + value: o.value, + height: 24, + textAlign: "left" + }, + lgap: 49 } }) } diff --git a/src/widget/relationview/relationview.region.container.js b/src/widget/relationview/relationview.region.container.js index 12180e871b..061dc83bf4 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: 200 + width: 210 }); }, diff --git a/src/widget/relationview/relationview.region.js b/src/widget/relationview/relationview.region.js index b1b785fa36..ee1dbb5c1e 100644 --- a/src/widget/relationview/relationview.region.js +++ b/src/widget/relationview/relationview.region.js @@ -25,9 +25,9 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.preview = BI.createWidget({ type: "bi.icon_button", - cls: "relation-table-preview-font", - width: 25, - height: 25, + cls: "eye relation-table-preview-font", + width: 36, + height: 24, stopPropagation: true }); this.preview.on(BI.IconButton.EVENT_CHANGE, function () { @@ -36,11 +36,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { this.title = BI.createWidget({ type: "bi.label", - height: 25, + height: 24, width: 70, text: o.text, value: o.value, - textAlign: "left" + textAlign: "left", + disabled: o.disabled }); // title放body上 if (BI.isKey(o.header)) { @@ -80,7 +81,8 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { var texts = BI.isArray(item.text) ? item.text : [item.text]; return BI.extend(item, { type: "bi.relation_view_item", - height: texts.length > 1 ? (texts.length + 1) * 25 : 25, + height: texts.length > 1 ? (texts.length + 1) * 24 : 24, + cls: i === items.length - 1 ? "" : "split-line", hoverIn: function () { self.setValue(item.value); self.fireEvent(BI.RelationViewRegion.EVENT_HOVER_IN, item.value); @@ -107,10 +109,12 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { getHeight: function () { var height = 0; - BI.each(this.button_group.getAllButtons(), function (idx, button) { - height += button.getHeight(); + var buttons = this.button_group.getAllButtons(); + BI.each(buttons, function (idx, button) { + //获取item高度的时候加上边框 + height += button.getHeight() + (idx === buttons.length - 1 ? 0 : 1); }); - return height + 25 + 2 * 20 + 3; + return height + 24 + 2 * 20 + 3; }, // 获取上方开始划线的位置