Commit 4112ad25 authored by tangfh's avatar tangfh

+

parent e76ac753
## 1.0.3(2024-10-29)
1.0.3
## 1.0.2(2024-10-29)
1.0.2
## 1.0.1(2024-10-29)
1.0.1
## 1.0.0(2024-07-22) ## 1.0.0(2024-07-22)
1.0.0 1.0.0
...@@ -251,9 +251,9 @@ ...@@ -251,9 +251,9 @@
const val = e.detail.value const val = e.detail.value
const y = this.years[val[0]] ? this.years[val[0]] : this.years[this.years.length - 1] const y = this.years[val[0]] ? this.years[val[0]] : this.years[this.years.length - 1]
const m = this.months[val[1]] ? this.months[val[1]] : this.months[this.months.length - 1] const m = this.months[val[1]] ? this.months[val[1]] : this.months[this.months.length - 1]
const d = this.days[val[2]] ? this.days[val[2]] : this.days[this.days.length - 1] const d = this.days[val[2]] ? this.days[val[2]] : 1
const h = this.hours[val[3]] >= 0 ? this.hours[val[3]] : this.hours[this.hours.length - 1] const h = this.hours[val[3]] >= 0 ? this.hours[val[3]] : 0
const minu = this.minutes[val[4]] >= 0 ? this.minutes[val[4]] : this.minutes[this.minutes.length - 1] const minu = this.minutes[val[4]] >= 0 ? this.minutes[val[4]] : 0
const date = `${y}/${m}/${d} ${h}:${minu}` const date = `${y}/${m}/${d} ${h}:${minu}`
if (prev[1] != val[1]) { if (prev[1] != val[1]) {
...@@ -262,6 +262,8 @@ ...@@ -262,6 +262,8 @@
this.initCurr(date) this.initCurr(date)
} }
this.pickerVal = val this.pickerVal = val
console.log('in date: ',date);
this.$emit("change", date)
}, },
// 点击确定 // 点击确定
confirm() { confirm() {
......
{ {
"id": "f-date-time-picker", "id": "f-date-time-picker",
"displayName": "f-date-time-picker", "displayName": "f-date-time-picker",
"version": "1.0.0", "version": "1.0.3",
"description": "年月日时分选择组件", "description": "年月日时分选择组件",
"keywords": [ "keywords": [
"f-date-time-picker" "f-date-time-picker"
......
## 1.0.4(2024-10-29)
1.0.4
## 1.0.3(2024-06-07) ## 1.0.3(2024-06-07)
1.0.3 1.0.3
## 1.0.2(2024-06-07) ## 1.0.2(2024-06-07)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
@click.stop="noHandle()" :animation="centerAnimationData" :style="{marginTop: '-44px'}"> @click.stop="noHandle()" :animation="centerAnimationData" :style="{marginTop: '-44px'}">
<view class="pop-view-top-title" v-if="isNeedDefaultTitleBar"> <view class="pop-view-top-title" v-if="isNeedDefaultTitleBar">
<text class="pop-text-top-title">{{ title }}</text> <text class="pop-text-top-title">{{ title }}</text>
<image class="pop-close-btn" :src="closeIcon" mode="aspectFill" @click="dismiss()"> <image class="pop-close-btn" :src="closeIcon" mode="aspectFill" @click="onCloseBtnClick()">
</image> </image>
</view> </view>
<slot name="center"></slot> <slot name="center"></slot>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
@touchmove.stop.prevent="noHandle"> @touchmove.stop.prevent="noHandle">
<view class="pop-view-top-title" v-if="isNeedDefaultTitleBar"> <view class="pop-view-top-title" v-if="isNeedDefaultTitleBar">
<text class="pop-text-top-title">{{ title }}</text> <text class="pop-text-top-title">{{ title }}</text>
<image class="pop-close-btn" :src="closeIcon" mode="aspectFill" @click="dismiss()"> <image class="pop-close-btn" :src="closeIcon" mode="aspectFill" @click="onCloseBtnClick()">
</image> </image>
</view> </view>
<slot name="bottom"></slot> <slot name="bottom"></slot>
...@@ -175,6 +175,10 @@ ...@@ -175,6 +175,10 @@
this.maskAnimationData = this.animationMask.opacity(1).step().export(); this.maskAnimationData = this.animationMask.opacity(1).step().export();
}.bind(this), this.showDelay); }.bind(this), this.showDelay);
}, },
onCloseBtnClick() {
this.$emit('close', {})
this.dismiss()
},
dismiss() { dismiss() {
if (this.isListentDismiss) { if (this.isListentDismiss) {
this.$emit('dismiss', {}) this.$emit('dismiss', {})
......
{ {
"id": "f-pop", "id": "f-pop",
"displayName": "f-pop", "displayName": "f-pop",
"version": "1.0.3", "version": "1.0.4",
"description": "f-pop 插件(底部弹出,中间弹出,顶部弹出)", "description": "f-pop 插件(底部弹出,中间弹出,顶部弹出)",
"keywords": [ "keywords": [
"f-pop" "f-pop"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment