From abf4b76c3078578cf9237c265a561cb552f01c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com> Date: Tue, 4 Jan 2022 22:32:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20menu=20=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=20more=20?= =?UTF-8?q?=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/docs/zh-CN/components/modal.md | 2 +- example/docs/zh-CN/components/timeline.md | 46 ++++++++++++++++++++++- src/module/menuItem/index.vue | 2 +- src/module/timelineItem/index.vue | 9 ++++- 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/example/docs/zh-CN/components/modal.md b/example/docs/zh-CN/components/modal.md index bc93ea2b..49e73f39 100644 --- a/example/docs/zh-CN/components/modal.md +++ b/example/docs/zh-CN/components/modal.md @@ -319,7 +319,7 @@ export default { ::: table | 备注 | 描述 | 默认值 | -| --------------- | ------------- | -------------------------- | +| --------------- | ------------- | --------------------------| | title | 标题 | -- | | move | 允许拖拽 | `false` | | maxmin | 最小化 最大化 | `false` | diff --git a/example/docs/zh-CN/components/timeline.md b/example/docs/zh-CN/components/timeline.md index 9641fcb3..f52cb769 100644 --- a/example/docs/zh-CN/components/timeline.md +++ b/example/docs/zh-CN/components/timeline.md @@ -75,7 +75,40 @@ export default { ::: -::: title timeline-item attributes + +::: title 节点插槽 +::: + +::: demo + + + + + +::: + +::: title Timeline Item 属性 ::: ::: table @@ -87,5 +120,16 @@ export default { ::: +::: title Timeline Item 属性 +::: + +::: table + +| | | | +| ------ | -------- | --- | +| dot | 节点 | -- | + +::: + ::: comment ::: \ No newline at end of file diff --git a/src/module/menuItem/index.vue b/src/module/menuItem/index.vue index 2bcb0e41..3965432e 100644 --- a/src/module/menuItem/index.vue +++ b/src/module/menuItem/index.vue @@ -6,7 +6,7 @@ > {{ title }} - +
  • - + + + +
    {{ title }} @@ -20,7 +23,9 @@ export default { - -::: - -::: title 纵向 -::: -::: demo - - - - - -::: - -::: title 区间 -::: - -::: demo - - - - -::: - -::: title 纵向区间 -::: - -::: demo - - - - -::: - -::: comment -::: +::: title 横向 +::: + +::: demo + + + + + +::: + +::: title 纵向 +::: +::: demo + + + + + +::: + +::: title 区间 +::: + +::: demo + + + + +::: + +::: title 纵向区间 +::: + +::: demo + + + + +::: + +::: comment +::: diff --git a/src/module/slider/index.vue b/src/module/slider/index.vue index e9de0ceb..7063a1c4 100644 --- a/src/module/slider/index.vue +++ b/src/module/slider/index.vue @@ -1,10 +1,27 @@ ::: +::: title slider 属性 +::: + +::: table + +| 属性 | 描述 | 类型 | 可选值 | 默认值 | +| ------------ | --------------------- | ------------------------- | -------------- | -------- | +| v-model | 选中值 | `number` | - | - | +| vertical | 是否垂直 | `Boolean` | - | - | +| range | 是否区间 | `Boolean` | - | - | +| verticalrange | 垂直区间值 | `Array` | - | - | +| standardrange | 水平区间值 | `Array` | - | - | + +::: + ::: comment ::: diff --git a/src/module/slider/index.vue b/src/module/slider/index.vue index da4b98d2..805a264c 100644 --- a/src/module/slider/index.vue +++ b/src/module/slider/index.vue @@ -116,6 +116,7 @@ interface LaySliderProps { disabled?: boolean; range?: boolean; verticalrange?: number[]; + standardrange?: number[]; } const props = withDefaults(defineProps(), { @@ -124,11 +125,12 @@ const props = withDefaults(defineProps(), { disabled: false, }); -let rangeValue: Ref = ref([0, 0]); -if (Array.isArray(props.modelValue)) { - // eslint-disable-next-line vue/no-setup-props-destructure - rangeValue.value = props.modelValue; -} +// let rangeValue: Ref = ref([0, 0]); +let rangeValue: Ref | any = toRef(props, "standardrange"); +// if (Array.isArray(props.modelValue)) { +// // eslint-disable-next-line vue/no-setup-props-destructure +// rangeValue.value = props.modelValue; +// } let verticalRangeValue: Ref | any = toRef(props, "verticalrange"); From c1ac6921f8336c1b8f62f9634597162891285e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com> Date: Wed, 5 Jan 2022 14:56:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=8B=86=E5=88=86=20menu-item=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6,=20=E4=B8=BA=20sub-menu=20=E4=B8=8E=20menu-item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/docs/zh-CN/components/menu.md | 70 ++++++++++++++++++++++---- example/docs/zh-CN/guide/changelog.md | 4 +- example/docs/zh-CN/guide/introduce.md | 2 +- example/src/assets/logo-new.png | Bin 0 -> 19099 bytes example/src/view/component.vue | 12 ++--- src/css/layui.css | 12 ++--- src/index.ts | 18 ++++--- src/module/menuItem/index.vue | 64 ++++++++--------------- src/module/subMenu/index.ts | 9 ++++ src/module/subMenu/index.vue | 57 +++++++++++++++++++++ 10 files changed, 172 insertions(+), 76 deletions(-) create mode 100644 example/src/assets/logo-new.png create mode 100644 src/module/subMenu/index.ts create mode 100644 src/module/subMenu/index.vue diff --git a/example/docs/zh-CN/components/menu.md b/example/docs/zh-CN/components/menu.md index 91525a7d..7ffac7fa 100644 --- a/example/docs/zh-CN/components/menu.md +++ b/example/docs/zh-CN/components/menu.md @@ -11,15 +11,15 @@ - + - + - - + + @@ -48,20 +48,68 @@ export default { + + + +::: + + +::: title 菜单插槽 +::: + +::: demo + +