Browse Source

修改dateFormat参数类型

ming 3 years ago
parent
commit
61e1a2bd32

+ 1 - 1
components/fs-date-format/fs-date-format.vue

@@ -8,7 +8,7 @@
 import dayjs from 'dayjs'
 
 const props = defineProps({
-	date: String,
+	date: [String, Object],
 	format: {
 		type: String,
 		default: 'YYYY-MM-DD'

+ 1 - 1
components/fs-modal/fs-modal.vue

@@ -23,7 +23,7 @@
 				<fs-icon type="icon-error" color="#fff" size="50rpx"></fs-icon>
 			</view>
 		</view>
-		<fs-mask v-model="modelValue" @close="handleClose" :maskClickable="maskClickable"></fs-mask>
+		<fs-mask :modelValue="modelValue" @close="handleClose" :maskClickable="maskClickable"></fs-mask>
 	</view>
 </template>
 

+ 1 - 1
components/fs-popup/fs-popup.vue

@@ -3,7 +3,7 @@
 		<view class="fs-popup-drawer" :class="[direction,{show:modelValue}]" :style="[style,customStyle]">
 			<slot></slot>
 		</view>
-		<fs-mask v-if="showMask" v-model="modelValue" @close="handleClose" :maskClickable="maskClickable"></fs-mask>
+		<fs-mask v-if="showMask" :modelValue="modelValue" @close="handleClose" :maskClickable="maskClickable"></fs-mask>
 	</view>
 </template>
 

+ 8 - 4
components/fs-scroll-list/fs-scroll-list.vue

@@ -14,7 +14,7 @@
 			</view>
 		</scroll-view>
 		
-		<view class="fs-scroll-indicator">
+		<view class="fs-scroll-indicator" v-if="indicator">
 			<view class="fs-scroll-indicator-line">
 				<view class="fs-scroll-indicator-bar" :style="barStyle"></view>
 			</view>
@@ -32,11 +32,15 @@ export default {
 import { onMounted, reactive, ref, computed, getCurrentInstance } from 'vue'
 
 const props = defineProps({
+	indicator: {
+		type: Boolean,
+		default: true
+	},
 	indicatorWidth: {
 		type: String,
 		default: '50px'
 	},
-	indicatorLineWidth: {
+	indicatorBarWidth: {
 		type: String,
 		default: '15px'
 	},
@@ -64,7 +68,7 @@ onMounted(() => {
 
 
 const indicatorLeftWidth = computed(() => {
-	return parseInt(props.indicatorWidth) - parseInt(props.indicatorLineWidth)
+	return parseInt(props.indicatorWidth) - parseInt(props.indicatorBarWidth)
 })
 const listLeftWidth = computed(() => {
 	return state.contentWidth - state.listWidth
@@ -107,7 +111,7 @@ const handleToLower = () => emits('right')
 	&-bar{
 		background-color: v-bind(indicatorActiveColor);
 		height: 8rpx;
-		width: v-bind(indicatorLineWidth);
+		width: v-bind(indicatorBarWidth);
 	}
 }
 </style>

+ 1 - 1
components/fs-timeago/fs-timeago.vue

@@ -8,7 +8,7 @@
 import timeago from '@/utils/timeago'
 
 const props = defineProps({
-	dateTime: [String, Number],
+	dateTime: [String, Number, Object],
 	format: {
 		type: String,
 		default: 'YYYY-MM-DD'