ts-glitter 13.4.8 → 13.5.0

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

@@ -88,7 +88,7 @@ export class BgRecommend {
                     if (vm.type === 'list') {
                         return BgWidget.container(
                             html`
-                                <div class="d-flex w-100 align-items-center">
+                                <div class="title-container">
                                     ${BgWidget.title('分銷連結')}
                                     <div class="flex-fill"></div>
                                     ${BgWidget.darkButton(
@@ -111,8 +111,7 @@ export class BgRecommend {
                                         })
                                     )
                                 )}
-                            `,
-                            BgWidget.getContainerWidth()
+                            `
                         );
                     } else if (vm.type === 'add') {
                         return this.editorLink({
@@ -394,7 +393,7 @@ export class BgRecommend {
                     if (vm.type === 'list') {
                         return BgWidget.container(
                             html`
-                                <div class="d-flex w-100 align-items-center">
+                                <div class="title-container">
                                     ${BgWidget.title('推薦人列表')}
                                     <div class="flex-fill"></div>
                                     ${BgWidget.darkButton(
@@ -532,8 +531,7 @@ export class BgRecommend {
                                         ].join('')
                                     )
                                 )}
-                            `,
-                            BgWidget.getContainerWidth()
+                            `
                         );
                     } else if (vm.type === 'add') {
                         return this.editorUser({
@@ -629,7 +627,7 @@ export class BgRecommend {
                     }
                     return BgWidget.container(
                         [
-                            html` <div class="d-flex w-100 align-items-center mb-3 ">
+                            html` <div class="title-container">
                                 ${BgWidget.goBack(
                                     gvc.event(() => {
                                         cf.callback();
@@ -638,9 +636,9 @@ export class BgRecommend {
                                 ${BgWidget.title(vm.data.title || '新增分銷連結')}
                                 <div class="flex-fill"></div>
                             </div>`,
-                            html`<div class="d-flex justify-content-center ${document.body.clientWidth < 768 ? 'flex-column' : ''}" style="gap: 24px">
-                                ${BgWidget.container(
-                                    gvc.bindView(() => {
+                            BgWidget.container1x2(
+                                {
+                                    html: gvc.bindView(() => {
                                         const id = glitter.getUUID();
                                         return {
                                             bind: id,
@@ -689,7 +687,9 @@ export class BgRecommend {
                                                                                 : 'flex-direction: column; gap: 0px; '}"
                                                                             class="w-100"
                                                                         >
-                                                                            <div style="padding: 9px 18px;background: #EAEAEA; justify-content: center; align-items: center; gap: 5px; display: flex">
+                                                                            <div
+                                                                                style="width:100%;padding: 9px 18px;background: #EAEAEA; justify-content: flex-start; align-items: center; gap: 5px; display: flex"
+                                                                            >
                                                                                 <div
                                                                                     style="text-align: right; color: #393939; font-size: 16px; font-family: Noto Sans; font-weight: 400; word-wrap: break-word"
                                                                                 >
@@ -1391,11 +1391,10 @@ export class BgRecommend {
                                             divCreate: { class: 'p-0' },
                                         };
                                     }),
-                                    undefined,
-                                    'padding: 0; margin: 0 !important; width: 65%;'
-                                )}
-                                ${BgWidget.container(
-                                    gvc.bindView(() => {
+                                    ratio: 65,
+                                },
+                                {
+                                    html: gvc.bindView(() => {
                                         return {
                                             bind: vm.noteId,
                                             dataList: [
@@ -1461,10 +1460,9 @@ export class BgRecommend {
                                             divCreate: { class: 'summary-card p-0' },
                                         };
                                     }),
-                                    undefined,
-                                    'padding: 0; margin: 0 !important; width: 35%;'
-                                )}
-                            </div>`,
+                                    ratio: 35,
+                                }
+                            ),
                             BgWidget.mbContainer(240),
                             html` <div class="update-bar-container">
                                 ${cf.data.id
@@ -1566,9 +1564,7 @@ export class BgRecommend {
                                     })
                                 )}
                             </div>`,
-                        ].join('<div class="my-2"></div>'),
-                        BgWidget.getContainerWidth(),
-                        'position: relative'
+                        ].join('<div class="my-2"></div>')
                     );
                 },
                 onCreate: () => {
@@ -1663,18 +1659,17 @@ export class BgRecommend {
                     if (vm.type === 'user') {
                         return BgWidget.container(
                             [
-                                html` <div class="d-flex flex-column mt-1">
-                                        <div class="d-flex w-100 align-items-center mb-2">
-                                            <div class="mt-1">
-                                                ${BgWidget.goBack(
-                                                    gvc.event(() => {
-                                                        cf.callback();
-                                                    })
-                                                )}
-                                            </div>
-                                            ${BgWidget.title(vm.data.name || '新增推薦人')}
+                                html` <div class="title-container">
+                                        <div class="mt-1">
+                                            ${BgWidget.goBack(
+                                                gvc.event(() => {
+                                                    cf.callback();
+                                                })
+                                            )}
+                                        </div>
+                                        <div>
+                                            ${BgWidget.title(vm.data.name || '新增推薦人')}${cf.data.id ? BgWidget.grayNote(`建立時間: ${Tool.convertDateTimeFormat(cf.data.created_time)}`) : ''}
                                         </div>
-                                        <div class="ms-3 mb-2">${cf.data.id ? BgWidget.grayNote(`建立時間: ${Tool.convertDateTimeFormat(cf.data.created_time)}`) : ''}</div>
                                     </div>
                                     <div class="flex-fill"></div>`,
                                 html`<div class="d-flex justify-content-center ${document.body.clientWidth < 768 ? 'flex-column' : ''}" style="gap: 24px">
@@ -1765,9 +1760,7 @@ export class BgRecommend {
                                                 },
                                                 divCreate: { class: 'p-0' },
                                             };
-                                        }),
-                                        BgWidget.getContainerWidth(),
-                                        'padding: 0; margin: 0 !important;'
+                                        })
                                     )}
                                 </div>`,
                                 BgWidget.mbContainer(240),
@@ -1847,9 +1840,7 @@ export class BgRecommend {
                                         })
                                     )}
                                 </div>`,
-                            ].join('<div class="my-2"></div>'),
-                            BgWidget.getContainerWidth(),
-                            'position: relative'
+                            ].join('<div class="my-2"></div>')
                         );
                     }
                     if (vm.type === 'link') {

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

@@ -7,26 +7,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { BgWidget } from "./bg-widget.js";
-import { PageEditor } from "../editor/page-editor.js";
-import { ApiPageConfig } from "../api/pageConfig.js";
-import { ShareDialog } from "../dialog/ShareDialog.js";
-import { StoreHelper } from "../helper/store-helper.js";
+import { BgWidget } from './bg-widget.js';
+import { PageEditor } from '../editor/page-editor.js';
+import { ApiPageConfig } from '../api/pageConfig.js';
+import { ShareDialog } from '../dialog/ShareDialog.js';
+import { StoreHelper } from '../helper/store-helper.js';
 const html = String.raw;
 export class BgSeo {
     static mainPage(gvc) {
         let selectTag = gvc.glitter.getUrlParameter('page');
         const leftID = gvc.glitter.getUUID();
         const rightID = gvc.glitter.getUUID();
-        let saveEvent = () => {
-        };
+        let saveEvent = () => { };
         return BgWidget.container(html `
             <div class="d-flex w-100 align-items-center pb-3 mb-2 border-bottom">
                 ${BgWidget.title(`SEO管理`)}
                 <div class="flex-fill"></div>
-                <button class="btn btn-primary-c" style="height:38px;font-size: 14px;" onclick="${gvc.event(() => {
+                <button
+                    class="btn btn-primary-c"
+                    style="height:38px;font-size: 14px;"
+                    onclick="${gvc.event(() => {
             saveEvent();
-        })}">儲存SEO設定
+        })}"
+                >
+                    儲存SEO設定
                 </button>
             </div>
             <div class="d-flex" style="gap:10px;">
@@ -42,15 +46,16 @@ export class BgSeo {
                         }, {
                             checkSelect: (data) => {
                                 return data.tag === selectTag;
-                            }
+                            },
                         }).then((data) => {
                             resolve(data.left);
                         });
                     });
                 },
                 divCreate: {
-                    class: `mx-n3 my-n2`, style: `max-height:calc(100vh - 200px);overflow-y:auto;`
-                }
+                    class: `mx-n3 my-n2`,
+                    style: `max-height:calc(100vh - 200px);overflow-y:auto;`,
+                },
             };
         }))}
                 </div>
@@ -64,7 +69,7 @@ export class BgSeo {
                         dialog.dataLoading({ visible: true });
                         const selectItem = (yield ApiPageConfig.getPage({
                             appName: window.appName,
-                            tag: selectTag
+                            tag: selectTag,
                         })).response.result[0];
                         dialog.dataLoading({ visible: false });
                         saveEvent = () => __awaiter(this, void 0, void 0, function* () {
@@ -76,7 +81,7 @@ export class BgSeo {
                                 name: selectItem.name,
                                 config: selectItem.config,
                                 group: selectItem.group,
-                                page_config: selectItem.page_config
+                                page_config: selectItem.page_config,
                             });
                             const viewModel = gvc.glitter.share.editorViewModel;
                             viewModel.appConfig.homePage = viewModel.homePage;
@@ -106,23 +111,23 @@ export class BgSeo {
                                 },
                                 get dataList() {
                                     return gvc.glitter.share.editorViewModel.dataList;
-                                }
+                                },
                             },
                             style: {
                                 style: `width:100%;`,
-                                class: ``
+                                class: ``,
                             },
-                            hiddenDelete: true
+                            hiddenDelete: true,
                         }));
                     }));
                 },
                 divCreate: {
-                    style: `max-height:calc(100vh - 200px);overflow-y:auto;`
-                }
+                    style: `max-height:calc(100vh - 200px);overflow-y:auto;`,
+                },
             };
         }), 'p-0 bg-white border rounded-3 shadow')}
                 </div>
             </div>
-        `, 1000);
+        `);
     }
 }

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

@@ -1,123 +1,139 @@
-import {BgWidget} from "./bg-widget.js";
-import {GVC} from "../glitterBundle/GVController.js";
-import {PageEditor} from "../editor/page-editor.js";
-import {ApiPageConfig} from "../api/pageConfig.js";
-import {ShareDialog} from "../dialog/ShareDialog.js";
-import {StoreHelper} from "../helper/store-helper.js";
+import { BgWidget } from './bg-widget.js';
+import { GVC } from '../glitterBundle/GVController.js';
+import { PageEditor } from '../editor/page-editor.js';
+import { ApiPageConfig } from '../api/pageConfig.js';
+import { ShareDialog } from '../dialog/ShareDialog.js';
+import { StoreHelper } from '../helper/store-helper.js';
 
-
-const html = String.raw
+const html = String.raw;
 
 export class BgSeo {
     public static mainPage(gvc: GVC) {
-        let selectTag = gvc.glitter.getUrlParameter('page')
-        const leftID = gvc.glitter.getUUID()
-        const rightID = gvc.glitter.getUUID()
-        let saveEvent = () => {
-
-        }
+        let selectTag = gvc.glitter.getUrlParameter('page');
+        const leftID = gvc.glitter.getUUID();
+        const rightID = gvc.glitter.getUUID();
+        let saveEvent = () => {};
         return BgWidget.container(html`
             <div class="d-flex w-100 align-items-center pb-3 mb-2 border-bottom">
                 ${BgWidget.title(`SEO管理`)}
                 <div class="flex-fill"></div>
-                <button class="btn btn-primary-c" style="height:38px;font-size: 14px;" onclick="${gvc.event(() => {
-                    saveEvent()
-                })}">儲存SEO設定
+                <button
+                    class="btn btn-primary-c"
+                    style="height:38px;font-size: 14px;"
+                    onclick="${gvc.event(() => {
+                        saveEvent();
+                    })}"
+                >
+                    儲存SEO設定
                 </button>
             </div>
             <div class="d-flex" style="gap:10px;">
                 <div style="width:300px;" class="">
-                    ${BgWidget.card(gvc.bindView(() => {
-                        return {
-                            bind: leftID,
-                            view: () => {
-                                return new Promise((resolve, reject) => {
-                                    PageEditor.pageSelctor(gvc, (d3: any) => {
-                                        selectTag = d3.tag;
-                                        gvc.notifyDataChange([leftID, rightID])
-                                    }, {
-                                        checkSelect: (data: any) => {
-                                            return data.tag === selectTag
-                                        }
-                                    }).then((data) => {
-                                        resolve(data.left)
-                                    })
-                                })
-                            },
-                            divCreate: {
-                                class: `mx-n3 my-n2`, style: `max-height:calc(100vh - 200px);overflow-y:auto;`
-                            }
-                        }
-                    }))}
+                    ${BgWidget.card(
+                        gvc.bindView(() => {
+                            return {
+                                bind: leftID,
+                                view: () => {
+                                    return new Promise((resolve, reject) => {
+                                        PageEditor.pageSelctor(
+                                            gvc,
+                                            (d3: any) => {
+                                                selectTag = d3.tag;
+                                                gvc.notifyDataChange([leftID, rightID]);
+                                            },
+                                            {
+                                                checkSelect: (data: any) => {
+                                                    return data.tag === selectTag;
+                                                },
+                                            }
+                                        ).then((data) => {
+                                            resolve(data.left);
+                                        });
+                                    });
+                                },
+                                divCreate: {
+                                    class: `mx-n3 my-n2`,
+                                    style: `max-height:calc(100vh - 200px);overflow-y:auto;`,
+                                },
+                            };
+                        })
+                    )}
                 </div>
                 <div class="flex-fill">
-                    ${BgWidget.card(gvc.bindView(() => {
-                        return {
-                            bind: rightID,
-                            view: () => {
-                                return new Promise(async (resolve, reject) => {
-                                    const dialog = new ShareDialog(gvc.glitter)
-                                    dialog.dataLoading({visible: true})
-                                    const selectItem = (await ApiPageConfig.getPage({
-                                        appName:(window as any).appName,
-                                        tag:selectTag
-                                    } )).response.result[0]
-                                    dialog.dataLoading({visible: false})
-                                    saveEvent = async () => {
-                                        dialog.dataLoading({visible: true})
-                                        const savePage = await ApiPageConfig.setPage({
-                                            id: selectItem.id,
-                                            appName: (window as any).appName,
-                                            tag: selectItem.tag,
-                                            name: selectItem.name,
-                                            config: selectItem.config,
-                                            group: selectItem.group,
-                                            page_config: selectItem.page_config
-                                        })
-                                        const viewModel = gvc.glitter.share.editorViewModel
-                                        viewModel.appConfig.homePage = viewModel.homePage
-                                        viewModel.appConfig.globalStyle = viewModel.globalStyle
-                                        viewModel.appConfig.globalScript = viewModel.globalScript
-                                        viewModel.appConfig.globalValue = viewModel.globalValue
-                                        viewModel.appConfig.globalStyleTag = viewModel.globalStyleTag
-                                        const savePlugin = await StoreHelper.setPlugin(viewModel.originalConfig, viewModel.appConfig)
-                                        dialog.dataLoading({visible: false})
-                                        if (savePage.result && savePlugin) {
-                                            dialog.successMessage({text: '儲存成功'})
-                                        } else {
-                                            dialog.errorMessage({text: '發生異常'})
-                                        }
-                                        if (gvc.glitter.getUrlParameter('page') === selectTag) {
-                                            gvc.glitter.share.reloadEditor()
-                                        }
-                                    }
-                                    resolve(PageEditor.pageEditorView({
-                                        gvc: gvc,
-                                        id: gvc.glitter.getUUID(),
-                                        vid: '',
-                                        viewModel: {
-                                            get selectItem() {
-                                                return selectItem
-                                            },
-                                            get dataList() {
-                                                return gvc.glitter.share.editorViewModel.dataList
+                    ${BgWidget.card(
+                        gvc.bindView(() => {
+                            return {
+                                bind: rightID,
+                                view: () => {
+                                    return new Promise(async (resolve, reject) => {
+                                        const dialog = new ShareDialog(gvc.glitter);
+                                        dialog.dataLoading({ visible: true });
+                                        const selectItem = (
+                                            await ApiPageConfig.getPage({
+                                                appName: (window as any).appName,
+                                                tag: selectTag,
+                                            })
+                                        ).response.result[0];
+                                        dialog.dataLoading({ visible: false });
+                                        saveEvent = async () => {
+                                            dialog.dataLoading({ visible: true });
+                                            const savePage = await ApiPageConfig.setPage({
+                                                id: selectItem.id,
+                                                appName: (window as any).appName,
+                                                tag: selectItem.tag,
+                                                name: selectItem.name,
+                                                config: selectItem.config,
+                                                group: selectItem.group,
+                                                page_config: selectItem.page_config,
+                                            });
+                                            const viewModel = gvc.glitter.share.editorViewModel;
+                                            viewModel.appConfig.homePage = viewModel.homePage;
+                                            viewModel.appConfig.globalStyle = viewModel.globalStyle;
+                                            viewModel.appConfig.globalScript = viewModel.globalScript;
+                                            viewModel.appConfig.globalValue = viewModel.globalValue;
+                                            viewModel.appConfig.globalStyleTag = viewModel.globalStyleTag;
+                                            const savePlugin = await StoreHelper.setPlugin(viewModel.originalConfig, viewModel.appConfig);
+                                            dialog.dataLoading({ visible: false });
+                                            if (savePage.result && savePlugin) {
+                                                dialog.successMessage({ text: '儲存成功' });
+                                            } else {
+                                                dialog.errorMessage({ text: '發生異常' });
+                                            }
+                                            if (gvc.glitter.getUrlParameter('page') === selectTag) {
+                                                gvc.glitter.share.reloadEditor();
                                             }
-                                        },
-                                        style: {
-                                            style: `width:100%;`,
-                                            class: ``
-                                        },
-                                        hiddenDelete: true
-                                    }))
-                                })
-                            },
-                            divCreate: {
-                                style: `max-height:calc(100vh - 200px);overflow-y:auto;`
-                            }
-                        }
-                    }), 'p-0 bg-white border rounded-3 shadow')}
+                                        };
+                                        resolve(
+                                            PageEditor.pageEditorView({
+                                                gvc: gvc,
+                                                id: gvc.glitter.getUUID(),
+                                                vid: '',
+                                                viewModel: {
+                                                    get selectItem() {
+                                                        return selectItem;
+                                                    },
+                                                    get dataList() {
+                                                        return gvc.glitter.share.editorViewModel.dataList;
+                                                    },
+                                                },
+                                                style: {
+                                                    style: `width:100%;`,
+                                                    class: ``,
+                                                },
+                                                hiddenDelete: true,
+                                            })
+                                        );
+                                    });
+                                },
+                                divCreate: {
+                                    style: `max-height:calc(100vh - 200px);overflow-y:auto;`,
+                                },
+                            };
+                        }),
+                        'p-0 bg-white border rounded-3 shadow'
+                    )}
                 </div>
             </div>
-        `, 1000)
+        `);
     }
-}
+}

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

@@ -283,7 +283,7 @@ export class BgShopping {
                         };
                         return BgWidget.container(html `
                                 <div class="d-flex">
-                                    ${BgWidget.container(html `<div class="d-flex w-100 align-items-center mb-3 ">
+                                    ${BgWidget.container(html `<div class="title-container">
                                                 ${BgWidget.goBack(gvc.event(() => {
                             vm.type = 'list';
                         }))}
@@ -649,9 +649,9 @@ export class BgShopping {
                                                         </div>
                                                     `)}
                                                 </div>
-                                            </div> `, 1200)}
+                                            </div> `)}
                                 </div>
-                            `, 1200);
+                            `);
                     }
                     else {
                         return ``;
@@ -882,7 +882,7 @@ export class BgShopping {
                         }
                         `);
         return BgWidget.container(html `
-                <div class="d-flex w-100 align-items-center mb-3 ">
+                <div class="title-container">
                     ${BgWidget.goBack(gvc.event(() => {
             vm.type = 'list';
         }))}
@@ -1499,7 +1499,7 @@ ${EditorElem.editeInput({
                           </div>
                       `
             : ``}
-            `, 700);
+            `);
     }
     static productManager(gvc) {
         const glitter = gvc.glitter;
@@ -1822,7 +1822,7 @@ ${EditorElem.editeInput({
                 },
                 divCreate: {},
             };
-        }), 800)}`;
+        }))}`;
     }
     static showListManager(obj) {
         let array = [];
@@ -2036,7 +2036,7 @@ ${EditorElem.editeInput({
                 },
                 divCreate: {},
             };
-        }), 800)}`;
+        }))}`;
     }
     static editProduct(obj) {
         let postMD = {
@@ -2060,7 +2060,7 @@ ${EditorElem.editeInput({
         const gvc = obj.gvc;
         const seoID = gvc.glitter.getUUID();
         return html ` <div class="d-flex">
-            ${BgWidget.container(html `<div class="d-flex w-100 align-items-center mb-3 ">
+            ${BgWidget.container(html `<div class="title-container">
                         ${BgWidget.goBack(obj.gvc.event(() => {
             obj.vm.status = 'list';
         }))}
@@ -2596,7 +2596,7 @@ ${EditorElem.editeInput({
                                 return url.href;
                             })();
                             return BgWidget.greenNote(href, gvc.event(() => {
-                                window.parent.open(href, '_blank');
+                                gvc.glitter.openNewTab(href);
                             }));
                         })(),
                         html `<div class="fs-sm fw-500" style="color:#545454;white-space: normal;">${postMD.seo.content || '尚未設定'}</div>`,
@@ -2807,7 +2807,7 @@ ${EditorElem.editeInput({
                             </div>
                         </div>
                         <div></div>
-                    </div> `, 1100)}
+                    </div> `)}
         </div>`;
     }
     static postEvent(postMD, gvc, vm) {
@@ -3008,7 +3008,7 @@ ${EditorElem.editeInput({
                 divCreate: { class: `d-flex flex-column flex-column-reverse  flex-md-row`, style: `gap:10px;` },
             };
         })}
-            `, undefined, 'width:calc(100% - 56px);');
+            `);
     }
     static invoice_setting(gvc) {
         const saasConfig = window.saasConfig;
@@ -3155,7 +3155,7 @@ ${EditorElem.editeInput({
                             })(),
                         ]);
                     })()}`)}
-                        `, 900);
+                        `);
                 },
                 divCreate: {
                     class: `d-flex justify-content-center w-100 flex-column align-items-center `,
@@ -3257,7 +3257,7 @@ ${EditorElem.editeInput({
                             };
                         });
                     })()}`)}
-                        `, 900);
+                        `);
                 },
                 divCreate: {
                     class: `d-flex justify-content-center w-100 flex-column align-items-center `,
@@ -3342,7 +3342,7 @@ ${EditorElem.editeInput({
                 divCreate: { class: `d-flex flex-column flex-column-reverse  flex-md-row`, style: `gap:10px;` },
             };
         })}
-            `, 900);
+            `);
     }
 }
 window.glitter.setModule(import.meta.url, BgShopping);