Skip to content

Commit 0c37b33

Browse files
sleepritegitee-org
sleeprite
authored and
gitee-org
committed
!175 2.3.1
Merge pull request !175 from 就眠儀式/2.x
2 parents cb2278f + 929601c commit 0c37b33

File tree

9 files changed

+1442
-1275
lines changed

9 files changed

+1442
-1275
lines changed

‎package/component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@layui/layui-vue",
3-
"version": "2.3.0",
3+
"version": "2.3.1",
44
"author": "就眠儀式",
55
"license": "MIT",
66
"description": "a component library for Vue 3 base on layui-vue",

‎package/component/src/component/carousel/index.vue

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -165,33 +165,24 @@ provide("anim", anim);
165165
</script>
166166

167167
<template>
168-
<div
169-
class="layui-carousel"
170-
:lay-anim="anim"
171-
:lay-indicator="indicator"
172-
:lay-arrow="arrow"
173-
:style="{ width: width, height: height }"
174-
@mouseenter="handleMouseEnter"
175-
@mouseleave="handleMouseLeave"
176-
>
168+
<div class="layui-carousel" :lay-anim="anim" :lay-indicator="indicator" :lay-arrow="arrow"
169+
:style="{ width: width, height: height }" @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave">
177170
<div carousel-item>
178171
<slot></slot>
179172
</div>
180-
<div class="layui-carousel-ind">
181-
<ul>
182-
<li
183-
v-for="(ss, index) in childrens"
184-
:key="index"
185-
:class="[ss.props?.id === active ? 'layui-this' : '']"
186-
@click.stop="change(ss.props?.id)"
187-
></li>
188-
</ul>
189-
</div>
190-
<button class="layui-icon layui-carousel-arrow" lay-type="sub" @click="sub">
191-
{{ anim === "updown" ? "" : "" }}
192-
</button>
193-
<button class="layui-icon layui-carousel-arrow" lay-type="add" @click="add">
194-
{{ anim === "updown" ? "" : "" }}
195-
</button>
173+
<template v-if="childrens.length > 1">
174+
<div class="layui-carousel-ind">
175+
<ul>
176+
<li v-for="(ss, index) in childrens" :key="index" :class="[ss.props?.id === active ? 'layui-this' : '']"
177+
@click.stop="change(ss.props?.id)"></li>
178+
</ul>
179+
</div>
180+
<button class="layui-icon layui-carousel-arrow" lay-type="sub" @click="sub">
181+
{{ anim === "updown" ? "" : "" }}
182+
</button>
183+
<button class="layui-icon layui-carousel-arrow" lay-type="add" @click="add">
184+
{{ anim === "updown" ? "" : "" }}
185+
</button>
186+
</template>
196187
</div>
197188
</template>

‎package/component/src/component/checkbox/index.less

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,64 @@
5454
}
5555
}
5656

57+
58+
.layui-checkbox[size="lg"] {
59+
.layui-form-checkbox {
60+
height: 34px;
61+
line-height: 34px;
62+
.layui-checkbox-label {
63+
font-size: 15px;
64+
}
65+
}
66+
.layui-form-checkbox i {
67+
height: 34px;
68+
line-height: 34px;
69+
font-size: 22px;
70+
}
71+
}
72+
.layui-checkbox[size="md"] {
73+
.layui-form-checkbox {
74+
height: 30px;
75+
line-height: 30px;
76+
.layui-checkbox-label {
77+
font-size: 14px;
78+
}
79+
}
80+
.layui-form-checkbox i {
81+
height: 30px;
82+
line-height: 30px;
83+
font-size: 20px;
84+
}
85+
}
86+
.layui-checkbox[size="sm"] {
87+
.layui-form-checkbox {
88+
height: 26px;
89+
line-height: 26px;
90+
.layui-checkbox-label {
91+
font-size: 13px;
92+
}
93+
}
94+
.layui-form-checkbox i {
95+
height: 26px;
96+
line-height: 26px;
97+
font-size: 18px;
98+
}
99+
}
100+
.layui-checkbox[size="xs"] {
101+
.layui-form-checkbox {
102+
height: 22px;
103+
line-height: 22px;
104+
.layui-checkbox-label {
105+
font-size: 12px;
106+
}
107+
}
108+
.layui-form-checkbox i {
109+
height: 22px;
110+
line-height: 22px;
111+
font-size: 16px;
112+
}
113+
}
114+
57115
.layui-checkbox input[type="checkbox"] {
58116
display: none;
59117
}
@@ -86,7 +144,7 @@
86144
}
87145

88146
.layui-form-checkbox i {
89-
width: 29px;
147+
width: 30px;
90148
height: 30px;
91149
position: absolute;
92150
box-sizing: border-box;

‎package/component/src/component/datePicker/components/YearPanel.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
class="laydate-btns-time"
3636
>{{ t("datePicker.selectMonth") }}</span
3737
>
38-
<template v-else-if="Year > 0">{{ Year }}</template>
38+
<template v-else-if="parseInt(Year.toString())>0">{{ Year }}</template>
3939
</PanelFoot>
4040
</div>
4141
</template>
@@ -138,6 +138,7 @@ const footOnNow = () => {
138138
Year.value = dayjs().year();
139139
if (datePicker.type === "yearmonth") {
140140
datePicker.currentMonth.value = dayjs().month();
141+
emits('update:modelValue',Year.value);
141142
}
142143
scrollTo();
143144
};

‎package/component/src/component/form/index.less

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
.layui-switch-container {
1212
margin-top: 10px;
1313
}
14+
.layui-form-checkbox {
15+
margin-top: 5px;
16+
}
1417
.layui-form-checkbox[lay-skin="primary"] {
1518
margin-top: 12px;
1619
}
@@ -35,6 +38,9 @@
3538
.layui-switch-container {
3639
margin-top: 8px;
3740
}
41+
.layui-form-checkbox {
42+
margin-top: 4px;
43+
}
3844
.layui-form-checkbox[lay-skin="primary"] {
3945
margin-top: 10px;
4046
}
@@ -62,6 +68,9 @@
6268
.layui-switch-container {
6369
margin-top: 6px;
6470
}
71+
.layui-form-checkbox {
72+
margin-top: 3px;
73+
}
6574
.layui-form-checkbox[lay-skin="primary"] {
6675
margin-top: 8px;
6776
}
@@ -89,6 +98,9 @@
8998
.layui-switch-container {
9099
margin-top: 4px;
91100
}
101+
.layui-form-checkbox {
102+
margin-top: 2px;
103+
}
92104
.layui-form-checkbox[lay-skin="primary"] {
93105
margin-top: 6px;
94106
}

‎package/component/src/component/table/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,6 @@ defineExpose({ getCheckData });
921921

922922
<template>
923923
<div ref="tableRef">
924-
<table class="layui-hide" lay-filter="test"></table>
925924
<div class="layui-form layui-border-box layui-table-view" :class="classes">
926925
<div v-if="defaultToolbar || slot.toolbar" class="layui-table-tool">
927926
<div class="layui-table-tool-temp">

‎package/document-component/src/document/zh-CN/components/card.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ export default {
219219
| 名称 | 描述 |
220220
| ------- | -------- |
221221
| default | 默认插槽 |
222-
| header | 头部插槽 |
222+
| title | 头部插槽 |
223223
| body | 内容插槽 |
224224
| extra | 扩展插槽 |
225225
| footer | 底部插槽 |

‎package/document-component/src/document/zh-CN/guide/changelog.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,23 @@
1313
::: demo
1414
<template>
1515
<lay-timeline>
16-
<lay-timeline-item title="2.3.x">
16+
<lay-timeline-item title="2.3.x">
17+
<ul>
18+
<a name="2-3-1"></a>
19+
<li>
20+
<h3>2.3.1 <span class="layui-badge-rim">2023-06-18</span></h3>
21+
<ul>
22+
<li>[补充] form 组件 label-width 属性遗漏。 </li>
23+
<li>[修正] card 组件 header 属性说明，调整为 title 属性。</li>
24+
<li>[修复] checkbox 组件 size 属性 skin 为 default 时不生效的问题。</li>
25+
<li>[修复] date-picker 组件 年月选择点击 `现在` 按钮无法正确更新年份问题。</li>
26+
<li>[优化] checkbox 组件在 skin 为 default 时在 form-item 中的居中问题。</li>
27+
<li>[优化] checkbox 组件 skin 属性为默认值的样式，消除 label 与 icon 之间的间隙。</li>
28+
<li>[优化] carousel 组件 carousel-item 仅存在一个时，不再显示指示器。</li>
29+
<li>[优化] table 组件 Dom 结构，移除无效元素。</li>
30+
</ul>
31+
</li>
32+
</ul>
1733
<ul>
1834
<a name="2-3-0"></a>
1935
<li>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy