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.

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(style-panel): modify this style-panel styles according to the design craft #853

Merged
merged 70 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
20e7f11
feat(style-panel): 根据设计稿修改样式面板的UI
betterdancing Sep 27, 2024
f0d378a
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Sep 27, 2024
c83e99e
feat(style-panel): 根据设计稿修改样式面板的UI
betterdancing Sep 29, 2024
0bfb2ea
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Sep 29, 2024
3251a10
feat(style-panel): 根据设计稿修改样式面板的UI
betterdancing Sep 29, 2024
cbfab6f
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
a58401f
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
7fb11ef
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
15996b2
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
4a187b6
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
037cf48
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
f5ad32c
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
e692684
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
b520b3a
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
7cbc1ae
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
0b34004
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
eb014a8
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
21a1ee2
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
6c1545a
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
2969348
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
3b6c9a6
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
6a739a9
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
b8e2763
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
317afe1
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
c5594b8
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
f9df935
feat(style-panel): modify this style-panel styles according to the de…
betterdancing Oct 11, 2024
8a9eafd
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 11, 2024
91a72eb
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 14, 2024
f9cf9a2
feat(style-panel): add style-panel can be collapsed or expanded
betterdancing Oct 14, 2024
1d67c9e
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 14, 2024
3904ccb
feat(style-panel): modify tabGroupComponent style error;
betterdancing Oct 14, 2024
1f703c2
feat(style-panel): 对其设计稿后修改部分样式
betterdancing Oct 14, 2024
e92b717
feat(style-pane): 修复部分样式颜色和间距问题
betterdancing Oct 15, 2024
6f74aec
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 15, 2024
1aa3d9a
feat(style-panel): 修复eslint报错问题
betterdancing Oct 15, 2024
9e7322e
feat(style-panel): 修改review意见
betterdancing Oct 15, 2024
fdb53f1
feat(style-panel): 修复AI的review意见
betterdancing Oct 16, 2024
ce0da77
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 16, 2024
0638b70
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 23, 2024
a13a6ac
feat(style-panel): use color variables insteads color values;
betterdancing Oct 23, 2024
bda9133
feat(style-panel): fix AI reviews;
betterdancing Oct 23, 2024
d451da6
feat(style-panel): fix AI reviews
betterdancing Oct 23, 2024
1a62eeb
feat(style-panel): 修改颜色变量--ti-base系列为--te-base
betterdancing Oct 23, 2024
9b59465
feat(style-panel): fix item width error
betterdancing Oct 24, 2024
3a68ea8
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 24, 2024
27b7001
feat(style-panel): fix review error
betterdancing Oct 24, 2024
5be03e7
feat(style-panel): use buttonGroup & dorpDown replace tabsGroupCompon…
betterdancing Oct 30, 2024
aa8e61f
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 30, 2024
a964715
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Oct 31, 2024
f276bd8
feat(style-panel): adjust the spacing font to non-italic, the spacing…
betterdancing Oct 31, 2024
1760b8b
feat(style-panel): fix the color variables;
betterdancing Oct 31, 2024
f860f33
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Nov 4, 2024
bfd1449
feat(style-panel): Modified review comments: color variables; numeric…
betterdancing Nov 5, 2024
f66542f
feat(style-panel): Resolved the remainning styles issues
betterdancing Nov 6, 2024
50a7a8a
feat(style-panel): fix some reviews
betterdancing Nov 7, 2024
92fa49a
feat(style-panel): Resolved the remainning styles issues
betterdancing Nov 7, 2024
f1fd4aa
feat(style-panel): fix some reviews
betterdancing Nov 7, 2024
19ba1f3
feat(style-panel): fix some reviews
betterdancing Nov 7, 2024
bcc65ad
feat(style-panel): fix some reviews
betterdancing Nov 7, 2024
4a7038a
feat(style-panel): add style panel collapsed or expand icon
betterdancing Nov 7, 2024
ed57828
Merge branch 'refactor/develop' of https://github.com/betterdancing/t…
betterdancing Nov 7, 2024
0bea58c
Create style-panel-expand.svg
betterdancing Nov 7, 2024
0e967e5
Create style-pabel-collapsed.svg
betterdancing Nov 7, 2024
ea029d3
Delete packages/design-core/assets/style-pabel-collapsed.svg
betterdancing Nov 7, 2024
650964e
Create style-panel-collapsed.svg
betterdancing Nov 7, 2024
8249af4
feat(style-panel): modify some icon color
betterdancing Nov 7, 2024
99ba593
feat(style-panel): fix some reviews
betterdancing Nov 8, 2024
ab35c29
feat(style-panel): fix some reviews
betterdancing Nov 8, 2024
1f4004d
feat(style-panel): fix some reviews
betterdancing Nov 8, 2024
12127ac
feat(style-panel): fix some reviews
betterdancing Nov 8, 2024
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
10 changes: 8 additions & 2 deletions packages/common/component/MetaCodeEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<div class="editor-wrap">
<slot :open="open">
<div v-if="buttonShowContent" :class="['full-width', { 'empty-color': value === '' }]" @click="open">
<span class="text-content text-ellipsis-multiple">{{ value === '' ? buttonLabel : value }}</span>
<span class="text-content text-ellipsis-multiple text-line-clamp">{{
value === '' ? buttonLabel : value
}}</span>
<svg-icon class="edit-icon" name="to-edit"></svg-icon>
</div>
<tiny-button v-else class="edit-btn" @click="open">
Expand Down Expand Up @@ -298,7 +300,7 @@ export default {
justify-content: space-between;
align-items: center;
width: 100%;
height: 32px;
height: 24px;
betterdancing marked this conversation as resolved.
Show resolved Hide resolved
padding: 4px;
border: 1px solid var(--ti-lowcode-meta-codeEditor-border-color);
border-radius: 6px;
Expand All @@ -322,6 +324,10 @@ export default {
color: var(--ti-lowcode-common-text-main-color);
}
}
.text-line-clamp {
-webkit-line-clamp: 1;
}
:deep(.tiny-dialog-box__header) {
padding-bottom: 15px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<div class="background-input">
<tiny-input v-model="color" placeholder="请输入颜色" @change="change">
<template #prefix>
<input v-model="color" type="color" class="input-color" @change="changeColor" />
<input v-model="inputColor" type="color" class="input-color" @change="changeColor" />
</template>
</tiny-input>
</div>
</template>

<script>
import { Input } from '@opentiny/vue'
import { ref, watchEffect } from 'vue'
import { ref, computed, watchEffect } from 'vue'
export default {
components: {
Expand All @@ -29,6 +29,7 @@ export default {
emits: ['change', 'update:modelValue'],
setup(props, { emit }) {
const color = ref(props.modelValue)
const inputColor = computed(() => color.value || '#FFFFFF')
const change = (value) => {
emit('update:modelValue', value)
Expand All @@ -45,6 +46,7 @@ export default {
return {
color,
inputColor,
change,
changeColor
}
Expand All @@ -57,7 +59,7 @@ export default {
width: 100%;
.input-color {
width: 22px;
width: 20px;
height: 24px;
border: none;
background: transparent;
Expand Down
2 changes: 2 additions & 0 deletions packages/configurator/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import SliderConfigurator from './slider-configurator/SliderConfigurator.vue'
import SlotConfigurator from './slot-configurator/SlotConfigurator.vue'
import SwitchConfigurator from './switch-configurator/SwitchConfigurator.vue'
import TableColumnsConfigurator from './table-columns-configurator/TableColumnsConfigurator.vue'
import TabsGroupConfigurator from './tabs-group-configurator/TabsGroupConfigurator.vue'
betterdancing marked this conversation as resolved.
Show resolved Hide resolved
import VariableConfigurator from './variable-configurator/VariableConfigurator.vue'

import { I18nInput, MetaCodeEditor } from '@opentiny/tiny-engine-common'
Expand Down Expand Up @@ -59,6 +60,7 @@ export {
SlotConfigurator,
SwitchConfigurator,
TableColumnsConfigurator,
TabsGroupConfigurator,
VariableConfigurator,
MetaCodeEditor,
I18nInput as I18nConfigurator,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ export default {
:deep(.tiny-numeric__input-inner) {
text-align: left;
}
:deep(.is-disabled) {
background-color: var(--te-common-bg-disabled);
}
&.is-without-controls {
:deep(.tiny-numeric__input-inner) {
padding-left: 8px;
Expand All @@ -181,15 +183,18 @@ export default {
}
}
.meta-numeric-unit {
position: absolute;
top: 2px;
height: calc(100% - 2px);
span {
color: var(--ti-lowcode-numeric-unit-text-color);
font-size: 14px;
padding: 4px;
}
:deep(.tiny-select) {
width: 100%;
float: right;
.tiny-input__inner {
height: 100%;
color: var(--ti-lowcode-numeric-unit-text-color);
padding: 2px;
border: none;
Expand All @@ -200,7 +205,7 @@ export default {
display: none;
}
.tiny-input.is-disabled .tiny-input__inner {
background: var(--ti-lowcode-input-bg);
background-color: var(--te-common-bg-container);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,21 @@ export default {
padding: 0;
cursor: pointer;
border: 0;
background-color: transparent;
background-color: var(--te-common-border-bg-divider);
position: relative;
outline: 0;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
}
input[type='range']::-webkit-slider-thumb {
width: 10px;
height: 10px;
border-radius: 50%;
border: 0;
background-color: #fff;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.21);
background-color: var(--te-common-bg-default);
box-shadow: 0 0 2px 0 var(--te-common-border-default);
-webkit-transition: border-color 0.15s, background-color 0.15s;
transition: border-color 0.15s, background-color 0.15s;
cursor: pointer;
Expand All @@ -158,7 +159,7 @@ export default {
}
input[type='range']::-webkit-slider-thumb:active {
border: 0;
background-color: #fff;
background-color: var(--te-common-bg-default);
}
}
</style>
Loading