Browse Source

Merge pull request #574 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '9dfae97bd59f829e5a866f1420cbedaf65bf4c16':
  update
  去画三角方法中的颜色
  BI-29639 && BI-24431 FineUI中需要encodeURIComponent需要对特殊字符编码
es6
windy 6 years ago
parent
commit
f51e7018e4
  1. 100
      dist/_fineui.min.js
  2. 21
      dist/base.css
  3. 59
      dist/base.js
  4. 32
      dist/bundle.css
  5. 78
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 102
      dist/bundle.min.js
  8. 2
      dist/core.css
  9. 19
      dist/core.js
  10. 2
      dist/core_without_normalize.css
  11. 32
      dist/fineui.css
  12. 78
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 100
      dist/fineui.min.js
  15. 19
      dist/utils.js
  16. 8
      dist/utils.min.js
  17. 9
      dist/widget.css
  18. 59
      src/base/layer/layer.popover.js
  19. 19
      src/core/alias.js
  20. 21
      src/css/base/combo/combo.css
  21. 2
      src/css/core/utils/common.css
  22. 6
      src/css/widget/multiselect/multiselect.css
  23. 3
      src/css/widget/singleselect/singleselect.css
  24. 9
      src/less/base/combo/combo.bubble.less
  25. 6
      src/less/base/combo/combo.searchtextvalue.less
  26. 2
      src/less/core/utils/common.less
  27. 12
      src/less/visual.less
  28. 5
      src/less/widget/multiselect/multiselect.combo.less
  29. 6
      src/less/widget/multiselect/multiselect.insert.combo.less
  30. 5
      src/less/widget/singleselect/singleselect.combo.less
  31. 11
      src/less/widget/singletreecombo/singletreecombo.less

100
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

21
dist/base.css vendored

@ -396,10 +396,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-45deg); transform: rotate(-45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-right { .bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1; z-index: 1;
@ -414,10 +411,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(135deg); transform: rotate(135deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-top { .bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1; z-index: 1;
@ -432,10 +426,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(45deg); transform: rotate(45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-bottom { .bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1; z-index: 1;
@ -450,8 +441,13 @@
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-135deg); transform: rotate(-135deg);
}
.bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #ffffff;
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7; border-right: 1px solid #f2f4f7;
} }
@ -460,6 +456,8 @@
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before, .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before { .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640; background-color: #242640;
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
} }
.bi-combo.bi-combo-popup { .bi-combo.bi-combo-popup {
@ -490,9 +488,6 @@
.bi-search-text-value-combo.combo-show .trigger-down { .bi-search-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-search-text-value-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label { .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {

59
dist/base.js vendored

@ -15409,44 +15409,39 @@ BI.Popover = BI.inherit(BI.Widget, {
var items = { var items = {
north: { north: {
el: { el: {
type: "bi.border", type: "bi.htape",
cls: "bi-message-title bi-background", cls: "bi-message-title bi-background",
ref: function (_ref) { ref: function (_ref) {
self.dragger = _ref; self.dragger = _ref;
}, },
items: { items: [{
center: { type: "bi.absolute",
el: { items: [{
type: "bi.absolute", el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
items: [{ extraCls: "bi-font-bold"
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, { }) : {
extraCls: "bi-font-bold" type: "bi.label",
}) : { cls: "bi-font-bold",
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
textAlign: "left"
},
left: 20,
top: 0,
right: 0,
bottom: 0
}]
}
},
east: {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { text: o.header,
self.close(); textAlign: "left"
}
}, },
width: 60 left: 20,
} top: 0,
} right: 0,
bottom: 0
}]
}, {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT,
handler: function () {
self.close();
}
},
width: 56
}]
}, },
height: this._constant.HEADER_HEIGHT height: this._constant.HEADER_HEIGHT
}, },

32
dist/bundle.css vendored

@ -408,7 +408,7 @@ textarea {
border-radius: 2px; border-radius: 2px;
} }
.bi-font-bold { .bi-font-bold {
font-weight: 600; font-weight: 700;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;
@ -2249,10 +2249,7 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-45deg); transform: rotate(-45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-right { .bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1; z-index: 1;
@ -2267,10 +2264,7 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(135deg); transform: rotate(135deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-top { .bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1; z-index: 1;
@ -2285,10 +2279,7 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(45deg); transform: rotate(45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-bottom { .bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1; z-index: 1;
@ -2303,8 +2294,13 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-135deg); transform: rotate(-135deg);
}
.bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #ffffff;
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7; border-right: 1px solid #f2f4f7;
} }
@ -2313,6 +2309,8 @@ textarea {
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before, .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before { .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640; background-color: #242640;
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
} }
.bi-combo.bi-combo-popup { .bi-combo.bi-combo-popup {
@ -2343,9 +2341,6 @@ textarea {
.bi-search-text-value-combo.combo-show .trigger-down { .bi-search-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-search-text-value-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label { .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
@ -4295,9 +4290,6 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo.combo-show .trigger-down { .bi-multi-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
@ -4314,9 +4306,6 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-insert-combo.combo-show .trigger-down { .bi-multi-select-insert-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {
@ -4574,9 +4563,6 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo.combo-show .trigger-down { .bi-single-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-single-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-single-slider-label { .bi-single-slider-label {
min-height: 50px; min-height: 50px;
} }

78
dist/bundle.js vendored

@ -26331,6 +26331,25 @@ BI.ShowAction = BI.inherit(BI.Action, {
})(jo); })(jo);
}; };
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
return window.encodeURIComponent(url);
};
BI.decodeURIComponent = function (url) {
var reserveSpecialCharsMap = {};
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return window.decodeURIComponent(url);
};
BI.contentFormat = function (cv, fmt) { BI.contentFormat = function (cv, fmt) {
if (isEmpty(cv)) { if (isEmpty(cv)) {
// 原值为空,返回空字符 // 原值为空,返回空字符
@ -51420,44 +51439,39 @@ BI.Popover = BI.inherit(BI.Widget, {
var items = { var items = {
north: { north: {
el: { el: {
type: "bi.border", type: "bi.htape",
cls: "bi-message-title bi-background", cls: "bi-message-title bi-background",
ref: function (_ref) { ref: function (_ref) {
self.dragger = _ref; self.dragger = _ref;
}, },
items: { items: [{
center: { type: "bi.absolute",
el: { items: [{
type: "bi.absolute", el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
items: [{ extraCls: "bi-font-bold"
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, { }) : {
extraCls: "bi-font-bold" type: "bi.label",
}) : { cls: "bi-font-bold",
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
textAlign: "left"
},
left: 20,
top: 0,
right: 0,
bottom: 0
}]
}
},
east: {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { text: o.header,
self.close(); textAlign: "left"
}
}, },
width: 60 left: 20,
} top: 0,
} right: 0,
bottom: 0
}]
}, {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT,
handler: function () {
self.close();
}
},
width: 56
}]
}, },
height: this._constant.HEADER_HEIGHT height: this._constant.HEADER_HEIGHT
}, },

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

102
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

@ -408,7 +408,7 @@ textarea {
border-radius: 2px; border-radius: 2px;
} }
.bi-font-bold { .bi-font-bold {
font-weight: 600; font-weight: 700;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;

19
dist/core.js vendored

@ -26331,6 +26331,25 @@ BI.ShowAction = BI.inherit(BI.Action, {
})(jo); })(jo);
}; };
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
return window.encodeURIComponent(url);
};
BI.decodeURIComponent = function (url) {
var reserveSpecialCharsMap = {};
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return window.decodeURIComponent(url);
};
BI.contentFormat = function (cv, fmt) { BI.contentFormat = function (cv, fmt) {
if (isEmpty(cv)) { if (isEmpty(cv)) {
// 原值为空,返回空字符 // 原值为空,返回空字符

2
dist/core_without_normalize.css vendored

@ -127,7 +127,7 @@ textarea {
border-radius: 2px; border-radius: 2px;
} }
.bi-font-bold { .bi-font-bold {
font-weight: 600; font-weight: 700;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;

32
dist/fineui.css vendored

@ -408,7 +408,7 @@ textarea {
border-radius: 2px; border-radius: 2px;
} }
.bi-font-bold { .bi-font-bold {
font-weight: 600; font-weight: 700;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;
@ -2249,10 +2249,7 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-45deg); transform: rotate(-45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-right { .bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1; z-index: 1;
@ -2267,10 +2264,7 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(135deg); transform: rotate(135deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-top { .bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1; z-index: 1;
@ -2285,10 +2279,7 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(45deg); transform: rotate(45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-bottom { .bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1; z-index: 1;
@ -2303,8 +2294,13 @@ textarea {
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-135deg); transform: rotate(-135deg);
}
.bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #ffffff;
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7; border-right: 1px solid #f2f4f7;
} }
@ -2313,6 +2309,8 @@ textarea {
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before, .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before { .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640; background-color: #242640;
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
} }
.bi-combo.bi-combo-popup { .bi-combo.bi-combo-popup {
@ -2343,9 +2341,6 @@ textarea {
.bi-search-text-value-combo.combo-show .trigger-down { .bi-search-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-search-text-value-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label { .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
@ -4295,9 +4290,6 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-combo.combo-show .trigger-down { .bi-multi-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
@ -4314,9 +4306,6 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-insert-combo.combo-show .trigger-down { .bi-multi-select-insert-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {
@ -4574,9 +4563,6 @@ ul.ztree.zTreeDragUL {
.bi-single-select-combo.combo-show .trigger-down { .bi-single-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-single-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-single-slider-label { .bi-single-slider-label {
min-height: 50px; min-height: 50px;
} }

78
dist/fineui.js vendored

@ -26552,6 +26552,25 @@ BI.ShowAction = BI.inherit(BI.Action, {
})(jo); })(jo);
}; };
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
return window.encodeURIComponent(url);
};
BI.decodeURIComponent = function (url) {
var reserveSpecialCharsMap = {};
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return window.decodeURIComponent(url);
};
BI.contentFormat = function (cv, fmt) { BI.contentFormat = function (cv, fmt) {
if (isEmpty(cv)) { if (isEmpty(cv)) {
// 原值为空,返回空字符 // 原值为空,返回空字符
@ -51641,44 +51660,39 @@ BI.Popover = BI.inherit(BI.Widget, {
var items = { var items = {
north: { north: {
el: { el: {
type: "bi.border", type: "bi.htape",
cls: "bi-message-title bi-background", cls: "bi-message-title bi-background",
ref: function (_ref) { ref: function (_ref) {
self.dragger = _ref; self.dragger = _ref;
}, },
items: { items: [{
center: { type: "bi.absolute",
el: { items: [{
type: "bi.absolute", el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
items: [{ extraCls: "bi-font-bold"
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, { }) : {
extraCls: "bi-font-bold" type: "bi.label",
}) : { cls: "bi-font-bold",
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
textAlign: "left"
},
left: 20,
top: 0,
right: 0,
bottom: 0
}]
}
},
east: {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { text: o.header,
self.close(); textAlign: "left"
}
}, },
width: 60 left: 20,
} top: 0,
} right: 0,
bottom: 0
}]
}, {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT,
handler: function () {
self.close();
}
},
width: 56
}]
}, },
height: this._constant.HEADER_HEIGHT height: this._constant.HEADER_HEIGHT
}, },

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

100
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

19
dist/utils.js vendored

@ -13136,6 +13136,25 @@ _.extend(BI.OB.prototype, {
})(jo); })(jo);
}; };
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
return window.encodeURIComponent(url);
};
BI.decodeURIComponent = function (url) {
var reserveSpecialCharsMap = {};
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return window.decodeURIComponent(url);
};
BI.contentFormat = function (cv, fmt) { BI.contentFormat = function (cv, fmt) {
if (isEmpty(cv)) { if (isEmpty(cv)) {
// 原值为空,返回空字符 // 原值为空,返回空字符

8
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/widget.css vendored

@ -117,9 +117,6 @@
.bi-multi-select-combo.combo-show .trigger-down { .bi-multi-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
@ -136,9 +133,6 @@
.bi-multi-select-insert-combo.combo-show .trigger-down { .bi-multi-select-insert-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {
@ -396,9 +390,6 @@
.bi-single-select-combo.combo-show .trigger-down { .bi-single-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-single-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-single-slider-label { .bi-single-slider-label {
min-height: 50px; min-height: 50px;
} }

59
src/base/layer/layer.popover.js

@ -45,44 +45,39 @@ BI.Popover = BI.inherit(BI.Widget, {
var items = { var items = {
north: { north: {
el: { el: {
type: "bi.border", type: "bi.htape",
cls: "bi-message-title bi-background", cls: "bi-message-title bi-background",
ref: function (_ref) { ref: function (_ref) {
self.dragger = _ref; self.dragger = _ref;
}, },
items: { items: [{
center: { type: "bi.absolute",
el: { items: [{
type: "bi.absolute", el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
items: [{ extraCls: "bi-font-bold"
el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, { }) : {
extraCls: "bi-font-bold" type: "bi.label",
}) : { cls: "bi-font-bold",
type: "bi.label",
cls: "bi-font-bold",
height: this._constant.HEADER_HEIGHT,
text: o.header,
textAlign: "left"
},
left: 20,
top: 0,
right: 0,
bottom: 0
}]
}
},
east: {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT, height: this._constant.HEADER_HEIGHT,
handler: function () { text: o.header,
self.close(); textAlign: "left"
}
}, },
width: 60 left: 20,
} top: 0,
} right: 0,
bottom: 0
}]
}, {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
height: this._constant.HEADER_HEIGHT,
handler: function () {
self.close();
}
},
width: 56
}]
}, },
height: this._constant.HEADER_HEIGHT height: this._constant.HEADER_HEIGHT
}, },

19
src/core/alias.js

@ -575,6 +575,25 @@
})(jo); })(jo);
}; };
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
return window.encodeURIComponent(url);
};
BI.decodeURIComponent = function (url) {
var reserveSpecialCharsMap = {};
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return window.decodeURIComponent(url);
};
BI.contentFormat = function (cv, fmt) { BI.contentFormat = function (cv, fmt) {
if (isEmpty(cv)) { if (isEmpty(cv)) {
// 原值为空,返回空字符 // 原值为空,返回空字符

21
src/css/base/combo/combo.css

@ -15,10 +15,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-45deg); transform: rotate(-45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-right { .bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1; z-index: 1;
@ -33,10 +30,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(135deg); transform: rotate(135deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-top { .bi-bubble-combo .bubble-combo-triangle-top {
z-index: 1; z-index: 1;
@ -51,10 +45,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(45deg); transform: rotate(45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
.bi-bubble-combo .bubble-combo-triangle-bottom { .bi-bubble-combo .bubble-combo-triangle-bottom {
z-index: 1; z-index: 1;
@ -69,8 +60,13 @@
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-135deg); transform: rotate(-135deg);
}
.bi-bubble-combo .bubble-combo-triangle-left:before,
.bi-bubble-combo.bubble-combo-triangle-right:before,
.bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #ffffff;
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7; border-right: 1px solid #f2f4f7;
} }
@ -79,6 +75,8 @@
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before, .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before { .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640; background-color: #242640;
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
} }
.bi-combo.bi-combo-popup { .bi-combo.bi-combo-popup {
@ -109,9 +107,6 @@
.bi-search-text-value-combo.combo-show .trigger-down { .bi-search-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-search-text-value-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label { .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {

2
src/css/core/utils/common.css

@ -127,7 +127,7 @@ textarea {
border-radius: 2px; border-radius: 2px;
} }
.bi-font-bold { .bi-font-bold {
font-weight: 600; font-weight: 700;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;

6
src/css/widget/multiselect/multiselect.css

@ -13,9 +13,6 @@
.bi-multi-select-combo.combo-show .trigger-down { .bi-multi-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button { .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
@ -32,9 +29,6 @@
.bi-multi-select-insert-combo.combo-show .trigger-down { .bi-multi-select-insert-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-multi-select-insert-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}
.bi-multi-select-trigger { .bi-multi-select-trigger {

3
src/css/widget/singleselect/singleselect.css

@ -13,6 +13,3 @@
.bi-single-select-combo.combo-show .trigger-down { .bi-single-select-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-single-select-combo .bi-combo-hover > .bi-border {
border-color: #3685f2;
}

9
src/less/base/combo/combo.bubble.less

@ -21,6 +21,13 @@
z-index: 1; z-index: 1;
.triangle-top(); .triangle-top();
} }
& .bubble-combo-triangle-left, &.bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom {
&:before {
background-color: @color-bi-background-default;
border-bottom: 1px solid @border-color-light-line;
border-right: 1px solid @border-color-light-line;
}
}
} }
.bi-theme-dark { .bi-theme-dark {
@ -28,6 +35,8 @@
& .bubble-combo-triangle-left, &.bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom { & .bubble-combo-triangle-left, &.bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom {
&:before { &:before {
background-color: @color-bi-background-default-theme-dark; background-color: @color-bi-background-default-theme-dark;
border-bottom: 1px solid @border-color-light-line-theme-dark;
border-right: 1px solid @border-color-light-line-theme-dark;
} }
} }
} }

6
src/less/base/combo/combo.searchtextvalue.less

@ -25,10 +25,4 @@
display: none; display: none;
} }
} }
& .bi-combo-hover {
& > .bi-border {
border-color: @color-bi-border-highlight;
}
}
} }

2
src/less/core/utils/common.less

@ -148,7 +148,7 @@ textarea {
} }
.bi-font-bold { .bi-font-bold {
font-weight: 600; font-weight: 700;
} }
.bi-theme-dark { .bi-theme-dark {

12
src/less/visual.less

@ -197,10 +197,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-135deg); transform: rotate(-135deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
} }
@ -216,10 +213,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(45deg); transform: rotate(45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
} }
@ -236,10 +230,7 @@
margin-left: 3px; margin-left: 3px;
margin-top: 3px; margin-top: 3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(135deg); transform: rotate(135deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
} }
@ -255,9 +246,6 @@
margin-left: 3px; margin-left: 3px;
margin-top: -3px; margin-top: -3px;
content: ""; content: "";
background-color: #ffffff;
transform: rotate(-45deg); transform: rotate(-45deg);
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
} }
} }

5
src/less/widget/multiselect/multiselect.combo.less

@ -18,9 +18,4 @@
display: none; display: none;
} }
} }
& .bi-combo-hover {
& > .bi-border {
border-color: @color-bi-border-highlight;
}
}
} }

6
src/less/widget/multiselect/multiselect.insert.combo.less

@ -18,10 +18,4 @@
display: none; display: none;
} }
} }
& .bi-combo-hover {
& > .bi-border {
border-color: @color-bi-border-highlight;
}
}
} }

5
src/less/widget/singleselect/singleselect.combo.less

@ -18,9 +18,4 @@
display: none; display: none;
} }
} }
& .bi-combo-hover {
& > .bi-border {
border-color: @color-bi-border-highlight;
}
}
} }

11
src/less/widget/singletreecombo/singletreecombo.less

@ -1,11 +0,0 @@
@import "../../index";
.bi-combo {
&.bi-combo-popup {
&:focus, &:hover {
& > .bi-single-tree-trigger {
border-color: @color-bi-border-highlight;
}
}
}
}
Loading…
Cancel
Save