ts-glitter 20.5.0 → 20.5.2

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.0';
+            glitter.share.editerVersion = 'V_20.5.2';
             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.0';
+      glitter.share.editerVersion = 'V_20.5.2';
       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/shopping-collections.js

@@ -960,8 +960,8 @@ export class ShoppingCollections {
                                 dialog.infoMessage({ text: '請填寫「標題」' });
                                 return;
                             }
-                            const regexTitle = /[\s,\/\\]+/g;
-                            if (regexTitle.test(vm.data.title)) {
+                            const forbiddenRegex = /[,/\\]/;
+                            if (forbiddenRegex.test(vm.data.title)) {
                                 dialog.infoMessage({ text: '標題不可包含空白格與以下符號：<br />「 , 」「 / 」「 \\ 」' });
                                 return;
                             }

package/lowcode/cms-plugin/shopping-collections.ts

@@ -1144,8 +1144,9 @@ export class ShoppingCollections {
                       return;
                     }
 
-                    const regexTitle = /[\s,\/\\]+/g;
-                    if (regexTitle.test(vm.data.title)) {
+                    // const regexTitle = /[\s,\/\\]+/g;
+                    const forbiddenRegex = /[,/\\]/;
+                    if (forbiddenRegex.test(vm.data.title)) {
                       dialog.infoMessage({ text: '標題不可包含空白格與以下符號：<br />「 , 」「 / 」「 \\ 」' });
                       return;
                     }

package/lowcode/cms-plugin/shopping-order-manager.js

@@ -1769,7 +1769,7 @@ export class ShoppingOrderManager {
                     ${document.body.clientWidth > 768 ? getBadgeList() : ''}
                   </div>
                   ${document.body.clientWidth > 768 ? '' : html ` <div class="mt-1 mb-3">${getBadgeList()}</div>`}
-                  <div class="d-flex justify-content-end">${funBTN().splitOrder()}</div>
+                  <div class="d-none justify-content-end">${funBTN().splitOrder()}</div>
                   ${BgWidget.container1x2({
                                     html: [
                                         !is_shipment ? '' : shipment_card,

package/lowcode/cms-plugin/shopping-order-manager.ts

@@ -1963,7 +1963,7 @@ export class ShoppingOrderManager {
                     ${document.body.clientWidth > 768 ? getBadgeList() : ''}
                   </div>
                   ${document.body.clientWidth > 768 ? '' : html` <div class="mt-1 mb-3">${getBadgeList()}</div>`}
-                  <div class="d-flex justify-content-end">${funBTN().splitOrder()}</div>
+                  <div class="d-none justify-content-end">${funBTN().splitOrder()}</div>
                   ${BgWidget.container1x2(
                     {
                       html: [

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

@@ -239,8 +239,13 @@ export class StockHistory {
                             {
                                 key: '總金額',
                                 value: `<span class="fs-7">$ ${dd.content.product_list.reduce((sum, item) => {
-                                    var _a;
-                                    return sum + item.cost * ((_a = item.recent_count) !== null && _a !== void 0 ? _a : 0);
+                                    var _a, _b;
+                                    if (dd.type === 'restocking') {
+                                        return sum + item.cost * ((_a = item.transfer_count) !== null && _a !== void 0 ? _a : 0);
+                                    }
+                                    else {
+                                        return sum + item.cost * ((_b = item.recent_count) !== null && _b !== void 0 ? _b : 0);
+                                    }
                                 }, 0).toLocaleString()}</span>`,
                             },
                             {

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;
 
@@ -271,7 +270,11 @@ export class StockHistory {
               {
                 key: '總金額',
                 value: `<span class="fs-7">$ ${  dd.content.product_list.reduce((sum, item) => {
-                return sum + item.cost * (item.recent_count ?? 0);
+                  if(dd.type==='restocking'){
+                    return sum + item.cost * (item.transfer_count ?? 0);
+                  }else{
+                    return sum + item.cost * (item.recent_count ?? 0);
+                  }
                 }, 0).toLocaleString()}</span>`,
               },
               {

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: '顧客新增失敗' });
                                 }
                             });
                         }