Skip to content

feat(form): form组件增加自动换行 #12

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 9 commits into from
Mar 13, 2023
Merged

feat(form): form组件增加自动换行 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c648410
feat(multi-select): 增加下拉选择器multi-select组件
TC-twwang Feb 25, 2023
223436e
feat(multi-select): 检视修改
TC-twwang Mar 1, 2023
9b2cb07
feat(multi-select): 样式命名规范修改
TC-twwang Mar 2, 2023
3b4edc6
Merge branch 'dev' of github.com:opentiny/tiny-vue-theme-mobile into dev
TC-twwang Mar 3, 2023
d8b758d
feat(form): form组件增加自动换行
TC-twwang Mar 3, 2023
c20475b
feat(form): form组件增加自动换行
TC-twwang Mar 7, 2023
98565b9
feat(form): form组件增加自动换行
TC-twwang Mar 7, 2023
0c62174
Merge branch 'dev' of github.com:opentiny/tiny-vue-theme-mobile into dev
TC-twwang Mar 12, 2023
e2171af
feat(form): form组件增加自动换行-检视意见修改
TC-twwang Mar 12, 2023
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
20 changes: 10 additions & 10 deletions src/action-sheet/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export default {
'tiny-mobile-action-sheet-content-bgcolor': '#ddd',
'tiny-mobile-action-sheet-menu-bgcolor': '#fff',
'tiny-mobile-action-sheet-item-color': '#333',
'tiny-mobile-action-sheet-item-warn-color': '#f36f64',
'tiny-mobile-action-sheet-item-font-size': '16px',
'tiny-mobile-action-sheet-item-border-color': '#ddd',
'tiny-mobile-action-sheet-item-active-bgcolor': '#ececec',
'tiny-mobile-action-sheet-item-active-color': '#039be5',
'tiny-mobile-action-sheet-action-bgcolor': '#fff'
}
"tiny-mobile-action-sheet-content-bg-color": "#fff",
"tiny-mobile-action-sheet-menu-bg-color": "#fff",
"tiny-mobile-action-sheet-item-text-color": "#333",
"tiny-mobile-action-sheet-item-warn-text-color": "#f36f64",
"tiny-mobile-action-sheet-item-font-size": "12px",
"tiny-mobile-action-sheet-item-border-color": "#ddd",
"tiny-mobile-action-sheet-item-active-bg-color": "#ececec",
"tiny-mobile-action-sheet-item-active-text-color": "#039be5",
"tiny-mobile-action-sheet-action-bg-color": "#fff",
};
32 changes: 19 additions & 13 deletions src/action-sheet/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
@action-sheet-prefix-cls: ~'@{css-prefix}mobile-action-sheet';

.@{action-sheet-prefix-cls} {
position: relative;
height: 100%;
&__mask {
position: fixed;
top: 0;
right: 0;
bottom: 0;
Expand All @@ -28,23 +29,25 @@
}

&__content {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background-color: var(--ti-mobile-action-sheet-content-bgcolor, #ddd);
background-color: var(--ti-mobile-action-sheet-content-bg-color, #fff);
transform: translate(0, 100%);
backface-visibility: hidden;
transition: transform 0.3s;
z-index: 5000;

z-index: 500;
overflow: hidden;
&.is-toggle {
transform: translate(0, 0);
}
&.is-not-content{
z-index: 2000;
}
}

&__menu {
background-color: var(--ti-mobile-action-sheet-menu-bgcolor, #fff);
background-color: var(--ti-mobile-action-sheet-menu-bg-color, #fff);
}

&__menu.is-ellipsis &__item {
Expand All @@ -58,33 +61,36 @@
&__item,
&__cancel {
position: relative;
padding: 10px 16px;
color: var(--ti-mobile-action-sheet-item-color, #333);
height: 40px;
line-height: 40px;
padding: 0px 16px;
color: var(--ti-mobile-action-sheet-item-text-color, #333);
font-size: var(--ti-mobile-action-sheet-item-font-size, 16px);
text-align: center;
}

&__item {
&:active {
background-color: var(--ti-mobile-action-sheet-item-active-bgcolor, #ececec);
background-color: var(--ti-mobile-action-sheet-item-active-bg-color, #ececec);
}

&.is-active {
color: var(--ti-mobile-action-sheet-item-active-color, #039be5);
color: var(--ti-mobile-action-sheet-item-active-text-color, #039be5);
}
}

&__item:not(:first-child) {
.hairline('top', var(--ti-mobile-action-sheet-item-border-color, #ddd));

&.is-warn {
color: var(--ti-mobile-action-sheet-item-warn-color, #f36f64);
color: var(--ti-mobile-action-sheet-item-warn-text-color, #f36f64);
}
}

&__action {
margin-top: 10px;
background-color: var(--ti-mobile-action-sheet-action-bgcolor, #fff);
width: 100%;
position: absolute;
background-color: var(--ti-mobile-action-sheet-action-bg-color, #fff);
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/action-sheet/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
:root {
--ti-mobile-action-sheet-content-bgcolor: #ddd;
--ti-mobile-action-sheet-menu-bgcolor: var(--ti-mobile-base-color-light, #fff);
--ti-mobile-action-sheet-item-color: var(--ti-mobile-base-color-info-normal, #333);
--ti-mobile-action-sheet-item-warn-color: #f36f64;
--ti-mobile-action-sheet-item-font-size: 16px;
--ti-mobile-action-sheet-content-bg-color: #fff;
--ti-mobile-action-sheet-menu-bg-color: var(--ti-mobile-base-color-light, #fff);
--ti-mobile-action-sheet-item-text-color: var(--ti-mobile-base-color-info-normal, #333);
--ti-mobile-action-sheet-item-warn-text-color: #f36f64;
--ti-mobile-action-sheet-item-font-size: 12px;
--ti-mobile-action-sheet-item-border-color: #ddd;
--ti-mobile-action-sheet-item-active-bgcolor: #ececec;
--ti-mobile-action-sheet-item-active-color: #039be5;
--ti-mobile-action-sheet-action-bgcolor: var(--ti-mobile-base-color-light, #fff);
--ti-mobile-action-sheet-item-active-bg-color: #ececec;
--ti-mobile-action-sheet-item-active-text-color: #039be5;
--ti-mobile-action-sheet-action-bg-color: var(--ti-mobile-base-color-light, #fff);
}
25 changes: 24 additions & 1 deletion src/form-item/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@
box-sizing: border-box;
}

&__value {
float: right;

.tiny-mobile-input-form__input{
text-align: left;
}
}

&__content {
line-height: 48px;
position: relative;
Expand All @@ -92,6 +100,21 @@
}
}

&__label.is-ellipsis{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
display: initial;
}

&.is-error .is-vertical{
margin-bottom: 36px;
}

.is-vertical {
border-bottom: 1px solid #ddd;
}

&__error {
color: var(--ti-form-item-error-color, #f5222d);
font-size: var(--ti-form-item-error-font-size, 12px);
Expand All @@ -112,7 +135,7 @@

&.is-required:not(.is-no-asterisk) {
.@{form-item-prefix-cls}__label-wrap > .@{form-item-prefix-cls}__label:before,
& > .@{form-item-prefix-cls}__label:before {
.@{form-item-prefix-cls}__label:before {
content: '*';
color: var(--ti-form-item-error-color, #f5222d);
margin-right: 4px;
Expand Down
21 changes: 13 additions & 8 deletions src/form/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,16 @@

.@{form-item-prefix-cls}__label {
width: 35%;
height: 48px;
min-height: 48px;
line-height: 1.4;
font-size: 16px;
display: flex;
align-items: center;
position: absolute;
left: 0;
top: 0;
z-index: 1;
padding: 13px 0px;
}

.@{form-item-prefix-cls}__content {
margin: 0 !important;
.@{form-item-prefix-cls}__value {
width: 65%;
}

&--inline {
Expand Down Expand Up @@ -81,7 +78,10 @@
position: initial;
text-align: left;
line-height: 1;
padding: 0 0 8px;
}

.@{form-item-prefix-cls}__value {
width: 100%;
}

.@{form-item-prefix-cls} {
Expand All @@ -91,6 +91,11 @@
.@{input-form-prefix-cls}__input {
width: 100%;
}

.@{form-item-prefix-cls}__content {
flex-wrap: wrap;
}

}

&--label-top & {
Expand Down
43 changes: 22 additions & 21 deletions src/input/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
export default {
'tiny-mobile-input-bgcolor': '#fff',
'tiny-mobile-input-height': '30px',
'tiny-mobile-input-medium-height': '42px',
'tiny-mobile-input-small-height': '36px',
'tiny-mobile-input-mini-height': '24px',
'tiny-mobile-input-disabled-color': '#999',
'tiny-mobile-input-disabled-bgcolor': '#f5f5f5',
'tiny-mobile-input-exceed-color': '#f5222d',
'tiny-mobile-input-icon-font-size': '16px',
'tiny-mobile-input-icon-close-color': '#bfbfbf',
'tiny-mobile-textarea-count-color': '#999',
'tiny-mobile-textarea-count-font-size': '12px',
'tiny-mobile-textarea-inner-height': '96px',
'tiny-mobile-textarea-inner-font-size': '16px',
'tiny-mobile-textarea-inner-color': '#666',
'tiny-mobile-textarea-inner-placeholder-color': '#ccc',
'tiny-mobile-textarea-title-font-size': '16px',
'tiny-mobile-textarea-title-color': '#333',
'tiny-mobile-textarea-showlimit-inner-height': '70px',
'tiny-mobile-textarea-showcontent-inner-height': '66px'
}
"tiny-mobile-input-bg-color": "#fff",
"tiny-mobile-input-line-height": "30px",
"tiny-mobile-input-medium-height": "42px",
"tiny-mobile-input-small-height": "36px",
"tiny-mobile-input-mini-height": "24px",
"tiny-mobile-input-color-disabled": "#999",
"tiny-mobile-input-bg-color-disabled": "#f5f5f5",
"tiny-mobile-input-exceed-text-color": "#f5222d",
"tiny-mobile-input-icon-font-size": "16px",
"tiny-mobile-input-icon-close-color": "#bfbfbf",
"tiny-mobile-textarea-count-text-color": "#999",
"tiny-mobile-textarea-count-font-size": "12px",
"tiny-mobile-textarea-inner-height": "96px",
"tiny-mobile-textarea-inner-font-size": "16px",
"tiny-mobile-textarea-inner-text-color": "#666",
"tiny-mobile-textarea-inner-placeholder-color": "#ccc",
"tiny-mobile-textarea-title-font-size": "16px",
"tiny-mobile-textarea-title-text-color": "#333",
"tiny-mobile-textarea-showlimit-inner-height": "70px",
"tiny-mobile-textarea-showcontent-inner-height": "66px",
"tiny-mobile-input-form-bg-color-error": "rgba(230, 34, 34, 0.04)",
};
Loading