@varlet/ui 1.23.4-alpha.3 → 1.23.4-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/snackbar/style/index.js +1 -1
- package/es/snackbar/style/less.js +1 -1
- package/lib/date-picker/DatePicker.js +17 -13
- package/lib/date-picker/src/day-picker-panel.js +15 -12
- package/lib/date-picker/src/month-picker-panel.js +13 -10
- package/lib/date-picker/src/year-picker-panel.js +6 -4
- package/lib/time-picker/TimePicker.js +12 -8
- package/lib/time-picker/clock.js +6 -4
- package/package.json +3 -3
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import '../../styles/common.css'
|
|
2
|
+
import '../SnackbarSfc.css'
|
|
2
3
|
import '../../styles/elevation.css'
|
|
3
4
|
import '../../loading/loading.css'
|
|
4
5
|
import '../../button/button.css'
|
|
5
6
|
import '../../icon/icon.css'
|
|
6
7
|
import '../snackbar.css'
|
|
7
8
|
import '../coreSfc.css'
|
|
8
|
-
import '../SnackbarSfc.css'
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import '../../styles/common.less'
|
|
2
|
+
import '../SnackbarSfc.less'
|
|
2
3
|
import '../../styles/elevation.less'
|
|
3
4
|
import '../../loading/loading.less'
|
|
4
5
|
import '../../button/button.less'
|
|
5
6
|
import '../../icon/icon.less'
|
|
6
7
|
import '../snackbar.less'
|
|
7
8
|
import '../coreSfc.less'
|
|
8
|
-
import '../SnackbarSfc.less'
|
|
@@ -6,7 +6,7 @@ exports.default = void 0;
|
|
|
6
6
|
|
|
7
7
|
var _vue = require("vue");
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var dayjs = _interopRequireWildcard(require("dayjs"));
|
|
10
10
|
|
|
11
11
|
var _monthPickerPanel = _interopRequireDefault(require("./src/month-picker-panel.js"));
|
|
12
12
|
|
|
@@ -22,6 +22,10 @@ var _locale = require("../locale");
|
|
|
22
22
|
|
|
23
23
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
24
24
|
|
|
25
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
26
|
+
|
|
27
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
28
|
+
|
|
25
29
|
var _withScopeId = n => ((0, _vue.pushScopeId)(""), n = n(), (0, _vue.popScopeId)(), n);
|
|
26
30
|
|
|
27
31
|
var _hoisted_1 = {
|
|
@@ -157,7 +161,7 @@ var _default = (0, _vue.defineComponent)({
|
|
|
157
161
|
props: _props.props,
|
|
158
162
|
|
|
159
163
|
setup(props) {
|
|
160
|
-
var currentDate = (
|
|
164
|
+
var currentDate = dayjs().format('YYYY-MM-D');
|
|
161
165
|
var [currentYear, currentMonth, currentDay] = currentDate.split('-');
|
|
162
166
|
|
|
163
167
|
var monthDes = _props.MONTH_LIST.find(month => month.index === currentMonth);
|
|
@@ -219,12 +223,12 @@ var _default = (0, _vue.defineComponent)({
|
|
|
219
223
|
} = props;
|
|
220
224
|
|
|
221
225
|
if (range) {
|
|
222
|
-
chooseRangeDay.value = chooseRangeDay.value.map(date => (
|
|
226
|
+
chooseRangeDay.value = chooseRangeDay.value.map(date => dayjs(date).format('YYYY-MM-DD'));
|
|
223
227
|
return chooseRangeDay.value[0] + " ~ " + chooseRangeDay.value[1];
|
|
224
228
|
}
|
|
225
229
|
|
|
226
230
|
if (multiple) return "" + chooseDays.value.length + _locale.pack.value.datePickerSelected;
|
|
227
|
-
var weekIndex = (
|
|
231
|
+
var weekIndex = dayjs(chooseYear.value + "-" + chooseMonth.value.index + "-" + chooseDay.value).day();
|
|
228
232
|
|
|
229
233
|
var week = _props.WEEK_HEADER.find(value => value.index === "" + weekIndex);
|
|
230
234
|
|
|
@@ -235,7 +239,7 @@ var _default = (0, _vue.defineComponent)({
|
|
|
235
239
|
return weekName.slice(0, 3) + ", " + monthName.slice(0, 3) + " " + chooseDay.value;
|
|
236
240
|
});
|
|
237
241
|
var slotProps = (0, _vue.computed)(() => {
|
|
238
|
-
var weekIndex = (
|
|
242
|
+
var weekIndex = dayjs(chooseYear.value + "-" + chooseMonth.value.index + "-" + chooseDay.value).day();
|
|
239
243
|
return {
|
|
240
244
|
week: "" + weekIndex,
|
|
241
245
|
year: chooseYear.value,
|
|
@@ -243,7 +247,7 @@ var _default = (0, _vue.defineComponent)({
|
|
|
243
247
|
date: chooseDay.value
|
|
244
248
|
};
|
|
245
249
|
});
|
|
246
|
-
var formatRange = (0, _vue.computed)(() => getChoose.value.chooseRangeDay.map(choose => (
|
|
250
|
+
var formatRange = (0, _vue.computed)(() => getChoose.value.chooseRangeDay.map(choose => dayjs(choose).format('YYYY-MM-DD')));
|
|
247
251
|
var isSameYear = (0, _vue.computed)(() => chooseYear.value === previewYear.value);
|
|
248
252
|
var isSameMonth = (0, _vue.computed)(() => chooseMonth.value.index === previewMonth.value.index);
|
|
249
253
|
|
|
@@ -262,7 +266,7 @@ var _default = (0, _vue.defineComponent)({
|
|
|
262
266
|
if (rangeDone.value) {
|
|
263
267
|
var _props$onUpdateModel;
|
|
264
268
|
|
|
265
|
-
var isChangeOrder = (
|
|
269
|
+
var isChangeOrder = dayjs(rangeDate.value[0]).isAfter(rangeDate.value[1]);
|
|
266
270
|
|
|
267
271
|
var _date = isChangeOrder ? [rangeDate.value[1], rangeDate.value[0]] : [...rangeDate.value];
|
|
268
272
|
|
|
@@ -276,7 +280,7 @@ var _default = (0, _vue.defineComponent)({
|
|
|
276
280
|
|
|
277
281
|
var multipleDates = type === 'month' ? chooseMonths : chooseDays;
|
|
278
282
|
var formatType = type === 'month' ? 'YYYY-MM' : 'YYYY-MM-DD';
|
|
279
|
-
var formatDates = multipleDates.value.map(date => (
|
|
283
|
+
var formatDates = multipleDates.value.map(date => dayjs(date).format(formatType));
|
|
280
284
|
var index = formatDates.findIndex(choose => choose === date);
|
|
281
285
|
if (index === -1) formatDates.push(date);else formatDates.splice(index, 1);
|
|
282
286
|
(_props$onUpdateModel2 = props['onUpdate:modelValue']) == null ? void 0 : _props$onUpdateModel2.call(props, formatDates);
|
|
@@ -300,7 +304,7 @@ var _default = (0, _vue.defineComponent)({
|
|
|
300
304
|
if (day < 0 || readonly) return;
|
|
301
305
|
reverse.value = getReverse('day', day);
|
|
302
306
|
var date = previewYear.value + "-" + previewMonth.value.index + "-" + day;
|
|
303
|
-
var formatDate = (
|
|
307
|
+
var formatDate = dayjs(date).format('YYYY-MM-DD');
|
|
304
308
|
if (range) updateRange(formatDate, 'day');else if (multiple) updateMultiple(formatDate, 'day');else {
|
|
305
309
|
updateModelValue == null ? void 0 : updateModelValue(formatDate);
|
|
306
310
|
onChange == null ? void 0 : onChange(formatDate);
|
|
@@ -387,11 +391,11 @@ var _default = (0, _vue.defineComponent)({
|
|
|
387
391
|
var rangeInit = (value, type) => {
|
|
388
392
|
var rangeDate = type === 'month' ? chooseRangeMonth : chooseRangeDay;
|
|
389
393
|
var formatType = type === 'month' ? 'YYYY-MM' : 'YYYY-MM-D';
|
|
390
|
-
var formatDateList = value.map(choose => (
|
|
394
|
+
var formatDateList = value.map(choose => dayjs(choose).format(formatType)).slice(0, 2);
|
|
391
395
|
var isValid = rangeDate.value.some(date => invalidFormatDate(date));
|
|
392
396
|
if (isValid) return;
|
|
393
397
|
rangeDate.value = formatDateList;
|
|
394
|
-
var isChangeOrder = (
|
|
398
|
+
var isChangeOrder = dayjs(rangeDate.value[0]).isAfter(rangeDate.value[1]);
|
|
395
399
|
|
|
396
400
|
if (rangeDate.value.length === 2 && isChangeOrder) {
|
|
397
401
|
rangeDate.value = [rangeDate.value[1], rangeDate.value[0]];
|
|
@@ -402,12 +406,12 @@ var _default = (0, _vue.defineComponent)({
|
|
|
402
406
|
var rangeDate = type === 'month' ? chooseMonths : chooseDays;
|
|
403
407
|
var formatType = type === 'month' ? 'YYYY-MM' : 'YYYY-MM-D'; // 需要去重
|
|
404
408
|
|
|
405
|
-
var formatDateList = Array.from(new Set(value.map(choose => (
|
|
409
|
+
var formatDateList = Array.from(new Set(value.map(choose => dayjs(choose).format(formatType))));
|
|
406
410
|
rangeDate.value = formatDateList.filter(date => date !== 'Invalid Date');
|
|
407
411
|
};
|
|
408
412
|
|
|
409
413
|
var dateInit = value => {
|
|
410
|
-
var formatDate = (
|
|
414
|
+
var formatDate = dayjs(value).format('YYYY-MM-D');
|
|
411
415
|
if (invalidFormatDate(formatDate)) return;
|
|
412
416
|
var [yearValue, monthValue, dayValue] = formatDate.split('-');
|
|
413
417
|
|
|
@@ -4,7 +4,7 @@ exports.__esModule = true;
|
|
|
4
4
|
exports.render = render;
|
|
5
5
|
exports.default = void 0;
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var dayjs = _interopRequireWildcard(require("dayjs"));
|
|
8
8
|
|
|
9
9
|
var _isSameOrBefore = _interopRequireDefault(require("dayjs/esm/plugin/isSameOrBefore"));
|
|
10
10
|
|
|
@@ -24,11 +24,14 @@ var _locale = require("../../locale");
|
|
|
24
24
|
|
|
25
25
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
26
26
|
|
|
27
|
-
function
|
|
27
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
28
|
+
|
|
29
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
28
30
|
|
|
29
|
-
|
|
31
|
+
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
30
32
|
|
|
31
|
-
|
|
33
|
+
dayjs.extend(_isSameOrBefore.default);
|
|
34
|
+
dayjs.extend(_isSameOrAfter.default);
|
|
32
35
|
|
|
33
36
|
var _withScopeId = n => ((0, _vue.pushScopeId)(""), n = n(), (0, _vue.popScopeId)(), n);
|
|
34
37
|
|
|
@@ -171,8 +174,8 @@ var _default = (0, _vue.defineComponent)({
|
|
|
171
174
|
previewYear
|
|
172
175
|
}
|
|
173
176
|
} = props;
|
|
174
|
-
var monthNum = (
|
|
175
|
-
var firstDayToWeek = (
|
|
177
|
+
var monthNum = dayjs(previewYear + "-" + previewMonth.index).daysInMonth();
|
|
178
|
+
var firstDayToWeek = dayjs(previewYear + "-" + previewMonth.index + "-01").day();
|
|
176
179
|
var index = sortWeekList.value.findIndex(week => week.index === "" + firstDayToWeek);
|
|
177
180
|
days.value = [...Array(index).fill(-1), ...Array.from(Array(monthNum + 1).keys())].filter(value => value);
|
|
178
181
|
};
|
|
@@ -191,13 +194,13 @@ var _default = (0, _vue.defineComponent)({
|
|
|
191
194
|
|
|
192
195
|
if (max) {
|
|
193
196
|
var date = previewYear + "-" + ((0, _shared.toNumber)(previewMonth.index) + 1);
|
|
194
|
-
panelBtnDisabled.right = !(
|
|
197
|
+
panelBtnDisabled.right = !dayjs(date).isSameOrBefore(dayjs(max), 'month');
|
|
195
198
|
}
|
|
196
199
|
|
|
197
200
|
if (min) {
|
|
198
201
|
var _date = previewYear + "-" + ((0, _shared.toNumber)(previewMonth.index) - 1);
|
|
199
202
|
|
|
200
|
-
panelBtnDisabled.left = !(
|
|
203
|
+
panelBtnDisabled.left = !dayjs(_date).isSameOrAfter(dayjs(min), 'month');
|
|
201
204
|
}
|
|
202
205
|
};
|
|
203
206
|
|
|
@@ -215,8 +218,8 @@ var _default = (0, _vue.defineComponent)({
|
|
|
215
218
|
var isBeforeMax = true;
|
|
216
219
|
var isAfterMin = true;
|
|
217
220
|
var previewDate = previewYear + "-" + previewMonth.index + "-" + day;
|
|
218
|
-
if (max) isBeforeMax = (
|
|
219
|
-
if (min) isAfterMin = (
|
|
221
|
+
if (max) isBeforeMax = dayjs(previewDate).isSameOrBefore(dayjs(max), 'day');
|
|
222
|
+
if (min) isAfterMin = dayjs(previewDate).isSameOrAfter(dayjs(min), 'day');
|
|
220
223
|
return isBeforeMax && isAfterMin;
|
|
221
224
|
};
|
|
222
225
|
|
|
@@ -233,8 +236,8 @@ var _default = (0, _vue.defineComponent)({
|
|
|
233
236
|
if (!chooseRangeDay.length) return false;
|
|
234
237
|
|
|
235
238
|
if (range) {
|
|
236
|
-
var isBeforeMax = (
|
|
237
|
-
var isAfterMin = (
|
|
239
|
+
var isBeforeMax = dayjs(val).isSameOrBefore(dayjs(chooseRangeDay[1]), 'day');
|
|
240
|
+
var isAfterMin = dayjs(val).isSameOrAfter(dayjs(chooseRangeDay[0]), 'day');
|
|
238
241
|
return isBeforeMax && isAfterMin;
|
|
239
242
|
}
|
|
240
243
|
|
|
@@ -6,7 +6,7 @@ exports.default = void 0;
|
|
|
6
6
|
|
|
7
7
|
var _vue = require("vue");
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var dayjs = _interopRequireWildcard(require("dayjs"));
|
|
10
10
|
|
|
11
11
|
var _isSameOrBefore = _interopRequireDefault(require("dayjs/esm/plugin/isSameOrBefore"));
|
|
12
12
|
|
|
@@ -24,11 +24,14 @@ var _locale = require("../../locale");
|
|
|
24
24
|
|
|
25
25
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
26
26
|
|
|
27
|
-
function
|
|
27
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
28
|
+
|
|
29
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
28
30
|
|
|
29
|
-
|
|
31
|
+
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
30
32
|
|
|
31
|
-
|
|
33
|
+
dayjs.extend(_isSameOrBefore.default);
|
|
34
|
+
dayjs.extend(_isSameOrAfter.default);
|
|
32
35
|
|
|
33
36
|
var _withScopeId = n => ((0, _vue.pushScopeId)(""), n = n(), (0, _vue.popScopeId)(), n);
|
|
34
37
|
|
|
@@ -151,8 +154,8 @@ var _default = (0, _vue.defineComponent)({
|
|
|
151
154
|
var isBeforeMax = true;
|
|
152
155
|
var isAfterMin = true;
|
|
153
156
|
var previewDate = previewYear + "-" + key;
|
|
154
|
-
if (max) isBeforeMax = (
|
|
155
|
-
if (min) isAfterMin = (
|
|
157
|
+
if (max) isBeforeMax = dayjs(previewDate).isSameOrBefore(dayjs(max), 'month');
|
|
158
|
+
if (min) isAfterMin = dayjs(previewDate).isSameOrAfter(dayjs(min), 'month');
|
|
156
159
|
return isBeforeMax && isAfterMin;
|
|
157
160
|
};
|
|
158
161
|
|
|
@@ -171,8 +174,8 @@ var _default = (0, _vue.defineComponent)({
|
|
|
171
174
|
if (!chooseRangeMonth.length) return false;
|
|
172
175
|
|
|
173
176
|
if (range) {
|
|
174
|
-
var isBeforeMax = (
|
|
175
|
-
var isAfterMin = (
|
|
177
|
+
var isBeforeMax = dayjs(val).isSameOrBefore(dayjs(chooseRangeMonth[1]), 'month');
|
|
178
|
+
var isAfterMin = dayjs(val).isSameOrAfter(dayjs(chooseRangeMonth[0]), 'month');
|
|
176
179
|
return isBeforeMax && isAfterMin;
|
|
177
180
|
}
|
|
178
181
|
|
|
@@ -263,8 +266,8 @@ var _default = (0, _vue.defineComponent)({
|
|
|
263
266
|
max
|
|
264
267
|
}
|
|
265
268
|
} = props;
|
|
266
|
-
if (max) panelBtnDisabled.right = !(
|
|
267
|
-
if (min) panelBtnDisabled.left = !(
|
|
269
|
+
if (max) panelBtnDisabled.right = !dayjs("" + ((0, _shared.toNumber)(year) + 1)).isSameOrBefore(dayjs(max), 'year');
|
|
270
|
+
if (min) panelBtnDisabled.left = !dayjs("" + ((0, _shared.toNumber)(year) - 1)).isSameOrAfter(dayjs(min), 'year');
|
|
268
271
|
}, {
|
|
269
272
|
immediate: true
|
|
270
273
|
});
|
|
@@ -6,11 +6,13 @@ exports.default = void 0;
|
|
|
6
6
|
|
|
7
7
|
var _vue = require("vue");
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var dayjs = _interopRequireWildcard(require("dayjs"));
|
|
10
10
|
|
|
11
11
|
var _shared = require("../../utils/shared");
|
|
12
12
|
|
|
13
|
-
function
|
|
13
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
14
|
+
|
|
15
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
14
16
|
|
|
15
17
|
var _withScopeId = n => ((0, _vue.pushScopeId)(""), n = n(), (0, _vue.popScopeId)(), n);
|
|
16
18
|
|
|
@@ -66,14 +68,14 @@ var _default = (0, _vue.defineComponent)({
|
|
|
66
68
|
var yearRange = [(0, _shared.toNumber)(preview) + 100, (0, _shared.toNumber)(preview) - 100];
|
|
67
69
|
|
|
68
70
|
if (max) {
|
|
69
|
-
var formatMax = (
|
|
71
|
+
var formatMax = dayjs(max).format('YYYY-MM-D');
|
|
70
72
|
var year = (0, _shared.toNumber)(formatMax.split('-')[0]);
|
|
71
73
|
if (year < yearRange[0] && year > yearRange[1]) yearRange = [year, yearRange[1]];
|
|
72
74
|
if (year <= yearRange[1]) return [year];
|
|
73
75
|
}
|
|
74
76
|
|
|
75
77
|
if (min) {
|
|
76
|
-
var formatMin = (
|
|
78
|
+
var formatMin = dayjs(min).format('YYYY-MM-D');
|
|
77
79
|
|
|
78
80
|
var _year = (0, _shared.toNumber)(formatMin.split('-')[0]);
|
|
79
81
|
|
|
@@ -6,7 +6,7 @@ exports.default = void 0;
|
|
|
6
6
|
|
|
7
7
|
var _vue = require("vue");
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var dayjs = _interopRequireWildcard(require("dayjs"));
|
|
10
10
|
|
|
11
11
|
var _clock = _interopRequireDefault(require("./clock.js"));
|
|
12
12
|
|
|
@@ -18,6 +18,10 @@ var _utils = require("./utils");
|
|
|
18
18
|
|
|
19
19
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
20
20
|
|
|
21
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
22
|
+
|
|
23
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
24
|
+
|
|
21
25
|
var _withScopeId = n => ((0, _vue.pushScopeId)(""), n = n(), (0, _vue.popScopeId)(), n);
|
|
22
26
|
|
|
23
27
|
var _hoisted_1 = {
|
|
@@ -216,9 +220,9 @@ var _default = (0, _vue.defineComponent)({
|
|
|
216
220
|
second
|
|
217
221
|
} = (0, _utils.getNumberTime)(value);
|
|
218
222
|
return {
|
|
219
|
-
hour: (
|
|
220
|
-
minute: (
|
|
221
|
-
second: (
|
|
223
|
+
hour: dayjs().hour(hour).format(hourFormat),
|
|
224
|
+
minute: dayjs().minute(minute).format('mm'),
|
|
225
|
+
second: dayjs().second(second).format('ss')
|
|
222
226
|
};
|
|
223
227
|
};
|
|
224
228
|
|
|
@@ -367,10 +371,10 @@ var _default = (0, _vue.defineComponent)({
|
|
|
367
371
|
minute,
|
|
368
372
|
second
|
|
369
373
|
} = (0, _utils.getNumberTime)(value);
|
|
370
|
-
var formatHour12 = (
|
|
371
|
-
var formatHour24 = (
|
|
372
|
-
var formatMinute = (
|
|
373
|
-
var formatSecond = (
|
|
374
|
+
var formatHour12 = dayjs().hour(hour).format('hh');
|
|
375
|
+
var formatHour24 = dayjs().hour(hour).format('HH');
|
|
376
|
+
var formatMinute = dayjs().minute(minute).format('mm');
|
|
377
|
+
var formatSecond = dayjs().second(second).format('ss');
|
|
374
378
|
hourRad.value = (formatHour12 === '12' ? 0 : (0, _shared.toNumber)(formatHour12)) * 30;
|
|
375
379
|
minuteRad.value = (0, _shared.toNumber)(formatMinute) * 6;
|
|
376
380
|
secondRad.value = (0, _shared.toNumber)(formatSecond) * 6;
|
package/lib/time-picker/clock.js
CHANGED
|
@@ -6,7 +6,7 @@ exports.default = void 0;
|
|
|
6
6
|
|
|
7
7
|
var _vue = require("vue");
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var dayjs = _interopRequireWildcard(require("dayjs"));
|
|
10
10
|
|
|
11
11
|
var _props = require("./props");
|
|
12
12
|
|
|
@@ -14,7 +14,9 @@ var _utils = require("./utils");
|
|
|
14
14
|
|
|
15
15
|
var _shared = require("../utils/shared");
|
|
16
16
|
|
|
17
|
-
function
|
|
17
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
18
|
+
|
|
19
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
18
20
|
|
|
19
21
|
var _withScopeId = n => ((0, _vue.pushScopeId)(""), n = n(), (0, _vue.popScopeId)(), n);
|
|
20
22
|
|
|
@@ -253,13 +255,13 @@ var _default = (0, _vue.defineComponent)({
|
|
|
253
255
|
} = (0, _utils.convertHour)(props.format, props.ampm, props.time.hour);
|
|
254
256
|
|
|
255
257
|
if (props.type === 'minute') {
|
|
256
|
-
var newMinute = (
|
|
258
|
+
var newMinute = dayjs().minute(radToMinSec).format('mm');
|
|
257
259
|
var second = props.useSeconds ? ":" + props.time.second : '';
|
|
258
260
|
newTime = hourStr + ":" + newMinute + second;
|
|
259
261
|
}
|
|
260
262
|
|
|
261
263
|
if (props.type === 'second') {
|
|
262
|
-
var newSecond = (
|
|
264
|
+
var newSecond = dayjs().second(radToMinSec).format('ss');
|
|
263
265
|
|
|
264
266
|
var _second = props.useSeconds ? ":" + newSecond : '';
|
|
265
267
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@varlet/ui",
|
|
3
|
-
"version": "1.23.4-alpha.
|
|
3
|
+
"version": "1.23.4-alpha.4+0b1d95fc",
|
|
4
4
|
"description": "A material like components library",
|
|
5
5
|
"module": "es/index.js",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
"peerDependencies": {
|
|
50
50
|
"vue": "^3.2.0"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "0b1d95fc740a225240ee3f28e06015f4538b2304",
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@varlet/cli": "^1.23.4-alpha.
|
|
54
|
+
"@varlet/cli": "^1.23.4-alpha.4+0b1d95fc"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"dayjs": "^1.10.4",
|