From ea66544ec251134a12f815f8a4d30557412b6113 Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 2 Jan 2022 00:32:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/linersegment/linear.segment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/case/linersegment/linear.segment.js b/src/case/linersegment/linear.segment.js index f0060dce3..d7febfcd1 100644 --- a/src/case/linersegment/linear.segment.js +++ b/src/case/linersegment/linear.segment.js @@ -18,6 +18,7 @@ BI.LinearSegment = BI.inherit(BI.Widget, { height: o.height - 1 }), layouts: o.layouts, + value: o.value, listeners: [{ eventName: "__EVENT_CHANGE__", action: function () { @@ -48,4 +49,4 @@ BI.LinearSegment = BI.inherit(BI.Widget, { return this.buttonGroup.getValue(); } }); -BI.shortcut("bi.linear_segment", BI.LinearSegment); \ No newline at end of file +BI.shortcut("bi.linear_segment", BI.LinearSegment); From 79d7fe937f2c7586b20e661e03fda3db530d6115 Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 2 Jan 2022 00:38:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/linersegment/button.linear.segment.js | 5 +++-- src/case/linersegment/linear.segment.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/case/linersegment/button.linear.segment.js b/src/case/linersegment/button.linear.segment.js index be8403844..38479accb 100644 --- a/src/case/linersegment/button.linear.segment.js +++ b/src/case/linersegment/button.linear.segment.js @@ -5,7 +5,7 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, { once: true, readonly: true, hgap: 10, - height: 25 + height: 24 }, render: function () { @@ -15,6 +15,7 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, { type: "bi.label", text: o.text, height: o.height, + textHeight: o.height - 2, value: o.value, hgap: o.hgap, ref: function () { @@ -51,4 +52,4 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, { this.text.setText(text); } }); -BI.shortcut("bi.linear_segment_button", BI.LinearSegmentButton); \ No newline at end of file +BI.shortcut("bi.linear_segment_button", BI.LinearSegmentButton); diff --git a/src/case/linersegment/linear.segment.js b/src/case/linersegment/linear.segment.js index d7febfcd1..3c1b677c3 100644 --- a/src/case/linersegment/linear.segment.js +++ b/src/case/linersegment/linear.segment.js @@ -6,7 +6,7 @@ BI.LinearSegment = BI.inherit(BI.Widget, { layouts: [{ type: "bi.center" }], - height: 29 + height: 30 }, render: function () { @@ -15,7 +15,7 @@ BI.LinearSegment = BI.inherit(BI.Widget, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.linear_segment_button", - height: o.height - 1 + height: o.height }), layouts: o.layouts, value: o.value, From b9171cd42819fc08511d7d360ae63f72af5f8222 Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 2 Jan 2022 00:50:00 +0800 Subject: [PATCH 3/5] update --- src/less/base/segment/button.segment.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/less/base/segment/button.segment.less b/src/less/base/segment/button.segment.less index 4247740f4..ff94a544d 100644 --- a/src/less/base/segment/button.segment.less +++ b/src/less/base/segment/button.segment.less @@ -5,3 +5,9 @@ .transition(@transition); color: @color-bi-text-highlight; } + +.bi-line-segment-button{ + .line-segment-button-line{ + .transition(background .3s); + } +} \ No newline at end of file From 5cdeb7c770e73580662356c0badd31b81a8e22fe Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 2 Jan 2022 00:50:18 +0800 Subject: [PATCH 4/5] upda --- src/less/base/segment/button.segment.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/less/base/segment/button.segment.less b/src/less/base/segment/button.segment.less index ff94a544d..66fbed510 100644 --- a/src/less/base/segment/button.segment.less +++ b/src/less/base/segment/button.segment.less @@ -1,13 +1,13 @@ @import "../../index"; .bi-segment-button { - @transition: color .3s,background .3s,border-color .3s,box-shadow .3s; + @transition: color 0.3s, background 0.3s, border-color 0.3s, box-shadow 0.3s; .transition(@transition); color: @color-bi-text-highlight; } -.bi-line-segment-button{ - .line-segment-button-line{ - .transition(background .3s); +.bi-line-segment-button { + .line-segment-button-line { + .transition(background 0.3s); } -} \ No newline at end of file +} From a4f9a488d1e56de89d18e6c863f40ad0c5a8f4a9 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 3 Jan 2022 17:17:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=88=E5=88=A0=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/utils/motion/fade.less | 36 ----- src/less/core/utils/motion/move.less | 131 ------------------- src/less/core/utils/motion/slide.less | 131 ------------------- src/less/core/utils/motion/zoom.less | 181 -------------------------- 4 files changed, 479 deletions(-) delete mode 100644 src/less/core/utils/motion/fade.less delete mode 100644 src/less/core/utils/motion/move.less delete mode 100644 src/less/core/utils/motion/slide.less delete mode 100644 src/less/core/utils/motion/zoom.less diff --git a/src/less/core/utils/motion/fade.less b/src/less/core/utils/motion/fade.less deleted file mode 100644 index ad14b0bc1..000000000 --- a/src/less/core/utils/motion/fade.less +++ /dev/null @@ -1,36 +0,0 @@ -@import "../../../index"; - -.fade-motion(@className, @keyframeName) { - @name: ~'bi-@{className}'; - .make-motion(@name, @keyframeName); - .@{name}-enter, - .@{name}-appear { - opacity: 0; - animation-timing-function: linear; - } - .@{name}-leave { - animation-timing-function: linear; - } -} - -.fade-motion(fade, biFade); - -@keyframes biFadeIn { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } -} - -@keyframes biFadeOut { - 0% { - opacity: 1; - } - - 100% { - opacity: 0; - } -} diff --git a/src/less/core/utils/motion/move.less b/src/less/core/utils/motion/move.less deleted file mode 100644 index ab707807c..000000000 --- a/src/less/core/utils/motion/move.less +++ /dev/null @@ -1,131 +0,0 @@ -@import "../../../index"; - -.move-motion(@className, @keyframeName) { - @name: ~'bi-@{className}'; - .make-motion(@name, @keyframeName); - .@{name}-enter, - .@{name}-appear { - opacity: 0; - animation-timing-function: @ease-out-circ; - } - .@{name}-leave { - animation-timing-function: @ease-in-circ; - } -} - -.move-motion(move-up, biMoveUp); -.move-motion(move-down, biMoveDown); -.move-motion(move-left, biMoveLeft); -.move-motion(move-right, biMoveRight); - -@keyframes biMoveDownIn { - 0% { - transform: translateY(100%); - transform-origin: 0 0; - opacity: 0; - } - - 100% { - transform: translateY(0%); - transform-origin: 0 0; - opacity: 1; - } -} - -@keyframes biMoveDownOut { - 0% { - transform: translateY(0%); - transform-origin: 0 0; - opacity: 1; - } - - 100% { - transform: translateY(100%); - transform-origin: 0 0; - opacity: 0; - } -} - -@keyframes biMoveLeftIn { - 0% { - transform: translateX(-100%); - transform-origin: 0 0; - opacity: 0; - } - - 100% { - transform: translateX(0%); - transform-origin: 0 0; - opacity: 1; - } -} - -@keyframes biMoveLeftOut { - 0% { - transform: translateX(0%); - transform-origin: 0 0; - opacity: 1; - } - - 100% { - transform: translateX(-100%); - transform-origin: 0 0; - opacity: 0; - } -} - -@keyframes biMoveRightIn { - 0% { - transform: translateX(100%); - transform-origin: 0 0; - opacity: 0; - } - - 100% { - transform: translateX(0%); - transform-origin: 0 0; - opacity: 1; - } -} - -@keyframes biMoveRightOut { - 0% { - transform: translateX(0%); - transform-origin: 0 0; - opacity: 1; - } - - 100% { - transform: translateX(100%); - transform-origin: 0 0; - opacity: 0; - } -} - -@keyframes biMoveUpIn { - 0% { - transform: translateY(-100%); - transform-origin: 0 0; - opacity: 0; - } - - 100% { - transform: translateY(0%); - transform-origin: 0 0; - opacity: 1; - } -} - -@keyframes biMoveUpOut { - 0% { - transform: translateY(0%); - transform-origin: 0 0; - opacity: 1; - } - - 100% { - transform: translateY(-100%); - transform-origin: 0 0; - opacity: 0; - } -} diff --git a/src/less/core/utils/motion/slide.less b/src/less/core/utils/motion/slide.less deleted file mode 100644 index b956f8814..000000000 --- a/src/less/core/utils/motion/slide.less +++ /dev/null @@ -1,131 +0,0 @@ -@import "../../../index"; - -.slide-motion(@className, @keyframeName) { - @name: ~'bi-@{className}'; - .make-motion(@name, @keyframeName); - .@{name}-enter, - .@{name}-appear { - opacity: 0; - animation-timing-function: @ease-out-quint; - } - .@{name}-leave { - animation-timing-function: @ease-in-quint; - } -} - -.slide-motion(slide-up, biSlideUp); -.slide-motion(slide-down, biSlideDown); -.slide-motion(slide-left, biSlideLeft); -.slide-motion(slide-right, biSlideRight); - -@keyframes biSlideUpIn { - 0% { - transform: scaleY(0.8); - transform-origin: 0% 0%; - opacity: 0; - } - - 100% { - transform: scaleY(1); - transform-origin: 0% 0%; - opacity: 1; - } -} - -@keyframes biSlideUpOut { - 0% { - transform: scaleY(1); - transform-origin: 0% 0%; - opacity: 1; - } - - 100% { - transform: scaleY(0.8); - transform-origin: 0% 0%; - opacity: 0; - } -} - -@keyframes biSlideDownIn { - 0% { - transform: scaleY(0.8); - transform-origin: 100% 100%; - opacity: 0; - } - - 100% { - transform: scaleY(1); - transform-origin: 100% 100%; - opacity: 1; - } -} - -@keyframes biSlideDownOut { - 0% { - transform: scaleY(1); - transform-origin: 100% 100%; - opacity: 1; - } - - 100% { - transform: scaleY(0.8); - transform-origin: 100% 100%; - opacity: 0; - } -} - -@keyframes biSlideLeftIn { - 0% { - transform: scaleX(0.8); - transform-origin: 0% 0%; - opacity: 0; - } - - 100% { - transform: scaleX(1); - transform-origin: 0% 0%; - opacity: 1; - } -} - -@keyframes biSlideLeftOut { - 0% { - transform: scaleX(1); - transform-origin: 0% 0%; - opacity: 1; - } - - 100% { - transform: scaleX(0.8); - transform-origin: 0% 0%; - opacity: 0; - } -} - -@keyframes biSlideRightIn { - 0% { - transform: scaleX(0.8); - transform-origin: 100% 0%; - opacity: 0; - } - - 100% { - transform: scaleX(1); - transform-origin: 100% 0%; - opacity: 1; - } -} - -@keyframes biSlideRightOut { - 0% { - transform: scaleX(1); - transform-origin: 100% 0%; - opacity: 1; - } - - 100% { - transform: scaleX(0.8); - transform-origin: 100% 0%; - opacity: 0; - } -} diff --git a/src/less/core/utils/motion/zoom.less b/src/less/core/utils/motion/zoom.less deleted file mode 100644 index d3351eeef..000000000 --- a/src/less/core/utils/motion/zoom.less +++ /dev/null @@ -1,181 +0,0 @@ -@import "../../../index"; - -.zoom-motion(@className, @keyframeName, @duration: @animation-duration-base) { - @name: ~'bi-@{className}'; - .make-motion(@name, @keyframeName, @duration); - .@{name}-enter, - .@{name}-appear { - transform: scale(0); // need this by yiminghe - opacity: 0; - animation-timing-function: @ease-out-circ; - - &-prepare { - transform: none; - } - } - .@{name}-leave { - animation-timing-function: @ease-in-out-circ; - } -} - -// For Modal, Select choosen item -.zoom-motion(zoom, biZoom); -// For Popover, Popconfirm, Dropdown -.zoom-motion(zoom-big, biZoomBig); -// For Tooltip -.zoom-motion(zoom-big-fast, biZoomBig, @animation-duration-fast); - -.zoom-motion(zoom-up, biZoomUp); -.zoom-motion(zoom-down, biZoomDown); -.zoom-motion(zoom-left, biZoomLeft); -.zoom-motion(zoom-right, biZoomRight); - -@keyframes biZoomIn { - 0% { - transform: scale(0.2); - opacity: 0; - } - - 100% { - transform: scale(1); - opacity: 1; - } -} - -@keyframes biZoomOut { - 0% { - transform: scale(1); - } - - 100% { - transform: scale(0.2); - opacity: 0; - } -} - -@keyframes biZoomBigIn { - 0% { - transform: scale(0.8); - opacity: 0; - } - - 100% { - transform: scale(1); - opacity: 1; - } -} - -@keyframes biZoomBigOut { - 0% { - transform: scale(1); - } - - 100% { - transform: scale(0.8); - opacity: 0; - } -} - -@keyframes biZoomUpIn { - 0% { - transform: scale(0.8); - transform-origin: 50% 0%; - opacity: 0; - } - - 100% { - transform: scale(1); - transform-origin: 50% 0%; - } -} - -@keyframes biZoomUpOut { - 0% { - transform: scale(1); - transform-origin: 50% 0%; - } - - 100% { - transform: scale(0.8); - transform-origin: 50% 0%; - opacity: 0; - } -} - -@keyframes biZoomLeftIn { - 0% { - transform: scale(0.8); - transform-origin: 0% 50%; - opacity: 0; - } - - 100% { - transform: scale(1); - transform-origin: 0% 50%; - } -} - -@keyframes biZoomLeftOut { - 0% { - transform: scale(1); - transform-origin: 0% 50%; - } - - 100% { - transform: scale(0.8); - transform-origin: 0% 50%; - opacity: 0; - } -} - -@keyframes biZoomRightIn { - 0% { - transform: scale(0.8); - transform-origin: 100% 50%; - opacity: 0; - } - - 100% { - transform: scale(1); - transform-origin: 100% 50%; - } -} - -@keyframes biZoomRightOut { - 0% { - transform: scale(1); - transform-origin: 100% 50%; - } - - 100% { - transform: scale(0.8); - transform-origin: 100% 50%; - opacity: 0; - } -} - -@keyframes biZoomDownIn { - 0% { - transform: scale(0.8); - transform-origin: 50% 100%; - opacity: 0; - } - - 100% { - transform: scale(1); - transform-origin: 50% 100%; - } -} - -@keyframes biZoomDownOut { - 0% { - transform: scale(1); - transform-origin: 50% 100%; - } - - 100% { - transform: scale(0.8); - transform-origin: 50% 100%; - opacity: 0; - } -}