sone-ui-component-3.2.4 2.1.43 → 2.1.44

package/package.json

@@ -1,6 +1,6 @@
   {
   "name": "sone-ui-component-3.2.4",
-  "version": "2.1.43",
+  "version": "2.1.44",
   "private": false,
   "main": "lib/sone-ui.common.js",
   "files": [

package/packages/form/src/mainNoDrag.vue

@@ -186,10 +186,7 @@
 						</template>
 
 						<!-- 日期范围、日期时间范围 -->
-						<template 
-							v-if="(item.layoutType === 'daterange' ||
-							item.layoutType === 'datetimerange' ) && 
-							form.hasOwnProperty(item.fieldName)">
+						<template v-if="['daterange', 'datetimerange', 'monthrange'].includes(item.layoutType) && form.hasOwnProperty(item.fieldName)">
 							<el-date-picker
 								:clearable="item.hasOwnProperty('clearable') ? item.clearable : true" 
 								v-model="form[item.fieldName]" 
@@ -201,6 +198,7 @@
 								:disabled="item.disabled"
 								:value-format="item.valueFormat"
 								:default-time="item.defaultTime"
+								:picker-options="item.layoutType === 'monthrange'? monthPickerOptions : pickerOptions"
 								@focus="focusFn(item.fieldName)"
 								@change="val => updateDate(val, item)"
 							></el-date-picker>
@@ -305,6 +303,56 @@ export default {
 	data() {
 		return {
 			isBottomCollapse: false,
+			monthPickerOptions: {
+				shortcuts: [{
+					text: '本月',
+					onClick(picker) {
+						picker.$emit('pick', [new Date(), new Date()]);
+					}
+				}, {
+					text: '今年至今',
+					onClick(picker) {
+						const end = new Date();
+						const start = new Date(new Date().getFullYear(), 0);
+						picker.$emit('pick', [start, end]);
+					}
+				}, {
+					text: '最近六个月',
+					onClick(picker) {
+						const end = new Date();
+						const start = new Date();
+						start.setMonth(start.getMonth() - 6);
+						picker.$emit('pick', [start, end]);
+					}
+				}]
+			},
+			pickerOptions: {
+				shortcuts: [{
+					text: '最近一周',
+					onClick(picker) {
+						const end = new Date();
+						const start = new Date();
+						start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+						picker.$emit('pick', [start, end]);
+					}
+				}, {
+					text: '最近一个月',
+					onClick(picker) {
+						const end = new Date();
+						const start = new Date();
+						start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+						picker.$emit('pick', [start, end]);
+					}
+				}, {
+					text: '最近三个月',
+					onClick(picker) {
+						const end = new Date();
+						const start = new Date();
+						start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+						picker.$emit('pick', [start, end]);
+					}
+				}]
+			},
 		}
   },
   methods: {
@@ -461,7 +509,37 @@ export default {
       this.$refs['sone-form'].$el.scrollTop = 0;
 			this.isBottomCollapse = !this.isBottomCollapse;
 			this.$emit('toggle', this.isBottomCollapse);
-		}
+		},
+
+		// pickerOptions(){
+		// 	return {
+		// 		shortcuts: [{
+		// 			text: '最近一周',
+		// 			onClick(picker) {
+		// 				const end = new Date();
+		// 				const start = new Date();
+		// 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+		// 				picker.$emit('pick', [start, end]);
+		// 			}
+		// 		}, {
+		// 			text: '最近一个月',
+		// 			onClick(picker) {
+		// 				const end = new Date();
+		// 				const start = new Date();
+		// 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+		// 				picker.$emit('pick', [start, end]);
+		// 			}
+		// 		}, {
+		// 			text: '最近三个月',
+		// 			onClick(picker) {
+		// 				const end = new Date();
+		// 				const start = new Date();
+		// 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+		// 				picker.$emit('pick', [start, end]);
+		// 			}
+		// 		}]
+		// 	}
+		// }
   },
 };
 </script>

package/src/index.js

@@ -57,7 +57,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.1.43',
+  version: '2.1.44',
   locale: locale.use,
   i18n: locale.i18n,
   install,