📝: 更新日志

This commit is contained in:
就眠儀式 2022-07-09 00:49:39 +08:00
parent c2f8511da9
commit 33bfadd92b
4 changed files with 84 additions and 37 deletions

View File

@ -1,23 +1,48 @@
<template>
<lay-dropdown class="layui-cascader" ref="dropdownRef" :autoFitMinWidth="false" :updateAtScroll="true">
<lay-input v-model="displayValue" readonly suffix-icon="layui-icon-down" :placeholder="placeholder"
v-if="!slots.default"></lay-input>
<lay-dropdown
class="layui-cascader"
ref="dropdownRef"
:autoFitMinWidth="false"
:updateAtScroll="true"
>
<lay-input
v-model="displayValue"
readonly
suffix-icon="layui-icon-down"
:placeholder="placeholder"
v-if="!slots.default"
></lay-input>
<slot v-else></slot>
<template #content>
<div class="layui-cascader-panel">
<template v-for="(itemCol, index) in treeData">
<lay-scroll height="180px" class="layui-cascader-menu" :key="'cascader-menu' + index"
v-if="itemCol.data.length">
<div class="layui-cascader-menu-item" v-for="(item, i) in itemCol.data" :key="index + i"
@click="selectBar(item, i, index)" :class="[
<lay-scroll
height="180px"
class="layui-cascader-menu"
:key="'cascader-menu' + index"
v-if="itemCol.data.length"
>
<div
class="layui-cascader-menu-item"
v-for="(item, i) in itemCol.data"
:key="index + i"
@click="selectBar(item, i, index)"
:class="[
{
'layui-cascader-selected': itemCol.selectIndex === i,
},
]">
<slot :name="item.slot" v-if="item.slot && slots[item.slot]"></slot>
]"
>
<slot
:name="item.slot"
v-if="item.slot && slots[item.slot]"
></slot>
<template v-else>{{ item.label }}</template>
<i class="layui-icon layui-icon-right" v-if="item.children && item.children.length"></i>
<i
class="layui-icon layui-icon-right"
v-if="item.children && item.children.length"
></i>
</div>
</lay-scroll>
</template>
@ -44,7 +69,7 @@ export interface LayCascaderProps {
decollator?: string;
placeholder?: string;
onlyLastLevel?: boolean;
replaceFields?: { label: string, value: string, children: string }
replaceFields?: { label: string; value: string; children: string };
}
const props = withDefaults(defineProps<LayCascaderProps>(), {
options: null,
@ -54,11 +79,11 @@ const props = withDefaults(defineProps<LayCascaderProps>(), {
onlyLastLevel: false,
replaceFields: () => {
return {
label: 'label',
value: 'value',
children: 'children'
}
}
label: "label",
value: "value",
children: "children",
};
},
});
const emit = defineEmits(["update:modelValue", "change", "clear"]);
@ -126,7 +151,10 @@ function getMaxFloor(treeData: any) {
if (floor > max) {
max = floor;
}
if (e[props.replaceFields.children] && e[props.replaceFields.children].length > 0) {
if (
e[props.replaceFields.children] &&
e[props.replaceFields.children].length > 0
) {
each(e[props.replaceFields.children], floor + 1);
}
});
@ -144,11 +172,15 @@ function findData(orginData: any, level: number) {
label: element[props.replaceFields.label],
slot: element.slot || false,
children: element[props.replaceFields.children] ?? false,
orginData: element
orginData: element,
});
}
if (level !== 1 && element[props.replaceFields.children] && element[props.replaceFields.children].length > 0) {
if (
level !== 1 &&
element[props.replaceFields.children] &&
element[props.replaceFields.children].length > 0
) {
findData(element[props.replaceFields.children], level - 1);
}
}
@ -181,23 +213,31 @@ const selectBar = (item: any, selectIndex: number, parentIndex: number) => {
}
}
extractData(treeData.value, data, 0);
let fullLable = data.map((e: any) => { return e.label; }).join(` ${props.decollator} `);
let fullLable = data
.map((e: any) => {
return e.label;
})
.join(` ${props.decollator} `);
if (!props.onlyLastLevel) {
displayValue.value = fullLable
displayValue.value = fullLable;
} else {
let _data = data.map((e: any) => {
return e.label;
});
displayValue.value = _data[_data.length - 1];
}
let value = data.map((e: any) => { return e.value; }).join(props.decollator);
let value = data
.map((e: any) => {
return e.value;
})
.join(props.decollator);
emit("update:modelValue", value);
let evt = {
display: displayValue.value,
value: value,
label: fullLable,
currentClick: JSON.parse(JSON.stringify(item.orginData))
}
currentClick: JSON.parse(JSON.stringify(item.orginData)),
};
emit("change", evt);
if (dropdownRef.value)
// @ts-ignore

View File

@ -30,7 +30,7 @@ const props = withDefaults(defineProps<LayInputProps>(), {
readonly: false,
allowClear: false,
autofocus: false,
modelValue: '',
modelValue: "",
});
interface InputEmits {
@ -49,13 +49,19 @@ const slots = useSlots();
const currentValue = ref<string>(String(props.modelValue));
const hasContent = computed(() => (props.modelValue as string)?.length > 0);
watch(() => props.modelValue, () => {
currentValue.value = String(props.modelValue);
})
watch(
() => props.modelValue,
() => {
currentValue.value = String(props.modelValue);
}
);
watch(() => currentValue, () => {
emit("update:modelValue", currentValue.value);
})
watch(
() => currentValue,
() => {
emit("update:modelValue", currentValue.value);
}
);
const onInput = function (event: Event) {
const inputElement = event.target as HTMLInputElement;

View File

@ -16,9 +16,10 @@
<li>
<h3>1.2.8 <span class="layui-badge-rim">2022-07-08</span></h3>
<ul>
<li>[修复] layer 组件 Notify 关闭图标样式问题。 by @SmallWai</li>
<li>[优化] cascader 组件 优化change回调参数 by @SmallWai</li>
<li>[新增] cascader 组件 新增replaceFields属性 用于自义定key by @SmallWai</li>
<li>[优化] cascader 组件 change 回调函数。 by @SmallWai</li>
<li>[修复] layer 组件 Notifiy 缺失关闭图标。 by @SmallWai</li>
<li>[修复] input 组件 modelValue 设置为 zero 不显示的问题。by @Jmysy</li>
<li>[新增] cascader 组件 replaceFields属性 用于自义定字段。by @SmallWai</li>
</ul>
</li>
</ul>

View File

@ -371,10 +371,10 @@ export function removeNotifiyFromQueen(layerId: string | undefined) {
let transOffsetTop = 15;
// @ts-ignore 删除项的高度
let offsetHeight =
// @ts-ignore
// @ts-ignore
document.getElementById(layerId)?.firstElementChild?.firstElementChild
// @ts-ignore
?.offsetHeight;
?.offsetHeight;
// @ts-ignore
window.NotifiyQueen = window.NotifiyQueen || [];
// @ts-ignore
@ -421,4 +421,4 @@ export function getNotifyAnimationClass(offset: any) {
suffix = "rl";
}
return `${prefix}-${suffix}`;
}
}