bi-eleme 2.4.3 → 2.4.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/lib/element-ui.common.js +15 -32
- package/lib/index.js +1 -1
- package/lib/super-date.js +9 -26
- package/package.json +1 -1
- package/packages/super-date/src/panel/date-range.vue +0 -5
- package/packages/super-date/src/picker/date-picker.js +0 -1
- package/packages/super-date/src/picker.vue +0 -11
- package/src/index.js +1 -1
package/lib/super-date.js
CHANGED
|
@@ -304,7 +304,7 @@ module.exports = require("bi-eleme/lib/utils/vue-popper");
|
|
|
304
304
|
// ESM COMPAT FLAG
|
|
305
305
|
__webpack_require__.r(__webpack_exports__);
|
|
306
306
|
|
|
307
|
-
// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/picker.vue?vue&type=template&id=
|
|
307
|
+
// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/picker.vue?vue&type=template&id=54fb4006
|
|
308
308
|
var render = function () {
|
|
309
309
|
var _vm = this
|
|
310
310
|
var _h = _vm.$createElement
|
|
@@ -374,7 +374,7 @@ var staticRenderFns = []
|
|
|
374
374
|
render._withStripped = true
|
|
375
375
|
|
|
376
376
|
|
|
377
|
-
// CONCATENATED MODULE: ./packages/super-date/src/picker.vue?vue&type=template&id=
|
|
377
|
+
// CONCATENATED MODULE: ./packages/super-date/src/picker.vue?vue&type=template&id=54fb4006
|
|
378
378
|
|
|
379
379
|
// EXTERNAL MODULE: external "vue"
|
|
380
380
|
var external_vue_ = __webpack_require__(7);
|
|
@@ -827,7 +827,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
827
827
|
|
|
828
828
|
watch: {
|
|
829
829
|
pickerVisible: function pickerVisible(val) {
|
|
830
|
-
console.log('🚀 ~ val:', val);
|
|
831
830
|
if (this.readonly || this.pickerDisabled) return;
|
|
832
831
|
if (val) {
|
|
833
832
|
this.showPicker();
|
|
@@ -850,7 +849,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
850
849
|
handler: function handler(val) {
|
|
851
850
|
if (this.picker) {
|
|
852
851
|
this.picker.value = this.mergeDateAndTime(this.value);
|
|
853
|
-
console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value).date);
|
|
854
852
|
}
|
|
855
853
|
}
|
|
856
854
|
},
|
|
@@ -874,7 +872,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
874
872
|
|
|
875
873
|
computed: {
|
|
876
874
|
returnedValue: function returnedValue() {
|
|
877
|
-
console.log('🚀 ~ returnedValue:');
|
|
878
875
|
var formattedValue = formatAsFormatAndType(this.parsedValue, this.format, this.type, this.rangeSeparator);
|
|
879
876
|
|
|
880
877
|
// 分离日期和时间
|
|
@@ -1081,7 +1078,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
1081
1078
|
}
|
|
1082
1079
|
},
|
|
1083
1080
|
blur: function blur() {
|
|
1084
|
-
console.log('blur');
|
|
1085
1081
|
this.refInput.forEach(function (input) {
|
|
1086
1082
|
return input.blur();
|
|
1087
1083
|
});
|
|
@@ -1127,7 +1123,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
1127
1123
|
var value = this.parseString(this.displayValue);
|
|
1128
1124
|
if (value) {
|
|
1129
1125
|
this.picker.value = value;
|
|
1130
|
-
console.log('🚀 ~ value:', value);
|
|
1131
1126
|
if (this.isValidValue(value)) {
|
|
1132
1127
|
this.emitInput(value);
|
|
1133
1128
|
this.userInput = null;
|
|
@@ -1160,7 +1155,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
1160
1155
|
this.userInput = [this.formatToString(value), this.displayValue[1]];
|
|
1161
1156
|
var newValue = [value, this.picker.value && this.picker.value[1]];
|
|
1162
1157
|
this.picker.value = newValue;
|
|
1163
|
-
console.log('🚀 ~ newValue:', newValue);
|
|
1164
1158
|
if (this.isValidValue(newValue)) {
|
|
1165
1159
|
this.emitInput(newValue);
|
|
1166
1160
|
this.userInput = null;
|
|
@@ -1173,7 +1167,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
1173
1167
|
this.userInput = [this.displayValue[0], this.formatToString(value)];
|
|
1174
1168
|
var newValue = [this.picker.value && this.picker.value[0], value];
|
|
1175
1169
|
this.picker.value = newValue;
|
|
1176
|
-
console.log('🚀 ~ newValue:', newValue);
|
|
1177
1170
|
if (this.isValidValue(newValue)) {
|
|
1178
1171
|
this.emitInput(newValue);
|
|
1179
1172
|
this.userInput = null;
|
|
@@ -1245,7 +1238,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
1245
1238
|
|
|
1246
1239
|
// 转换parsedValue为包含date、time、type和dynamicRange字段的对象格式
|
|
1247
1240
|
this.picker.value = this.mergeDateAndTime(this.value);
|
|
1248
|
-
console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value));
|
|
1249
1241
|
this.picker.resetView && this.picker.resetView();
|
|
1250
1242
|
|
|
1251
1243
|
this.$nextTick(function () {
|
|
@@ -1314,7 +1306,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
1314
1306
|
var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
|
|
1315
1307
|
var visible = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
1316
1308
|
|
|
1317
|
-
console.log('🚀🚀🚀🚀🚀🚀🚀 ~ date:', date);
|
|
1318
1309
|
_this2.userInput = null;
|
|
1319
1310
|
_this2.pickerVisible = _this2.picker.visible = visible;
|
|
1320
1311
|
_this2.emitInput(date);
|
|
@@ -1351,9 +1342,7 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
|
|
|
1351
1342
|
}
|
|
1352
1343
|
},
|
|
1353
1344
|
emitChange: function emitChange(val) {
|
|
1354
|
-
console.log('🚀 ~ val:', val);
|
|
1355
1345
|
// determine user real change only
|
|
1356
|
-
console.log('🚀 ~ valueEquals(val, this.valueOnOpen):', valueEquals(val, this.valueOnOpen));
|
|
1357
1346
|
if (!valueEquals(val, this.valueOnOpen)) {
|
|
1358
1347
|
this.$emit('change', val);
|
|
1359
1348
|
this.valueOnOpen = val;
|
|
@@ -1405,8 +1394,8 @@ var component = Object(componentNormalizer["a" /* default */])(
|
|
|
1405
1394
|
)
|
|
1406
1395
|
|
|
1407
1396
|
/* harmony default export */ var picker = (component.exports);
|
|
1408
|
-
// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/panel/date-range.vue?vue&type=template&id=
|
|
1409
|
-
var
|
|
1397
|
+
// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/panel/date-range.vue?vue&type=template&id=2936a8ba
|
|
1398
|
+
var date_rangevue_type_template_id_2936a8ba_render = function () {
|
|
1410
1399
|
var _vm = this
|
|
1411
1400
|
var _h = _vm.$createElement
|
|
1412
1401
|
var _c = _vm._self._c || _h
|
|
@@ -2115,11 +2104,11 @@ var date_rangevue_type_template_id_6b603d76_render = function () {
|
|
|
2115
2104
|
]
|
|
2116
2105
|
)
|
|
2117
2106
|
}
|
|
2118
|
-
var
|
|
2119
|
-
|
|
2107
|
+
var date_rangevue_type_template_id_2936a8ba_staticRenderFns = []
|
|
2108
|
+
date_rangevue_type_template_id_2936a8ba_render._withStripped = true
|
|
2120
2109
|
|
|
2121
2110
|
|
|
2122
|
-
// CONCATENATED MODULE: ./packages/super-date/src/panel/date-range.vue?vue&type=template&id=
|
|
2111
|
+
// CONCATENATED MODULE: ./packages/super-date/src/panel/date-range.vue?vue&type=template&id=2936a8ba
|
|
2123
2112
|
|
|
2124
2113
|
// EXTERNAL MODULE: external "bi-eleme/lib/mixins/locale"
|
|
2125
2114
|
var locale_ = __webpack_require__(6);
|
|
@@ -4363,7 +4352,6 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
|
|
|
4363
4352
|
initDate: function initDate() {
|
|
4364
4353
|
var newVal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.value;
|
|
4365
4354
|
|
|
4366
|
-
console.log('🚀 ~ newVal:', newVal);
|
|
4367
4355
|
try {
|
|
4368
4356
|
if (!newVal) {
|
|
4369
4357
|
this.minDate = null;
|
|
@@ -4413,18 +4401,15 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
|
|
|
4413
4401
|
} else if (this.panelType === 'dynamic' && Array.isArray(dynamicRange) && dynamicRange.length === 2) {
|
|
4414
4402
|
this.dynamicRange = Array.from(dynamicRange);
|
|
4415
4403
|
if (typeof dynamicRange[0] === 'string') {
|
|
4416
|
-
console.log('用了defaultTime');
|
|
4417
4404
|
this.dynamicTypeLeft = 'specific';
|
|
4418
4405
|
this.dynamicValue = Object(date_util_["modifyWithTimeString"])(new Date(dynamicRange[0]), this.defaultTime[0]);
|
|
4419
4406
|
|
|
4420
4407
|
this.minDate = Object(date_util_["modifyWithTimeString"])(new Date(dynamicRange[0]), this.defaultTime[0]);
|
|
4421
4408
|
} else {
|
|
4422
|
-
console.log('用了defaultTime');
|
|
4423
4409
|
this.dynamicTypeLeft = 'past';
|
|
4424
4410
|
this.dynamicValue = Object(date_util_["modifyWithTimeString"])(Object(date_util_["setDaysDiff"])(new Date(), this.dynamicRange[0]), this.defaultTime[0]);
|
|
4425
4411
|
this.minDate = Object(date_util_["modifyWithTimeString"])(Object(date_util_["setDaysDiff"])(new Date(), this.dynamicRange[0]), this.defaultTime[0]);
|
|
4426
4412
|
}
|
|
4427
|
-
console.log('用了defaultTime');
|
|
4428
4413
|
this.handleDynamicRange(this.dynamicRange[1]);
|
|
4429
4414
|
this.dynamicDate = Object(date_util_["formatDate"])(this.dynamicValue, 'yyyy-MM-dd');
|
|
4430
4415
|
this.maxDate = Object(date_util_["modifyWithTimeString"])(Object(date_util_["setDaysDiff"])(new Date(), this.dynamicRange[1]), this.defaultTime[1]);
|
|
@@ -4538,7 +4523,6 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
|
|
|
4538
4523
|
}
|
|
4539
4524
|
},
|
|
4540
4525
|
handleTimeChange: function handleTimeChange(value, type) {
|
|
4541
|
-
console.log('🚀 ~ value:', value);
|
|
4542
4526
|
var parsedValue = Object(date_util_["parseDate"])(value, this.timeFormat);
|
|
4543
4527
|
if (parsedValue) {
|
|
4544
4528
|
if (type === 'min') {
|
|
@@ -4769,8 +4753,8 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
|
|
|
4769
4753
|
|
|
4770
4754
|
var date_range_component = Object(componentNormalizer["a" /* default */])(
|
|
4771
4755
|
panel_date_rangevue_type_script_lang_js,
|
|
4772
|
-
|
|
4773
|
-
|
|
4756
|
+
date_rangevue_type_template_id_2936a8ba_render,
|
|
4757
|
+
date_rangevue_type_template_id_2936a8ba_staticRenderFns,
|
|
4774
4758
|
false,
|
|
4775
4759
|
null,
|
|
4776
4760
|
null,
|
|
@@ -4781,7 +4765,6 @@ var date_range_component = Object(componentNormalizer["a" /* default */])(
|
|
|
4781
4765
|
/* harmony default export */ var date_range = (date_range_component.exports);
|
|
4782
4766
|
// CONCATENATED MODULE: ./packages/super-date/src/picker/date-picker.js
|
|
4783
4767
|
|
|
4784
|
-
console.log('🚀 ~ Picker:', picker);
|
|
4785
4768
|
|
|
4786
4769
|
|
|
4787
4770
|
/* harmony default export */ var date_picker = ({
|
package/package.json
CHANGED
|
@@ -612,7 +612,6 @@ export default {
|
|
|
612
612
|
return daysDiff > this.selectableDynamicDays[0] || daysDiff < this.selectableDynamicDays[1]
|
|
613
613
|
},
|
|
614
614
|
initDate(newVal = this.value) {
|
|
615
|
-
console.log('🚀 ~ newVal:', newVal)
|
|
616
615
|
try {
|
|
617
616
|
if (!newVal) {
|
|
618
617
|
this.minDate = null
|
|
@@ -657,18 +656,15 @@ export default {
|
|
|
657
656
|
} else if (this.panelType === 'dynamic' && Array.isArray(dynamicRange) && dynamicRange.length === 2) {
|
|
658
657
|
this.dynamicRange = Array.from(dynamicRange)
|
|
659
658
|
if (typeof dynamicRange[0] === 'string') {
|
|
660
|
-
console.log('用了defaultTime')
|
|
661
659
|
this.dynamicTypeLeft = 'specific'
|
|
662
660
|
this.dynamicValue = modifyWithTimeString(new Date(dynamicRange[0]), this.defaultTime[0])
|
|
663
661
|
|
|
664
662
|
this.minDate = modifyWithTimeString(new Date(dynamicRange[0]), this.defaultTime[0])
|
|
665
663
|
} else {
|
|
666
|
-
console.log('用了defaultTime')
|
|
667
664
|
this.dynamicTypeLeft = 'past'
|
|
668
665
|
this.dynamicValue = modifyWithTimeString(setDaysDiff(new Date(), this.dynamicRange[0]), this.defaultTime[0])
|
|
669
666
|
this.minDate = modifyWithTimeString(setDaysDiff(new Date(), this.dynamicRange[0]), this.defaultTime[0])
|
|
670
667
|
}
|
|
671
|
-
console.log('用了defaultTime')
|
|
672
668
|
this.handleDynamicRange(this.dynamicRange[1])
|
|
673
669
|
this.dynamicDate = formatDate(this.dynamicValue, 'yyyy-MM-dd')
|
|
674
670
|
this.maxDate = modifyWithTimeString(setDaysDiff(new Date(), this.dynamicRange[1]), this.defaultTime[1])
|
|
@@ -781,7 +777,6 @@ export default {
|
|
|
781
777
|
},
|
|
782
778
|
|
|
783
779
|
handleTimeChange(value, type) {
|
|
784
|
-
console.log('🚀 ~ value:', value)
|
|
785
780
|
const parsedValue = parseDate(value, this.timeFormat)
|
|
786
781
|
if (parsedValue) {
|
|
787
782
|
if (type === 'min') {
|
|
@@ -395,7 +395,6 @@ export default {
|
|
|
395
395
|
|
|
396
396
|
watch: {
|
|
397
397
|
pickerVisible(val) {
|
|
398
|
-
console.log('🚀 ~ val:', val)
|
|
399
398
|
if (this.readonly || this.pickerDisabled) return
|
|
400
399
|
if (val) {
|
|
401
400
|
this.showPicker()
|
|
@@ -417,7 +416,6 @@ export default {
|
|
|
417
416
|
handler(val) {
|
|
418
417
|
if (this.picker) {
|
|
419
418
|
this.picker.value = this.mergeDateAndTime(this.value)
|
|
420
|
-
console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value).date)
|
|
421
419
|
}
|
|
422
420
|
}
|
|
423
421
|
},
|
|
@@ -441,7 +439,6 @@ export default {
|
|
|
441
439
|
|
|
442
440
|
computed: {
|
|
443
441
|
returnedValue() {
|
|
444
|
-
console.log('🚀 ~ returnedValue:')
|
|
445
442
|
const formattedValue = formatAsFormatAndType(this.parsedValue, this.format, this.type, this.rangeSeparator)
|
|
446
443
|
|
|
447
444
|
// 分离日期和时间
|
|
@@ -654,7 +651,6 @@ export default {
|
|
|
654
651
|
},
|
|
655
652
|
|
|
656
653
|
blur() {
|
|
657
|
-
console.log('blur')
|
|
658
654
|
this.refInput.forEach((input) => input.blur())
|
|
659
655
|
},
|
|
660
656
|
|
|
@@ -700,7 +696,6 @@ export default {
|
|
|
700
696
|
const value = this.parseString(this.displayValue)
|
|
701
697
|
if (value) {
|
|
702
698
|
this.picker.value = value
|
|
703
|
-
console.log('🚀 ~ value:', value)
|
|
704
699
|
if (this.isValidValue(value)) {
|
|
705
700
|
this.emitInput(value)
|
|
706
701
|
this.userInput = null
|
|
@@ -736,7 +731,6 @@ export default {
|
|
|
736
731
|
this.userInput = [this.formatToString(value), this.displayValue[1]]
|
|
737
732
|
const newValue = [value, this.picker.value && this.picker.value[1]]
|
|
738
733
|
this.picker.value = newValue
|
|
739
|
-
console.log('🚀 ~ newValue:', newValue)
|
|
740
734
|
if (this.isValidValue(newValue)) {
|
|
741
735
|
this.emitInput(newValue)
|
|
742
736
|
this.userInput = null
|
|
@@ -750,7 +744,6 @@ export default {
|
|
|
750
744
|
this.userInput = [this.displayValue[0], this.formatToString(value)]
|
|
751
745
|
const newValue = [this.picker.value && this.picker.value[0], value]
|
|
752
746
|
this.picker.value = newValue
|
|
753
|
-
console.log('🚀 ~ newValue:', newValue)
|
|
754
747
|
if (this.isValidValue(newValue)) {
|
|
755
748
|
this.emitInput(newValue)
|
|
756
749
|
this.userInput = null
|
|
@@ -827,7 +820,6 @@ export default {
|
|
|
827
820
|
|
|
828
821
|
// 转换parsedValue为包含date、time、type和dynamicRange字段的对象格式
|
|
829
822
|
this.picker.value = this.mergeDateAndTime(this.value)
|
|
830
|
-
console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value))
|
|
831
823
|
this.picker.resetView && this.picker.resetView()
|
|
832
824
|
|
|
833
825
|
this.$nextTick(() => {
|
|
@@ -890,7 +882,6 @@ export default {
|
|
|
890
882
|
|
|
891
883
|
this.picker.$on('dodestroy', this.doDestroy)
|
|
892
884
|
this.picker.$on('pick', (date = '', visible = false) => {
|
|
893
|
-
console.log('🚀🚀🚀🚀🚀🚀🚀 ~ date:', date)
|
|
894
885
|
this.userInput = null
|
|
895
886
|
this.pickerVisible = this.picker.visible = visible
|
|
896
887
|
this.emitInput(date)
|
|
@@ -926,9 +917,7 @@ export default {
|
|
|
926
917
|
},
|
|
927
918
|
|
|
928
919
|
emitChange(val) {
|
|
929
|
-
console.log('🚀 ~ val:', val)
|
|
930
920
|
// determine user real change only
|
|
931
|
-
console.log('🚀 ~ valueEquals(val, this.valueOnOpen):', valueEquals(val, this.valueOnOpen))
|
|
932
921
|
if (!valueEquals(val, this.valueOnOpen)) {
|
|
933
922
|
this.$emit('change', val)
|
|
934
923
|
this.valueOnOpen = val
|