theluyuan/layui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛(component): datePicker 修复年选择器清空后的bug,并新增三个事件

Browse Source
This commit is contained in:
0o张不歪o0 2022-11-08 17:03:06 +08:00
parent 30b4e18bb3
commit 3a04d0bb80
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/component/src/component/datePicker/components/MonthPanel.vue
View File

@ -100,7 +100,7 @@ watch(
//关闭回调
const footOnOk = () => {
emits("update:modelValue", Month.value);
emits("update:modelValue", Month.value?Month.value:-1);
if (datePicker.range) {
//关闭菜单
emits("ok");

2
package/component/src/component/datePicker/components/YearPanel.vue
View File

@ -116,7 +116,7 @@ const scrollTo = () => {
//关闭回调
const footOnOk = () => {
emits("update:modelValue", Year.value);
emits("update:modelValue", Year.value?Year.value:-1);
if (datePicker.range) {
//关闭菜单
emits("ok");

12
package/component/src/component/datePicker/index.vue
View File

@ -21,6 +21,8 @@
v-model="dateValue"
v-if="!range"
@change="onChange"
@blur="$emit('blur')"
@focus="$emit('focus')"
:allow-clear="!disabled && allowClear"
:size="size"
@clear="
@ -37,6 +39,8 @@
:placeholder="startPlaceholder"
:disabled="disabled"
@change="onChange"
@blur="$emit('blur')"
@focus="$emit('focus')"
class="start-input"
:size="size"
>
@ -50,6 +54,8 @@
v-model="dateValue[1]"
:disabled="disabled"
@change="onChange"
@blur="$emit('blur')"
@focus="$emit('focus')"
class="end-input"
:size="size"
@clear="
@ -181,7 +187,7 @@ const endPlaceholder = computed(() => {
});
const dropdownRef = ref(null);
const $emits = defineEmits(["update:modelValue"]);
const $emits = defineEmits(["update:modelValue",'change','blur','focus']);
const hms = ref({
hh: 0,
mm: 0,
@ -261,8 +267,10 @@ const getDateValue = () => {
}
if (props.timestamp) {
$emits("update:modelValue", dayjs(dayjsVal).unix() * 1000);
$emits("change",dayjs(dayjsVal).unix() * 1000);
} else {
$emits("update:modelValue", dayjsVal);
$emits("change",dayjsVal);
}
setTimeout(() => {
unWatch = false;
@ -273,6 +281,7 @@ const getDateValueByRange = () => {
if (rangeValue.first === "" || rangeValue.last === "") {
dateValue.value = ["", ""];
$emits("update:modelValue", dateValue.value);
$emits("change",dateValue.value);
return;
}
let format = "YYYY-MM-DD";
@ -292,6 +301,7 @@ const getDateValueByRange = () => {
dayjs(rangeValue.last).format(format),
];
$emits("update:modelValue", dateValue.value);
$emits("change",dateValue.value);
setTimeout(() => {
unWatch = false;
}, 0);

12
package/document-component/src/document/zh-CN/components/datePicker.md
View File

@ -303,6 +303,18 @@ export default {
| contentClass | 内容自定义Class | `string` `Array<string \| object>` `object` | -- | -- |-- |
:::
::: title Date Picker 事件
:::
::: table
| 事件 | 描述 | 参数 |
| ----- | ------------------- | -------------------------- |
| change| 原生 change 事件 | (value : 同v-model) |
| focus | 原生 focus事件 | event : Event |
| blur | 原生 blur 事件 | event : Event |
:::
::: contributor datePicker
:::