ts-glitter 22.4.7 → 22.5.0

package/lowcode/cms-plugin/stock-stores.js

@@ -522,6 +522,7 @@ export class StockStores {
     static getPublicData() {
         return new Promise((resolve, reject) => {
             ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {
+                console.log("dd -- ", dd);
                 if (dd.result && dd.response.value) {
                     resolve(dd.response.value);
                 }

package/lowcode/cms-plugin/stock-stores.ts

@@ -607,6 +607,7 @@ export class StockStores {
   static getPublicData() {
     return new Promise<any>((resolve, reject) => {
       ApiUser.getPublicConfig('store_manager', 'manager').then((dd: any) => {
+        console.log("dd -- " , dd);
         if (dd.result && dd.response.value) {
           resolve(dd.response.value);
         } else {

package/lowcode/cms-plugin/user-list.js

@@ -27,6 +27,7 @@ import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { ListHeaderOption } from './list-header-option.js';
 import { UserModule } from './user/user-module.js';
 import { TableStorage } from './module/table-storage.js';
+import { InputCustom } from '../official_view_component/form-widget/input-custom.js';
 const html = String.raw;
 export class UserList {
     static main(gvc, obj) {
@@ -1038,24 +1039,42 @@ export class UserList {
                                                                                     item.group = '';
                                                                                 }
                                                                                 const formRenderMap = {
-                                                                                    input: () => html `
+                                                                                    input: () => {
+                                                                                        if (item.form_config.type === 'date' && (vmi.mode === 'edit')) {
+                                                                                            return InputCustom.globalUse({
+                                                                                                gvc: gvc,
+                                                                                                title: item.title,
+                                                                                                title_class: `tx_normal`,
+                                                                                                input_class: `form-control`,
+                                                                                                input_style: `background:white !important;`,
+                                                                                                value: referObj[item.key] || '',
+                                                                                                callback: (text) => {
+                                                                                                    referObj[item.key] = text;
+                                                                                                    gvc.notifyDataChange(id);
+                                                                                                },
+                                                                                                place_holder: `請輸入${item.title}`,
+                                                                                                type: 'date'
+                                                                                            });
+                                                                                        }
+                                                                                        return html `
                                                     <div>
                                                       <div class="tx_normal">${item.title}</div>
                                                       <div>
                                                         ${BgWidget.editeInput({
-                                                                                        gvc,
-                                                                                        title: '',
-                                                                                        default: `${referObj[item.key] || ''}`,
-                                                                                        placeHolder: `請輸入${item.title}`,
-                                                                                        callback: text => {
-                                                                                            referObj[item.key] = text;
-                                                                                            gvc.notifyDataChange(id);
-                                                                                        },
-                                                                                        readonly: vmi.mode !== 'edit',
-                                                                                    })}
+                                                                                            gvc,
+                                                                                            title: '',
+                                                                                            default: `${referObj[item.key] || ''}`,
+                                                                                            placeHolder: `請輸入${item.title}`,
+                                                                                            callback: text => {
+                                                                                                referObj[item.key] = text;
+                                                                                                gvc.notifyDataChange(id);
+                                                                                            },
+                                                                                            readonly: vmi.mode !== 'edit',
+                                                                                        })}
                                                       </div>
                                                     </div>
-                                                  `,
+                                                  `;
+                                                                                    },
                                                                                     multiple_line_text: () => html `
                                                     <div>
                                                       <div class="tx_normal">${item.title}</div>
@@ -1073,6 +1092,7 @@ export class UserList {
                                                     </div>
                                                   `,
                                                                                 };
+                                                                                console.log(`itemitemitem==>`, item);
                                                                                 return formRenderMap[item.page]
                                                                                     ? formRenderMap[item.page]()
                                                                                     : FormWidget.editorView({
@@ -1762,6 +1782,21 @@ export class UserList {
                                 html ` <div class="update-bar-container">
                     ${BgWidget.cancel(gvc.event(() => cf.callback()))}
                     ${BgWidget.save(gvc.event(() => {
+                                    function isValidDateFormat(dateStr) {
+                                        const regex = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/;
+                                        if (!regex.test(dateStr)) {
+                                            return false;
+                                        }
+                                        const [year, month, day] = dateStr.split('-').map(Number);
+                                        const date = new Date(year, month - 1, day);
+                                        return date.getFullYear() === year &&
+                                            date.getMonth() === month - 1 &&
+                                            date.getDate() === day;
+                                    }
+                                    if (vm.data.userData.birth && !isValidDateFormat(vm.data.userData.birth)) {
+                                        dialog.errorMessage({ text: '生日格式錯誤' });
+                                        return;
+                                    }
                                     ApiUser.getPublicConfig('user_general_tags', 'manager').then(dd => {
                                         var _a, _b;
                                         if (dd.result && ((_b = (_a = dd.response) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.list)) {

package/lowcode/cms-plugin/user-list.ts

@@ -19,6 +19,7 @@ import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { ListHeaderOption } from './list-header-option.js';
 import { UserModule } from './user/user-module.js';
 import { TableStorage } from './module/table-storage.js';
+import { InputCustom } from '../official_view_component/form-widget/input-custom.js';
 
 const html = String.raw;
 
@@ -1191,24 +1192,42 @@ export class UserList {
                                                 }
 
                                                 const formRenderMap: Record<string, () => string> = {
-                                                  input: () => html`
+                                                  input: () => {
+                                                    if(item.form_config.type === 'date' && (vmi.mode === 'edit')){
+return InputCustom.globalUse({
+  gvc:gvc,
+  title:item.title,
+  title_class:`tx_normal`,
+  input_class:`form-control`,
+  input_style:`background:white !important;`,
+ value:referObj[item.key] || '',
+  callback:(text)=>{
+    referObj[item.key] = text;
+    gvc.notifyDataChange(id);
+  },
+  place_holder:`請輸入${item.title}`,
+  type:'date'
+})
+                                                    }
+                                                    return html`
                                                     <div>
                                                       <div class="tx_normal">${item.title}</div>
                                                       <div>
                                                         ${BgWidget.editeInput({
-                                                          gvc,
-                                                          title: '',
-                                                          default: `${referObj[item.key] || ''}`,
-                                                          placeHolder: `請輸入${item.title}`,
-                                                          callback: text => {
-                                                            referObj[item.key] = text;
-                                                            gvc.notifyDataChange(id);
-                                                          },
-                                                          readonly: vmi.mode !== 'edit',
-                                                        })}
+                                                      gvc,
+                                                      title: '',
+                                                      default: `${referObj[item.key] || ''}`,
+                                                      placeHolder: `請輸入${item.title}`,
+                                                      callback: text => {
+                                                        referObj[item.key] = text;
+                                                        gvc.notifyDataChange(id);
+                                                      },
+                                                      readonly: vmi.mode !== 'edit',
+                                                    })}
                                                       </div>
                                                     </div>
-                                                  `,
+                                                  `
+                                                  },
                                                   multiple_line_text: () => html`
                                                     <div>
                                                       <div class="tx_normal">${item.title}</div>
@@ -1226,7 +1245,7 @@ export class UserList {
                                                     </div>
                                                   `,
                                                 };
-
+  console.log(`itemitemitem==>`,item)
                                                 return formRenderMap[item.page]
                                                   ? formRenderMap[item.page]()
                                                   : FormWidget.editorView({
@@ -2024,6 +2043,26 @@ export class UserList {
                     ${BgWidget.cancel(gvc.event(() => cf.callback()))}
                     ${BgWidget.save(
                       gvc.event(() => {
+                        function isValidDateFormat(dateStr:string) {
+                          // 匹配 yyyy-MM-dd 格式
+                          const regex = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/;
+
+                          if (!regex.test(dateStr)) {
+                            return false;
+                          }
+
+                          // 进一步验证日期是否有效
+                          const [year, month, day] = dateStr.split('-').map(Number);
+                          const date = new Date(year, month - 1, day);
+
+                          return date.getFullYear() === year &&
+                            date.getMonth() === month - 1 &&
+                            date.getDate() === day;
+                        }
+                        if(vm.data.userData.birth && !isValidDateFormat(vm.data.userData.birth)){
+                          dialog.errorMessage({text:'生日格式錯誤'})
+                          return
+                        }
                         ApiUser.getPublicConfig('user_general_tags', 'manager').then(dd => {
                           if (dd.result && dd.response?.value?.list) {
                             UserModule.setUserTags(gvc, [...dd.response.value.list, ...vm.data.userData.tags]);
@@ -2221,7 +2260,6 @@ export class UserList {
                         dialog.infoMessage({ text: BgWidget.taiwanPhoneAlert() });
                         return;
                       }
-
                       if (!CheckInput.isBirthString(userData.birth)) {
                         dialog.infoMessage({
                           text: html`

package/lowcode/css/editor.css

@@ -409,6 +409,12 @@ h6 {
   font-weight: 700;
 }
 
+.tx_gray_16 {
+  font-size: 16px;
+  color: var(--main-gray-3);
+  font-weight: 400;
+}
+
 .tx_gray_14 {
   font-size: 14px;
   color: var(--main-gray-3);

package/lowcode/glitterBundle/Glitter.css

@@ -1,82 +1,94 @@
 /*Read only*/
 /*Please dont change*/
 @media screen {
-    .hy-drawer-scrim {
-        display: block;
-        position: fixed;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        opacity: 0;
-        z-index: 2;
-        pointer-events: none;
-        background: rgba(0, 0, 0, 0.5);
-        transform: translateX(0);
-        -webkit-tap-highlight-color: transparent;
-    }
+  .hy-drawer-scrim {
+    display: block;
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    opacity: 0;
+    z-index: 2;
+    pointer-events: none;
+    background: rgba(0, 0, 0, 0.5);
+    transform: translateX(0);
+    -webkit-tap-highlight-color: transparent;
+  }
 
-    .hy-drawer-content {
-        position: fixed;
-        bottom: 0;
-        top: 0;
-        z-index: 3;
-        overflow-x: hidden;
-        overflow-y: auto;
-        contain: strict;
-        width: 300px;
-        background: #e8e8e8;
-        box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
-        transform: translateX(0);
-        -webkit-overflow-scrolling: touch;
-    }
+  .hy-drawer-content {
+    position: fixed;
+    bottom: 0;
+    top: 0;
+    z-index: 3;
+    overflow-x: hidden;
+    overflow-y: auto;
+    contain: strict;
+    width: 300px;
+    background: #fff;
+    box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
+    transform: translateX(0);
+    -webkit-overflow-scrolling: touch;
+  }
 
-    .hy-drawer-content.hy-drawer-left {
-        left: -300px;
-    }
+  .hy-drawer-content.hy-drawer-left {
+    left: -300px;
+  }
 
-    .hy-drawer-content.hy-drawer-right {
-        right: -300px;
-    }
+  .hy-drawer-content.hy-drawer-right {
+    right: -300px;
+  }
 
-    .hy-drawer-content.hy-drawer-left.hy-drawer-opened {
-        left: 0!important;
-        transform: translateX(0)!important;
-    }
+  .hy-drawer-content.hy-drawer-left.hy-drawer-opened {
+    left: 0 !important;
+    transform: translateX(0) !important;
+  }
 
-    .hy-drawer-content.hy-drawer-right.hy-drawer-opened {
-        right: 0!important;
-        transform: translateX(0)!important;
-    }
+  .hy-drawer-content.hy-drawer-right.hy-drawer-opened {
+    right: 0 !important;
+    transform: translateX(0) !important;
+  }
 }
 
 @media print {
-    .hy-drawer-scrim {
-        display: none!important;
-    }
+  .hy-drawer-scrim {
+    display: none !important;
+  }
 
-    .hy-drawer-content {
-        transform: none!important;
-    }
+  .hy-drawer-content {
+    transform: none !important;
+  }
 }
 
-.translation{
-    animation:TestMove 0.5s ; /*IE*/
-    -moz-animation:TestMove 0.5s; /*FireFox*/
-    -webkit-animation:TestMove 0.5s ; /*Chrome, Safari*/
+.translation {
+  animation: TestMove 0.5s; /*IE*/
+  -moz-animation: TestMove 0.5s; /*FireFox*/
+  -webkit-animation: TestMove 0.5s; /*Chrome, Safari*/
 }
 
-@keyframes TestMove{
-    from {left:100%;}
-    to {left:0%;}
+@keyframes TestMove {
+  from {
+    left: 100%;
+  }
+  to {
+    left: 0%;
+  }
 }
 
-@-moz-keyframes TestMove{
-    from {left:100%;}
-    to {left:0%;}
+@-moz-keyframes TestMove {
+  from {
+    left: 100%;
+  }
+  to {
+    left: 0%;
+  }
 }
 
-@-webkit-keyframes TestMove{
-    from {left:100%;}
-    to {left:0%;}
-}
+@-webkit-keyframes TestMove {
+  from {
+    left: 100%;
+  }
+  to {
+    left: 0%;
+  }
+}