Skip to content

Uiselect #423

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

Open
gzcqqqqqqqq1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Uiselect #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec108c7
update base ui
gzcqqqqqqqq1 Apr 28, 2026
2d6cd8a
update app style
gzcqqqqqqqq1 Apr 29, 2026
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
63 changes: 51 additions & 12 deletions src/AsyncUserSelect/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
height: auto !important;
min-height: 38px;
max-width: calc(100% - 10px);
padding: 0.4375rem 1rem 0.4375rem 0.5rem;
}

.dtable-ui-selected-users-container .dtable-ui-user-select-placeholder {
Expand All @@ -12,40 +13,57 @@
.dtable-ui-user-select-popover .popover {
width: 385px;
max-width: 385px;
border-radius: 4px;
fill: #FFFFFF 100%;
background-color: #FFFFFF;
border: 1px solid #EEEEEE;
border-radius: 4px;
box-shadow: 0px 6px 14px rgba(0, 0, 0, 0.1);
}

.dtable-ui-user-select-container {
position: relative;
}

.dtable-ui-user-select-container .dtable-ui-user-search-container {
padding: 10px 10px 0 10px;
}

.dtable-ui-user-select-container .dtable-ui-user-search-container input {
height: 28px;
height: 32px;
}

.dtable-ui-user-select-container .dtable-ui-user-list-container {
min-height: 160px;
max-height: 200px;
margin: 10px 0;
padding: 8px !important;
overflow: auto;
position: relative;
}

.dtable-ui-user-select-container .form-control {
border: none;
border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
border-radius: 4px 4px 0 0;
padding: .375rem 1rem !important;
}

.dtable-ui-user-select-container .form-control:focus {
border-color: transparent !important;
border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
box-shadow: none !important;
}

.dtable-ui-user-select-container .dtable-ui-user-list-container .dtable-ui-user-item-container {
display: flex;
align-items: center;
justify-content: space-between;
height: 30px;
padding: 0 10px;
height: 32px;
padding: 0 8px;
font-size: 14px;
cursor: pointer;
border-radius: 4px;
}

.dtable-ui-user-select-container .dtable-ui-user-list-container .dtable-ui-user-item-container:hover,
.dtable-ui-user-select-container .dtable-ui-user-list-container .dtable-ui-user-item-container-highlight {
background: #f5f5f5;
background-color: rgba(0, 0, 0, 0.04);
cursor: pointer;
}

Expand All @@ -61,16 +79,33 @@
background: transparent;
}

.dtable-ui-user-list-container .dtable-ui-collaborator-check-icon .dtable-icon-check-mark {
color: #798d99;
.dtable-ui-user-list-container .dtable-ui-collaborator-check-icon .dtable-icon-check {
color: #666666;
font-size: 14px;
}

.dtable-ui-user-select-container .dtable-ui-user-search-container .search-clear-btn {
position: absolute;
top: 5px;
right: 10px;
height: 22px;
line-height: 22px;
width: 28px;
text-align: center;
color: #999;
cursor: pointer;
}

.dtable-ui-user-select-container .dtable-ui-user-search-container .search-clear-btn .dtable-icon-x {
font-size: 12px;
color: #999999;
}

/* user-item */
.dtable-ui-user-item {
display: inline-flex;
align-items: center;
margin: 2px 10px 2px 0;
margin: 2px 4px 2px 0;
padding: 0 8px 0 2px;
height: 20px;
font-size: 13px;
Expand Down Expand Up @@ -120,3 +155,7 @@
color: #666666;
cursor: pointer;
}

.dtable-ui-selected-users-container .dtable-ui-users-input {
padding-right: 37px;
}
41 changes: 26 additions & 15 deletions src/AsyncUserSelect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,20 +191,22 @@ const AsyncUserSelect = ({ className, emptyPlaceholder = '', searchPlaceholder =
<ClickOutside onClickOutside={onClickOutside}>
<>
<div className={classnames('dtable-ui-selected-users-container form-control d-flex align-items-center', className, { 'focus': isPopoverOpen })} onClick={onTogglePopover} ref={selectorRef}>
{selectedUsers.map((user, index) => {
return (
<UserItem
key={`dtable-ui-user-selector-selected-user-${index}`}
user={user}
deleteUser={deselectUser}
/>
);
})}
{selectedUsers.length === 0 && (
<div className="dtable-ui-user-select-placeholder">
{emptyPlaceholder || getLocale('Search_users')}
</div>
)}
<div className='dtable-ui-users-input'>
{selectedUsers.map((user, index) => {
return (
<UserItem
key={`dtable-ui-user-selector-selected-user-${index}`}
user={user}
deleteUser={deselectUser}
/>
);
})}
{selectedUsers.length === 0 && (
<div className="dtable-ui-user-select-placeholder">
{emptyPlaceholder || getLocale('Search_users')}
</div>
)}
</div>
</div>
{selectorRef.current && (
<Popover
Expand All @@ -225,6 +227,15 @@ const AsyncUserSelect = ({ className, emptyPlaceholder = '', searchPlaceholder =
onChange={onSearchValueChanged}
onKeyDown={onKeyDown}
/>
{searchValue && (
<div
className="search-clear-btn position-absolute"
onClick={() => onSearchValueChanged('')}
title={getLocale('Clear_search_text')}
>
<i aria-hidden="true" className="dtable-font dtable-icon-x"></i>
</div>
)}
</div>
<div className="dtable-ui-user-list-container" ref={userListContainerRef}>
{searchedUsers.length > 0 && (
Expand All @@ -239,7 +250,7 @@ const AsyncUserSelect = ({ className, emptyPlaceholder = '', searchPlaceholder =
<UserItem key={`dtable-ui-user-selector-searched-user-${index}`} user={user} enableShowIDInOrgWhenSearchUser={enableShowIDInOrgWhenSearchUser} />
{selectedUsers.find(u => u.email === user.email) && (
<div className='dtable-ui-collaborator-check-icon'>
<i className="dtable-font dtable-icon-check-mark" aria-hidden="true"></i>
<i className="dtable-font dtable-icon-check" aria-hidden="true"></i>
</div>
)}
</div>
Expand Down
29 changes: 23 additions & 6 deletions src/DTableCustomizeSelect/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.dtable-select.custom-select {
display: flex;
padding: 0 10px;
padding: 0 16px;
border-radius: 3px;
align-items: center;
justify-content: space-between;
Expand Down Expand Up @@ -39,14 +39,10 @@
.dtable-select .dtable-icon-down3 {
display: inline-block;
font-size: 12px;
color: #999;
color: #666666;
transition: all 0.1s;
}

.dtable-select .dtable-icon-down3:hover {
color: #555;
}

.dtable-select .selected-option {
display: flex;
flex: 1;
Expand Down Expand Up @@ -98,3 +94,24 @@
font-size: 14px;
white-space: nowrap;
}

.option-group .option-group-selector-multiple-select .option-group-search,
.option-group .option-group-selector-single-select .option-group-search {
padding: 0 0 8px 0 !important;
}

.option-group-selector-multiple-select .form-control,
.option-group-selector-single-select .form-control {
border: none;
border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
border-radius: 4px 4px 0 0;
padding: .375rem .5rem !important;
height: 32px;
}

.option-group-selector-multiple-select .form-control:focus,
.option-group-selector-single-select .form-control:focus {
border-color: transparent !important;
border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
box-shadow: none !important;
}
4 changes: 2 additions & 2 deletions src/DTableFiltersPopover/utils/filter-item-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class FilterItemUtils {
<div className='select-option-name single-select-option-name'>
<div className="single-select-option" style={{ background: option.color, color: option.textColor || null }} title={option.name} aria-label={option.name}>{option.name}</div>
<div className='single-select-check-icon'>
{selectedOption?.id === option.id && <i className="option-edit dtable-font dtable-icon-check-mark"></i>}
{selectedOption?.id === option.id && <i className="option-edit dtable-font dtable-icon-check"></i>}
</div>
</div>
)
Expand All @@ -86,7 +86,7 @@ class FilterItemUtils {
<div className='select-option-name multiple-option-name'>
<div className="multiple-select-option" style={{ background: option.color, color: option.textColor }} title={option.name} aria-label={option.name}>{option.name}</div>
<div className='multiple-check-icon'>
{filterTerm.indexOf(option.id) > -1 && <i className="option-edit dtable-font dtable-icon-check-mark"></i>}
{filterTerm.indexOf(option.id) > -1 && <i className="option-edit dtable-font dtable-icon-check"></i>}
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/DTableFiltersPopover/widgets/collaborator-filter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class CollaboratorFilter extends Component {
</div>
</div>
<div className='collaborator-check-icon'>
{isSelected && <i className="option-edit dtable-font dtable-icon-check-mark"></i>}
{isSelected && <i className="option-edit dtable-font dtable-icon-check"></i>}
</div>
</div>
</Fragment>
Expand Down
10 changes: 5 additions & 5 deletions src/DTableFiltersPopover/widgets/filter-list/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
.option-group-dtable-ui-collaborator-selector .option:hover,
.option-group-dtable-ui-collaborator-selector .option.option-active {
color: #212529;
background-color: #f7f7f7;
background-color: #f5f5f5;
}

.dtable-ui-filters-list .dtable-ui-multiple-select-selector .option.option-active .select-option-name,
Expand Down Expand Up @@ -333,7 +333,7 @@
display: inline-flex;
align-items: center;
height: 20px;
margin-right: 10px;
margin-right: 4px;
padding: 0 8px 0 2px;
font-size: 13px;
border-radius: 10px;
Expand Down Expand Up @@ -412,20 +412,20 @@

.filter-header-icon {
display: inline-block;
padding: 0 0.3125rem;
padding-right: 0.5rem;
margin-left: -0.3125rem;
}

.filter-header-icon .dtable-font,
.filter-header-icon .multicolor-icon {
font-size: 14px;
color: #aaa;
color: #999;
cursor: default;
}

.option.option-active .filter-header-icon .dtable-font,
.option.option-active .filter-header-icon .multicolor-icon {
color: #fff;
color: #999;
}

.dtable-ui-filters-list .single-select-option,
Expand Down
39 changes: 34 additions & 5 deletions src/DTableGroupSelect/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.group-select.custom-select {
display: flex;
padding: 5px 10px;
padding: 7px 8px !important;
border-radius: 3px;
align-items: center;
justify-content: space-between;
Expand Down Expand Up @@ -79,18 +79,47 @@
}

.group-select .selected-option-show .selected-option-item {
background-color: rgb(240, 240, 240);
border-radius: 16px;
background-color: #F7F7F5;
border-radius: 4px !important;
display: flex;
align-items: center;
height: 24px;
}

.group-select .selected-option-show .selected-option-item .selected-option-item-name {
font-size: 13px;
font-size: 14px !important;
color: #212529;
margin-left: 6px;
margin-right: 8px
}

.group-select .selected-option-show .selected-option-item .dtable-icon-x {
cursor: pointer;
color: rgb(103, 103, 103);
color: #666666;
font-size: 12px;
margin-right: 6px;
}

.seatable-group-select .option-group-search {
padding: 0 !important;
}

.seatable-group-select .form-control {
border: none;
border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
border-radius: 4px 4px 0 0;
padding: .375rem 1rem !important;
height: 32px;
}

.seatable-group-select .form-control:focus {
border-color: transparent !important;
border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
box-shadow: none !important;
}

.option-group-content .dtable-icon-check {
color: #666666;
font-size: 14px;
margin-left: 16px;
}
2 changes: 1 addition & 1 deletion src/DTableGroupSelect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class DTableGroupSelect extends Component {
{selectedOptions.length > 0 ?
<span className="selected-option-show">
{selectedOptions.map(item =>
<span key={item.id} className="selected-option-item mr-1 pr-1 pl-2">
<span key={item.id} className="selected-option-item">
<span className='selected-option-item-name'>{item.name}</span>
<i className="dtable-font dtable-icon-x ml-1" onClick={() => { this.props.onDeleteOption(item); }}></i>
</span>
Expand Down
Loading
Loading