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

✨(component): release 1.4.4

Browse Source
This commit is contained in:
就眠儀式 2022-08-18 18:28:10 +08:00
parent 0b05559d87
commit 98c4327000
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,11 +294,20 @@ watch(
if (unWatch) { if (unWatch) {
return; return;
} }
let initModelValue = props.range && props.modelValue ? (props.modelValue as string[])[0] || "" : (props.modelValue as string); let initModelValue =
props.range && props.modelValue
hms.value.hh = isNaN(dayjs(initModelValue).hour()) ? 0 : dayjs(initModelValue).hour(); ? (props.modelValue as string[])[0] || ""
hms.value.mm = isNaN(dayjs(initModelValue).minute()) ? 0 : dayjs(initModelValue).minute(); : (props.modelValue as string);
hms.value.ss = isNaN(dayjs(initModelValue).second()) ? 0 : dayjs(initModelValue).second();
hms.value.hh = isNaN(dayjs(initModelValue).hour())
? 0
: dayjs(initModelValue).hour();
hms.value.mm = isNaN(dayjs(initModelValue).minute())
? 0
: dayjs(initModelValue).minute();
hms.value.ss = isNaN(dayjs(initModelValue).second())
? 0
: dayjs(initModelValue).second();
if (initModelValue.length === 8 && props.type === "time") { if (initModelValue.length === 8 && props.type === "time") {
let modelValue = initModelValue; let modelValue = initModelValue;

2
package/component/src/component/table/index.vue
View File

@ -858,7 +858,7 @@ onBeforeUnmount(() => {
</div> </div>
<div class="layui-table-footer" v-if="slot.footer"> <div class="layui-table-footer" v-if="slot.footer">
<slot name="footer"></slot> <slot name="footer"></slot>
</div> </div>
</div> </div>
<div v-if="page" class="layui-table-page"> <div v-if="page" class="layui-table-page">