ts-glitter 17.5.6 → 17.5.7

package/lib/glitterBundle/dialog/ShareDialog.ts

@@ -1,43 +1,35 @@
-import {GVC} from "../GVController.js";
-import {Glitter} from "../Glitter.js";
+import { GVC } from '../GVController.js';
+import { Glitter } from '../Glitter.js';
 
 export class ShareDialog {
-    public dataLoading = (obj: { text?: string; visible: boolean }) => {
-
-    };
-    public errorMessage = (obj: { text?: string }) => {
-    };
-    public successMessage = (obj: { text?: string }) => {
-    };
-    public checkYesOrNot: (obj: { callback:(response:boolean)=>void, text: string }) => void;
-    public policy: () => void;
+    public dataLoading = (obj: { text?: string; visible: boolean }) => {};
+    public errorMessage = (obj: { text?: string }) => {};
+    public successMessage = (obj: { text?: string }) => {};
+    public checkYesOrNot: (obj: { callback: (response: boolean) => void; text: string }) => void;
 
     constructor(glitter: Glitter) {
-
         this.dataLoading = (obj: { text?: string; visible: boolean }) => {
-            if(obj.visible){
-                glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'dataLoading', {type:'dataLoading',obj:obj})
-            }else{
-                glitter.closeDiaLog('dataLoading')
+            if (obj.visible) {
+                glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'dataLoading', { type: 'dataLoading', obj: obj });
+            } else {
+                glitter.closeDiaLog('dataLoading');
             }
         };
-        this.errorMessage = (obj: { text?: string; }) => {
-            glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'errorMessage', {type:'errorMessage',obj:obj})
-        };
-        this.successMessage = (obj: { text?: string; }) => {
-            glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'successMessage', {type:'successMessage',obj:obj})
+        this.errorMessage = (obj: { text?: string }) => {
+            glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'errorMessage', { type: 'errorMessage', obj: obj });
         };
-        this.policy = () => {
-            glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'policy', {type:'policy'})
+        this.successMessage = (obj: { text?: string }) => {
+            glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'successMessage', { type: 'successMessage', obj: obj });
         };
-        this.checkYesOrNot = (obj:{text:string,callback:(response:boolean)=>void})=>{
+        this.checkYesOrNot = (obj: { text: string; callback: (response: boolean) => void }) => {
             glitter.openDiaLog('glitterBundle/dialog/dialog.js', 'checkYesOrNot', {
-                type: 'checkYesOrNot', callback: (response: boolean) => {
-                    glitter.closeDiaLog('checkYesOrNot')
-                    obj.callback(response)
-                },title:obj.text
-            })
-        }
-
+                type: 'checkYesOrNot',
+                callback: (response: boolean) => {
+                    glitter.closeDiaLog('checkYesOrNot');
+                    obj.callback(response);
+                },
+                title: obj.text,
+            });
+        };
     }
-}
+}

package/lowcode/Entry.js

@@ -89,7 +89,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_17.5.6';
+        glitter.share.editerVersion = 'V_17.5.7';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -90,7 +90,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_17.5.6';
+        glitter.share.editerVersion = 'V_17.5.7';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

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

@@ -1610,7 +1610,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                                     vm.originalData.map((dd, index) => {
                                         const checkboxParent = gvc.glitter.document.querySelector(`[gvc-checkbox="checkbox${index}"]`);
                                         if (checkboxParent) {
-                                            const checkboxIcon = checkboxParent.querySelector(result ? 'i.fa-regular.fa-square' : 'i.fa-solid.fa-square-check ');
+                                            const checkboxIcon = checkboxParent.querySelector(result ? 'i.fa-square' : 'i.fa-square-check');
                                             if (checkboxIcon) {
                                                 checkboxIcon.click();
                                             }
@@ -1792,6 +1792,9 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                                                                                 class="${ids.textClass} ${tdClass} tb_v3 tx_normal"
                                                                                 style="${style}"
                                                                                 ${obj.filter.length !== 0 && tdIndex === 0 ? `gvc-checkbox="checkbox${trIndex}"` : ''}
+                                                                                onclick="${d3.key.includes('data-click="false"') ? gvc.event((e, event) => {
+                                    event.stopPropagation();
+                                }) : ''}"
                                                                         >
                                                                             <div class="text-nowrap"
                                                                                  style="color: #393939 !important;">
@@ -2010,13 +2013,13 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                             >
                                 <input
                                         class="form-check-input ${randomString} cursor_pointer"
-                                        style="margin-top: 0.35rem;"
+                                        style="margin-top: 0.35rem; margin-right: 0.5rem;"
                                         type="${obj && obj.single ? 'radio' : 'checkbox'}"
                                         id="${id}_${item.key}"
                                         ${def.includes(item.key) ? 'checked' : ''}
                                 />
                                 <label class="form-check-label cursor_pointer" for="${id}_${item.key}"
-                                       style="font-size: 16px; color: #393939;">${item.name}</label>
+                                       style="font-size: 16px; color: #393939; margin-top: 0.125rem;">${item.name}</label>
                             </div>
                             ${def.includes(item.key) && item.innerHtml
                         ? html `
@@ -2190,7 +2193,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
             height: 40px !important;
             border-radius: 10px;
             background: linear-gradient(0deg, #f7f7f7 0%, #f7f7f7 100%), #fff;
-            padding: 0 22px;
+            padding: 0 20px;
             ${document.body.clientWidth > 768 ? `width: 100%;` : `width: calc(100vw - 24px); `}
         `;
         return html `
@@ -3032,7 +3035,6 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                 const id = Tool.randomString(7);
                 opt.key = `${opt.key}`;
                 function call() {
-                    console.log(1);
                     if (obj.default.includes(opt.key)) {
                         obj.default = obj.default.filter((item) => item !== opt.key);
                     }
@@ -3205,7 +3207,6 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                 const id = Tool.randomString(7);
                 opt.key = `${opt.key}`;
                 function call() {
-                    console.log(2);
                     if (obj.default.includes(opt.key)) {
                         obj.default = obj.default.filter((item) => item !== opt.key);
                     }
@@ -3765,8 +3766,8 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
         const className = Tool.randomString(6);
         gvc.addStyle(`
             .${className} {
-                min-width: 1rem;
-                min-height: 1rem;
+                min-width: 1.25rem;
+                min-height: 1.25rem;
             }
             .${className}:checked[type='checkbox'] {
                 border: 2px solid ${color !== null && color !== void 0 ? color : '#000'};
@@ -3781,8 +3782,8 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
         const className = `dark_dot`;
         gvc.addStyle(`
             .${className} {
-                min-width: 1rem;
-                min-height: 1rem;
+                min-width: 1.15rem;
+                min-height: 1.15rem;
                 margin-right: 4px;
             }
             .${className}:checked[type='radio'] {
@@ -3798,8 +3799,8 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
         const className = Tool.randomString(6);
         gvc.addStyle(`
             .${className} {
-                min-width: 1rem;
-                min-height: 1rem;
+                min-width: 1.15rem;
+                min-height: 1.15rem;
                 margin-right: 4px;
             }
             .${className}:checked[type='radio'] {

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

@@ -1916,7 +1916,7 @@ ${obj.default ?? ''}</textarea
                                     vm.originalData.map((dd: any, index: number) => {
                                         const checkboxParent = gvc.glitter.document.querySelector(`[gvc-checkbox="checkbox${index}"]`);
                                         if (checkboxParent) {
-                                            const checkboxIcon = checkboxParent.querySelector(result ? 'i.fa-regular.fa-square' : 'i.fa-solid.fa-square-check ') as any;
+                                            const checkboxIcon = checkboxParent.querySelector(result ? 'i.fa-square' : 'i.fa-square-check') as any;
                                             if (checkboxIcon) {
                                                 checkboxIcon.click();
                                             }
@@ -2107,12 +2107,16 @@ ${obj.default ?? ''}</textarea
                                                                 ${dd.length > 1 && tdIndex === 0 ? 'border-radius: 10px 0 0 10px;' : ''}
                                                                 ${dd.length > 1 && tdIndex === dd.length - 1 ? 'border-radius: 0 10px 10px 0;' : ''}
                                                                 ${dd.length === 1 ? 'border-radius: 10px;' : ''}`
-                                                                 
                                                                     return html`
                                                                         <td
                                                                                 class="${ids.textClass} ${tdClass} tb_v3 tx_normal"
                                                                                 style="${style}"
                                                                                 ${obj.filter.length !== 0 && tdIndex === 0 ? `gvc-checkbox="checkbox${trIndex}"` : ''}
+                                                                                onclick="${
+                                                                                    d3.key.includes('data-click="false"') ? gvc.event((e, event) => {
+                                                                                        event.stopPropagation();
+                                                                                    }) : ''
+                                                                                }"
                                                                         >
                                                                             <div class="text-nowrap"
                                                                                  style="color: #393939 !important;">
@@ -2402,13 +2406,13 @@ ${obj.default ?? ''}</textarea
                             >
                                 <input
                                         class="form-check-input ${randomString} cursor_pointer"
-                                        style="margin-top: 0.35rem;"
+                                        style="margin-top: 0.35rem; margin-right: 0.5rem;"
                                         type="${obj && obj.single ? 'radio' : 'checkbox'}"
                                         id="${id}_${item.key}"
                                         ${def.includes(item.key) ? 'checked' : ''}
                                 />
                                 <label class="form-check-label cursor_pointer" for="${id}_${item.key}"
-                                       style="font-size: 16px; color: #393939;">${item.name}</label>
+                                       style="font-size: 16px; color: #393939; margin-top: 0.125rem;">${item.name}</label>
                             </div>
                             ${def.includes(item.key) && item.innerHtml
                                     ? html`
@@ -2609,7 +2613,7 @@ ${obj.default ?? ''}</textarea
             height: 40px !important;
             border-radius: 10px;
             background: linear-gradient(0deg, #f7f7f7 0%, #f7f7f7 100%), #fff;
-            padding: 0 22px;
+            padding: 0 20px;
             ${document.body.clientWidth > 768 ? `width: 100%;` : `width: calc(100vw - 24px); `}
         `;
         return html`
@@ -3555,7 +3559,6 @@ ${obj.default ?? ''}</textarea
                 opt.key = `${opt.key}`;
 
                 function call() {
-                    console.log(1);
                     if (obj.default.includes(opt.key)) {
                         obj.default = obj.default.filter((item) => item !== opt.key);
                     } else {
@@ -3762,7 +3765,6 @@ ${obj.default ?? ''}</textarea
                 opt.key = `${opt.key}`;
 
                 function call() {
-                    console.log(2);
                     if (obj.default.includes(opt.key)) {
                         obj.default = obj.default.filter((item) => item !== opt.key);
                     } else {
@@ -4432,8 +4434,8 @@ ${obj.default ?? ''}</textarea
         const className = Tool.randomString(6);
         gvc.addStyle(`
             .${className} {
-                min-width: 1rem;
-                min-height: 1rem;
+                min-width: 1.25rem;
+                min-height: 1.25rem;
             }
             .${className}:checked[type='checkbox'] {
                 border: 2px solid ${color ?? '#000'};
@@ -4449,8 +4451,8 @@ ${obj.default ?? ''}</textarea
         const className = `dark_dot`;
         gvc.addStyle(`
             .${className} {
-                min-width: 1rem;
-                min-height: 1rem;
+                min-width: 1.15rem;
+                min-height: 1.15rem;
                 margin-right: 4px;
             }
             .${className}:checked[type='radio'] {
@@ -4467,8 +4469,8 @@ ${obj.default ?? ''}</textarea
         const className = Tool.randomString(6);
         gvc.addStyle(`
             .${className} {
-                min-width: 1rem;
-                min-height: 1rem;
+                min-width: 1.15rem;
+                min-height: 1.15rem;
                 margin-right: 4px;
             }
             .${className}:checked[type='radio'] {

package/lowcode/cms-plugin/module/data.d.ts

@@ -0,0 +1,109 @@
+interface OrderData {
+    distribution_info?: {
+        code: string;
+        condition: number;
+        link: string;
+        recommend_medium: any;
+        recommend_status: string;
+        recommend_user: any;
+        redirect: string;
+        relative: string;
+        relative_data: any;
+        share_type: string;
+        share_value: number;
+        startDate: string;
+        startTime: string;
+        status: boolean;
+        title: string;
+        voucher: number;
+        voucher_status: string;
+    };
+    archived: 'true' | 'false';
+    customer_info: any;
+    editRecord: any;
+    method: string;
+    shipment_selector: {
+        name: string;
+        value: string;
+        form: any;
+    }[];
+    orderStatus: string;
+    use_wallet: number;
+    email: string;
+    total: number;
+    discount: number;
+    expectDate: string;
+    shipment_fee: number;
+    use_rebate: number;
+    lineItems: {
+        id: number;
+        spec: string[];
+        count: string;
+        sale_price: number;
+        title: string;
+        sku: string;
+    }[];
+    user_info: {
+        name: string;
+        email: string;
+        phone: string;
+        address: string;
+        custom_form_delivery?: any;
+        shipment: 'normal' | 'FAMIC2C' | 'UNIMARTC2C' | 'HILIFEC2C' | 'OKMARTC2C' | 'now' | 'shop' | 'global_express' | 'black_cat';
+        CVSStoreName: string;
+        CVSStoreID: string;
+        CVSTelephone: string;
+        MerchantTradeNo: string;
+        CVSAddress: string;
+        note?: string;
+        code_note?: string;
+    };
+    custom_receipt_form?: any;
+    custom_form_format?: any;
+    custom_form_data?: any;
+    proof_purchase: any;
+    progress: string;
+    // progress: 'finish' | 'wait' | 'shipping' | "returns";
+    order_note: string;
+    voucherList: [
+        {
+            title: string;
+            method: 'percent' | 'fixed';
+            trigger: 'auto' | 'code';
+            value: string;
+            for: 'collection' | 'product';
+            rule: 'min_price' | 'min_count';
+            forKey: string[];
+            ruleValue: number;
+            startDate: string;
+            startTime: string;
+            endDate?: string;
+            endTime?: string;
+            status: 0 | 1 | -1;
+            type: 'voucher';
+            code?: string;
+            overlay: boolean;
+            bind?: {
+                id: string;
+                spec: string[];
+                count: number;
+                sale_price: number;
+                collection: string[];
+                discount_price: number;
+            }[];
+            start_ISO_Date: string;
+            end_ISO_Date: string;
+        },
+    ];
+    orderSource?: string;
+    deliveryData: Record<string, string>;
+}
+
+interface CartData {
+    id: number;
+    cart_token: string;
+    status: number;
+    email: string;
+    orderData: OrderData;
+    created_time: string;
+}

package/lowcode/cms-plugin/module/delivery-html.ts

@@ -5,116 +5,6 @@ import { ApiUser } from '../../glitter-base/route/user.js';
 
 const html = String.raw;
 
-interface OrderData {
-    distribution_info?: {
-        code: string;
-        condition: number;
-        link: string;
-        recommend_medium: any;
-        recommend_status: string;
-        recommend_user: any;
-        redirect: string;
-        relative: string;
-        relative_data: any;
-        share_type: string;
-        share_value: number;
-        startDate: string;
-        startTime: string;
-        status: boolean;
-        title: string;
-        voucher: number;
-        voucher_status: string;
-    };
-    archived: 'true' | 'false';
-    customer_info: any;
-    editRecord: any;
-    method: string;
-    shipment_selector: {
-        name: string;
-        value: string;
-        form: any;
-    }[];
-    orderStatus: string;
-    use_wallet: number;
-    email: string;
-    total: number;
-    discount: number;
-    expectDate: string;
-    shipment_fee: number;
-    use_rebate: number;
-    lineItems: {
-        id: number;
-        spec: string[];
-        count: string;
-        sale_price: number;
-        title: string;
-        sku: string;
-    }[];
-    user_info: {
-        name: string;
-        email: string;
-        phone: string;
-        address: string;
-        custom_form_delivery?: any;
-        shipment: 'normal' | 'FAMIC2C' | 'UNIMARTC2C' | 'HILIFEC2C' | 'OKMARTC2C' | 'now' | 'shop' | 'global_express';
-        CVSStoreName: string;
-        CVSStoreID: string;
-        CVSTelephone: string;
-        MerchantTradeNo: string;
-        CVSAddress: string;
-        note?: string;
-        code_note?: string;
-    };
-    custom_receipt_form?: any;
-    custom_form_format?: any;
-    custom_form_data?: any;
-    proof_purchase: any;
-    progress: string;
-    // progress: 'finish' | 'wait' | 'shipping' | "returns";
-    order_note: string;
-    voucherList: [
-        {
-            title: string;
-            method: 'percent' | 'fixed';
-            trigger: 'auto' | 'code';
-            value: string;
-            for: 'collection' | 'product';
-            rule: 'min_price' | 'min_count';
-            forKey: string[];
-            ruleValue: number;
-            startDate: string;
-            startTime: string;
-            endDate?: string;
-            endTime?: string;
-            status: 0 | 1 | -1;
-            type: 'voucher';
-            code?: string;
-            overlay: boolean;
-            bind?: {
-                id: string;
-                spec: string[];
-                count: number;
-                sale_price: number;
-                collection: string[];
-                discount_price: number;
-            }[];
-            start_ISO_Date: string;
-            end_ISO_Date: string;
-        }
-    ];
-    orderSource?: string;
-    deliveryData: Record<string, string>;
-}
-
-interface CartData {
-    id: number;
-    cart_token: string;
-    status: number;
-    email: string;
-    orderData: OrderData;
-    created_time: string;
-}
-
 export class DeliveryHTML {
     static print(ogvc: GVC, dataArray: CartData[], type: 'shipment' | 'pick') {
         const prefix = Tool.randomString(5);