📝(all): 更新日志

This commit is contained in:
就眠儀式
2022-06-27 18:43:01 +08:00
parent 0a3ac48d95
commit d92880da97
10 changed files with 93 additions and 80 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "@layui/layui-vue",
"version": "1.2.3",
"version": "1.2.4-alpha.1",
"author": "就眠儀式",
"license": "MIT",
"description": "a component library for Vue 3 base on layui-vue",

View File

@@ -18,12 +18,12 @@ export interface LayAiffxProps {
}
const props = withDefaults(defineProps<LayAiffxProps>(), {
offset: 0,
position: 'top',
position: "top",
target: () => {
return document.body;
},
});
const emit = defineEmits(['scroll'])
const emit = defineEmits(["scroll"]);
const outWindow = ref(false);
const dom = ref();
@@ -43,7 +43,7 @@ const getStyle = computed(() => {
bottom: "unset",
left: orginOffsetLeft - marginLeft + "px",
};
if (props.position === 'top') {
if (props.position === "top") {
style.top = fixedOffset - marginTop + "px";
} else {
style.bottom = fixedOffset - marginBottom + "px";
@@ -56,7 +56,7 @@ const checkInWindow = () => {
if (dom.value) {
let offsetTop = dom.value.offsetTop;
let scrollTop = props.target?.scrollTop;
if (props.position === 'top') {
if (props.position === "top") {
//top检查 当前元素与容器顶部距离-减去滚动条的高度+容器offsetTop
let result = offsetTop - scrollTop + props.target.offsetTop;
if (result < fixedOffset) {
@@ -82,15 +82,15 @@ const checkInWindow = () => {
}
} else {
if (result < fixedOffset) {
changeScrollTop = scrollTop - result + props.offset
changeScrollTop = scrollTop - result + props.offset;
outWindow.value = true;
}
}
}
emit('scroll', {
emit("scroll", {
targetScroll: scrollTop,
affixed: outWindow.value,
offset: !outWindow.value ? 0 : Math.abs(scrollTop - changeScrollTop)
offset: !outWindow.value ? 0 : Math.abs(scrollTop - changeScrollTop),
});
}
};
@@ -106,14 +106,14 @@ const getDomStyle = (dom: any, attr: string) => {
onMounted(() => {
nextTick(() => {
orginOffsetTop = dom.value.offsetTop - props.target.offsetTop
orginOffsetLeft = dom.value.getBoundingClientRect().left
marginLeft = parseFloat(getDomStyle(dom.value, 'marginLeft'))
marginTop = parseFloat(getDomStyle(dom.value, 'marginTop'))
marginBottom = parseFloat(getDomStyle(dom.value, 'marginBottom'))
fixedOffset = props.offset + props.target.offsetTop
if (props.position === 'bottom') {
fixedOffset = props.offset
orginOffsetTop = dom.value.offsetTop - props.target.offsetTop;
orginOffsetLeft = dom.value.getBoundingClientRect().left;
marginLeft = parseFloat(getDomStyle(dom.value, "marginLeft"));
marginTop = parseFloat(getDomStyle(dom.value, "marginTop"));
marginBottom = parseFloat(getDomStyle(dom.value, "marginBottom"));
fixedOffset = props.offset + props.target.offsetTop;
if (props.position === "bottom") {
fixedOffset = props.offset;
}
props.target.addEventListener("scroll", checkInWindow, true);
checkInWindow();

View File

@@ -1,10 +1,11 @@
<template>
<div>
<lay-dropdown ref="dropdownRef" :disabled="props.disabled">
<lay-input :name="name" :value="dateValue || modelValue" readonly>
<template #prefix>
<lay-icon type="layui-icon-date"></lay-icon>
</template>
<lay-input
readonly
:name="name"
:value="dateValue || modelValue"
prefix-icon="layui-icon-date">
</lay-input>
<template #content>
<!-- 日期选择 -->

View File

@@ -25,8 +25,9 @@
border-radius: var(--input-border-radius);
}
.layui-input-wrapper:hover,
.layui-input-wrapper:focus-within {
border-color: var(--global-checked-color);
border-color: #d2d2d2 !important;
}
.layui-input-prefix {
@@ -55,14 +56,6 @@
color: rgba(0, 0, 0, 0.45);
}
.layui-input:hover {
border-color: #eee !important;
}
.layui-input:focus {
border-color: #d2d2d2 !important;
}
.layui-input::-webkit-input-placeholder {
line-height: 1.3;
}