♻️: 合并冲突

更新文档
This commit is contained in:
就眠儀式 2022-06-21 16:09:15 +08:00
parent c6e14ac986
commit cc8ef06e50
2 changed files with 3 additions and 3 deletions

View File

@ -59,13 +59,13 @@ export interface LayCascaderProps {
options?: Array<any> | null; options?: Array<any> | null;
modelValue?: string; modelValue?: string;
decollator?: string; decollator?: string;
placeholder?:string; placeholder?: string;
} }
const props = withDefaults(defineProps<LayCascaderProps>(), { const props = withDefaults(defineProps<LayCascaderProps>(), {
options: null, options: null,
modelValue: "", modelValue: "",
decollator: "/", decollator: "/",
placeholder:'' placeholder: "",
}); });
const emit = defineEmits(["update:modelValue", "change", "clear"]); const emit = defineEmits(["update:modelValue", "change", "clear"]);

View File

@ -401,7 +401,7 @@ const zhCN = [
}, },
{ {
path: "/zh-CN/components/Cascader", path: "/zh-CN/components/Cascader",
component: () =>import("../document/zh-CN/components/cascader.md"), component: () => import("../document/zh-CN/components/cascader.md"),
meta: { title: "级联选择器" }, meta: { title: "级联选择器" },
}, },
], ],