fixed: icons bug, opti: rename files

Author: Fasttian

uni_modules/uni-datetime-picker/changelog.md

@@ -1,3 +1,6 @@
+## 2.0.6（2021-05-22）
+- 修复 图标 在小程序上不显示的 bug
+- 优化 重命名引用组件，避免冲突
 ## 2.0.5（2021-05-20）
 - 优化 代码目录扁平化
 ## 2.0.4（2021-05-12）

uni_modules/uni-datetime-picker/components/uni-datetime-picker/cale-50.png

@@ -93,7 +93,7 @@
 
 <script>
 	import Calendar from './util.js';
-	import calendarItem from './uni-calendar-item.vue'
+	import calendarItem from './calendar-item.vue'
 	import timePicker from './time-picker.vue'
 	/**
 	 * Calendar 日历
@@ -117,7 +117,7 @@
 	 */
 	export default {
 		components: {
-			calendarItem,
+			calendarItem,
 			timePicker
 		},
 		props: {
@@ -209,7 +209,7 @@
 				timeRange: {
 					startTime: this.defTime.start ? this.defTime.start : '',
 					endTime: this.defTime.end ? this.defTime.end : ''
-				},
+				},
 				tempSingleDate: this.date,
 				tempRange: {
 					before: '',
@@ -444,7 +444,7 @@
 				this.calendar = weeks
 				// 设置多选
 				this.cale.setMultiple(this.calendar.fullDate, true)
-				this.weeks = this.cale.weeks
+				this.weeks = this.cale.weeks
 				this.tempSingleDate = this.calendar.fullDate
 				this.tempRange.before = this.cale.multipleStatus.before
 				this.tempRange.after = this.cale.multipleStatus.after
@@ -757,4 +757,4 @@
 	.mr-10 {
 		margin-right: 10px;
 	}
-</style>
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-calendar-item.vue renamed to uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue

@@ -78,7 +78,7 @@
 			</view>
 		</view>
 		<!-- #ifdef H5 -->
-		<keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" />
+		<!-- <keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" /> -->
 		<!-- #endif -->
 	</view>
 </template>
@@ -921,4 +921,4 @@
 	.time-hide-second {
 		width: 180px;
 	}
-</style>
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-calendar.vue renamed to uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

@@ -4,14 +4,14 @@
 		'uni-date-x--border': border}">
 			<view v-if="!isRange" class="uni-date-x uni-date-single" @click="show">
 				<view class="uni-date__icon-logo">
-					<image class="uni-date-editor--logo" src="./cale-50.png" mode=""></image>
+					<image class="uni-date-editor--logo" :src="iconBase64" mode=""></image>
 				</view>
 				<input class="uni-date__input" type="text" v-model="singleVal" :placeholder="placeholder"
 					:disabled="true" />
 			</view>
 			<view v-else class="uni-date-x uni-date-range" @click="show">
 				<view class="uni-date__icon-logo">
-					<image class="uni-date-editor--logo" src="./cale-50.png" mode=""></image>
+					<image class="uni-date-editor--logo" :src="iconBase64" mode=""></image>
 				</view>
 				<input class="uni-date__input uni-date-range__input" type="text" v-model="range.startDate"
 					:placeholder="startPlaceholder" :disabled="true" />
@@ -28,7 +28,7 @@
 		</view>
 
 		<view v-show="popup" class="uni-date-mask" @click="close"></view>
-		<view ref="datePicker" v-show="popup" class="uni-date-picker__container">
+		<view ref="datePicker" v-show="popup" class="uni-date-picker__container">
 			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
 				<view v-show="hasTime" class="uni-date-changed popup-x-header">
 					<input class="uni-date__input uni-date-range__input" type="text" v-model="tempSingleDate"
@@ -39,12 +39,12 @@
 							placeholder="选择时间" :disabled="!tempSingleDate" />
 					</time-picker>
 				</view>
-				<uni-calendar ref="pcSingle" :showMonth="false" :start-date="caleRange.startDate"
+				<calendar ref="pcSingle" :showMonth="false" :start-date="caleRange.startDate"
 					:end-date="caleRange.endDate" :date="defSingleDate" @change="singleChange" />
 				<view v-if="hasTime" class="popup-x-footer">
 					<!-- <text class="">此刻</text> -->
 					<text class="confirm" @click="confirmSingleChange">确定</text>
-				</view>
+				</view>
 				<view class="uni-date-popper__arrow"></view>
 			</view>
 
@@ -71,10 +71,10 @@
 					</view>
 				</view>
 				<view class="popup-x-body">
-					<uni-calendar ref="left" :showMonth="false" :start-date="caleRange.startDate"
+					<calendar ref="left" :showMonth="false" :start-date="caleRange.startDate"
 						:end-date="caleRange.endDate" :range="true" @change="leftChange" :pleStatus="endMultipleStatus"
 						@firstEnterCale="updateRightCale" @monthSwitch="leftMonthSwitch" style="padding-right: 16px;" />
-					<uni-calendar ref="right" :showMonth="false" :start-date="caleRange.startDate"
+					<calendar ref="right" :showMonth="false" :start-date="caleRange.startDate"
 						:end-date="caleRange.endDate" :range="true" @change="rightChange"
 						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
 						@monthSwitch="rightMonthSwitch" style="padding-left: 16px;border-left: 1px solid #F1F1F1;" />
@@ -85,14 +85,14 @@
 				</view>
 			</view>
 		</view>
-		<uni-calendar ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
+		<calendar ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
 			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
 			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
 			@confirm="mobileChange" />
 	</view>
 </template>
 <script>
-	import uniCalendar from './uni-calendar.vue'
+	import calendar from './calendar.vue'
 	import timePicker from './time-picker.vue'
 
 	/**
@@ -110,10 +110,10 @@
 	 * @event {Function} change 确定日期时触发的事件
 	 **/
 
-	export default {
+	export default {
 		name:'UniDatetimePicker',
 		components: {
-			uniCalendar,
+			calendar,
 			timePicker
 		},
 		data() {
@@ -160,7 +160,8 @@
 				},
 				visible: false,
 				popup: false,
-				popover: null
+				popover: null,
+				iconBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABmJLR0QA/wD/AP+gvaeTAAACVklEQVRoge2Zv2vTQRTAP4oWJQQskmolBAnSQVMcSxbp4ubmIEWETu0oIjg5iIOgpLNunfQfMHToUgpOVgfRqRAL4q8WRLQVq4sOdyHPL9/7evfNJReS+8DB433v7r37fl/eu9xBJBKUB0BLt+uDaOOQZb8SUNXyuKuRftg46NeXcBww6M8AC0ANOAycAyb1s7e6+SbNxi/gBfAQ2HadcA7YB/4MUPsKzLos4jzwewAcNy3mhMnx5I/9BiqUAD4DDWAXmAfqWt8Enlq+GBfSbEwAt4AicAxYBO7aTPaGzhu4KvTLQn/Hh9cpmGzcFvqmaXAyaxWE/MGTg93yXsgFUyfbOrJCJ2s8y+tRP21s0fmMTlmih8zT8WnN1GloCmJWaF0CpvrlSAb1/3fJXshNT470hZEIrZeoahqaU8BZ10Exa4XGtiCaKKL+EIHaMX8U81ZEP7ntrwi7n4CfWi7p+UCFdFdh7Rpaps9+mn93rjY2THut0QqtoVlIkpi1QjNyCzEdnl0W+idCXxb6VmKudaGfsbBhRbcHdEWhf5eYt0o6FVR6BjhqYcOKoQkt2y/SAB5rWVbpVeCilmUl3hb6JNeAI1p+ZWEjFzH9hsY2tEwHdHX9DGATWNLyceCeGL/YhY+58LWhy9o0uhJDKw3T4dlr4L6WZab5JvRBGJqs9UPI5R44lQfpx56pUzK0NlA3R6AK1Engu1+/nGhfK7R5bjtwGnXdFfpSJ6190Quz5grqQCC048lFXMhy2nQZWkUVsRowZv8OvLOPCvdHwE5APyKRSMQzfwE22DtT3T5PPwAAAABJRU5ErkJggg=='
 			}
 		},
 		props: {
@@ -407,10 +408,10 @@
 				}
 				this.$emit('change', value)
 				this.$emit('input', value)
-			},
-			createTimestamp(date) {
-				date = this.fixIosDateFormat(date)
-				return Date.parse(new Date(date))
+			},
+			createTimestamp(date) {
+				date = this.fixIosDateFormat(date)
+				return Date.parse(new Date(date))
 			},
 			singleChange(e) {
 				this.tempSingleDate = e.fulldate
@@ -574,7 +575,7 @@
 				// if (this.popup) this.popup = false
 			},
 
-			parseDate(date) {
+			parseDate(date) {
 				date = this.fixIosDateFormat(date)
 				const defVal = new Date(date)
 				const year = defVal.getFullYear()
@@ -595,13 +596,13 @@
 				return item < 10 ? '0' + item : item
 			},
 
-			//兼容 iOS、safari 日期格式
-			fixIosDateFormat(value) {
-				if (typeof value === 'string') {
-					value = value.replace(/-/g, '/')
-				}
-				return value
-			},
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
 
 			leftMonthSwitch(e) {
 				// console.log('leftMonthSwitch 返回:', e)
@@ -687,7 +688,7 @@
 		z-index: 996;
 	}
 
-	.uni-date-single--x {
+	.uni-date-single--x {
 		/* padding: 0 8px; */
 		position: absolute;
 		top: 0;
@@ -699,7 +700,7 @@
 		border-radius: 4px;
 	}
 
-	.uni-date-range--x {
+	.uni-date-range--x {
 		padding: 0 8px;
 		background-color: #fff;
 		position: absolute;
@@ -790,31 +791,31 @@
 	.uni-date-changed--time-date {
 		color: #333;
 		opacity: 0.6;
-	}
-
-	/* .uni-date-popper__arrow {
-			width: 10px;
-			height: 10px;
-	    top: -6px;
-	    left: 35px;
-	    margin-right: 3px;
-	    border-top-width: 0;
-	    border-bottom-color: #ebeef5;
-	    border-width: 6px;
-	    filter: drop-shadow(0 2px 12px rgba(0,0,0,.03));
-	}
-	.uni-date-popper__arrow:after {
-			content: " ";
-	    position: absolute;
-	    display: block;
-	    width: 0;
-	    height: 0;
-	    border-color: transparent;
-	    border-style: solid;
+	}
+
+	/* .uni-date-popper__arrow {
+			width: 10px;
+			height: 10px;
+	    top: -6px;
+	    left: 35px;
+	    margin-right: 3px;
+	    border-top-width: 0;
+	    border-bottom-color: #ebeef5;
+	    border-width: 6px;
+	    filter: drop-shadow(0 2px 12px rgba(0,0,0,.03));
+	}
+	.uni-date-popper__arrow:after {
+			content: " ";
+	    position: absolute;
+	    display: block;
+	    width: 0;
+	    height: 0;
+	    border-color: transparent;
+	    border-style: solid;
 	} */
 
 	.mr-50 {
 		margin-right: 50px;
-	}
+	}
 
-</style>
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue

@@ -1,7 +1,7 @@
 {
   "id": "uni-datetime-picker",
   "displayName": "uni-datetime-picker 日期选择器",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
   "keywords": [
     "uni-datetime-picker",