eoss-mobiles 0.2.51 → 0.2.53
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/date.js +45 -21
- package/lib/eoss-mobile.common.js +92 -51
- package/lib/field.js +13 -2
- package/lib/index.js +1 -1
- package/lib/picker.js +6 -4
- package/lib/selector.js +12 -8
- package/lib/theme-chalk/base.css +1 -1
- package/lib/theme-chalk/field.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/package.json +1 -1
- package/packages/date/src/date-picker.vue +2 -7
- package/packages/date/src/main.vue +44 -9
- package/packages/field/src/main.vue +11 -1
- package/packages/picker/src/main.vue +3 -2
- package/packages/selector/src/selector-field.vue +1 -1
- package/packages/theme-chalk/lib/base.css +1 -1
- package/packages/theme-chalk/lib/field.css +1 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/src/base.scss +13 -9
- package/packages/theme-chalk/src/field.scss +17 -15
- package/src/index.js +1 -1
package/lib/date.js
CHANGED
|
@@ -199,7 +199,7 @@ function normalizeComponent(
|
|
|
199
199
|
// ESM COMPAT FLAG
|
|
200
200
|
__webpack_require__.r(__webpack_exports__);
|
|
201
201
|
|
|
202
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=
|
|
202
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=57ffad94&
|
|
203
203
|
var render = function () {
|
|
204
204
|
var _vm = this
|
|
205
205
|
var _h = _vm.$createElement
|
|
@@ -216,7 +216,7 @@ var render = function () {
|
|
|
216
216
|
readonly: "",
|
|
217
217
|
clickable: "",
|
|
218
218
|
label: _vm.label,
|
|
219
|
-
value: _vm.pickerValue,
|
|
219
|
+
value: _vm.pickerValue || "",
|
|
220
220
|
"label-align": _vm.labelAlign,
|
|
221
221
|
"input-align": _vm.inputAlign,
|
|
222
222
|
"label-width": _vm.labelWidth,
|
|
@@ -237,7 +237,15 @@ var render = function () {
|
|
|
237
237
|
[
|
|
238
238
|
_c("template", { slot: "input" }, [
|
|
239
239
|
_vm.pickerValue
|
|
240
|
-
? _c(
|
|
240
|
+
? _c(
|
|
241
|
+
"span",
|
|
242
|
+
{
|
|
243
|
+
style:
|
|
244
|
+
"color:" +
|
|
245
|
+
(_vm.disabled || _vm.readonly ? "#c8c9cc" : ""),
|
|
246
|
+
},
|
|
247
|
+
[_vm._v(_vm._s(_vm.pickerValue) + " ")]
|
|
248
|
+
)
|
|
241
249
|
: _c("span", { staticStyle: { color: "#c8c9cc" } }, [
|
|
242
250
|
_vm._v(
|
|
243
251
|
_vm._s(
|
|
@@ -345,7 +353,7 @@ var staticRenderFns = []
|
|
|
345
353
|
render._withStripped = true
|
|
346
354
|
|
|
347
355
|
|
|
348
|
-
// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=
|
|
356
|
+
// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=57ffad94&
|
|
349
357
|
|
|
350
358
|
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-time.vue?vue&type=template&id=df431e74&
|
|
351
359
|
var date_timevue_type_template_id_df431e74_render = function () {
|
|
@@ -678,8 +686,8 @@ var component = Object(componentNormalizer["a" /* default */])(
|
|
|
678
686
|
)
|
|
679
687
|
|
|
680
688
|
/* harmony default export */ var date_time = (component.exports);
|
|
681
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=
|
|
682
|
-
var
|
|
689
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=7b158890&
|
|
690
|
+
var date_pickervue_type_template_id_7b158890_render = function () {
|
|
683
691
|
var _vm = this
|
|
684
692
|
var _h = _vm.$createElement
|
|
685
693
|
var _c = _vm._self._c || _h
|
|
@@ -714,11 +722,11 @@ var date_pickervue_type_template_id_14b63295_render = function () {
|
|
|
714
722
|
2
|
|
715
723
|
)
|
|
716
724
|
}
|
|
717
|
-
var
|
|
718
|
-
|
|
725
|
+
var date_pickervue_type_template_id_7b158890_staticRenderFns = []
|
|
726
|
+
date_pickervue_type_template_id_7b158890_render._withStripped = true
|
|
719
727
|
|
|
720
728
|
|
|
721
|
-
// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=
|
|
729
|
+
// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=7b158890&
|
|
722
730
|
|
|
723
731
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=script&lang=js&
|
|
724
732
|
//
|
|
@@ -743,7 +751,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
743
751
|
name: 'DatePicker',
|
|
744
752
|
props: {
|
|
745
753
|
model: {
|
|
746
|
-
type: [String, Array, Object, Date],
|
|
754
|
+
type: [String, Array, Object, Date, Boolean],
|
|
747
755
|
default: ''
|
|
748
756
|
},
|
|
749
757
|
timePeriod: {
|
|
@@ -751,7 +759,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
751
759
|
default: false
|
|
752
760
|
},
|
|
753
761
|
timePeriodValue: {
|
|
754
|
-
type: [String, Number],
|
|
762
|
+
type: [String, Number, Boolean],
|
|
755
763
|
default: 'AM'
|
|
756
764
|
}
|
|
757
765
|
},
|
|
@@ -785,8 +793,6 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
785
793
|
var timePeriod = void 0;
|
|
786
794
|
if (this.$attrs.type === 'datehour' && this.timePeriod) {
|
|
787
795
|
timePeriod = this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex == 0 ? 'AM' : 'PM';
|
|
788
|
-
|
|
789
|
-
console.log(this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex);
|
|
790
796
|
}
|
|
791
797
|
this.$emit('confirm', value, timePeriod);
|
|
792
798
|
},
|
|
@@ -807,8 +813,8 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
807
813
|
|
|
808
814
|
var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
809
815
|
src_date_pickervue_type_script_lang_js_,
|
|
810
|
-
|
|
811
|
-
|
|
816
|
+
date_pickervue_type_template_id_7b158890_render,
|
|
817
|
+
date_pickervue_type_template_id_7b158890_staticRenderFns,
|
|
812
818
|
false,
|
|
813
819
|
null,
|
|
814
820
|
null,
|
|
@@ -887,6 +893,10 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
887
893
|
//
|
|
888
894
|
//
|
|
889
895
|
//
|
|
896
|
+
//
|
|
897
|
+
//
|
|
898
|
+
//
|
|
899
|
+
//
|
|
890
900
|
|
|
891
901
|
|
|
892
902
|
|
|
@@ -899,6 +909,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
899
909
|
showPicker: false,
|
|
900
910
|
newLoading: false,
|
|
901
911
|
changeValue: true,
|
|
912
|
+
firstShow: true,
|
|
902
913
|
newValueKey: '',
|
|
903
914
|
newValue: '',
|
|
904
915
|
lastValue: '',
|
|
@@ -908,6 +919,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
908
919
|
isOnConfirm: false,
|
|
909
920
|
count: 0,
|
|
910
921
|
pickerValue: '',
|
|
922
|
+
timeText: '',
|
|
911
923
|
timePeriodText: ''
|
|
912
924
|
};
|
|
913
925
|
},
|
|
@@ -931,7 +943,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
931
943
|
},
|
|
932
944
|
// 绑定值
|
|
933
945
|
value: {
|
|
934
|
-
type: [String, Array, Object, Date, Number],
|
|
946
|
+
type: [String, Array, Object, Date, Number, Boolean],
|
|
935
947
|
default: ''
|
|
936
948
|
},
|
|
937
949
|
// 展示标题
|
|
@@ -983,7 +995,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
983
995
|
default: false
|
|
984
996
|
},
|
|
985
997
|
timePeriodValue: {
|
|
986
|
-
type: [String, Number],
|
|
998
|
+
type: [String, Number, Boolean],
|
|
987
999
|
default: 'AM'
|
|
988
1000
|
}
|
|
989
1001
|
},
|
|
@@ -1008,14 +1020,19 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1008
1020
|
},
|
|
1009
1021
|
|
|
1010
1022
|
mounted: function mounted() {
|
|
1011
|
-
|
|
1023
|
+
var _this = this;
|
|
1024
|
+
|
|
1025
|
+
this.$nextTick(function () {
|
|
1026
|
+
_this.lastValue = _this.value;
|
|
1027
|
+
});
|
|
1012
1028
|
},
|
|
1013
1029
|
|
|
1014
1030
|
methods: {
|
|
1015
1031
|
handleClear: function handleClear() {
|
|
1016
1032
|
this.pickerValue = '';
|
|
1033
|
+
this.timeText = '';
|
|
1017
1034
|
this.lastValue = '';
|
|
1018
|
-
this.$emit('input', this.pickerValue);
|
|
1035
|
+
this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
|
|
1019
1036
|
},
|
|
1020
1037
|
onChange: function onChange(picker) {
|
|
1021
1038
|
this.$emit('change', picker);
|
|
@@ -1071,13 +1088,14 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1071
1088
|
this.showPicker = false;
|
|
1072
1089
|
},
|
|
1073
1090
|
onConfirm: function onConfirm(value, timePeriod) {
|
|
1091
|
+
|
|
1074
1092
|
this.showPicker = false;
|
|
1075
1093
|
this.timePeriodText = timePeriod;
|
|
1076
1094
|
this.pickerValue = this.getValue(value);
|
|
1077
1095
|
this.isOnConfirm = true;
|
|
1078
1096
|
this.lastValue = value;
|
|
1079
1097
|
this.changeValue = false;
|
|
1080
|
-
this.$emit('input', this.pickerValue);
|
|
1098
|
+
this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
|
|
1081
1099
|
this.$emit('confirm', value, this.timePeriodText);
|
|
1082
1100
|
},
|
|
1083
1101
|
getValue: function getValue(val) {
|
|
@@ -1085,7 +1103,6 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1085
1103
|
|
|
1086
1104
|
var timePeriodText = '';
|
|
1087
1105
|
if (this.timePeriod && (this.timePeriodText || this.timePeriodValue)) {
|
|
1088
|
-
console.log('进来了');
|
|
1089
1106
|
timePeriodText = (this.timePeriodText || this.timePeriodValue) == 'AM' ? '上午' : '下午';
|
|
1090
1107
|
}
|
|
1091
1108
|
var value = '';
|
|
@@ -1127,6 +1144,9 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1127
1144
|
value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + h + (this.joinStr ? ':' : '时') + minute + (this.joinStr ? type === 'datetimeSecond' ? ':' : '' : '分') + (type === 'datetimeSecond' ? s + (this.joinStr ? '' : '秒') : '');
|
|
1128
1145
|
} else if (type === 'datehour' && newValue != 'Invalid Date') {
|
|
1129
1146
|
value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + (this.timePeriod ? timePeriodText : h + (this.joinStr ? ' ' : '时'));
|
|
1147
|
+
if (this.timePeriod && type === 'datehour') {
|
|
1148
|
+
this.timeText = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? '' : '日 ');
|
|
1149
|
+
}
|
|
1130
1150
|
} else if (type === 'year' && newValue != 'Invalid Date') {
|
|
1131
1151
|
value = y + (this.joinStr ? '' : '年');
|
|
1132
1152
|
}
|
|
@@ -1134,6 +1154,10 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1134
1154
|
},
|
|
1135
1155
|
handlePicker: function handlePicker() {
|
|
1136
1156
|
if (this.disabled || this.readonly) return;
|
|
1157
|
+
if (this.firstShow) {
|
|
1158
|
+
this.lastValue = this.value;
|
|
1159
|
+
}
|
|
1160
|
+
this.firstShow = false;
|
|
1137
1161
|
this.showPicker = true;
|
|
1138
1162
|
this.$emit('showPicker');
|
|
1139
1163
|
}
|
|
@@ -4301,8 +4301,8 @@ var selector_tree_component = normalizeComponent(
|
|
|
4301
4301
|
)
|
|
4302
4302
|
|
|
4303
4303
|
/* harmony default export */ var selector_tree = (selector_tree_component.exports);
|
|
4304
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=template&id=
|
|
4305
|
-
var
|
|
4304
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=template&id=e58694a8&
|
|
4305
|
+
var selector_fieldvue_type_template_id_e58694a8_render = function () {
|
|
4306
4306
|
var _vm = this
|
|
4307
4307
|
var _h = _vm.$createElement
|
|
4308
4308
|
var _c = _vm._self._c || _h
|
|
@@ -4315,7 +4315,11 @@ var selector_fieldvue_type_template_id_ef77a3f6_render = function () {
|
|
|
4315
4315
|
_vm._b(
|
|
4316
4316
|
{
|
|
4317
4317
|
class: { "hide-label": _vm.hideLabel },
|
|
4318
|
-
attrs: {
|
|
4318
|
+
attrs: {
|
|
4319
|
+
readonly: "",
|
|
4320
|
+
clickable: "",
|
|
4321
|
+
"right-icon": _vm.disabled || _vm.readonly ? "" : "arrow",
|
|
4322
|
+
},
|
|
4319
4323
|
on: {
|
|
4320
4324
|
click: function ($event) {
|
|
4321
4325
|
_vm.clickTree()
|
|
@@ -4461,11 +4465,11 @@ var selector_fieldvue_type_template_id_ef77a3f6_render = function () {
|
|
|
4461
4465
|
1
|
|
4462
4466
|
)
|
|
4463
4467
|
}
|
|
4464
|
-
var
|
|
4465
|
-
|
|
4468
|
+
var selector_fieldvue_type_template_id_e58694a8_staticRenderFns = []
|
|
4469
|
+
selector_fieldvue_type_template_id_e58694a8_render._withStripped = true
|
|
4466
4470
|
|
|
4467
4471
|
|
|
4468
|
-
// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=
|
|
4472
|
+
// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=e58694a8&
|
|
4469
4473
|
|
|
4470
4474
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=script&lang=js&
|
|
4471
4475
|
//
|
|
@@ -4718,8 +4722,8 @@ selector_fieldvue_type_template_id_ef77a3f6_render._withStripped = true
|
|
|
4718
4722
|
|
|
4719
4723
|
var selector_field_component = normalizeComponent(
|
|
4720
4724
|
src_selector_fieldvue_type_script_lang_js_,
|
|
4721
|
-
|
|
4722
|
-
|
|
4725
|
+
selector_fieldvue_type_template_id_e58694a8_render,
|
|
4726
|
+
selector_fieldvue_type_template_id_e58694a8_staticRenderFns,
|
|
4723
4727
|
false,
|
|
4724
4728
|
null,
|
|
4725
4729
|
null,
|
|
@@ -4886,8 +4890,8 @@ selector_src_main.install = function (Vue) {
|
|
|
4886
4890
|
};
|
|
4887
4891
|
|
|
4888
4892
|
/* harmony default export */ var selector = (selector_src_main);
|
|
4889
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=
|
|
4890
|
-
var
|
|
4893
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=5c2d4e2d&
|
|
4894
|
+
var mainvue_type_template_id_5c2d4e2d_render = function () {
|
|
4891
4895
|
var _vm = this
|
|
4892
4896
|
var _h = _vm.$createElement
|
|
4893
4897
|
var _c = _vm._self._c || _h
|
|
@@ -5004,11 +5008,11 @@ var mainvue_type_template_id_099f12b6_render = function () {
|
|
|
5004
5008
|
1
|
|
5005
5009
|
)
|
|
5006
5010
|
}
|
|
5007
|
-
var
|
|
5008
|
-
|
|
5011
|
+
var mainvue_type_template_id_5c2d4e2d_staticRenderFns = []
|
|
5012
|
+
mainvue_type_template_id_5c2d4e2d_render._withStripped = true
|
|
5009
5013
|
|
|
5010
5014
|
|
|
5011
|
-
// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=
|
|
5015
|
+
// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=5c2d4e2d&
|
|
5012
5016
|
|
|
5013
5017
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=script&lang=js&
|
|
5014
5018
|
//
|
|
@@ -5076,6 +5080,7 @@ mainvue_type_template_id_099f12b6_render._withStripped = true
|
|
|
5076
5080
|
//
|
|
5077
5081
|
//
|
|
5078
5082
|
//
|
|
5083
|
+
//
|
|
5079
5084
|
|
|
5080
5085
|
/* harmony default export */ var field_src_mainvue_type_script_lang_js_ = ({
|
|
5081
5086
|
name: 'EmInput',
|
|
@@ -5144,6 +5149,16 @@ mainvue_type_template_id_099f12b6_render._withStripped = true
|
|
|
5144
5149
|
default: true
|
|
5145
5150
|
}
|
|
5146
5151
|
},
|
|
5152
|
+
watch: {
|
|
5153
|
+
value: {
|
|
5154
|
+
handler: function handler(val, oldval) {
|
|
5155
|
+
console.log(val, oldval, 'input');
|
|
5156
|
+
},
|
|
5157
|
+
|
|
5158
|
+
deep: true,
|
|
5159
|
+
immediate: true
|
|
5160
|
+
}
|
|
5161
|
+
},
|
|
5147
5162
|
data: function data() {
|
|
5148
5163
|
return {
|
|
5149
5164
|
newPlaceholder: '',
|
|
@@ -5251,8 +5266,8 @@ mainvue_type_template_id_099f12b6_render._withStripped = true
|
|
|
5251
5266
|
|
|
5252
5267
|
var field_src_main_component = normalizeComponent(
|
|
5253
5268
|
packages_field_src_mainvue_type_script_lang_js_,
|
|
5254
|
-
|
|
5255
|
-
|
|
5269
|
+
mainvue_type_template_id_5c2d4e2d_render,
|
|
5270
|
+
mainvue_type_template_id_5c2d4e2d_staticRenderFns,
|
|
5256
5271
|
false,
|
|
5257
5272
|
null,
|
|
5258
5273
|
null,
|
|
@@ -5554,8 +5569,8 @@ radio_src_main.install = function (Vue) {
|
|
|
5554
5569
|
};
|
|
5555
5570
|
|
|
5556
5571
|
/* harmony default export */ var packages_radio = (radio_src_main);
|
|
5557
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=template&id=
|
|
5558
|
-
var
|
|
5572
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=template&id=8ae7f90c&
|
|
5573
|
+
var mainvue_type_template_id_8ae7f90c_render = function () {
|
|
5559
5574
|
var _vm = this
|
|
5560
5575
|
var _h = _vm.$createElement
|
|
5561
5576
|
var _c = _vm._self._c || _h
|
|
@@ -5583,7 +5598,8 @@ var mainvue_type_template_id_19aea2bf_render = function () {
|
|
|
5583
5598
|
: _vm.placeholder
|
|
5584
5599
|
? _vm.placeholder
|
|
5585
5600
|
: "请选择" + _vm.label,
|
|
5586
|
-
|
|
5601
|
+
disabled: _vm.disabled || _vm.readonly,
|
|
5602
|
+
"right-icon": _vm.disabled || _vm.readonly ? "" : "arrow",
|
|
5587
5603
|
},
|
|
5588
5604
|
on: { click: _vm.handlePicker },
|
|
5589
5605
|
},
|
|
@@ -5604,7 +5620,7 @@ var mainvue_type_template_id_19aea2bf_render = function () {
|
|
|
5604
5620
|
disabled: _vm.disabled || _vm.readonly,
|
|
5605
5621
|
"label-width": _vm.labelWidth,
|
|
5606
5622
|
hideLabel: _vm.hideLabel,
|
|
5607
|
-
"right-icon": "arrow",
|
|
5623
|
+
"right-icon": _vm.disabled || _vm.readonly ? "" : "arrow",
|
|
5608
5624
|
},
|
|
5609
5625
|
on: { click: _vm.handlePicker },
|
|
5610
5626
|
},
|
|
@@ -5824,11 +5840,11 @@ var mainvue_type_template_id_19aea2bf_render = function () {
|
|
|
5824
5840
|
1
|
|
5825
5841
|
)
|
|
5826
5842
|
}
|
|
5827
|
-
var
|
|
5828
|
-
|
|
5843
|
+
var mainvue_type_template_id_8ae7f90c_staticRenderFns = []
|
|
5844
|
+
mainvue_type_template_id_8ae7f90c_render._withStripped = true
|
|
5829
5845
|
|
|
5830
5846
|
|
|
5831
|
-
// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=
|
|
5847
|
+
// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=8ae7f90c&
|
|
5832
5848
|
|
|
5833
5849
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=script&lang=js&
|
|
5834
5850
|
var src_mainvue_type_script_lang_js_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; };
|
|
@@ -5959,6 +5975,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
5959
5975
|
//
|
|
5960
5976
|
//
|
|
5961
5977
|
//
|
|
5978
|
+
//
|
|
5962
5979
|
|
|
5963
5980
|
|
|
5964
5981
|
|
|
@@ -6389,8 +6406,8 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6389
6406
|
|
|
6390
6407
|
var picker_src_main_component = normalizeComponent(
|
|
6391
6408
|
packages_picker_src_mainvue_type_script_lang_js_,
|
|
6392
|
-
|
|
6393
|
-
|
|
6409
|
+
mainvue_type_template_id_8ae7f90c_render,
|
|
6410
|
+
mainvue_type_template_id_8ae7f90c_staticRenderFns,
|
|
6394
6411
|
false,
|
|
6395
6412
|
null,
|
|
6396
6413
|
null,
|
|
@@ -7998,8 +8015,8 @@ empty_src_main.install = function (Vue) {
|
|
|
7998
8015
|
};
|
|
7999
8016
|
|
|
8000
8017
|
/* harmony default export */ var empty = (empty_src_main);
|
|
8001
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=
|
|
8002
|
-
var
|
|
8018
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=57ffad94&
|
|
8019
|
+
var mainvue_type_template_id_57ffad94_render = function () {
|
|
8003
8020
|
var _vm = this
|
|
8004
8021
|
var _h = _vm.$createElement
|
|
8005
8022
|
var _c = _vm._self._c || _h
|
|
@@ -8015,7 +8032,7 @@ var mainvue_type_template_id_22c800c0_render = function () {
|
|
|
8015
8032
|
readonly: "",
|
|
8016
8033
|
clickable: "",
|
|
8017
8034
|
label: _vm.label,
|
|
8018
|
-
value: _vm.pickerValue,
|
|
8035
|
+
value: _vm.pickerValue || "",
|
|
8019
8036
|
"label-align": _vm.labelAlign,
|
|
8020
8037
|
"input-align": _vm.inputAlign,
|
|
8021
8038
|
"label-width": _vm.labelWidth,
|
|
@@ -8036,7 +8053,15 @@ var mainvue_type_template_id_22c800c0_render = function () {
|
|
|
8036
8053
|
[
|
|
8037
8054
|
_c("template", { slot: "input" }, [
|
|
8038
8055
|
_vm.pickerValue
|
|
8039
|
-
? _c(
|
|
8056
|
+
? _c(
|
|
8057
|
+
"span",
|
|
8058
|
+
{
|
|
8059
|
+
style:
|
|
8060
|
+
"color:" +
|
|
8061
|
+
(_vm.disabled || _vm.readonly ? "#c8c9cc" : ""),
|
|
8062
|
+
},
|
|
8063
|
+
[_vm._v(_vm._s(_vm.pickerValue) + " ")]
|
|
8064
|
+
)
|
|
8040
8065
|
: _c("span", { staticStyle: { color: "#c8c9cc" } }, [
|
|
8041
8066
|
_vm._v(
|
|
8042
8067
|
_vm._s(
|
|
@@ -8140,11 +8165,11 @@ var mainvue_type_template_id_22c800c0_render = function () {
|
|
|
8140
8165
|
1
|
|
8141
8166
|
)
|
|
8142
8167
|
}
|
|
8143
|
-
var
|
|
8144
|
-
|
|
8168
|
+
var mainvue_type_template_id_57ffad94_staticRenderFns = []
|
|
8169
|
+
mainvue_type_template_id_57ffad94_render._withStripped = true
|
|
8145
8170
|
|
|
8146
8171
|
|
|
8147
|
-
// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=
|
|
8172
|
+
// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=57ffad94&
|
|
8148
8173
|
|
|
8149
8174
|
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-time.vue?vue&type=template&id=df431e74&
|
|
8150
8175
|
var date_timevue_type_template_id_df431e74_render = function () {
|
|
@@ -8474,8 +8499,8 @@ var date_time_component = normalizeComponent(
|
|
|
8474
8499
|
)
|
|
8475
8500
|
|
|
8476
8501
|
/* harmony default export */ var date_time = (date_time_component.exports);
|
|
8477
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=
|
|
8478
|
-
var
|
|
8502
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=7b158890&
|
|
8503
|
+
var date_pickervue_type_template_id_7b158890_render = function () {
|
|
8479
8504
|
var _vm = this
|
|
8480
8505
|
var _h = _vm.$createElement
|
|
8481
8506
|
var _c = _vm._self._c || _h
|
|
@@ -8510,11 +8535,11 @@ var date_pickervue_type_template_id_14b63295_render = function () {
|
|
|
8510
8535
|
2
|
|
8511
8536
|
)
|
|
8512
8537
|
}
|
|
8513
|
-
var
|
|
8514
|
-
|
|
8538
|
+
var date_pickervue_type_template_id_7b158890_staticRenderFns = []
|
|
8539
|
+
date_pickervue_type_template_id_7b158890_render._withStripped = true
|
|
8515
8540
|
|
|
8516
8541
|
|
|
8517
|
-
// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=
|
|
8542
|
+
// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=7b158890&
|
|
8518
8543
|
|
|
8519
8544
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=script&lang=js&
|
|
8520
8545
|
//
|
|
@@ -8539,7 +8564,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
8539
8564
|
name: 'DatePicker',
|
|
8540
8565
|
props: {
|
|
8541
8566
|
model: {
|
|
8542
|
-
type: [String, Array, Object, Date],
|
|
8567
|
+
type: [String, Array, Object, Date, Boolean],
|
|
8543
8568
|
default: ''
|
|
8544
8569
|
},
|
|
8545
8570
|
timePeriod: {
|
|
@@ -8547,7 +8572,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
8547
8572
|
default: false
|
|
8548
8573
|
},
|
|
8549
8574
|
timePeriodValue: {
|
|
8550
|
-
type: [String, Number],
|
|
8575
|
+
type: [String, Number, Boolean],
|
|
8551
8576
|
default: 'AM'
|
|
8552
8577
|
}
|
|
8553
8578
|
},
|
|
@@ -8581,8 +8606,6 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
8581
8606
|
var timePeriod = void 0;
|
|
8582
8607
|
if (this.$attrs.type === 'datehour' && this.timePeriod) {
|
|
8583
8608
|
timePeriod = this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex == 0 ? 'AM' : 'PM';
|
|
8584
|
-
|
|
8585
|
-
console.log(this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex);
|
|
8586
8609
|
}
|
|
8587
8610
|
this.$emit('confirm', value, timePeriod);
|
|
8588
8611
|
},
|
|
@@ -8603,8 +8626,8 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
|
|
|
8603
8626
|
|
|
8604
8627
|
var date_picker_component = normalizeComponent(
|
|
8605
8628
|
src_date_pickervue_type_script_lang_js_,
|
|
8606
|
-
|
|
8607
|
-
|
|
8629
|
+
date_pickervue_type_template_id_7b158890_render,
|
|
8630
|
+
date_pickervue_type_template_id_7b158890_staticRenderFns,
|
|
8608
8631
|
false,
|
|
8609
8632
|
null,
|
|
8610
8633
|
null,
|
|
@@ -8683,6 +8706,10 @@ var date_picker_component = normalizeComponent(
|
|
|
8683
8706
|
//
|
|
8684
8707
|
//
|
|
8685
8708
|
//
|
|
8709
|
+
//
|
|
8710
|
+
//
|
|
8711
|
+
//
|
|
8712
|
+
//
|
|
8686
8713
|
|
|
8687
8714
|
|
|
8688
8715
|
|
|
@@ -8695,6 +8722,7 @@ var date_picker_component = normalizeComponent(
|
|
|
8695
8722
|
showPicker: false,
|
|
8696
8723
|
newLoading: false,
|
|
8697
8724
|
changeValue: true,
|
|
8725
|
+
firstShow: true,
|
|
8698
8726
|
newValueKey: '',
|
|
8699
8727
|
newValue: '',
|
|
8700
8728
|
lastValue: '',
|
|
@@ -8704,6 +8732,7 @@ var date_picker_component = normalizeComponent(
|
|
|
8704
8732
|
isOnConfirm: false,
|
|
8705
8733
|
count: 0,
|
|
8706
8734
|
pickerValue: '',
|
|
8735
|
+
timeText: '',
|
|
8707
8736
|
timePeriodText: ''
|
|
8708
8737
|
};
|
|
8709
8738
|
},
|
|
@@ -8727,7 +8756,7 @@ var date_picker_component = normalizeComponent(
|
|
|
8727
8756
|
},
|
|
8728
8757
|
// 绑定值
|
|
8729
8758
|
value: {
|
|
8730
|
-
type: [String, Array, Object, Date, Number],
|
|
8759
|
+
type: [String, Array, Object, Date, Number, Boolean],
|
|
8731
8760
|
default: ''
|
|
8732
8761
|
},
|
|
8733
8762
|
// 展示标题
|
|
@@ -8779,7 +8808,7 @@ var date_picker_component = normalizeComponent(
|
|
|
8779
8808
|
default: false
|
|
8780
8809
|
},
|
|
8781
8810
|
timePeriodValue: {
|
|
8782
|
-
type: [String, Number],
|
|
8811
|
+
type: [String, Number, Boolean],
|
|
8783
8812
|
default: 'AM'
|
|
8784
8813
|
}
|
|
8785
8814
|
},
|
|
@@ -8804,14 +8833,19 @@ var date_picker_component = normalizeComponent(
|
|
|
8804
8833
|
},
|
|
8805
8834
|
|
|
8806
8835
|
mounted: function mounted() {
|
|
8807
|
-
|
|
8836
|
+
var _this = this;
|
|
8837
|
+
|
|
8838
|
+
this.$nextTick(function () {
|
|
8839
|
+
_this.lastValue = _this.value;
|
|
8840
|
+
});
|
|
8808
8841
|
},
|
|
8809
8842
|
|
|
8810
8843
|
methods: {
|
|
8811
8844
|
handleClear: function handleClear() {
|
|
8812
8845
|
this.pickerValue = '';
|
|
8846
|
+
this.timeText = '';
|
|
8813
8847
|
this.lastValue = '';
|
|
8814
|
-
this.$emit('input', this.pickerValue);
|
|
8848
|
+
this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
|
|
8815
8849
|
},
|
|
8816
8850
|
onChange: function onChange(picker) {
|
|
8817
8851
|
this.$emit('change', picker);
|
|
@@ -8867,13 +8901,14 @@ var date_picker_component = normalizeComponent(
|
|
|
8867
8901
|
this.showPicker = false;
|
|
8868
8902
|
},
|
|
8869
8903
|
onConfirm: function onConfirm(value, timePeriod) {
|
|
8904
|
+
|
|
8870
8905
|
this.showPicker = false;
|
|
8871
8906
|
this.timePeriodText = timePeriod;
|
|
8872
8907
|
this.pickerValue = this.getValue(value);
|
|
8873
8908
|
this.isOnConfirm = true;
|
|
8874
8909
|
this.lastValue = value;
|
|
8875
8910
|
this.changeValue = false;
|
|
8876
|
-
this.$emit('input', this.pickerValue);
|
|
8911
|
+
this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
|
|
8877
8912
|
this.$emit('confirm', value, this.timePeriodText);
|
|
8878
8913
|
},
|
|
8879
8914
|
getValue: function getValue(val) {
|
|
@@ -8881,7 +8916,6 @@ var date_picker_component = normalizeComponent(
|
|
|
8881
8916
|
|
|
8882
8917
|
var timePeriodText = '';
|
|
8883
8918
|
if (this.timePeriod && (this.timePeriodText || this.timePeriodValue)) {
|
|
8884
|
-
console.log('进来了');
|
|
8885
8919
|
timePeriodText = (this.timePeriodText || this.timePeriodValue) == 'AM' ? '上午' : '下午';
|
|
8886
8920
|
}
|
|
8887
8921
|
var value = '';
|
|
@@ -8923,6 +8957,9 @@ var date_picker_component = normalizeComponent(
|
|
|
8923
8957
|
value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + h + (this.joinStr ? ':' : '时') + minute + (this.joinStr ? type === 'datetimeSecond' ? ':' : '' : '分') + (type === 'datetimeSecond' ? s + (this.joinStr ? '' : '秒') : '');
|
|
8924
8958
|
} else if (type === 'datehour' && newValue != 'Invalid Date') {
|
|
8925
8959
|
value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + (this.timePeriod ? timePeriodText : h + (this.joinStr ? ' ' : '时'));
|
|
8960
|
+
if (this.timePeriod && type === 'datehour') {
|
|
8961
|
+
this.timeText = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? '' : '日 ');
|
|
8962
|
+
}
|
|
8926
8963
|
} else if (type === 'year' && newValue != 'Invalid Date') {
|
|
8927
8964
|
value = y + (this.joinStr ? '' : '年');
|
|
8928
8965
|
}
|
|
@@ -8930,6 +8967,10 @@ var date_picker_component = normalizeComponent(
|
|
|
8930
8967
|
},
|
|
8931
8968
|
handlePicker: function handlePicker() {
|
|
8932
8969
|
if (this.disabled || this.readonly) return;
|
|
8970
|
+
if (this.firstShow) {
|
|
8971
|
+
this.lastValue = this.value;
|
|
8972
|
+
}
|
|
8973
|
+
this.firstShow = false;
|
|
8933
8974
|
this.showPicker = true;
|
|
8934
8975
|
this.$emit('showPicker');
|
|
8935
8976
|
}
|
|
@@ -8947,8 +8988,8 @@ var date_picker_component = normalizeComponent(
|
|
|
8947
8988
|
|
|
8948
8989
|
var date_src_main_component = normalizeComponent(
|
|
8949
8990
|
packages_date_src_mainvue_type_script_lang_js_,
|
|
8950
|
-
|
|
8951
|
-
|
|
8991
|
+
mainvue_type_template_id_57ffad94_render,
|
|
8992
|
+
mainvue_type_template_id_57ffad94_staticRenderFns,
|
|
8952
8993
|
false,
|
|
8953
8994
|
null,
|
|
8954
8995
|
null,
|
|
@@ -22783,7 +22824,7 @@ if (typeof window !== 'undefined' && window.Vue) {
|
|
|
22783
22824
|
}
|
|
22784
22825
|
|
|
22785
22826
|
/* harmony default export */ var src = __webpack_exports__["default"] = ({
|
|
22786
|
-
version: '0.2.
|
|
22827
|
+
version: '0.2.53',
|
|
22787
22828
|
install: install,
|
|
22788
22829
|
Button: packages_button,
|
|
22789
22830
|
ButtonGroup: button_group,
|
package/lib/field.js
CHANGED
|
@@ -199,7 +199,7 @@ function normalizeComponent(
|
|
|
199
199
|
// ESM COMPAT FLAG
|
|
200
200
|
__webpack_require__.r(__webpack_exports__);
|
|
201
201
|
|
|
202
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=
|
|
202
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=5c2d4e2d&
|
|
203
203
|
var render = function () {
|
|
204
204
|
var _vm = this
|
|
205
205
|
var _h = _vm.$createElement
|
|
@@ -321,7 +321,7 @@ var staticRenderFns = []
|
|
|
321
321
|
render._withStripped = true
|
|
322
322
|
|
|
323
323
|
|
|
324
|
-
// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=
|
|
324
|
+
// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=5c2d4e2d&
|
|
325
325
|
|
|
326
326
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=script&lang=js&
|
|
327
327
|
//
|
|
@@ -389,6 +389,7 @@ render._withStripped = true
|
|
|
389
389
|
//
|
|
390
390
|
//
|
|
391
391
|
//
|
|
392
|
+
//
|
|
392
393
|
|
|
393
394
|
/* harmony default export */ var mainvue_type_script_lang_js_ = ({
|
|
394
395
|
name: 'EmInput',
|
|
@@ -457,6 +458,16 @@ render._withStripped = true
|
|
|
457
458
|
default: true
|
|
458
459
|
}
|
|
459
460
|
},
|
|
461
|
+
watch: {
|
|
462
|
+
value: {
|
|
463
|
+
handler: function handler(val, oldval) {
|
|
464
|
+
console.log(val, oldval, 'input');
|
|
465
|
+
},
|
|
466
|
+
|
|
467
|
+
deep: true,
|
|
468
|
+
immediate: true
|
|
469
|
+
}
|
|
470
|
+
},
|
|
460
471
|
data: function data() {
|
|
461
472
|
return {
|
|
462
473
|
newPlaceholder: '',
|