Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(form): [form] x-design theme refresh #2093

Merged
merged 1 commit into from
Sep 11, 2024
Merged

feat(form): [form] x-design theme refresh #2093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions examples/sites/demos/pc/app/form/error-slot-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@
<tiny-form-item label="姓名" prop="name">
<tiny-input v-model="createData.name"></tiny-input>
</tiny-form-item>
<tiny-form-item label="年龄" prop="age">
<tiny-input v-model="createData.age"></tiny-input>
<template #error>
<span>错误提示内容插槽</span>
</template>
</tiny-form-item>
<tiny-form-item label="昵称" prop="nickname" validate-type="text">
<tiny-input v-model="createData.nickname"></tiny-input>
<template #error="message">
<span class="error-slot">{{ message }}</span>
</template>
</tiny-form-item>
<tiny-form-item label="年龄" prop="age">
<tiny-input v-model="createData.age"></tiny-input>
<template #error>
<div class="custom-error">
<tiny-icon-error></tiny-icon-error>
<span>错误提示内容插槽，提示文本很长很长，提示文本很长很长，提示文本很长很长，提示文本很长很长。</span>
</div>
</template>
</tiny-form-item>
<tiny-form-item>
<tiny-button type="primary" @click="validateField"> 校验 </tiny-button>
</tiny-form-item>
Expand All @@ -26,6 +29,9 @@
<script setup>
import { ref } from 'vue'
import { Form as TinyForm, FormItem as TinyFormItem, Input as TinyInput, Button as TinyButton } from '@opentiny/vue'
import { iconError } from '@opentiny/vue-icon'

const TinyIconError = iconError()

const createData = ref({
name: '',
Expand Down Expand Up @@ -60,3 +66,17 @@ function validateField() {
color: #ffd0a6;
}
</style>

<style lang="less">
.custom-error {
padding: 4px 0;
display: flex;
.tiny-svg {
fill: var(--ti-tooltip-validate-icon-color);
margin-right: 8px;
font-size: 16px;
flex-shrink: 0;
margin-top: 2px;
}
}
</style>
4 changes: 3 additions & 1 deletion examples/sites/demos/pc/app/form/error-slot.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ test('错误提示插槽', async ({ page }) => {

await validBtn.click()
await expect(getTooltipByText('必填')).toBeVisible()
await expect(getTooltipByText('错误提示内容插槽')).toBeVisible()
await expect(
getTooltipByText('错误提示内容插槽，提示文本很长很长，提示文本很长很长，提示文本很长很长，提示文本很长很长。')
).toBeVisible()
await expect(page.locator('.error-slot')).toBeVisible()
})
39 changes: 31 additions & 8 deletions examples/sites/demos/pc/app/form/error-slot.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@
<tiny-form-item label="姓名" prop="name">
<tiny-input v-model="createData.name"></tiny-input>
</tiny-form-item>
<tiny-form-item label="年龄" prop="age">
<tiny-input v-model="createData.age"></tiny-input>
<template #error>
<span>错误提示内容插槽</span>
</template>
</tiny-form-item>
<tiny-form-item label="昵称" prop="nickname" validate-type="text">
<tiny-input v-model="createData.nickname"></tiny-input>
<template #error="message">
<span class="error-slot">{{ message }}</span>
</template>
</tiny-form-item>
<tiny-form-item label="年龄" prop="age">
<tiny-input v-model="createData.age"></tiny-input>
<template #error>
<div class="custom-error">
<tiny-icon-error></tiny-icon-error>
<span>错误提示内容插槽，提示文本很长很长，提示文本很长很长，提示文本很长很长，提示文本很长很长。</span>
</div>
</template>
</tiny-form-item>
<tiny-form-item>
<tiny-button type="primary" @click="validateField"> 校验 </tiny-button>
</tiny-form-item>
Expand All @@ -25,13 +28,15 @@

<script>
import { Form, FormItem, Input, Button } from '@opentiny/vue'
import { iconError } from '@opentiny/vue-icon'

export default {
components: {
TinyForm: Form,
TinyFormItem: FormItem,
TinyInput: Input,
TinyButton: Button
TinyButton: Button,
TinyIconError: iconError()
},
data() {
return {
Expand All @@ -42,7 +47,11 @@ export default {
},
rules: {
name: [
{ required: true, message: '必填', trigger: 'blur' },
{
required: true,
message: '必填',
trigger: 'blur'
},
{ min: 2, max: 11, message: '长度必须不小于2', trigger: ['change', 'blur'] }
],
age: { required: true },
Expand All @@ -69,3 +78,17 @@ export default {
color: #ffd0a6;
}
</style>

<style lang="less">
.custom-error {
padding: 4px 0;
display: flex;
.tiny-svg {
fill: var(--ti-tooltip-validate-icon-color);
margin-right: 8px;
font-size: 16px;
flex-shrink: 0;
margin-top: 2px;
}
}
</style>
13 changes: 12 additions & 1 deletion examples/sites/demos/pc/app/form/slot-label.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
<tiny-date-picker v-model="createData.datepicker"></tiny-date-picker>
</tiny-form-item>
<tiny-form-item prop="url">
<template #label> URL </template>
<template #label>
<div class="custom-label">超过两行文字，省略显示</div>
</template>
<tiny-input v-model="createData.url"></tiny-input>
</tiny-form-item>
<tiny-form-item prop="radio">
Expand Down Expand Up @@ -80,4 +82,13 @@ export default {
.demo-form {
width: 380px;
}
.custom-label {
display: -webkit-box;
width: 100%;
-webkit-line-clamp: 2;
line-height: 1.2;
overflow: hidden;
-webkit-box-orient: vertical;
white-space: wrap;
}
</style>
16 changes: 8 additions & 8 deletions packages/theme/src/form-item/smb-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
export const tinyFormItemSmbTheme = {
'ti-form-item-margin-bottom-default': 'var(--ti-common-space-6x)',
'ti-form-item-margin-bottom-mini': 'var(--ti-common-space-3x)',
'ti-form-item-margin-bottom-small': 'var(--ti-common-space-5x)',
'ti-form-item-margin-bottom-mini': 'var(--ti-common-space-5x)',
'ti-form-item-margin-bottom-small': 'var(--ti-common-space-6x)',
'ti-form-item-margin-bottom-medium': 'var(--ti-common-space-6x)',
'ti-form-item-input-mini-height': 'var(--ti-common-space-5x)',
'ti-form-item-input-small-height': 'var(--ti-common-space-6x)',
'ti-form-item-input-medium-height': 'var(--ti-common-space-8x)',
'ti-form-item-mini-line-height': 'var(--ti-common-space-5x)',
'ti-form-item-small-line-height': 'var(--ti-common-space-6x)',
'ti-form-item-medium-line-height': 'var(--ti-common-space-8x)',
'ti-form-item-input-mini-height': 'var(--ti-common-size-6x)',
'ti-form-item-input-small-height': '28px',
'ti-form-item-input-medium-height': 'var(--ti-common-size-10x)',
'ti-form-item-mini-line-height': '24px',
'ti-form-item-small-line-height': '28px',
'ti-form-item-medium-line-height': 'var(--ti-common-size-10x)',
'ti-form-item-label-padding-right': 'var(--ti-common-space-6x)'
}
1 change: 1 addition & 0 deletions packages/theme/src/form/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
.tooltip-validate-icon {
fill: var(--ti-tooltip-validate-icon-color);
margin-right: 8px;
font-size: 16px;
}

&[x-placement^='top'] .popper__arrow {
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/src/form/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

.component-css-vars-form() {
// 表单校验水平内边距
--ti-form-valid-padding-horizontal: calc(var(--ti-common-space-2x, 8px) + 2px);
--ti-form-valid-padding-horizontal: var(--ti-common-space-4x, 16px);
// 表单校验垂直内边距
--ti-form-valid-padding-vertical: calc(var(--ti-common-space-2x, 8px) + 2px);
--ti-form-valid-padding-vertical: var(--ti-common-space-3x, 12px);
// 行内表单输入框右边距(hide)
--ti-form-item-margin-right: calc(var(--ti-common-space-2x, 8px) + 2px);

Expand Down
Loading