Skip to content

Commit

Permalink
feat(style-panel): fix some reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
betterdancing committed Nov 8, 2024
1 parent 8249af4 commit 99ba593
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export default {
text-align: left;
}
:deep(.is-disabled) {
background-color: var(--te-common-bg-default);
background-color: var(--te-common-bg-disabled);
}
&.is-without-controls {
:deep(.tiny-numeric__input-inner) {
Expand Down Expand Up @@ -205,7 +205,7 @@ export default {
display: none;
}
.tiny-input.is-disabled .tiny-input__inner {
background-color: var(--te-common-bg-disabled);
background-color: var(--te-common-bg-container);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,26 +103,27 @@ import {
} from '@opentiny/vue'
const props = defineProps({
// tab选中值,用于默认选中的tab
modelValue: {
type: String,
default: ''
},
// tab选中值如果是对象,valueKey是对象内的某个key
valueKey: {
type: String,
default: ''
},
effect: {
type: String,
default: 'dark'
},
// 提示内容位置
placement: {
type: String,
default: 'top'
},
// tabItem宽度
labelWidth: {
type: Number,
default: 63
},
// tab的选项,如果选项中包含collapsed,则会折叠为下拉
options: {
type: Array,
default: () => []
Expand Down
4 changes: 0 additions & 4 deletions packages/design-core/assets/style-panel-collapsed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions packages/design-core/assets/style-panel-expand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/layout/src/DesignSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div v-show="activating" class="active"></div>
</tiny-tab-item>
</tiny-tabs>
<div class="tabs-setting">
<div v-if="layoutState.settings.render === 'style'" class="tabs-setting">
<tiny-tooltip effect="dark" :content="isCollapsed ? '展开' : '折叠'" placement="top" :visible-arrow="false">
<template #default> <svg-icon :name="settingIcon" @click="isCollapsed = !isCollapsed"></svg-icon> </template>
</tiny-tooltip>
Expand Down
2 changes: 1 addition & 1 deletion packages/settings/styles/src/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export default {
display: inline-block;
margin-left: 4px;
vertical-align: middle;
border: 2px solid var(--ti-lowcode-setting-style-reset-dot-color);
border: 2px solid var(--te-common-border-checked);
border-radius: 2px;
}
</style>
2 changes: 0 additions & 2 deletions packages/theme/light/setting-style.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
--ti-lowcode-setting-style-btn-border-color: var(--ti-lowcode-base-gray-90);
--ti-lowcode-setting-style-title-color: var(--ti-lowcode-base-text-color);
--ti-lowcode-setting-style-tab-bg-color: var(--ti-lowcode-base-bg-7);
--ti-lowcode-setting-style-reset-bg-color: var(--te-common-bg-primary-checked);
--ti-lowcode-setting-style-reset-dot-color: var(--te-common-bg-primary-checked);
--ti-lowcode-setting-style-drag-bar-bg: var(--ti-lowcode-base-bg);
--ti-lowcode-setting-style-spacing-bg: var(--te-base-gray-34);
}

0 comments on commit 99ba593

Please sign in to comment.