Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:Tencent/tdesign-vue-next-starter…
Browse files Browse the repository at this point in the history
… into main
  • Loading branch information
uyarn committed Feb 18, 2023
2 parents 848c0e6 + 24d913d commit 753cfeb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"qrcode.vue": "^3.3.3",
"qs": "^6.11.0",
"tdesign-icons-vue-next": "^0.1.7",
"tdesign-vue-next": "^1.0.0",
"tdesign-vue-next": "^1.0.8",
"tvision-color": "^1.5.0",
"vue": "^3.2.45",
"vue-clipboard3": "^2.0.0",
Expand Down
20 changes: 11 additions & 9 deletions src/layouts/setting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@ watchEffect(() => {
if (formData.value.brandTheme) settingStore.updateConfig(formData.value);
});
</script>
<style lang="less" scoped>
<!-- teleport导致drawer 内 scoped样式问题无法生效 先规避下 -->
<!-- eslint-disable-next-line vue-scoped-css/enforce-style-type -->
<style lang="less">
.tdesign-setting {
z-index: 100;
position: fixed;
Expand Down Expand Up @@ -297,14 +299,14 @@ watchEffect(() => {
.setting-container {
padding-bottom: 100px;
}
:deep(.t-radio-group.t-size-m) {
.t-radio-group.t-size-m {
min-height: 32px;
width: 100%;
justify-content: space-between;
align-items: center;
}

:deep(.t-radio-group.t-size-m .t-radio-button) {
.t-radio-group.t-size-m .t-radio-button {
height: auto;
}

Expand All @@ -314,7 +316,7 @@ watchEffect(() => {
align-items: center;
margin-bottom: 16px;

:deep(.t-radio-button) {
.t-radio-button {
display: inline-flex;
max-height: 78px;
padding: 8px;
Expand All @@ -325,30 +327,30 @@ watchEffect(() => {
}
}

:deep(.t-is-checked) {
.t-is-checked {
border: 2px solid var(--td-brand-color) !important;
}

:deep(.t-form__controls-content) {
.t-form__controls-content {
justify-content: end;
}
}

:deep(.t-form__controls-content) {
.t-form__controls-content {
justify-content: end;
}
}

.setting-route-theme {
:deep(.t-form__label) {
.t-form__label {
min-width: 310px !important;
color: var(--td-text-color-secondary);
}
}

.setting-color-theme {
.setting-layout-drawer {
:deep(.t-radio-button) {
.t-radio-button {
height: 32px;
}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/list/tree/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="table-tree-container">
<div class="list-tree-wrapper">
<div class="list-tree-operator">
<t-input v-model="filterText" placeholder="请输入关键词" @input="onInput">
<t-input v-model="filterText" placeholder="请输入关键词" @change="onInput">
<template #suffix-icon>
<search-icon size="var(--td-comp-size-xxxs)" />
</template>
Expand Down

0 comments on commit 753cfeb

Please sign in to comment.