ts-glitter 13.8.56 → 13.8.58

package/lowcode/Entry.js

@@ -64,7 +64,7 @@ export class Entry {
         }
         window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_13.8.56';
+        glitter.share.editerVersion = 'V_13.8.58';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -64,7 +64,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_13.8.56';
+        glitter.share.editerVersion = 'V_13.8.58';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

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

@@ -769,15 +769,18 @@ function detail(gvc, cf, vm, cVm, page_tab) {
                                                                         return [dd.product_id].concat(dd.variant.spec).join('-');
                                                                     }),
                                                                     callback: (value) => __awaiter(this, void 0, void 0, function* () {
-                                                                        vm.data.content.relative_data = value.map((dd) => {
+                                                                        var _a;
+                                                                        vm.data.content.relative_data = (_a = vm.data.content.relative_data) !== null && _a !== void 0 ? _a : [];
+                                                                        vm.data.content.relative_data = vm.data.content.relative_data.concat(value.map((dd) => {
                                                                             return {
-                                                                                variant: dd.variant_content,
+                                                                                variant: dd.variant,
                                                                                 product_id: dd.product_id,
                                                                             };
-                                                                        });
+                                                                        }));
                                                                         subVM.loading = true;
                                                                         gvc.notifyDataChange(subVM.id);
                                                                     }),
+                                                                    show_mode: 'all'
                                                                 });
                                                             }), { textStyle: 'font-weight: 400;' })}
                                                                                 </div>

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

@@ -837,15 +837,17 @@ function detail(gvc: GVC, cf: any, vm: any, cVm: any, page_tab: 'page' | 'hidden
                                                                                                     return [dd.product_id].concat(dd.variant.spec).join('-');
                                                                                                 }),
                                                                                                 callback: async (value) => {
-                                                                                                    vm.data.content.relative_data = value.map((dd: any) => {
+                                                                                                    vm.data.content.relative_data=  vm.data.content.relative_data ?? []
+                                                                                                    vm.data.content.relative_data = vm.data.content.relative_data.concat(value.map((dd: any) => {
                                                                                                         return {
-                                                                                                            variant: dd.variant_content,
+                                                                                                            variant: dd.variant,
                                                                                                             product_id: dd.product_id,
                                                                                                         };
-                                                                                                    });
+                                                                                                    }));
                                                                                                     subVM.loading = true;
                                                                                                     gvc.notifyDataChange(subVM.id);
                                                                                                 },
+                                                                                                show_mode:'all'
                                                                                             });
                                                                                         }),
                                                                                         { textStyle: 'font-weight: 400;' }

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

@@ -1204,195 +1204,198 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
             return {
                 bind: ids.container,
                 view: () => {
-                    if (vm.loading) {
-                        return html `
+                    try {
+                        if (vm.loading) {
+                            return html `
                             <div style="text-align: center; padding: 24px; font-size: 24px; font-weight: 700;">資料載入中
                                 ....
                             </div>`;
-                    }
-                    if (vm.tableData.length === 0) {
-                        return html `
+                        }
+                        if (vm.tableData.length === 0) {
+                            return html `
                             <div style="text-align: center; padding: 24px; font-size: 24px; font-weight: 700;">
                                 暫無資料
                             </div>`;
-                    }
-                    function checkAllBox(changeView) {
-                        return EditorElem.checkBoxOnly({
-                            gvc: gvc,
-                            def: vm.originalData.every((item) => item.checked),
-                            callback: (result) => {
-                                vm.originalData.map((dd, index) => {
-                                    const checkboxParent = document.querySelector(`[gvc-checkbox="checkbox${index}"]`);
-                                    if (checkboxParent) {
-                                        const checkboxIcon = checkboxParent.querySelector(result ? 'i.fa-regular.fa-square' : 'i.fa-solid.fa-square-check ');
-                                        if (checkboxIcon) {
-                                            checkboxIcon.click();
+                        }
+                        function checkAllBox(changeView) {
+                            return EditorElem.checkBoxOnly({
+                                gvc: gvc,
+                                def: vm.originalData.every((item) => item.checked),
+                                callback: (result) => {
+                                    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 ');
+                                            if (checkboxIcon) {
+                                                checkboxIcon.click();
+                                            }
                                         }
-                                    }
-                                });
-                                gvc.notifyDataChange(ids.filter);
-                                changeHeaderStyle();
-                            },
-                            stopChangeView: changeView,
-                        });
-                    }
-                    function changeHeaderStyle() {
-                        const target = document.querySelector(`[gvc-id="${gvc.id(ids.header)}"]`);
-                        if (target) {
-                            if (vm.originalData.find((dd) => dd.checked)) {
-                                target.style.position = 'sticky';
-                                target.style.top = '0';
-                                target.style.left = '0';
-                            }
-                            else {
-                                target.style.position = 'relative';
-                                target.style.top = '';
-                                target.style.left = '';
-                            }
+                                    });
+                                    gvc.notifyDataChange(ids.filter);
+                                    obj.item_select && obj.item_select();
+                                    changeHeaderStyle();
+                                },
+                                stopChangeView: changeView,
+                            });
                         }
-                    }
-                    if (!created.checkbox) {
-                        vm.tableData = vm.tableData.map((item, index) => {
-                            if (obj.filter.length > 0) {
-                                return [
-                                    {
-                                        key: checkAllBox(true),
-                                        value: EditorElem.checkBoxOnly({
-                                            gvc: gvc,
-                                            def: false,
-                                            callback: (result) => {
-                                                vm.originalData[index].checked = result;
-                                                gvc.notifyDataChange(ids.filter);
-                                                changeHeaderStyle();
-                                            },
-                                        }),
-                                    },
-                                    ...item,
-                                ];
+                        function changeHeaderStyle() {
+                            const target = document.querySelector(`[gvc-id="${gvc.id(ids.header)}"]`);
+                            if (target) {
+                                if (vm.originalData.find((dd) => dd.checked)) {
+                                    target.style.position = 'sticky';
+                                    target.style.top = '0';
+                                    target.style.left = '0';
+                                }
+                                else {
+                                    target.style.position = 'relative';
+                                    target.style.top = '';
+                                    target.style.left = '';
+                                }
                             }
-                            return item;
-                        });
-                        created.checkbox = !created.checkbox;
-                    }
-                    return html `
+                        }
+                        if (!created.checkbox) {
+                            vm.tableData = vm.tableData.map((item, index) => {
+                                if (obj.filter.length > 0) {
+                                    return [
+                                        {
+                                            key: checkAllBox(true),
+                                            value: EditorElem.checkBoxOnly({
+                                                gvc: gvc,
+                                                def: false,
+                                                callback: (result) => {
+                                                    vm.originalData[index].checked = result;
+                                                    gvc.notifyDataChange(ids.filter);
+                                                    changeHeaderStyle();
+                                                    obj.item_select && obj.item_select();
+                                                },
+                                            }),
+                                        },
+                                        ...item,
+                                    ];
+                                }
+                                return item;
+                            });
+                            created.checkbox = !created.checkbox;
+                        }
+                        return html `
                         <div style="margin-top: 4px; overflow-x: scroll; position: relative; min-height: 350px">
                             <div class="w-100 h-100 bg-white top-0"
                                  style="position: absolute; z-index: ${defWidth > 0 ? 0 : 2}; display: ${defWidth > 0 ? 'none' : 'block'};"></div>
                             ${gvc.bindView({
-                        bind: ids.header,
-                        view: () => {
-                            return gvc.bindView({
-                                bind: ids.filter,
-                                view: () => {
-                                    if (vm.originalData.find((dd) => dd.checked)) {
-                                        const checkedData = vm.originalData.filter((dd) => dd.checked);
-                                        if (document.body.clientWidth < 768) {
-                                            return BgWidget.selNavbar({
-                                                checkbox: checkAllBox(false),
-                                                count: checkedData.length,
-                                                buttonList: [
+                            bind: ids.header,
+                            view: () => {
+                                return gvc.bindView({
+                                    bind: ids.filter,
+                                    view: () => {
+                                        if (vm.originalData.find((dd) => dd.checked)) {
+                                            const checkedData = vm.originalData.filter((dd) => dd.checked);
+                                            if (document.body.clientWidth < 768) {
+                                                return BgWidget.selNavbar({
+                                                    checkbox: checkAllBox(false),
+                                                    count: checkedData.length,
+                                                    buttonList: [
+                                                        BgWidget.selEventDropmenu({
+                                                            gvc: gvc,
+                                                            options: obj.filter.map((item) => {
+                                                                return {
+                                                                    name: item.name,
+                                                                    event: gvc.event(() => item.event(checkedData)),
+                                                                };
+                                                            }),
+                                                            text: '',
+                                                        }),
+                                                    ],
+                                                });
+                                            }
+                                            const inButtons = obj.filter.filter((item) => item.option);
+                                            const outButtons = obj.filter.filter((item) => !item.option);
+                                            const inList = inButtons.length > 0
+                                                ? [
                                                     BgWidget.selEventDropmenu({
                                                         gvc: gvc,
-                                                        options: obj.filter.map((item) => {
+                                                        options: inButtons.map((item) => {
                                                             return {
                                                                 name: item.name,
                                                                 event: gvc.event(() => item.event(checkedData)),
                                                             };
                                                         }),
-                                                        text: '',
+                                                        text: '更多操作',
                                                     }),
-                                                ],
+                                                ]
+                                                : [];
+                                            const outList = outButtons.map((item) => {
+                                                return BgWidget.selEventButton(item.name, gvc.event(() => item.event(checkedData)));
+                                            });
+                                            return BgWidget.selNavbar({
+                                                checkbox: checkAllBox(false),
+                                                count: checkedData.length,
+                                                buttonList: [...inList, ...outList],
                                             });
                                         }
-                                        const inButtons = obj.filter.filter((item) => item.option);
-                                        const outButtons = obj.filter.filter((item) => !item.option);
-                                        const inList = inButtons.length > 0
-                                            ? [
-                                                BgWidget.selEventDropmenu({
-                                                    gvc: gvc,
-                                                    options: inButtons.map((item) => {
-                                                        return {
-                                                            name: item.name,
-                                                            event: gvc.event(() => item.event(checkedData)),
-                                                        };
-                                                    }),
-                                                    text: '更多操作',
-                                                }),
-                                            ]
-                                            : [];
-                                        const outList = outButtons.map((item) => {
-                                            return BgWidget.selEventButton(item.name, gvc.event(() => item.event(checkedData)));
-                                        });
-                                        return BgWidget.selNavbar({
-                                            checkbox: checkAllBox(false),
-                                            count: checkedData.length,
-                                            buttonList: [...inList, ...outList],
-                                        });
-                                    }
-                                    return vm.tableData[0]
-                                        .map((dd, index) => {
-                                        return html `
+                                        return vm.tableData[0]
+                                            .map((dd, index) => {
+                                            return html `
                                                             <div class="${ids.headerCell} ${ids.textClass} tx_700"
                                                                  style="min-width: ${widthList[index]}px;">${dd.key}
                                                             </div>`;
-                                    })
-                                        .join('');
-                                },
-                                divCreate: {
-                                    class: `d-flex align-items-center mb-2 ${ids.header}`,
-                                    style: `height: 40px !important;`,
-                                },
-                                onCreate: () => {
-                                    if (!created.header) {
-                                        let timer = 0;
-                                        const si = setInterval(() => {
-                                            timer++;
-                                            const header = document.querySelector(`.${ids.header}`);
-                                            if (!created.header && header && header.offsetWidth > 0) {
-                                                let n = 0;
-                                                const htmlTags = new RegExp(/<[^>]*>/);
-                                                header === null || header === void 0 ? void 0 : header.querySelectorAll('div').forEach((div) => {
-                                                    if (div.classList.contains(ids.headerCell)) {
-                                                        const baseWidth = htmlTags.test(div.innerHTML) ? 0 : div.innerHTML.replace(/\n/g, '').trim().length * 24;
-                                                        widthList[n] = div.offsetWidth > baseWidth ? div.offsetWidth : baseWidth;
-                                                        n++;
-                                                    }
-                                                });
-                                                fullWidth = header.offsetWidth;
-                                                created.header = !created.header;
-                                                clearInterval(si);
-                                            }
-                                            if (timer > 500) {
-                                                clearInterval(si);
-                                            }
-                                        }, 50);
-                                    }
-                                },
-                            });
-                        },
-                    })}
+                                        })
+                                            .join('');
+                                    },
+                                    divCreate: {
+                                        class: `d-flex align-items-center mb-2 ${ids.header}`,
+                                        style: `height: 40px !important;`,
+                                    },
+                                    onCreate: () => {
+                                        if (!created.header) {
+                                            let timer = 0;
+                                            const si = setInterval(() => {
+                                                timer++;
+                                                const header = gvc.glitter.document.querySelector(`.${ids.header}`);
+                                                if (!created.header && header && header.offsetWidth > 0) {
+                                                    let n = 0;
+                                                    const htmlTags = new RegExp(/<[^>]*>/);
+                                                    header === null || header === void 0 ? void 0 : header.querySelectorAll('div').forEach((div) => {
+                                                        if (div.classList.contains(ids.headerCell)) {
+                                                            const baseWidth = htmlTags.test(div.innerHTML) ? 0 : div.innerHTML.replace(/\n/g, '').trim().length * 24;
+                                                            widthList[n] = div.offsetWidth > baseWidth ? div.offsetWidth : baseWidth;
+                                                            n++;
+                                                        }
+                                                    });
+                                                    fullWidth = header.offsetWidth;
+                                                    created.header = !created.header;
+                                                    clearInterval(si);
+                                                }
+                                                if (timer > 500) {
+                                                    clearInterval(si);
+                                                }
+                                            }, 50);
+                                        }
+                                    },
+                                });
+                            },
+                        })}
                             <table class="table table-centered table-nowrap text-center table-hover"
                                    style="width: ${defWidth}px;">
                                 <tbody>
                                 ${vm.tableData
-                        .map((dd, trIndex) => {
-                        return html `
+                            .map((dd, trIndex) => {
+                            return html `
                                                 <tr
                                                         class="${trIndex === 0 ? ids.tr : ''}"
                                                         onclick="${gvc.event(() => {
-                            obj.rowClick && obj.rowClick(dd, trIndex);
-                        })}"
+                                obj.rowClick && obj.rowClick(dd, trIndex);
+                            })}"
                                                         onmouseover="${gvc.event(() => {
-                            $(`#${ids.pencil}${trIndex}`).removeClass('d-none');
-                        })}"
+                                $(`#${ids.pencil}${trIndex}`).removeClass('d-none');
+                            })}"
                                                         onmouseout="${gvc.event(() => {
-                            $(`#${ids.pencil}${trIndex}`).addClass('d-none');
-                        })}"
+                                $(`#${ids.pencil}${trIndex}`).addClass('d-none');
+                            })}"
                                                 >
                                                     ${dd
-                            .map((d3, tdIndex) => {
-                            const tdClass = Tool.randomString(5);
-                            gvc.addStyle(`
+                                .map((d3, tdIndex) => {
+                                const tdClass = Tool.randomString(5);
+                                gvc.addStyle(`
                                                             .${tdClass} {
                                                                 border: none;
                                                                 vertical-align: middle;
@@ -1402,7 +1405,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                                                                 ${dd.length === 1 ? 'border-radius: 10px;' : ''}
                                                             }
                                                         `);
-                            return html `
+                                return html `
                                                                     <td
                                                                             class="${ids.textClass} ${tdClass} tx_normal"
                                                                             ${obj.filter.length !== 0 && tdIndex === 0 ? `gvc-checkbox="checkbox${trIndex}"` : ''}
@@ -1412,24 +1415,29 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                                                                             ${d3.value}
                                                                         </div>
                                                                     </td>`;
+                            })
+                                .join('')}
+                                                </tr>`;
                         })
                             .join('')}
-                                                </tr>`;
-                    })
-                        .join('')}
                                 </tbody>
                             </table>
                         </div>
                         <div>
                             ${obj.hiddenPageSplit
-                        ? ''
-                        : ps.pageSplitV2(vm.pageSize, vm.page, (page) => {
-                            vm.tableData = [];
-                            vm.page = page;
-                            vm.loading = true;
-                            gvc.notifyDataChange(ids.container);
-                        }, false)}
+                            ? ''
+                            : ps.pageSplitV2(vm.pageSize, vm.page, (page) => {
+                                vm.tableData = [];
+                                vm.page = page;
+                                vm.loading = true;
+                                gvc.notifyDataChange(ids.container);
+                            }, false)}
                         </div>`;
+                    }
+                    catch (e) {
+                        console.log(e);
+                        return `${e}`;
+                    }
                 },
                 divCreate: {},
                 onCreate: () => {
@@ -1443,7 +1451,8 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                                 timer++;
                                 if (created.header) {
                                     const checkbox = obj.filter.length > 0;
-                                    const tr = document.querySelector(`.${ids.tr}`);
+                                    console.log(`query==>`, ids.tr);
+                                    const tr = gvc.glitter.document.querySelector(`.${ids.tr}`);
                                     tr === null || tr === void 0 ? void 0 : tr.querySelectorAll('td').forEach((td, index) => {
                                         if (checkbox && index === 0) {
                                             widthList[index] = 60;