tsanie/ui-lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Tsanie Lily 2023-04-28 15:06:47 +08:00
parent 58de68a878
commit 9bf9e7da27
6 changed files with 64 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/app/communications/customer.js
View File

@ -435,7 +435,7 @@ class CustomerCommunication {
#createContacts(container, option) { #createContacts(container, option) {
const readonly = option.readonly; const readonly = option.readonly;
const recordReadonly = option.recordReadonly; const recordReadonly = option.recordReadonly;
const contacts = createElement('div'); const contacts = createElement('div', 'bar-list-container');
container.append( container.append(
createElement('div', 'contact-bar', createElement('div', 'contact-bar',
createElement('div', 'bar-icon', createElement('div', 'bar-icon',
@ -491,7 +491,7 @@ class CustomerCommunication {
})); }));
button.addEventListener('click', () => { button.addEventListener('click', () => {
const add = new Contact({ const add = new Contact({
company: !nullOrEmpty(this.#data.companyCode), company: !nullOrEmpty(this.#data.companyName),
onSave: item => { onSave: item => {
const exists = this.#gridContact.source.some(s => s.Name === item.Name && s.MobilePhone === item.MobilePhone); const exists = this.#gridContact.source.some(s => s.Name === item.Name && s.MobilePhone === item.MobilePhone);
if (exists) { if (exists) {
@ -535,14 +535,14 @@ class CustomerCommunication {
}), }),
createElement('div', null, createElement('div', null,
createElement('div', div => { createElement('div', div => {
if (nullOrEmpty(this.#data.companyCode)) { if (nullOrEmpty(this.#data.companyName)) {
div.style.display = 'none'; div.style.display = 'none';
} }
div.style.fontWeight = 'bold'; div.style.fontWeight = 'bold';
div.innerText = r('contactFromRecord', 'Contacts from Customer Record'); div.innerText = r('contactFromRecord', 'Contacts from Customer Record');
}), }),
createElement('div', div => { createElement('div', div => {
if (nullOrEmpty(this.#data.companyCode)) { if (nullOrEmpty(this.#data.companyName)) {
div.style.display = 'none'; div.style.display = 'none';
} }
div.className = 'contacts-record'; div.className = 'contacts-record';
@ -606,7 +606,7 @@ class CustomerCommunication {
onclick: function () { onclick: function () {
const edit = new Contact({ const edit = new Contact({
contact: this, contact: this,
company: !nullOrEmpty(This.#data.companyCode), company: !nullOrEmpty(This.#data.companyName),
onSave: (item, _op) => { onSave: (item, _op) => {
const exists = const exists =
This.#gridContact.source.some(s => s !== this && s.Name === item.Name && s.MobilePhone === item.MobilePhone) || This.#gridContact.source.some(s => s !== this && s.Name === item.Name && s.MobilePhone === item.MobilePhone) ||
@ -804,7 +804,7 @@ class CustomerCommunication {
#createFollowers(container, option) { #createFollowers(container, option) {
const readonly = option.readonly; const readonly = option.readonly;
const recordReadonly = option.recordReadonly; const recordReadonly = option.recordReadonly;
const followers = createElement('div'); const followers = createElement('div', 'bar-list-container');
const buttonEditFollower = createElement('button', button => { const buttonEditFollower = createElement('button', button => {
button.className = 'roundbtn button-edit-followers'; button.className = 'roundbtn button-edit-followers';
button.style.backgroundColor = 'rgb(48, 107, 255)'; button.style.backgroundColor = 'rgb(48, 107, 255)';
@ -872,6 +872,7 @@ class CustomerCommunication {
div.className = 'followers-record'; div.className = 'followers-record';
div.style.maxHeight = '400px'; div.style.maxHeight = '400px';
div.style.width = '660px'; div.style.width = '660px';
div.style.overflow = 'auto';
}) })
) )
); );

67
lib/app/communications/style.scss
View File

@ -42,7 +42,7 @@
&:hover { &:hover {
background-color: var(--dark-fore-opacity-color); background-color: var(--dark-fore-opacity-color);
>svg { > svg {
opacity: .6; opacity: .6;
} }
} }
@ -52,12 +52,12 @@
fill: lightgray; fill: lightgray;
background-color: transparent !important; background-color: transparent !important;
&:hover>svg { &:hover > svg {
opacity: unset; opacity: unset;
} }
} }
>svg { > svg {
width: 13px; width: 13px;
height: 14px; height: 14px;
display: block; display: block;
@ -75,16 +75,16 @@
align-items: center; align-items: center;
font-size: var(--font-larger-size); font-size: var(--font-larger-size);
>div { > div {
flex: 1 1 auto; flex: 1 1 auto;
} }
>.title-functions { > .title-functions {
flex: 0 0 auto; flex: 0 0 auto;
display: flex; display: flex;
padding: 4px; padding: 4px;
>label { > label {
margin: 0 4px; margin: 0 4px;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; cursor: pointer;
@ -97,7 +97,7 @@
justify-content: center; justify-content: center;
transition: background-color .2s; transition: background-color .2s;
>svg { > svg {
fill: var(--strong-color); fill: var(--strong-color);
width: 14px; width: 14px;
height: 14px; height: 14px;
@ -107,7 +107,7 @@
&:hover { &:hover {
background-color: var(--dark-fore-opacity-color); background-color: var(--dark-fore-opacity-color);
>svg { > svg {
opacity: .6; opacity: .6;
} }
} }
@ -119,7 +119,7 @@
&:hover { &:hover {
background-color: var(--dark-fore-color); background-color: var(--dark-fore-color);
>svg { > svg {
opacity: unset; opacity: unset;
} }
} }
@ -134,26 +134,31 @@
display: flex; display: flex;
border-bottom: 1px solid var(--title-bg-color); border-bottom: 1px solid var(--title-bg-color);
>.bar-icon { > .bar-icon {
flex: 0 0 auto; flex: 0 0 auto;
>svg { > svg {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin: 0 8px; margin: 0 8px;
} }
} }
>.bar-list { > .bar-list {
flex: 1 1 auto; flex: 1 1 auto;
width: calc(100% - 46px); width: calc(100% - 46px);
.bar-list-container {
max-height: 120px;
overflow: auto;
}
.contact-item { .contact-item {
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 22px; line-height: 22px;
>svg { > svg {
flex: 0 0 auto; flex: 0 0 auto;
width: 16px; width: 16px;
height: 16px; height: 16px;
@ -161,7 +166,7 @@
fill: var(--strong-color); fill: var(--strong-color);
} }
>span { > span {
// flex: 1 1 auto; // flex: 1 1 auto;
color: var(--strong-color); color: var(--strong-color);
font-size: var(--font-size); font-size: var(--font-size);
@ -177,7 +182,7 @@
float: right; float: right;
margin: 4px 10px 10px; margin: 4px 10px 10px;
>svg { > svg {
width: 16px; width: 16px;
} }
} }
@ -189,7 +194,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
>textarea { > textarea {
padding: 10px 10px 0; padding: 10px 10px 0;
border: none; border: none;
height: 70px; height: 70px;
@ -200,17 +205,17 @@
@include outline(); @include outline();
} }
>div { > div {
padding: 0 10px 10px; padding: 0 10px 10px;
>.customer-name { > .customer-name {
float: left; float: left;
>span { > span {
font-size: var(--font-smaller-size); font-size: var(--font-smaller-size);
} }
>.ui-input { > .ui-input {
margin-left: 4px; margin-left: 4px;
width: 150px; width: 150px;
border-top: none; border-top: none;
@ -219,7 +224,7 @@
} }
} }
>.prompt-count { > .prompt-count {
display: inline-block; display: inline-block;
color: var(--light-color); color: var(--light-color);
font-size: var(--font-smaller-size); font-size: var(--font-smaller-size);
@ -254,7 +259,7 @@
font-size: var(--font-size); font-size: var(--font-size);
align-self: flex-start; align-self: flex-start;
.ui-tooltip-wrapper>.ui-tooltip-content { .ui-tooltip-wrapper > .ui-tooltip-content {
font-weight: normal; font-weight: normal;
} }
} }
@ -268,7 +273,7 @@
max-width: 240px; max-width: 240px;
background-color: rgb(244, 244, 244); background-color: rgb(244, 244, 244);
a>svg { a > svg {
width: 13px; width: 13px;
height: 13px; height: 13px;
fill: #2140fb; fill: #2140fb;
@ -278,7 +283,7 @@
} }
} }
>span::after { > span::after {
content: ''; content: '';
display: block; display: block;
} }
@ -330,7 +335,7 @@
height: 100%; height: 100%;
min-height: 120px; min-height: 120px;
>.ui-grid-body .ui-grid-body-content>.ui-grid-row>td { > .ui-grid-body .ui-grid-body-content > .ui-grid-row > td {
vertical-align: top; vertical-align: top;
.col-icon { .col-icon {
@ -340,11 +345,11 @@
.icon-contact-type { .icon-contact-type {
cursor: unset; cursor: unset;
>svg { > svg {
fill: #333; fill: #333;
} }
&:hover>svg { &:hover > svg {
opacity: unset; opacity: unset;
} }
} }
@ -370,22 +375,22 @@
flex-direction: column; flex-direction: column;
width: 600px; width: 600px;
>.follower-search { > .follower-search {
margin-bottom: 6px; margin-bottom: 6px;
} }
>.follower-grid { > .follower-grid {
height: 380px; height: 380px;
} }
} }
} }
} }
@media (prefers-color-scheme: dark) { /*@media (prefers-color-scheme: dark) {
.comm { .comm {
--dark-fore-color: #000; --dark-fore-color: #000;
--dark-fore-opacity-color: rgba(0, 0, 0, .4); --dark-fore-opacity-color: rgba(0, 0, 0, .4);
--strong-color: #ccc; --strong-color: #ccc;
--light-color: #333; --light-color: #333;
} }
} }*/

4
lib/ui/css/grid.scss
View File

@ -515,7 +515,7 @@
} }
} }
@media (prefers-color-scheme: dark) { /*@media (prefers-color-scheme: dark) {
.ui-grid { .ui-grid {
--cell-hover-bg-color: yellow; --cell-hover-bg-color: yellow;
--header-border-color: #525456; --header-border-color: #525456;
@ -532,4 +532,4 @@
--row-selected-bg-color: #190d04; --row-selected-bg-color: #190d04;
--text-disabled-color: gray; --text-disabled-color: gray;
} }
} }*/

6
lib/ui/css/variables/definition.scss
View File

@ -10,7 +10,7 @@
} }
:root { :root {
color-scheme: light dark; /*color-scheme: light dark;*/
--color: #201f1e; --color: #201f1e;
--bg-color: #fff; --bg-color: #fff;
@ -40,7 +40,7 @@
--font-family: "Franklin Gothic Book", "San Francisco", "Segoe UI", "Open Sans", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei UI", sans-serif; --font-family: "Franklin Gothic Book", "San Francisco", "Segoe UI", "Open Sans", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei UI", sans-serif;
} }
@media (prefers-color-scheme: dark) { /*@media (prefers-color-scheme: dark) {
:root { :root {
--color: rgb(255 255 255/87%); --color: rgb(255 255 255/87%);
--bg-color: #141414; --bg-color: #141414;
@ -60,4 +60,4 @@
--loading-bg-color: rgb(20 20 20/40%); --loading-bg-color: rgb(20 20 20/40%);
--loading-fore-color: rgb(255 255 255/20%); --loading-fore-color: rgb(255 255 255/20%);
} }
} }*/

14
lib/ui/grid/grid.js
View File

@ -296,7 +296,7 @@ class Grid {
let height = this.height; let height = this.height;
if (height === 0) { if (height === 0) {
height = this.#containerHeight; height = this.#containerHeight ??= this.containerHeight;
} else if (isNaN(height) || height < 0) { } else if (isNaN(height) || height < 0) {
height = this.#el.offsetHeight - top; height = this.#el.offsetHeight - top;
} }
@ -308,12 +308,16 @@ class Grid {
this.#bodyClientWidth = body.clientWidth; this.#bodyClientWidth = body.clientWidth;
} }
reload() { get containerHeight() {
let length = this.#currentSource.length; let length = this.#currentSource.length;
if (this.extraRows > 0) { if (this.extraRows > 0) {
length += this.extraRows; length += this.extraRows;
} }
this.#containerHeight = length * (this.rowHeight + 1); return length * (this.rowHeight + 1);
}
reload() {
this.#containerHeight = this.containerHeight;
this.#refs.body.scrollTop = 0; this.#refs.body.scrollTop = 0;
this.#refs.body.scrollLeft = 0; this.#refs.body.scrollLeft = 0;
this.#refs.bodyContent.style.top = '0px'; this.#refs.bodyContent.style.top = '0px';
@ -634,7 +638,7 @@ class Grid {
} }
} }
if (Grid.ColumnTypes.isCheckbox(col.type)) { if (Grid.ColumnTypes.isCheckbox(col.type)) {
cell.appendChild(GridCheckboxColumn.createEdit(e => this.#onRowChanged(e, exists + i, col, e.target.checked))); cell.appendChild(GridCheckboxColumn.createEdit(e => this.#onRowChanged(e, index, col, e.target.checked)));
// this.#colTypes[col.key] = GridCheckboxColumn; // this.#colTypes[col.key] = GridCheckboxColumn;
} else { } else {
let type = this.#colTypes[col.key]; let type = this.#colTypes[col.key];
@ -1532,7 +1536,7 @@ class Grid {
if (this.#currentSource == null) { if (this.#currentSource == null) {
return; return;
} }
const row = this.#currentSource[this.#startIndex + index]; const row = this.#currentSource[index];
const item = row.values; const item = row.values;
if (item == null) { if (item == null) {
return; return;

8
lib/utility.js
View File

@ -44,7 +44,13 @@ function isEmail(text) {
} }
function isPhone(text) { function isPhone(text) {
return /^[1-9]\d{9,}$/.test(text); if (/^[1-9]\d{9,}$/.test(text)) {
return true;
}
if (/^\+?[1-9][\d-]{9,}\d$/.test(text) && /^[1-9]\d{9,}$/.test(text.replace('+', '').replace(new RegExp('-', 'g'), ''))) {
return true;
}
return false;
} }
export { export {