Skip to content

style(auto-complete): auto-complete 组件 size 大小使用scss变量向标准统一 #1199 #1324

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

Merged
merged 3 commits into from
Sep 11, 2022
Merged

style(auto-complete): auto-complete 组件 size 大小使用scss变量向标准统一 #1199 #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc3fd1b
style(auto-complete): auto-complete 组件 size 大小使用scss变量向标准统一 #1199
vaebe Sep 7, 2022
f604629
Merge branch 'dev' into zcj-fix-auto-complete
vaebe Sep 11, 2022
955155b
Merge branch 'dev' into zcj-fix-auto-complete
vaebe Sep 11, 2022
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
8 changes: 4 additions & 4 deletions packages/devui-vue/devui/auto-complete/src/auto-complete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,17 @@

.#{$devui-prefix}-auto-complete {
&--sm {
height: 26px;
height: $devui-size-sm;
font-size: $devui-font-size-sm;
}

&--md {
height: 32px;
font-size: $devui-font-size;
height: $devui-size-md;
font-size: $devui-font-size-md;
}

&--lg {
height: 46px;
height: $devui-size-lg;
font-size: $devui-font-size-lg;
}

Expand Down
16 changes: 9 additions & 7 deletions packages/devui-vue/docs/components/auto-complete/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,14 @@ export default defineComponent({

```vue
<template>
<div class="mb-0">Small</div>
<d-auto-complete class="mb-2" size="sm" :source="source" v-model="value1" :width="420"> </d-auto-complete>
<div class="mb-0">Middle</div>
<d-auto-complete class="mb-2" :source="source" v-model="value2" :width="420"> </d-auto-complete>
<div class="mb-0">Large</div>
<d-auto-complete class="mb-2" size="lg" :source="source" v-model="value3" :width="420"> </d-auto-complete>
<h4>Small</h4>
<d-auto-complete size="sm" :source="source" v-model="value1" :width="420"> </d-auto-complete>

<h4>Middle</h4>
<d-auto-complete :source="source" v-model="value2" :width="420"> </d-auto-complete>

<h4>Large</h4>
<d-auto-complete size="lg" :source="source" v-model="value3" :width="420"> </d-auto-complete>
</template>

<script>
Expand Down Expand Up @@ -125,7 +127,7 @@ export default defineComponent({
</d-col>
<d-col :flex="2">
<d-button id="primaryBtn" @click="toggle" style="margin-left:10px">
{{ isDisabled ? 'Enable AutoComplete' : 'Disable AutoComplete' }}
{{ isDisabled ? '点击启用' : '点击禁用' }}
</d-button>
</d-col>
</d-row>
Expand Down