ts-glitter 16.6.8 → 16.7.1

package/lib/glitterBundle/module/Html_generate.ts

@@ -714,7 +714,7 @@ ${obj.gvc.bindView({
                                                             onCreate: () => {
 
                                                                 gvc.glitter.document.querySelector(`[gvc-id="${component}"]`).onResumeEvent=()=>{
-                                                                    alert('ss')
+
                                                                 }
                                                             },
                                                         }

package/lowcode/Entry.js

@@ -76,11 +76,9 @@ export class Entry {
                     scroll-behavior: auto !important;
                 }
             }
-
             .hide-elem {
                 display: none !important;
             }
-
             .hy-drawer-left {
                 left: -1000px !important;
             }
@@ -90,7 +88,7 @@ export class Entry {
         }
         window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_16.6.8';
+        glitter.share.editerVersion = 'V_16.7.1';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -76,11 +76,9 @@ export class Entry {
                     scroll-behavior: auto !important;
                 }
             }
-
             .hide-elem {
                 display: none !important;
             }
-
             .hy-drawer-left {
                 left: -1000px !important;
             }
@@ -90,7 +88,7 @@ export class Entry {
         }
         (window as any).renderClock = (window as any).renderClock ?? clockF();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_16.6.8';
+        glitter.share.editerVersion = 'V_16.7.1';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

package/lowcode/backend-manager/bg-widget.ts

@@ -4420,7 +4420,6 @@ ${obj.default ?? ''}</textarea
             </div>`;
         }, windowID);
     }
-
     static richTextEditor(obj: { gvc: GVC; content: string; callback: (content: string) => void; title: string }) {
         const gvc = obj.gvc;
         return gvc.bindView(

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

@@ -24,10 +24,14 @@ import { ConnectionMode } from "./pos-pages/connection-mode.js";
 import { PosFunction } from "./pos-pages/pos-function.js";
 import { UserList } from "./user-list.js";
 import { TempOrder } from "./pos-pages/temp-order.js";
+import { PosSummary } from "./pos-pages/pos-summary.js";
+import { ApiPos } from "../glitter-base/route/pos.js";
+import { PosWidget } from "./pos-widget.js";
 function getConfig() {
     const saasConfig = window.parent.saasConfig;
     return saasConfig;
 }
+const css = String.raw;
 export class POSSetting {
     static loginManager(gvc, mode, result) {
         const dialog = new ShareDialog(gvc.glitter);
@@ -254,18 +258,20 @@ height: 51px;
                 bind: id,
                 view: () => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        let [initial, res, member_auth, store_list] = yield Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
+                        let [initial, res, member_auth, store_list, work_status] = yield Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
                                 app: gvc.glitter.getUrlParameter('app-id'),
                                 token: GlobalUser.saas_token,
                             }), ApiUser.getPermission({
                                 page: 0,
                                 limit: 100
-                            }), ApiUser.getPublicConfig('store_manager', 'manager')]);
+                            }), ApiUser.getPublicConfig('store_manager', 'manager'),
+                            ApiPos.getWorkStatus('')]);
                         member_auth = member_auth.response.data.filter((dd) => {
                             return dd.invited && dd.status;
                         });
                         store_list = store_list.response.value.list;
                         glitter.share.store_list = store_list;
+                        glitter.share.work_status = work_status.response.status;
                         glitter.share.member_auth_list = member_auth;
                         try {
                             const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID;
@@ -480,54 +486,54 @@ height: 51px;
             }
         }
         gvc.addStyle(`
-                        .product-show{
-                        -ms-overflow-style: none;
-                        scrollbar-width: none;
-                        
-                        }
-                        .product-show::-webkit-scrollbar {
-                            display: none;  /* Chrome, Safari, Opera */
-                        }
-                          .hoverHidden div {
+            .product-show{
+            -ms-overflow-style: none;
+            scrollbar-width: none;
+
+            }
+            .product-show::-webkit-scrollbar {
+            display: none;  /* Chrome, Safari, Opera */
+            }
+            .hoverHidden div {
             display: none;
-        }
+            }
 
-        .hoverHidden:hover div {
+            .hoverHidden:hover div {
             display: flex;
-        }
+            }
 
-        .tooltip {
+            .tooltip {
             z-index: 99999 !important;
-        }
+            }
 
-        .scroll-in {
+            .scroll-in {
             animation: slideInFromLeft 0.3s ease-out forwards;
-        }
+            }
 
-        .scroll-out {
+            .scroll-out {
             left: 0%; /* 將元素移到畫面外 */
             animation: slideOutFromLeft 0.3s ease-out forwards;
-        }
+            }
 
-        /* @keyframes 定義動畫 */
-        @keyframes slideInFromLeft {
+            /* @keyframes 定義動畫 */
+            @keyframes slideInFromLeft {
             0% {
-                left: -120%; /* 起始位置在畫面外 */
+            left: -120%; /* 起始位置在畫面外 */
             }
             100% {
-                left: 0; /* 結束位置在畫面內 */
+            left: 0; /* 結束位置在畫面內 */
             }
-        }
-        /* @keyframes 定義動畫 */
-        @keyframes slideOutFromLeft {
+            }
+            /* @keyframes 定義動畫 */
+            @keyframes slideOutFromLeft {
             0% {
-                left: 0; /* 起始位置在畫面外 */
+            left: 0; /* 起始位置在畫面外 */
             }
             100% {
-                left: -120%; /* 結束位置在畫面內 */
+            left: -120%; /* 結束位置在畫面內 */
             }
-        }
-                    `);
+            }
+        `);
         const apConfig = (ApiUser.getPublicConfig('store-information', 'manager')).then((res) => {
             PayConfig.pos_config = res.response.value;
             vm.loading = false;
@@ -541,9 +547,10 @@ height: 51px;
                 bind: vm.id,
                 view: () => {
                     if (vm.loading) {
-                        return `<div class="d-flex align-items-center justify-content-center p-3">
-<div class="spinner-border"></div>
-</div>`;
+                        return html `
+                                <div class="d-flex align-items-center justify-content-center p-3">
+                                    <div class="spinner-border"></div>
+                                </div>`;
                     }
                     try {
                         loadOrderData();
@@ -688,7 +695,8 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                                                          style="gap:10px;">
                                                                         <div class="ps-2 text-start">
 
-                                                                            <div class="" style="color: #393939;
+                                                                            <div class="d-flex align-items-center"
+                                                                                 style="color: #393939;
                                                                         font-size: 18px;
                                                                         font-style: normal;
                                                                         font-weight: 400;
@@ -710,7 +718,25 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                         }).name}
                                                                                 </div>
                                                                             </div>
-
+                                                                            <div class="d-flex align-items-center mt-1">
+                                                                                ${(glitter.share.work_status === 'off_work') ? html `
+                                                                                            <div class="rounded-circle "
+                                                                                                 style="width:8px;height: 8px;background: #fe5541;">
+                                                                                            </div>
+                                                                                            <div class="fw-500 ms-1"
+                                                                                                 style="font-size: 12px;">
+                                                                                                已下班
+                                                                                            </div>
+                                                                                        ` : html `
+                                                                                            <div class="rounded-circle "
+                                                                                                 style="width:8px;height: 8px;background: #33a252;">
+                                                                                            </div>
+                                                                                            <div class="fw-500 ms-1"
+                                                                                                 style="font-size: 12px;">
+                                                                                                上班中
+                                                                                            </div>
+                                                                                        `}
+                                                                            </div>
                                                                         </div>
                                                                         <i class="fa-regular fa-angle-down fs-6"></i>
                                                                     </div>
@@ -737,13 +763,49 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                             })(),
                                             ...(() => {
                                                 if (glitter.share.select_member.config.support_shop.length > 1) {
-                                                    return [`<a
-                                                                                    class="dropdown-item cursor_pointer d-flex align-items-center" style="gap:5px;"
-                                                                                    onclick="${gvc.event(() => {
+                                                    return [html `<a
+                                                                                        class="dropdown-item cursor_pointer d-flex align-items-center"
+                                                                                        style="gap:5px;"
+                                                                                        onclick="${gvc.event(() => {
                                                             PosFunction.selectStoreSwitch(gvc);
                                                         })}">
-                                                                               <i class="fa-solid fa-store me-1"></i>切換門市
-                                                                            </a>`];
+                                                                                    <i class="fa-solid fa-store me-1"></i>切換門市
+                                                                                </a>`];
+                                                }
+                                                else {
+                                                    return [];
+                                                }
+                                            })(),
+                                            ...(() => {
+                                                if (glitter.share.work_status === 'on_work') {
+                                                    return [html `<a
+                                                                                        class="dropdown-item cursor_pointer d-flex align-items-center"
+                                                                                        style="gap:5px;"
+                                                                                        onclick="${gvc.event(() => {
+                                                            const dialog = new ShareDialog(gvc.glitter);
+                                                            dialog.checkYesOrNot({
+                                                                text: html `是否確認打卡下班?
+                                                                                                <br><span style="font-size:13px;color:gray;">*打卡下班前請記得填寫小結單*</span>`,
+                                                                callback: (response) => {
+                                                                    if (response) {
+                                                                        dialog.dataLoading({ visible: true });
+                                                                        ApiPos.setWorkStatus({
+                                                                            status: 'off_work'
+                                                                        }).then((res) => {
+                                                                            dialog.dataLoading({ visible: false });
+                                                                            if (!res.result) {
+                                                                                dialog.errorMessage({ text: '打卡異常' });
+                                                                            }
+                                                                            else {
+                                                                                gvc.recreateView();
+                                                                            }
+                                                                        });
+                                                                    }
+                                                                }
+                                                            });
+                                                        })}">
+                                                                                    <i class="fa-sharp fa-solid fa-right-from-bracket me-1  fs-6"></i>打卡下班
+                                                                                </a>`];
                                                 }
                                                 else {
                                                     return [];
@@ -871,6 +933,9 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                             view: () => __awaiter(this, void 0, void 0, function* () {
                                 let view = (() => {
                                     try {
+                                        if (glitter.share.work_status === 'off_work') {
+                                            return PosWidget.checkInView(gvc);
+                                        }
                                         OrderDetail.singleInstance = orderDetail;
                                         orderDetail.user_info.shipment = orderDetail.user_info.shipment || 'now';
                                         if (vm.type == 'payment') {
@@ -889,6 +954,11 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                         else if (vm.type === 'setting') {
                                             return PosSetting.main({ gvc: gvc, vm: vm });
                                         }
+                                        else if (vm.type === 'summary') {
+                                            return PosSummary.main({
+                                                gvc: gvc
+                                            });
+                                        }
                                         vm.searchable = true;
                                         return ProductsPage.main({ gvc: gvc, vm: vm, orderDetail: orderDetail });
                                     }
@@ -1017,6 +1087,14 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                                     </svg>`,
                                         title: `會員`,
                                         type: `member`,
+                                    },
+                                    {
+                                        selectIcon: html `
+                                                    <i class="fa-solid fa-list-check fs-4" style="color:#393939;"></i>`,
+                                        unselectIcon: html `
+                                                    <i class="fa-solid fa-list-check fs-4" style="color:#8d8d8d;"></i>`,
+                                        title: `小結`,
+                                        type: `summary`,
                                     }
                                 ];
                                 return page

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

@@ -16,12 +16,16 @@ import {ConnectionMode} from "./pos-pages/connection-mode.js";
 import {PosFunction} from "./pos-pages/pos-function.js";
 import {UserList} from "./user-list.js";
 import {TempOrder} from "./pos-pages/temp-order.js";
+import {PosSummary} from "./pos-pages/pos-summary.js";
+import {ApiPos} from "../glitter-base/route/pos.js";
+import {PosWidget} from "./pos-widget.js";
 
 function getConfig() {
     const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
     return saasConfig;
 }
 
+const css = String.raw
 
 export class POSSetting {
 
@@ -50,7 +54,6 @@ export class POSSetting {
         set pickup_number(value) {
             localStorage.setItem('orderGetNumber', `${value}`)
         },
-
         get where_store() {
             return localStorage.getItem('where_store') || ''
         },
@@ -308,18 +311,20 @@ height: 51px;
                 bind: id,
                 view: async () => {
                     try {
-                        let [initial, res, member_auth, store_list]: any = await Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
+                        let [initial, res, member_auth, store_list, work_status]: any = await Promise.all([POSSetting.initial(gvc), ApiUser.checkAdminAuth({
                             app: gvc.glitter.getUrlParameter('app-id'),
                             token: GlobalUser.saas_token,
                         }), ApiUser.getPermission({
                             page: 0,
                             limit: 100
-                        }), ApiUser.getPublicConfig('store_manager', 'manager')]);
+                        }), ApiUser.getPublicConfig('store_manager', 'manager'),
+                            ApiPos.getWorkStatus('')]);
                         member_auth = member_auth.response.data.filter((dd: any) => {
                             return dd.invited && dd.status
                         });
                         store_list = store_list.response.value.list;
                         glitter.share.store_list = store_list;
+                        glitter.share.work_status = work_status.response.status
                         glitter.share.member_auth_list = member_auth
                         try {
                             const login_user = GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID
@@ -541,54 +546,54 @@ height: 51px;
         }
 
         gvc.addStyle(`
-                        .product-show{
-                        -ms-overflow-style: none;
-                        scrollbar-width: none;
-                        
-                        }
-                        .product-show::-webkit-scrollbar {
-                            display: none;  /* Chrome, Safari, Opera */
-                        }
-                          .hoverHidden div {
+            .product-show{
+            -ms-overflow-style: none;
+            scrollbar-width: none;
+
+            }
+            .product-show::-webkit-scrollbar {
+            display: none;  /* Chrome, Safari, Opera */
+            }
+            .hoverHidden div {
             display: none;
-        }
+            }
 
-        .hoverHidden:hover div {
+            .hoverHidden:hover div {
             display: flex;
-        }
+            }
 
-        .tooltip {
+            .tooltip {
             z-index: 99999 !important;
-        }
+            }
 
-        .scroll-in {
+            .scroll-in {
             animation: slideInFromLeft 0.3s ease-out forwards;
-        }
+            }
 
-        .scroll-out {
+            .scroll-out {
             left: 0%; /* 將元素移到畫面外 */
             animation: slideOutFromLeft 0.3s ease-out forwards;
-        }
+            }
 
-        /* @keyframes 定義動畫 */
-        @keyframes slideInFromLeft {
+            /* @keyframes 定義動畫 */
+            @keyframes slideInFromLeft {
             0% {
-                left: -120%; /* 起始位置在畫面外 */
+            left: -120%; /* 起始位置在畫面外 */
             }
             100% {
-                left: 0; /* 結束位置在畫面內 */
+            left: 0; /* 結束位置在畫面內 */
             }
-        }
-        /* @keyframes 定義動畫 */
-        @keyframes slideOutFromLeft {
+            }
+            /* @keyframes 定義動畫 */
+            @keyframes slideOutFromLeft {
             0% {
-                left: 0; /* 起始位置在畫面外 */
+            left: 0; /* 起始位置在畫面外 */
             }
             100% {
-                left: -120%; /* 結束位置在畫面內 */
+            left: -120%; /* 結束位置在畫面內 */
             }
-        }
-                    `);
+            }
+        `);
 
         const apConfig = (ApiUser.getPublicConfig('store-information', 'manager')).then((res) => {
             PayConfig.pos_config = res.response.value;
@@ -604,9 +609,10 @@ height: 51px;
                     bind: vm.id,
                     view: () => {
                         if (vm.loading) {
-                            return `<div class="d-flex align-items-center justify-content-center p-3">
-<div class="spinner-border"></div>
-</div>`
+                            return html`
+                                <div class="d-flex align-items-center justify-content-center p-3">
+                                    <div class="spinner-border"></div>
+                                </div>`
                         }
                         try {
                             loadOrderData()
@@ -754,7 +760,8 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                                                          style="gap:10px;">
                                                                         <div class="ps-2 text-start">
 
-                                                                            <div class="" style="color: #393939;
+                                                                            <div class="d-flex align-items-center"
+                                                                                 style="color: #393939;
                                                                         font-size: 18px;
                                                                         font-style: normal;
                                                                         font-weight: 400;
@@ -776,7 +783,27 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                                                                     }).name}
                                                                                 </div>
                                                                             </div>
-
+                                                                            <div class="d-flex align-items-center mt-1">
+                                                                                ${
+                                                                                        (glitter.share.work_status === 'off_work') ? html`
+                                                                                            <div class="rounded-circle "
+                                                                                                 style="width:8px;height: 8px;background: #fe5541;">
+                                                                                            </div>
+                                                                                            <div class="fw-500 ms-1"
+                                                                                                 style="font-size: 12px;">
+                                                                                                已下班
+                                                                                            </div>
+                                                                                        ` : html`
+                                                                                            <div class="rounded-circle "
+                                                                                                 style="width:8px;height: 8px;background: #33a252;">
+                                                                                            </div>
+                                                                                            <div class="fw-500 ms-1"
+                                                                                                 style="font-size: 12px;">
+                                                                                                上班中
+                                                                                            </div>
+                                                                                        `
+                                                                                }
+                                                                            </div>
                                                                         </div>
                                                                         <i class="fa-regular fa-angle-down fs-6"></i>
                                                                     </div>
@@ -803,13 +830,49 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                                                         ...(() => {
 
                                                                             if (glitter.share.select_member.config.support_shop.length > 1) {
-                                                                                return [`<a
-                                                                                    class="dropdown-item cursor_pointer d-flex align-items-center" style="gap:5px;"
-                                                                                    onclick="${gvc.event(() => {
-                                                                                    PosFunction.selectStoreSwitch(gvc)
-                                                                                })}">
-                                                                               <i class="fa-solid fa-store me-1"></i>切換門市
-                                                                            </a>`]
+                                                                                return [html`<a
+                                                                                        class="dropdown-item cursor_pointer d-flex align-items-center"
+                                                                                        style="gap:5px;"
+                                                                                        onclick="${gvc.event(() => {
+                                                                                            PosFunction.selectStoreSwitch(gvc)
+                                                                                        })}">
+                                                                                    <i class="fa-solid fa-store me-1"></i>切換門市
+                                                                                </a>`]
+                                                                            } else {
+                                                                                return []
+                                                                            }
+                                                                        })(),
+                                                                        ...(() => {
+
+                                                                            if (glitter.share.work_status === 'on_work') {
+                                                                                return [html`<a
+                                                                                        class="dropdown-item cursor_pointer d-flex align-items-center"
+                                                                                        style="gap:5px;"
+                                                                                        onclick="${gvc.event(() => {
+                                                                                            const dialog = new ShareDialog(gvc.glitter);
+                                                                                            dialog.checkYesOrNot({
+                                                                                                text: html`是否確認打卡下班?
+                                                                                                <br><span style="font-size:13px;color:gray;">*打卡下班前請記得填寫小結單*</span>`,
+                                                                                                callback: (response) => {
+                                                                                                    if (response) {
+                                                                                                        dialog.dataLoading({visible: true})
+                                                                                                        ApiPos.setWorkStatus({
+                                                                                                            status: 'off_work'
+                                                                                                        }).then((res) => {
+                                                                                                            dialog.dataLoading({visible: false})
+                                                                                                            if (!res.result) {
+                                                                                                                dialog.errorMessage({text: '打卡異常'})
+                                                                                                            } else {
+                                                                                                                gvc.recreateView()
+                                                                                                            }
+                                                                                                        })
+                                                                                                    } 
+                                                                                                }
+                                                                                            })
+
+                                                                                        })}">
+                                                                                    <i class="fa-sharp fa-solid fa-right-from-bracket me-1  fs-6"></i>打卡下班
+                                                                                </a>`]
                                                                             } else {
                                                                                 return []
                                                                             }
@@ -937,6 +1000,9 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                     view: async () => {
                                         let view = (() => {
                                             try {
+                                                if (glitter.share.work_status === 'off_work') {
+                                                    return PosWidget.checkInView(gvc)
+                                                }
                                                 OrderDetail.singleInstance = orderDetail;
                                                 (orderDetail.user_info.shipment as any) = (orderDetail.user_info.shipment as any) || 'now';
                                                 if (vm.type == 'payment') {
@@ -952,6 +1018,10 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                                     return `<div class="vw-100 px-lg-3" style="overflow-y: scroll;">${UserList.main(gvc)}</div>`;
                                                 } else if (vm.type === 'setting') {
                                                     return PosSetting.main({gvc: gvc, vm: vm})
+                                                } else if (vm.type === 'summary') {
+                                                    return PosSummary.main({
+                                                        gvc: gvc
+                                                    })
                                                 }
                                                 vm.searchable = true
                                                 return ProductsPage.main({gvc: gvc, vm: vm, orderDetail: orderDetail});
@@ -1110,6 +1180,14 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                                                     </svg>`,
                                                 title: `會員`,
                                                 type: `member`,
+                                            },
+                                            {
+                                                selectIcon: html`
+                                                    <i class="fa-solid fa-list-check fs-4" style="color:#393939;"></i>`,
+                                                unselectIcon: html`
+                                                    <i class="fa-solid fa-list-check fs-4" style="color:#8d8d8d;"></i>`,
+                                                title: `小結`,
+                                                type: `summary`,
                                             }
                                             // ...(() => {
                                             //     if (POSSetting.config.who === 'manager') {
@@ -1202,7 +1280,7 @@ ${document.body.clientWidth < 800 ? `` : `position: absolute;left: 50%;top:50%;t
                         }
                     },
                 };
-            })+NormalPageEditor.leftNav(gvc)
+            }) + NormalPageEditor.leftNav(gvc)
         );
     }