Skip to content

Commit c745843

Browse files
EarlyHEarlyH
committed
0.10.20
 - `ui-imagemap`新增`clean-allzone-btn`配置，开启后显示清空所有热区按钮 - 修复`ui-timepicker`在选择时间时，如果禁用了某段时间会有闪烁的问题 - 修复`ui-tip`鼠标无法移动到内容区域的问题 - 修复`ui-datepicker`中`is-range`和`selectable-range`无法同时使用的问题
2 parents c73d87d + 77c5af9 commit c745843

File tree

194 files changed

+1149
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+1149
-819
lines changed

‎.stylelintrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"value-no-vendor-prefix" : true,
4343
"declaration-block-single-line-max-declarations" : 1,
4444
"selector-max-attribute" : 2,
45-
"selector-max-class" : 5,
45+
"selector-max-class" : 6,
4646
"selector-max-combinators" : 5,
4747
"selector-max-compound-selectors" : 6,
4848
"selector-max-empty-lines" : 0,

‎dist/morning-ui.css‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6973,6 +6973,7 @@ mor-calendar header .titlebar .title {
69736973
}
69746974
mor-calendar .calendar {
69756975
padding-top: 0.5em;
6976+
min-width: 280px;
69766977
}
69776978
mor-calendar .calendar .pick-day {
69786979
display: flex;
@@ -7013,6 +7014,9 @@ mor-calendar .calendar .pick-day .day.highlight .inner-layer {
70137014
mor-calendar .calendar .pick-day .day.middle .select-layer {
70147015
background-color: #fee9ec;
70157016
}
7017+
mor-calendar .calendar .pick-day .day.middle.bg-mark-disabled .select-layer {
7018+
background-color: #A8B3C2;
7019+
}
70167020
mor-calendar .calendar .pick-day .day.start {
70177021
text-align: right;
70187022
}
@@ -7041,6 +7045,14 @@ mor-calendar .calendar .pick-day .day.end .select-layer {
70417045
border-radius: 0 100em 100em 0;
70427046
width: auto;
70437047
}
7048+
mor-calendar .calendar .pick-day .day.start.bg-mark-disabled .inner-layer,
7049+
mor-calendar .calendar .pick-day .day.end.bg-mark-disabled .inner-layer {
7050+
background-color: #45505C;
7051+
}
7052+
mor-calendar .calendar .pick-day .day.start.bg-mark-disabled .select-layer,
7053+
mor-calendar .calendar .pick-day .day.end.bg-mark-disabled .select-layer {
7054+
background-color: #A8B3C2;
7055+
}
70447056
mor-calendar .calendar .pick-day .day.point-mark {
70457057
position: relative;
70467058
}
@@ -7507,7 +7519,6 @@ mor-tip.in {
75077519
}
75087520
mor-tip.morning-tether-element-attached-bottom {
75097521
padding: 5px 0;
7510-
margin-top: -3px;
75117522
}
75127523
mor-tip.morning-tether-element-attached-bottom .tip-arrow {
75137524
bottom: 0;
@@ -7516,18 +7527,16 @@ mor-tip.morning-tether-element-attached-bottom .tip-arrow {
75167527
border-width: 5px 5px 0;
75177528
}
75187529
mor-tip.morning-tether-element-attached-left {
7519-
padding: 0 5px;
7520-
margin-left: 3px;
7530+
padding: 0 5px 0 10px;
75217531
}
75227532
mor-tip.morning-tether-element-attached-left .tip-arrow {
75237533
top: 50%;
7524-
left: 0;
7534+
left: 5px;
75257535
margin-top: -5px;
75267536
border-width: 5px 5px 5px 0;
75277537
}
75287538
mor-tip.morning-tether-element-attached-top {
75297539
padding: 5px 0;
7530-
margin-top: 3px;
75317540
}
75327541
mor-tip.morning-tether-element-attached-top .tip-arrow {
75337542
top: 0;
@@ -7536,12 +7545,11 @@ mor-tip.morning-tether-element-attached-top .tip-arrow {
75367545
border-width: 0 5px 5px;
75377546
}
75387547
mor-tip.morning-tether-element-attached-right {
7539-
padding: 0 5px;
7540-
margin-left: -3px;
7548+
padding: 0 10px 0 5px;
75417549
}
75427550
mor-tip.morning-tether-element-attached-right .tip-arrow {
75437551
top: 50%;
7544-
right: 0;
7552+
right: 5px;
75457553
margin-top: -5px;
75467554
border-width: 5px 0 5px 5px;
75477555
}
@@ -10021,7 +10029,6 @@ mor-datepicker .wrap .datepicker-input-0 .date-select,
1002110029
mor-datepicker .wrap .datepicker-input-1 .date-select {
1002210030
position: absolute;
1002310031
width: 50%;
10024-
min-width: 270px;
1002510032
}
1002610033
mor-datepicker .wrap .datepicker-input-0 .date-select.align-left,
1002710034
mor-datepicker .wrap .datepicker-input-1 .date-select.align-left {
@@ -10039,11 +10046,13 @@ mor-datepicker .wrap .datepicker-input-0 mor-textinput input {
1003910046
border-radius: 0;
1004010047
}
1004110048
mor-datepicker .wrap .datepicker-input-0 .date-select {
10049+
min-width: calc(280px + 1px);
1004210050
border-bottom-right-radius: 0;
1004310051
border-top-right-radius: 0;
1004410052
border-right: none;
1004510053
}
1004610054
mor-datepicker .wrap .datepicker-input-1 .date-select {
10055+
min-width: calc(280px + 2px);
1004710056
border-bottom-left-radius: 0;
1004810057
border-top-left-radius: 0;
1004910058
}
@@ -10672,6 +10681,9 @@ mor-imagemap.st-disabled .operate:hover {
1067210681
.mor-imagemap-dialog-map .content > footer {
1067310682
z-index: 2;
1067410683
}
10684+
.mor-imagemap-dialog-map .content > footer .clean-allzone-btn {
10685+
margin-right: 6px;
10686+
}
1067510687
.mor-imagemap-dialog-map.imagemap-disabled .zonearea {
1067610688
cursor: default;
1067710689
}

‎dist/morning-ui.js‎

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7813,7 +7813,7 @@ var morning = {
78137813
_groupVmMap: {},
78147814
_options: {},
78157815
isMorning: true,
7816-
version: '0.10.19',
7816+
version: '0.10.20',
78177817
map: {}
78187818
};
78197819

@@ -26683,6 +26683,8 @@ exports.default = {
2668326683

2668426684
$target.addEventListener('mouseenter', this._enter);
2668526685
$target.addEventListener('mouseleave', this._leave);
26686+
this.$el.addEventListener('mouseenter', this._enter);
26687+
this.$el.addEventListener('mouseleave', this._leave);
2668626688
} else if (trigger === 'foucs') {
2668726689

2668826690
$target.addEventListener('focusin', this._enter);
@@ -26714,6 +26716,8 @@ exports.default = {
2671426716
$target.removeEventListener('click', this.toggle);
2671526717
$target.removeEventListener('mouseenter', this._enter);
2671626718
$target.removeEventListener('mouseleave', this._leave);
26719+
this.$el.removeEventListener('mouseenter', this._enter);
26720+
this.$el.removeEventListener('mouseleave', this._leave);
2671726721
$target.removeEventListener('focusin', this._enter);
2671826722
$target.removeEventListener('focusout', this._leave);
2671926723
},
@@ -26886,11 +26890,6 @@ exports.default = {
2688626890
var targetOffset = '0 0',
2688726891
options = {};
2688826892

26889-
if (this.conf.placement === 'left') {
26890-
26891-
targetOffset = '0 -10px';
26892-
}
26893-
2689426893
options = {
2689526894
attachment: this.data.attachmentMap[this.conf.placement],
2689626895
element: this.$el,
@@ -35359,25 +35358,27 @@ exports.default = {
3535935358
var input1Calendar = input1.$refs['ui-calendar-' + input1.uiid];
3536035359
var input1CalendarStart = (0, _dateFns.startOfMonth)(input1Calendar.getTime());
3536135360
var input1CalendarEnd = (0, _dateFns.endOfMonth)(input1Calendar.getTime());
35361+
var input0HighlightDays = void 0;
35362+
var input1HighlightDays = void 0;
3536235363

3536335364
// start超过左侧日历/end在左侧日历
3536435365
if (start <= input0CalendarStart && end >= input0CalendarStart && end <= input0CalendarEnd) {
3536535366

35366-
this.data.input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
35367+
input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
3536735368
start: (0, _dateFns.subDays)(+input0CalendarStart, 1),
3536835369
end: end
3536935370
});
35370-
this.data.input1HighlightDays = [];
35371+
input1HighlightDays = [];
3537135372
}
3537235373

3537335374
// start超过左侧日历/end在右侧日历
3537435375
if (start <= input0CalendarStart && end >= input1CalendarStart && end <= input1CalendarEnd) {
3537535376

35376-
this.data.input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
35377+
input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
3537735378
start: (0, _dateFns.subDays)(+input0CalendarStart, 1),
3537835379
end: (0, _dateFns.addDays)(+input0CalendarEnd, 1)
3537935380
});
35380-
this.data.input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
35381+
input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
3538135382
start: (0, _dateFns.subDays)(+input1CalendarStart, 1),
3538235383
end: end
3538335384
});
@@ -35386,11 +35387,11 @@ exports.default = {
3538635387
// start在左侧日历/end超过右侧日历
3538735388
if (start >= input0CalendarStart && start <= input0CalendarEnd && end >= input1CalendarEnd) {
3538835389

35389-
this.data.input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
35390+
input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
3539035391
start: start,
3539135392
end: (0, _dateFns.addDays)(+input0CalendarEnd, 1)
3539235393
});
35393-
this.data.input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
35394+
input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
3539435395
start: (0, _dateFns.subDays)(+input1CalendarStart, 1),
3539535396
end: (0, _dateFns.addDays)(+input1CalendarEnd, 1)
3539635397
});
@@ -35399,8 +35400,8 @@ exports.default = {
3539935400
// start在右侧日历/end超过右侧日历
3540035401
if (start >= input1CalendarStart && start <= input1CalendarEnd && end >= input1CalendarEnd) {
3540135402

35402-
this.data.input0HighlightDays = [];
35403-
this.data.input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
35403+
input0HighlightDays = [];
35404+
input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
3540435405
start: start,
3540535406
end: (0, _dateFns.addDays)(+input1CalendarEnd, 1)
3540635407
});
@@ -35409,11 +35410,11 @@ exports.default = {
3540935410
// start超过左侧日历/end超过右侧日历
3541035411
if (start <= input0CalendarStart && end >= input1CalendarEnd) {
3541135412

35412-
this.data.input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
35413+
input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
3541335414
start: (0, _dateFns.subDays)(+input0CalendarStart, 1),
3541435415
end: (0, _dateFns.addDays)(+input0CalendarEnd, 1)
3541535416
});
35416-
this.data.input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
35417+
input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
3541735418
start: (0, _dateFns.subDays)(+input1CalendarStart, 1),
3541835419
end: (0, _dateFns.addDays)(+input1CalendarEnd, 1)
3541935420
});
@@ -35422,22 +35423,22 @@ exports.default = {
3542235423
// start/end均在左侧日历中
3542335424
if (start <= input0CalendarEnd && start >= input0CalendarStart && +end <= input0CalendarEnd && +end >= input0CalendarStart) {
3542435425

35425-
this.data.input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
35426+
input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
3542635427
start: start,
3542735428
end: end
3542835429
});
35429-
this.data.input1HighlightDays = [];
35430+
input1HighlightDays = [];
3543035431
}
3543135432

3543235433
// start在左侧/end在右侧
3543335434
if (start <= input0CalendarEnd && start >= input0CalendarStart && end >= input1CalendarStart && end <= input1CalendarEnd) {
3543435435

35435-
this.data.input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
35436+
input0HighlightDays = (0, _dateFns.eachDayOfInterval)({
3543635437
start: start,
3543735438
end: (0, _dateFns.addDays)(+input0CalendarEnd, 1)
3543835439
});
3543935440

35440-
this.data.input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
35441+
input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
3544135442
start: (0, _dateFns.subDays)(+input1CalendarStart, 1),
3544235443
end: end
3544335444
});
@@ -35446,12 +35447,15 @@ exports.default = {
3544635447
// start/end钧在右侧
3544735448
if (start <= input1CalendarEnd && start >= input1CalendarStart && end >= input1CalendarStart && end <= input1CalendarEnd) {
3544835449

35449-
this.data.input0HighlightDays = [];
35450-
this.data.input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
35450+
input0HighlightDays = [];
35451+
input1HighlightDays = (0, _dateFns.eachDayOfInterval)({
3545135452
start: start,
3545235453
end: end
3545335454
});
3545435455
}
35456+
35457+
this.data.input0HighlightDays = input0HighlightDays;
35458+
this.data.input1HighlightDays = input1HighlightDays;
3545535459
},
3545635460
_syncValueFromInputToRootForClick: function _syncValueFromInputToRootForClick(date) {
3545735461

@@ -39017,6 +39021,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
3901739021
//
3901839022
//
3901939023
//
39024+
//
39025+
//
3902039026

3902139027
var _extend = __webpack_require__(3);
3902239028

@@ -39065,6 +39071,10 @@ exports.default = {
3906539071
type: Boolean,
3906639072
default: true
3906739073
},
39074+
cleanAllzoneBtn: {
39075+
type: Boolean,
39076+
default: true
39077+
},
3906839078
max: {
3906939079
type: Number,
3907039080
default: 1
@@ -39084,6 +39094,7 @@ exports.default = {
3908439094
validate: this.validate,
3908539095
uploader: this.uploader,
3908639096
cleanZone: this.cleanZone,
39097+
cleanAllzoneBtn: this.cleanAllzoneBtn,
3908739098
max: this.max,
3908839099
maxSpot: this.maxSpot
3908939100
};
@@ -39683,6 +39694,17 @@ exports.default = {
3968339694

3968439695
this._set(result, true);
3968539696
},
39697+
_cleanAllzone: function _cleanAllzone() {
39698+
39699+
/* eslint-disable no-alert */
39700+
var result = window.confirm('确认清除所有热区？');
39701+
/* eslint-enable no-alert */
39702+
39703+
if (result) {
39704+
39705+
this.cleanZones();
39706+
}
39707+
},
3968639708
set: function set(value) {
3968739709

3968839710
var result = this._set(value);
@@ -39859,6 +39881,7 @@ var render = function() {
3985939881
validate: _vm.validate,
3986039882
uploader: _vm.uploader,
3986139883
"clean-zone": _vm.cleanZone,
39884+
"clean-allzone-btn": _vm.cleanAllzoneBtn,
3986239885
max: _vm.max,
3986339886
"max-spot": _vm.maxSpot
3986439887
}
@@ -40195,6 +40218,17 @@ var render = function() {
4019540218
_c(
4019640219
"div",
4019740220
[
40221+
_vm.conf.cleanAllzoneBtn && _vm.conf.state !== "disabled"
40222+
? _c(
40223+
"morning-link",
40224+
{
40225+
attrs: { color: "danger clean-allzone-btn" },
40226+
on: { emit: _vm._cleanAllzone }
40227+
},
40228+
[_vm._v("清除所有热区")]
40229+
)
40230+
: _vm._e(),
40231+
_vm._v(" "),
4019840232
_c(
4019940233
"morning-btn",
4020040234
{
@@ -40760,9 +40794,16 @@ exports.default = {
4076040794
date = this._timeGetStandardDate();
4076140795
}
4076240796

40763-
if (!this._checkSelectable('all')) {
40797+
if (date) {
40798+
40799+
var h = (0, _dateFns.getHours)(date);
40800+
var m = (0, _dateFns.getMinutes)(date);
40801+
var s = (0, _dateFns.getSeconds)(date);
4076440802

40765-
date = this._getClosestTime(date);
40803+
if (!this.data.inputFocus && (!this._checkSelectable('hour', h) || !this._checkSelectable('minute', m) || !this._checkSelectable('second', s))) {
40804+
40805+
date = this._getClosestTime(date);
40806+
}
4076640807
}
4076740808

4076840809
return (0, _dateFns.format)(date, this.conf.format);

0 commit comments

Comments
 (0)