ts-glitter 20.5.1 → 20.5.3

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

@@ -1357,103 +1357,104 @@ export class UserList {
                                 </div>`,
                               ].join(BgWidget.mbContainer(12)),
                               [
-                                html`<div class="tx_700">升級方式</div>`,
+                                html`
+                                  <div class="d-flex align-items-center gap-2">
+                                    <div class="tx_700">升級方式</div>
+                                    ${BgWidget.blueNote(
+                                      '查看會員級數規則',
+                                      gvc.event(() => {
+                                        BgWidget.infoDialog({
+                                          gvc: gvc,
+                                          title: '會員規則',
+                                          innerHTML: BgWidget.tableV3({
+                                            gvc: gvc,
+                                            getData: vd => {
+                                              setTimeout(() => {
+                                                vd.tableData = vm.data.member.map((leadData: any) => {
+                                                  return [
+                                                    {
+                                                      key: '會員等級',
+                                                      value: leadData.tag_name,
+                                                    },
+                                                    {
+                                                      key: '升級規則',
+                                                      value: (() => {
+                                                        let text = '';
+                                                        const val = parseInt(
+                                                          `${leadData.og.condition.value}`,
+                                                          10
+                                                        ).toLocaleString();
+                                                        const condition_type =
+                                                          leadData.og.condition.type === 'single' ? '單筆' : '累積';
+                                                        if (leadData.og.duration.type === 'noLimit') {
+                                                          text = `${condition_type}消費額達 NT$${val}`;
+                                                        } else {
+                                                          text = `${leadData.og.duration.value}天內${condition_type}消費額達 NT$${val}`;
+                                                        }
+                                                        return text;
+                                                      })(),
+                                                    },
+                                                    {
+                                                      key: '有效期限',
+                                                      value: (() => {
+                                                        const { type, value } = leadData.og.dead_line;
+                                                        let dead_line = '';
+
+                                                        if (type === 'date') {
+                                                          const deadlines = [
+                                                            {
+                                                              title: '一個月',
+                                                              value: 30,
+                                                            },
+                                                            {
+                                                              title: '三個月',
+                                                              value: 90,
+                                                            },
+                                                            {
+                                                              title: '六個月',
+                                                              value: 180,
+                                                            },
+                                                            {
+                                                              title: '一年',
+                                                              value: 365,
+                                                            },
+                                                          ];
+
+                                                          const matchedDeadline = deadlines.find(
+                                                            item => item.value === value
+                                                          );
+                                                          dead_line = matchedDeadline
+                                                            ? matchedDeadline.title
+                                                            : `${value}天`;
+                                                        } else if (type === 'noLimit') {
+                                                          dead_line = '沒有期限';
+                                                        }
+
+                                                        return dead_line;
+                                                      })(),
+                                                    },
+                                                  ];
+                                                });
+                                                vd.originalData = vm.data.member;
+                                                vd.loading = false;
+                                                vd.callback();
+                                              }, 200);
+                                            },
+                                            filter: [],
+                                            rowClick: () => {},
+                                            hiddenPageSplit: true,
+                                          }),
+                                        });
+                                      })
+                                    )}
+                                  </div>
+                                `,
                                 BgWidget.multiCheckboxContainer(
                                   gvc,
                                   [
                                     {
                                       key: 'auto',
-                                      name: html`<div>
-                                        根據本站<span
-                                          style="color: #4D86DB; text-decoration: underline;"
-                                          onclick="${gvc.event((e, ev) => {
-                                            ev.stopPropagation();
-                                            BgWidget.infoDialog({
-                                              gvc: gvc,
-                                              title: '會員規則',
-                                              innerHTML: BgWidget.tableV3({
-                                                gvc: gvc,
-                                                getData: vd => {
-                                                  setTimeout(() => {
-                                                    vd.tableData = vm.data.member.map((leadData: any) => {
-                                                      return [
-                                                        {
-                                                          key: '會員等級',
-                                                          value: leadData.tag_name,
-                                                        },
-                                                        {
-                                                          key: '升級條件',
-                                                          value: (() => {
-                                                            let text = '';
-                                                            const val = parseInt(
-                                                              `${leadData.og.condition.value}`,
-                                                              10
-                                                            ).toLocaleString();
-                                                            const condition_type =
-                                                              leadData.og.condition.type === 'single' ? '單筆' : '累積';
-                                                            if (leadData.og.duration.type === 'noLimit') {
-                                                              text = `${condition_type}消費額達 NT$${val}`;
-                                                            } else {
-                                                              text = `${leadData.og.duration.value}天內${condition_type}消費額達 NT$${val}`;
-                                                            }
-                                                            return text;
-                                                          })(),
-                                                        },
-                                                        {
-                                                          key: '有效期限',
-                                                          value: (() => {
-                                                            const { type, value } = leadData.og.dead_line;
-                                                            let dead_line = '';
-
-                                                            if (type === 'date') {
-                                                              const deadlines = [
-                                                                {
-                                                                  title: '一個月',
-                                                                  value: 30,
-                                                                },
-                                                                {
-                                                                  title: '三個月',
-                                                                  value: 90,
-                                                                },
-                                                                {
-                                                                  title: '六個月',
-                                                                  value: 180,
-                                                                },
-                                                                {
-                                                                  title: '一年',
-                                                                  value: 365,
-                                                                },
-                                                              ];
-
-                                                              const matchedDeadline = deadlines.find(
-                                                                item => item.value === value
-                                                              );
-                                                              dead_line = matchedDeadline
-                                                                ? matchedDeadline.title
-                                                                : `${value}天`;
-                                                            } else if (type === 'noLimit') {
-                                                              dead_line = '沒有期限';
-                                                            }
-
-                                                            return dead_line;
-                                                          })(),
-                                                        },
-                                                      ];
-                                                    });
-                                                    vd.originalData = vm.data.member;
-                                                    vd.loading = false;
-                                                    vd.callback();
-                                                  }, 200);
-                                                },
-                                                filter: [],
-                                                rowClick: () => {},
-                                                hiddenPageSplit: true,
-                                              }),
-                                            });
-                                          })}"
-                                          >會員規則</span
-                                        >自動升級
-                                      </div>`,
+                                      name: '根據本站會員規則自動升級',
                                     },
                                     {
                                       key: 'manual',
@@ -2022,15 +2023,23 @@ export class UserList {
                               bind: id,
                               view: () => {
                                 return new Promise(async resolve => {
-                                  const response = await saasConfig.api.getPrivateConfig(
+                                  const getDefaultForm = await saasConfig.api.getPrivateConfig(
                                     saasConfig.config.appName,
                                     'glitterUserForm'
                                   );
-                                  const result = response?.response?.result?.[0]?.value;
-                                  const data = Array.isArray(result) ? result : [];
+                                  const defaultForm = getDefaultForm?.response?.result?.[0]?.value;
+
+                                  const customerForm = (
+                                    await ApiUser.getPublicConfig('customer_form_user_setting', 'manager')
+                                  )?.response?.value || { list: [] };
+
+                                  const formList = [
+                                    ...(Array.isArray(defaultForm) ? defaultForm : []),
+                                    ...customerForm.list,
+                                  ];
 
-                                  function loopForm(data: any[], refer_obj: any): string {
-                                    return data
+                                  function loopForm(dataArray: any[], refer_obj: any): string {
+                                    return dataArray
                                       .map(item => {
                                         const { title, key, page } = item;
                                         const value = refer_obj[key] || '';
@@ -2083,7 +2092,7 @@ export class UserList {
                                   // 預設用戶表單
                                   const form_array_view: any = [
                                     html`<div style="display:flex; gap: 12px; flex-direction: column;">
-                                      ${loopForm(data, userData)}
+                                      ${loopForm(formList, userData)}
                                     </div>`,
                                   ];
 
@@ -2121,7 +2130,7 @@ export class UserList {
                         return;
                       }
 
-                      if (!CheckInput.isEmpty(userData.phone) && !CheckInput.isTaiwanPhone(userData.phone)) {
+                      if (!CheckInput.isTaiwanPhone(userData.phone)) {
                         dialog.infoMessage({ text: BgWidget.taiwanPhoneAlert() });
                         return;
                       }
@@ -2148,13 +2157,12 @@ export class UserList {
                           pwd: gvc.glitter.getUUID(),
                           userData: userData,
                         }).then(r => {
+                          dialog.dataLoading({ visible: false });
                           if (r.result) {
-                            dialog.dataLoading({ visible: false });
-                            dialog.infoMessage({ text: '成功新增會員' });
+                            dialog.successMessage({ text: '顧客新增成功' });
                             vm.type = 'list';
                           } else {
-                            dialog.dataLoading({ visible: false });
-                            dialog.errorMessage({ text: '會員建立失敗' });
+                            dialog.errorMessage({ text: '顧客新增失敗' });
                           }
                         });
                       }

package/lowcode/modules/checkInput.js

@@ -28,11 +28,11 @@ export class CheckInput {
         return regex.test(input);
     }
     static isChineseEnglishNumberHyphen(input) {
-        const regex = /^[A-Za-z0-9\u4e00-\u9fa5\- ]*$/;
+        const regex = /^[\u4e00-\u9fa5a-zA-Z0-9-]+$/;
         return regex.test(input);
     }
     static isBirthString(input) {
-        if (input.length !== 8) {
+        if (!input || input.length !== 8) {
             return false;
         }
         const year = parseInt(input.substring(0, 4), 10);

package/lowcode/modules/checkInput.ts

@@ -1,62 +1,59 @@
 export class CheckInput {
-    static isEmpty(input: any): boolean {
-        return input === undefined || typeof input === 'undefined' || input === null || input.length === 0;
-    }
-
-    static isURL(input: string): boolean {
-        try {
-            return Boolean(new URL(input));
-        } catch (e) {
-            return false;
-        }
-    }
-
-    static isEmail(input: string): boolean {
-        const regex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-        return regex.test(input);
-    }
-
-    static isTaiwanPhone(input: string): boolean {
-        const landlineRegex = /^0\d{1,2}-\d{6,8}(#\d{1,5})?$/;
-        const mobileRegex = /^09\d{8}$/;
-        return landlineRegex.test(input) || mobileRegex.test(input);
-    }
-
-    static isNumberString(input: string): boolean {
-        const num = parseFloat(input);
-
-        return !isNaN(num);
-    }
-
-    static isEnglishNumberHyphen(input: string): boolean {
-        const regex = /^[a-zA-Z0-9-]+$/;
-        return regex.test(input);
-    }
-
-    static isChineseEnglishNumberHyphen(input: string): boolean {
-        const regex = /^[A-Za-z0-9\u4e00-\u9fa5\- ]*$/;
-        return regex.test(input);
-
-    }
-
-    static isBirthString(input: string): boolean {
-        // 檢查長度是否為8位數
-        if (input.length !== 8) {
-            return false;
-        }
-
-        // 分割出年、月、日
-        const year = parseInt(input.substring(0, 4), 10);
-        const month = parseInt(input.substring(4, 6), 10);
-        const day = parseInt(input.substring(6, 8), 10);
-
-        // 檢查年月日範圍是否合理
-        if (year < 1900 || year > 2100 || month < 1 || month > 12 || day < 1) {
-            return false;
-        }
-
-        // 使用 Date 對象檢查日期是否合法
-        const date = new Date(year, month - 1, day);
-        return date.getFullYear() === year && date.getMonth() + 1 === month && date.getDate() === day;
-    }
-}
+  static isEmpty(input: any): boolean {
+    return input === undefined || typeof input === 'undefined' || input === null || input.length === 0;
+  }
+
+  static isURL(input: string): boolean {
+    try {
+      return Boolean(new URL(input));
+    } catch (e) {
+      return false;
+    }
+  }
+
+  static isEmail(input: string): boolean {
+    const regex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+    return regex.test(input);
+  }
+
+  static isTaiwanPhone(input: string): boolean {
+    const landlineRegex = /^0\d{1,2}-\d{6,8}(#\d{1,5})?$/;
+    const mobileRegex = /^09\d{8}$/;
+    return landlineRegex.test(input) || mobileRegex.test(input);
+  }
+
+  static isNumberString(input: string): boolean {
+    const num = parseFloat(input);
+
+    return !isNaN(num);
+  }
+
+  static isEnglishNumberHyphen(input: string): boolean {
+    const regex = /^[a-zA-Z0-9-]+$/;
+    return regex.test(input);
+  }
+
+  static isChineseEnglishNumberHyphen(input: string): boolean {
+    const regex = /^[\u4e00-\u9fa5a-zA-Z0-9-]+$/;
+    return regex.test(input);
+  }
+
+  static isBirthString(input: string): boolean {
+    // 檢查長度是否為8位數
+    if (!input || input.length !== 8) {
+      return false;
+    }
+
+    // 分割出年、月、日
+    const year = parseInt(input.substring(0, 4), 10);
+    const month = parseInt(input.substring(4, 6), 10);
+    const day = parseInt(input.substring(6, 8), 10);
+
+    // 檢查年月日範圍是否合理
+    if (year < 1900 || year > 2100 || month < 1 || month > 12 || day < 1) {
+      return false;
+    }
+    // 使用 Date 對象檢查日期是否合法
+    const date = new Date(year, month - 1, day);
+    return date.getFullYear() === year && date.getMonth() + 1 === month && date.getDate() === day;
+  }}

package/lowcode/public-components/checkout/index.js

@@ -3037,7 +3037,6 @@ export class CheckoutIndex {
                                                                                 dialog.dataLoading({ visible: true });
                                                                                 PayNow.checkout().then((response) => {
                                                                                     dialog.dataLoading({ visible: false });
-                                                                                    console.log('response -- ', response);
                                                                                     if (response.error) {
                                                                                         dialog.errorMessage({
                                                                                             text: response.error.message,

package/lowcode/public-components/checkout/index.ts

@@ -3291,7 +3291,6 @@ export class CheckoutIndex {
                                                                       dialog.dataLoading({ visible: true });
                                                                       PayNow.checkout().then((response: any) => {
                                                                         dialog.dataLoading({ visible: false });
-                                                                        console.log('response -- ', response);
                                                                         if (response.error) {
                                                                           dialog.errorMessage({
                                                                             text: response.error.message,