ts-glitter 20.5.1 → 20.5.3

package/lowcode/Entry.js

@@ -144,7 +144,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.5.1';
+            glitter.share.editerVersion = 'V_20.5.3';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -146,7 +146,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.5.1';
+      glitter.share.editerVersion = 'V_20.5.3';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/lowcode/cms-plugin/member-setting.js

@@ -132,7 +132,7 @@ export class MemberSetting {
                         style="margin-bottom: 12px;"
                       >
                         註冊頁面表單
-                        <span class="" style="color:#8D8D8D;font-size: 12px;">於註冊頁面中設定顧客必須填寫的資料</span>
+                        <span style="color:#8D8D8D;font-size: 12px;">於註冊頁面中設定顧客必須填寫的資料</span>
                       </div>`,
                                 },
                                 {
@@ -142,9 +142,7 @@ export class MemberSetting {
                         style="margin-bottom: 12px;"
                       >
                         設定頁面表單
-                        <span class="" style="color:#8D8D8D;font-size: 12px;"
-                          >於用戶設定頁面中設定顧客可填寫的額外資料</span
-                        >
+                        <span style="color:#8D8D8D;font-size: 12px;">於用戶設定頁面中設定顧客可填寫的額外資料</span>
                       </div>`,
                                 },
                             ]);

package/lowcode/cms-plugin/member-setting.ts

@@ -148,7 +148,7 @@ export class MemberSetting {
                         style="margin-bottom: 12px;"
                       >
                         註冊頁面表單
-                        <span class="" style="color:#8D8D8D;font-size: 12px;">於註冊頁面中設定顧客必須填寫的資料</span>
+                        <span style="color:#8D8D8D;font-size: 12px;">於註冊頁面中設定顧客必須填寫的資料</span>
                       </div>`,
                     },
                     {
@@ -158,9 +158,7 @@ export class MemberSetting {
                         style="margin-bottom: 12px;"
                       >
                         設定頁面表單
-                        <span class="" style="color:#8D8D8D;font-size: 12px;"
-                          >於用戶設定頁面中設定顧客可填寫的額外資料</span
-                        >
+                        <span style="color:#8D8D8D;font-size: 12px;">於用戶設定頁面中設定顧客可填寫的額外資料</span>
                       </div>`,
                     },
                   ]);

package/lowcode/cms-plugin/module/user-excel.js

@@ -87,24 +87,26 @@ export class UserExcel {
             }
             const formatDate = (date) => date ? gvc.glitter.ut.dateFormat(new Date(date), 'yyyy-MM-dd hh:mm') : '';
             const formatJSON = (obj) => Object.fromEntries(Object.entries(obj).filter(([key]) => column.includes(key)));
-            const getUserJSON = (user) => formatJSON({
-                ID: user.id,
-                會員編號: user.userID,
-                顧客名稱: user.userData.name,
-                電子信箱: user.userData.email,
-                電話: user.userData.phone,
-                生日: user.userData.birth,
-                地址: user.userData.address,
-                性別: user.userData.gender,
-                手機載具: user.userData.carrier_number,
-                統一編號: user.userData.gui_number,
-                公司: user.company || user.userData.company,
-                收貨人: user.userData.consignee_name,
-                收貨人地址: user.userData.consignee_address,
-                收貨人電子郵件: user.userData.consignee_email,
-                收貨人手機: user.userData.consignee_phone,
-                顧客備註: user.userData.managerNote,
-            });
+            const getUserJSON = (user) => {
+                return formatJSON({
+                    ID: user.id,
+                    會員編號: user.userID,
+                    顧客名稱: user.userData.name,
+                    電子信箱: user.userData.email,
+                    電話: user.userData.phone,
+                    生日: user.userData.birth,
+                    地址: user.userData.address,
+                    性別: user.userData.gender,
+                    手機載具: user.userData.carrier_number,
+                    統一編號: user.userData.gui_number,
+                    公司: user.company || user.userData.company,
+                    收貨人: user.userData.consignee_name,
+                    收貨人地址: user.userData.consignee_address,
+                    收貨人電子郵件: user.userData.consignee_email,
+                    收貨人手機: user.userData.consignee_phone,
+                    顧客備註: user.userData.managerNote,
+                });
+            };
             const getRecordJSON = (user) => {
                 var _a;
                 return formatJSON({
@@ -113,7 +115,7 @@ export class UserExcel {
                     會員有效期: formatDate(user.member_deadline),
                     會員標籤: ((_a = user.userData.tags) !== null && _a !== void 0 ? _a : []).join(','),
                     註冊時間: formatDate(user.created_time),
-                    現有購物金: user.rebate,
+                    購物金餘額: user.rebate,
                     'LINE UID': user.userData.lineID,
                     'FB UID': user.userData['fb-id'],
                 });
@@ -255,6 +257,7 @@ export class UserExcel {
                             lineID: user['LINE UID'],
                             'fb-id': user['FB UID'],
                             tags: ((_b = user['會員標籤']) !== null && _b !== void 0 ? _b : '').split(','),
+                            rebate: user['購物金餘額'],
                         };
                         jsonData[i] = {
                             account: userData.email,
@@ -334,7 +337,7 @@ export class UserExcel {
                         : ''}
             <div class="d-flex flex-column w-100 align-items-start gap-3" style="padding: 20px">
               <div class="d-flex align-items-center gap-2">
-                <div class="tx_700">透過XLSX檔案匯入商品</div>
+                <div class="tx_700">透過XLSX檔案匯入顧客</div>
                 ${BgWidget.blueNote('下載範例', gvc.event(viewData.example.event))}
               </div>
               <input
@@ -417,6 +420,7 @@ UserExcel.importExampleData = [
         會員標籤: '台中,青年',
         'LINE UID': '12341234',
         'FB UID': '12341234',
+        購物金餘額: '100',
     },
 ];
 UserExcel.headerColumn = {
@@ -438,6 +442,6 @@ UserExcel.headerColumn = {
         '收貨人手機',
         '顧客備註',
     ],
-    個人紀錄: ['黑名單', '會員等級', '會員有效期', '會員標籤', '註冊時間', '現有購物金', 'LINE UID', 'FB UID'],
+    個人紀錄: ['黑名單', '會員等級', '會員有效期', '會員標籤', '註冊時間', '購物金餘額', 'LINE UID', 'FB UID'],
     訂單相關: ['最後購買日期', '最後消費金額', '最後出貨日期', '累積消費金額', '累積消費次數'],
 };

package/lowcode/cms-plugin/module/user-excel.ts

@@ -75,6 +75,7 @@ export class UserExcel {
       會員標籤: '台中,青年',
       'LINE UID': '12341234',
       'FB UID': '12341234',
+      購物金餘額: '100',
     },
   ];
 
@@ -98,7 +99,7 @@ export class UserExcel {
       '收貨人手機',
       '顧客備註',
     ],
-    個人紀錄: ['黑名單', '會員等級', '會員有效期', '會員標籤', '註冊時間', '現有購物金', 'LINE UID', 'FB UID'],
+    個人紀錄: ['黑名單', '會員等級', '會員有效期', '會員標籤', '註冊時間', '購物金餘額', 'LINE UID', 'FB UID'],
     訂單相關: ['最後購買日期', '最後消費金額', '最後出貨日期', '累積消費金額', '累積消費次數'],
   };
 
@@ -192,8 +193,8 @@ export class UserExcel {
       Object.fromEntries(Object.entries(obj).filter(([key]) => column.includes(key)));
 
     // 顧客欄位物件
-    const getUserJSON = (user: User) =>
-      formatJSON({
+    const getUserJSON = (user: User) => {
+      return formatJSON({
         ID: user.id,
         會員編號: user.userID,
         顧客名稱: user.userData.name,
@@ -211,8 +212,9 @@ export class UserExcel {
         收貨人手機: user.userData.consignee_phone,
         顧客備註: user.userData.managerNote,
       });
+    };
 
-    // 紀錄欄位物件
+    // 個人紀錄欄位物件
     const getRecordJSON = (user: User) => {
       return formatJSON({
         黑名單: user.status === 1 ? '否' : '是',
@@ -220,7 +222,7 @@ export class UserExcel {
         會員有效期: formatDate(user.member_deadline),
         會員標籤: (user.userData.tags ?? []).join(','),
         註冊時間: formatDate(user.created_time),
-        現有購物金: user.rebate,
+        購物金餘額: user.rebate,
         'LINE UID': user.userData.lineID,
         'FB UID': user.userData['fb-id'],
       });
@@ -400,6 +402,7 @@ export class UserExcel {
             lineID: user['LINE UID'],
             'fb-id': user['FB UID'],
             tags: (user['會員標籤'] ?? '').split(','),
+            rebate: user['購物金餘額'],
           };
 
           jsonData[i] = {
@@ -496,7 +499,7 @@ export class UserExcel {
               : ''}
             <div class="d-flex flex-column w-100 align-items-start gap-3" style="padding: 20px">
               <div class="d-flex align-items-center gap-2">
-                <div class="tx_700">透過XLSX檔案匯入商品</div>
+                <div class="tx_700">透過XLSX檔案匯入顧客</div>
                 ${BgWidget.blueNote('下載範例', gvc.event(viewData.example.event))}
               </div>
               <input

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

@@ -12,7 +12,6 @@ import { StockVendors, VendorData } from './stock-vendors.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Tool } from '../modules/tool.js';
 import { BgProduct, OptionsItem } from '../backend-manager/bg-product.js';
-import { al } from '@faker-js/faker/dist/airline-CBNP41sR.js';
 
 const html = String.raw;
 

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

@@ -1181,94 +1181,92 @@ 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) => {
+                                                                            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) => {
-                                                                                    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',
@@ -1766,12 +1764,16 @@ export class UserList {
                                             bind: id,
                                             view: () => {
                                                 return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                                                    var _a, _b, _c;
-                                                    const response = yield saasConfig.api.getPrivateConfig(saasConfig.config.appName, 'glitterUserForm');
-                                                    const result = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.response) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value;
-                                                    const data = Array.isArray(result) ? result : [];
-                                                    function loopForm(data, refer_obj) {
-                                                        return data
+                                                    var _a, _b, _c, _d, _e;
+                                                    const getDefaultForm = yield saasConfig.api.getPrivateConfig(saasConfig.config.appName, 'glitterUserForm');
+                                                    const defaultForm = (_c = (_b = (_a = getDefaultForm === null || getDefaultForm === void 0 ? void 0 : getDefaultForm.response) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value;
+                                                    const customerForm = ((_e = (_d = (yield ApiUser.getPublicConfig('customer_form_user_setting', 'manager'))) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.value) || { list: [] };
+                                                    const formList = [
+                                                        ...(Array.isArray(defaultForm) ? defaultForm : []),
+                                                        ...customerForm.list,
+                                                    ];
+                                                    function loopForm(dataArray, refer_obj) {
+                                                        return dataArray
                                                             .map(item => {
                                                             const { title, key, page } = item;
                                                             const value = refer_obj[key] || '';
@@ -1821,7 +1823,7 @@ export class UserList {
                                                     }
                                                     const form_array_view = [
                                                         html `<div style="display:flex; gap: 12px; flex-direction: column;">
-                                      ${loopForm(data, userData)}
+                                      ${loopForm(formList, userData)}
                                     </div>`,
                                                     ];
                                                     resolve(form_array_view.join(html `<div class="my-4 border"></div>`));
@@ -1850,7 +1852,7 @@ export class UserList {
                             dialog.infoMessage({ text: '請輸入正確的電子信箱格式' });
                             return;
                         }
-                        if (!CheckInput.isEmpty(userData.phone) && !CheckInput.isTaiwanPhone(userData.phone)) {
+                        if (!CheckInput.isTaiwanPhone(userData.phone)) {
                             dialog.infoMessage({ text: BgWidget.taiwanPhoneAlert() });
                             return;
                         }
@@ -1877,14 +1879,13 @@ 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: '顧客新增失敗' });
                                 }
                             });
                         }