fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
6aa0a08006 a62177f9e3
commit
fef3083c49
16 changed files with 242 additions and 152 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      dist/bundle.css
  2. 78
      dist/bundle.js
  3. 18
      dist/fineui.css
  4. 78
      dist/fineui.js
  5. 18
      dist/widget.css
  6. 78
      dist/widget.js
  7. 9
      src/css/widget/relationview/relationview.css
  8. 3
      src/css/widget/relationview/relationview.item.css
  9. 6
      src/css/widget/relationview/relationview.region.css
  10. 3
      src/less/widget/relationview/relationview.item.less
  11. 7
      src/less/widget/relationview/relationview.region.less
  12. 2
      src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
  13. 2
      src/widget/multilayersingletree/multilayersingletree.leveltree.js
  14. 50
      src/widget/relationview/relationview.item.js
  15. 2
      src/widget/relationview/relationview.region.container.js
  16. 22
      src/widget/relationview/relationview.region.js

18
dist/bundle.css vendored
Unescape View File

@ -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;

78
dist/bundle.js vendored
Unescape View File

@ -84493,7 +84493,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {
@ -85043,7 +85043,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {
@ -91474,36 +91474,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
}
})
}
@ -91856,7 +91854,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
});
},
@ -91971,9 +91969,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 () {
@ -91982,11 +91980,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)) {
@ -92026,7 +92025,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);
@ -92053,10 +92053,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;
},
// 获取上方开始划线的位置

18
dist/fineui.css vendored
Unescape View File

@ -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;

78
dist/fineui.js vendored
Unescape View File

@ -86247,7 +86247,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {
@ -86797,7 +86797,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {
@ -93228,36 +93228,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
}
})
}
@ -93610,7 +93608,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
});
},
@ -93725,9 +93723,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 () {
@ -93736,11 +93734,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)) {
@ -93780,7 +93779,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);
@ -93807,10 +93807,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;
},
// 获取上方开始划线的位置

18
dist/widget.css vendored
Unescape View File

@ -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;

78
dist/widget.js vendored
Unescape View File

@ -7958,7 +7958,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {
@ -8508,7 +8508,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {
@ -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;
},
// 获取上方开始划线的位置

9
src/css/widget/relationview/relationview.css
Unescape View File

@ -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;
}

3
src/css/widget/relationview/relationview.item.css
Unescape View File

@ -0,0 +1,3 @@
.bi-relation-view-item .primary-key-region {
font-size: 16px;
}

6
src/css/widget/relationview/relationview.region.css
Unescape View File

@ -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;
}

3
src/less/widget/relationview/relationview.item.less
Unescape View File

@ -1,4 +1,7 @@
@import "../../index";
.bi-relation-view-item{
& .primary-key-region{
font-size: 16px;
}
}

7
src/less/widget/relationview/relationview.region.less
Unescape View File

@ -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
}
}
}

2
src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
Unescape View File

@ -110,7 +110,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {

2
src/widget/multilayersingletree/multilayersingletree.leveltree.js
Unescape View File

@ -112,7 +112,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
},
getValue: function () {
return this.tree.getValue();
return BI.uniq(this.tree.getValue());
},
getAllLeaves: function () {

50
src/widget/relationview/relationview.item.js
Unescape View File

@ -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
}
})
}

2
src/widget/relationview/relationview.region.container.js
Unescape View File

@ -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
});
},

22
src/widget/relationview/relationview.region.js
Unescape View File

@ -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;
},
// 获取上方开始划线的位置

Write Preview
Loading…
Cancel
Save