underpost 2.8.1 → 2.8.7

package/src/client/components/core/Input.js

@@ -1,6 +1,8 @@
 import { AgGrid } from './AgGrid.js';
 import { BtnIcon } from './BtnIcon.js';
+import { isValidDate } from './CommonJs.js';
 import { darkTheme } from './Css.js';
+import { DropDown } from './DropDown.js';
 import { loggerFactory } from './Logger.js';
 import { RichText } from './RichText.js';
 import { ToggleSwitch } from './ToggleSwitch.js';
@@ -86,8 +88,10 @@ const Input = {
               <div class="fl input-row-${id}">
                 <div class="in fll" style="width: 80%;">${inputElement}</div>
                 <div class="in fll btn-eye-password btn-eye-${id}" style="width: 20%;">
-                  <i class="fas fa-eye fa-eye-${id} eye-password"></i>
-                  <i class="fas fa-eye-slash fa-eye-slash-${id} eye-password" style="display: none"></i>
+                  <div class="abs center">
+                    <i class="fas fa-eye fa-eye-${id} eye-password"></i>
+                    <i class="fas fa-eye-slash fa-eye-slash-${id} eye-password" style="display: none"></i>
+                  </div>
                 </div>
               </div>
             `
@@ -98,7 +102,7 @@ const Input = {
       </div>
     </div>`;
   },
-  parseJsonEval: (selector) => {
+  parseJson: (selector) => {
     try {
       return JSON.parse(s(selector).value);
     } catch (error) {
@@ -147,6 +151,10 @@ const Input = {
             htmls(`.file-name-render-${inputData.id}`, `${s(`.${inputData.id}`).fileNameInputExtDefaultContent}`);
           continue;
           break;
+        case 'dropdown-checkbox': {
+          s(`.dropdown-option-${inputData.id}-reset`).click();
+          break;
+        }
         case 'md':
           RichText.Tokens[inputData.id].easyMDE.value('');
           continue;
@@ -196,6 +204,12 @@ const Input = {
             RichText.Tokens[inputData.id].easyMDE.value(fileObj[inputData.model].mdPlain);
             continue;
             break;
+
+          case 'dropdown-checkbox': {
+            s(`.dropdown-option-${inputData.id}-reset`).click();
+            for (const opt of originObj[inputData.model]) s(`.dropdown-option-${inputData.id}-${opt}`).click();
+            break;
+          }
           case 'checkbox':
           case 'checkbox-on-off':
             if (
@@ -207,9 +221,11 @@ const Input = {
             break;
           case 'datetime-local':
             {
-              const date = new Date(originObj[inputData.model]);
-              date.setMinutes(date.getMinutes() - date.getTimezoneOffset());
-              s(`.${inputData.id}`).value = date.toISOString().slice(0, 16);
+              if (isValidDate(originObj[inputData.model])) {
+                const date = new Date(originObj[inputData.model]);
+                // date.setMinutes(date.getMinutes() - date.getTimezoneOffset());
+                s(`.${inputData.id}`).value = date.toISOString().slice(0, 16);
+              } else s(`.${inputData.id}`).value = null;
             }
             continue;
             break;

package/src/client/components/core/JoyStick.js

@@ -19,8 +19,8 @@ const JoyStick = {
             /* border: 2px solid red; */
             left: 5px;
             bottom: 5px;
-            height: 200px;
-            width: 200px;
+            height: 175px;
+            width: 175px;
             z-index: 3;
           }
           .joy-img-background-${id} {

package/src/client/components/core/LoadingAnimation.js

@@ -76,22 +76,11 @@ const LoadingAnimation = {
         'text-align': 'center',
       };
 
-      if (s(container).classList) {
-        const classes = Array.from(s(container).classList);
-        if (classes.find((e) => e.match('management-table-btn-mini'))) {
-          style.top = '-2px';
-          style.left = '-2px';
-        } else if (classes.find((e) => e.match('action-bar-box'))) {
-          style.top = '-30px';
-          style.left = '-12px';
-        }
-      }
-
       append(
         container,
         html`
           <div
-            class="in ${id}"
+            class="abs center ${id}"
             style="${renderCssAttr({
               style,
             })}"
@@ -145,6 +134,8 @@ const LoadingAnimation = {
         s(backgroundContainer).style.opacity = 0;
         setTimeout(async () => {
           s(backgroundContainer).style.display = 'none';
+          if (s(`.modal-menu`)) s(`.modal-menu`).classList.remove('hide');
+          if (s(`.main-body-btn-container`)) s(`.main-body-btn-container`).classList.remove('hide');
           if (callBack) callBack();
         }, 300);
       });

package/src/client/components/core/LogIn.js

@@ -135,7 +135,7 @@ const LogIn = {
     return html`
       <div class="in">
         ${await BtnIcon.Render({
-          class: 'section-mp form-button btn-log-in-i-not-have-account',
+          class: 'in section-mp form-button btn-log-in-i-not-have-account',
           label: html`<i class="fas fa-user-plus"></i> ${Translate.Render(`i-not-have-account`)}
             <br />
             ${Translate.Render(`sign-up`)}`,
@@ -165,7 +165,7 @@ const LogIn = {
         </div>
         <div class="in">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-log-in-forgot-password',
+            class: 'in section-mp form-button btn-log-in-forgot-password',
             label: html`<i class="fas fa-question-circle"></i> ${Translate.Render(`forgot-password`)}`,
             type: 'button',
           })}
@@ -181,7 +181,7 @@ const LogIn = {
 
         <div class="in">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-log-in',
+            class: 'in section-mp form-button btn-log-in',
             label: Translate.Render('log-in'),
             type: 'submit',
           })}

package/src/client/components/core/LogOut.js

@@ -47,7 +47,7 @@ const LogOut = {
     return html` <form class="in">
       <div class="in">
         ${await BtnIcon.Render({
-          class: 'section-mp btn-custom btn-log-out',
+          class: 'inl section-mp btn-custom btn-log-out',
           label: html`<i class="fa-solid fa-power-off"></i> ${Translate.Render('log-out')}`,
           type: 'submit',
         })}

package/src/client/components/core/Modal.js

@@ -9,7 +9,6 @@ import {
   htmls,
   sa,
   getAllChildNodes,
-  getCurrentTrace,
   isActiveElement,
 } from './VanillaJs.js';
 import { BtnIcon } from './BtnIcon.js';
@@ -50,6 +49,7 @@ const Modal = {
       mode: '' /* slide-menu */,
       RouterInstance: {},
       disableTools: [],
+      observer: false,
     },
   ) {
     if (options.heightBottomBar === undefined) options.heightBottomBar = 50;
@@ -77,12 +77,15 @@ const Modal = {
       options,
       onCloseListener: {},
       onMenuListener: {},
+      onCollapseMenuListener: {},
+      onExtendMenuListener: {},
       onDragEndListener: {},
       onObserverListener: {},
       onClickListener: {},
       onExpandUiListener: {},
       onBarUiOpen: {},
       onBarUiClose: {},
+      onHome: {},
       query: options.query ? `${window.location.search}` : undefined,
     };
     const setCenterRestore = () => {
@@ -157,7 +160,8 @@ const Modal = {
             };
             options.mode === 'slide-menu-right' ? (options.style.right = '0px') : (options.style.left = '0px');
             const contentIconClass = 'abs center';
-
+            if (options.class) options.class += ' hide';
+            else options.class = 'hide';
             options.dragDisabled = true;
             options.titleClass = 'hide';
             top = '0px';
@@ -239,7 +243,7 @@ const Modal = {
                 'body',
                 html`
                   <div
-                    class="abs main-body-btn-container"
+                    class="abs main-body-btn-container hide"
                     style="top: ${options.heightTopBar + 50}px; z-index: 9; ${true ||
                     (options.mode && options.mode.match('right'))
                       ? 'right'
@@ -403,6 +407,11 @@ const Modal = {
                     })}
                   </div>
                 </div>
+                ${options?.slideMenuTopBarFix
+                  ? html`<div class="abs modal slide-menu-top-bar-fix" style="height: ${options.heightTopBar}px">
+                      ${await options.slideMenuTopBarFix()}
+                    </div>`
+                  : ''}
               </div>`,
             );
             EventsUI.onClick(`.action-btn-profile-log-in`, () => {
@@ -537,12 +546,12 @@ const Modal = {
                         if (routerId) {
                           if (
                             s(`.main-btn-${routerId}`) &&
-                            (routerId.toLocaleLowerCase().match(s(`.${id}`).value.toLocaleLowerCase()) ||
+                            (routerId.toLowerCase().match(s(`.${id}`).value.toLowerCase()) ||
                               (Translate.Data[routerId] &&
                                 Object.keys(Translate.Data[routerId]).filter((keyLang) =>
                                   Translate.Data[routerId][keyLang]
-                                    .toLocaleLowerCase()
-                                    .match(s(`.${id}`).value.toLocaleLowerCase()),
+                                    .toLowerCase()
+                                    .match(s(`.${id}`).value.toLowerCase()),
                                 ).length > 0))
                           ) {
                             const fontAwesomeIcon = getAllChildNodes(s(`.main-btn-${routerId}`)).find((e) => {
@@ -1002,14 +1011,15 @@ const Modal = {
                   e.preventDefault();
                   window.history.forward();
                 });
-                EventsUI.onClick(`.action-btn-home`, () => s(`.main-btn-home`).click());
-                EventsUI.onClick(`.action-btn-app-icon`, () => s(`.action-btn-home`).click());
+                EventsUI.onClick(`.action-btn-home`, async () => {
+                  await Modal.onHomeRouterEvent();
+                  Object.keys(this.Data[idModal].onHome).map((keyListener) => this.Data[idModal].onHome[keyListener]());
+                });
+                EventsUI.onClick(`.action-btn-app-icon`, () => Modal.onHomeRouterEvent());
                 Keyboard.instanceMultiPressKey({
                   id: 'input-shortcut-global-escape',
                   keys: ['Escape'],
                   eventCallBack: () => {
-                    // if (s(`.main-btn-home`)) s(`.main-btn-home`).click();
-
                     if (s(`.btn-close-${this.currentTopModalId}`)) s(`.btn-close-${this.currentTopModalId}`).click();
                   },
                 });
@@ -1149,7 +1159,7 @@ const Modal = {
           top: ${top};
           left: ${left};
           overflow: auto; /* resizable required */
-          resize: auto; /* resizable required */
+          resize: both; /* resizable required */
           transition: ${transition};
           opacity: 0;
           z-index: 1;
@@ -1335,7 +1345,7 @@ const Modal = {
           s(`.btn-icon-menu-back`).classList.add('hide');
           if (s(`.menu-btn-container-main`)) s(`.menu-btn-container-main`).classList.remove('hide');
         };
-        s(`.main-btn-home`).onclick = () => {
+        this.onHomeRouterEvent = async () => {
           for (const keyModal of Object.keys(this.Data)) {
             if (
               ![idModal, 'main-body-top', 'main-body']
@@ -1349,6 +1359,9 @@ const Modal = {
           setPath(getProxyPath());
           setDocTitle({ ...options.RouterInstance, route: '' });
         };
+        s(`.main-btn-home`).onclick = async () => {
+          await this.onHomeRouterEvent();
+        };
         EventsUI.onClick(`.btn-icon-menu-back`, backMenuButtonEvent);
         EventsUI.onClick(`.btn-icon-menu-mode`, () => {
           if (s(`.btn-icon-menu-mode-right`).classList.contains('hide')) {
@@ -1379,6 +1392,9 @@ const Modal = {
             if (options.onCollapseMenu) options.onCollapseMenu();
             s(`.sub-menu-title-container-${'modal-menu'}`).classList.add('hide');
             s(`.nav-path-container-${'modal-menu'}`).classList.add('hide');
+            Object.keys(this.Data[idModal].onCollapseMenuListener).map((keyListener) =>
+              this.Data[idModal].onCollapseMenuListener[keyListener](),
+            );
           } else {
             slideMenuWidth = originSlideMenuWidth;
             setTimeout(() => {
@@ -1399,6 +1415,9 @@ const Modal = {
             if (options.onExtendMenu) options.onExtendMenu();
             s(`.sub-menu-title-container-${'modal-menu'}`).classList.remove('hide');
             s(`.nav-path-container-${'modal-menu'}`).classList.remove('hide');
+            Object.keys(this.Data[idModal].onExtendMenuListener).map((keyListener) =>
+              this.Data[idModal].onExtendMenuListener[keyListener](),
+            );
           }
           // btn-bar-center-icon-menu
           this.actionBtnCenter();
@@ -1606,9 +1625,11 @@ const Modal = {
       ...this.Data[idModal],
     };
   },
+  onHomeRouterEvent: () => {},
   currentTopModalId: '',
   zIndexSync: function ({ idModal }) {
     setTimeout(() => {
+      if (!this.Data[idModal]) return;
       const cleanTopModal = () => {
         Object.keys(this.Data).map((_idModal) => {
           if (this.Data[_idModal].options.zIndexSync && s(`.${_idModal}`)) s(`.${_idModal}`).style.zIndex = '3';
@@ -1691,7 +1712,7 @@ const Modal = {
       const htmlRender = html`
         <br />
         <div class="in section-mp" style="font-size: 40px; text-align: center">
-          <i class="fas fa-question-circle"></i>
+          ${options.icon ? options.icon : html` <i class="fas fa-question-circle"></i>`}
         </div>
         ${await options.html()}
         <div class="in section-mp">
@@ -1702,7 +1723,7 @@ const Modal = {
             style: `margin: auto`,
           })}
         </div>
-        <div class="in section-mp">
+        <div class="in section-mp ${options.disableBtnCancel ? 'hide' : ''}">
           ${await BtnIcon.Render({
             class: `in section-mp form-button btn-cancel-${id}`,
             label: Translate.Render('cancel'),
@@ -1717,7 +1738,7 @@ const Modal = {
         titleClass: 'hide',
         style: {
           width: '300px',
-          height: '350px',
+          height: '400px',
           overflow: 'hidden',
           'z-index': '11',
           resize: 'none',
@@ -1751,7 +1772,6 @@ const Modal = {
   },
   headerTitleHeight: 40,
   actionBtnCenter: function () {
-    // if (!s(`.btn-close-modal-menu`).classList.contains('hide')) return s(`.main-btn-home`).click();
     if (!s(`.btn-close-modal-menu`).classList.contains('hide')) {
       return s(`.btn-close-modal-menu`).click();
     }
@@ -1777,20 +1797,34 @@ const renderMenuLabel = ({ img, text, icon }) => {
     <div class="abs center main-btn-menu-text">${text}</div>`;
 };
 
-const renderViewTitle = (options = { icon: '', img: '', text: '', assetFolder: '', 'ui-icons': '', dim, top }) => {
-  if (options.dim === undefined) options.dim = 60;
+const renderViewTitle = (
+  options = { icon: '', img: '', text: '', assetFolder: '', 'ui-icons': '', dim, top, topText: '' },
+) => {
+  if (options.dim === undefined) options.dim = 30;
   const { img, text, icon, dim, top } = options;
   if (!img && !options['ui-icon']) return html`<span class="view-title-icon">${icon}</span> ${text}`;
   return html`<img
       class="abs img-btn-square-view-title"
       style="${renderCssAttr({
-        style: { width: `${dim}px`, height: `${dim}px`, top: top !== undefined ? `${top}px` : `-${dim / 2}px` },
+        style: {
+          width: `${dim}px`,
+          height: `${dim}px`,
+          top: top !== undefined ? `${top}px !important` : undefined,
+        },
       })}"
       src="${options['ui-icon']
         ? `${getProxyPath()}assets/${options.assetFolder ? options.assetFolder : 'ui-icons'}/${options['ui-icon']}`
         : img}"
     />
-    <div class="in text-btn-square-view-title" style="${renderCssAttr({ style: { 'padding-left': `${dim}px` } })}">
+    <div
+      class="in text-btn-square-view-title"
+      style="${renderCssAttr({
+        style: {
+          // 'padding-left': `${20 + dim}px`,
+          ...(options.topText !== undefined ? { top: options.topText + 'px !important' } : {}),
+        },
+      })}"
+    >
       ${text}
     </div>`;
 };