ts-glitter 21.1.6 → 21.1.8

package/lowcode/editor-components/global-widget/bridge.js

@@ -0,0 +1,43 @@
+import { ToolSetting } from '../../jspage/function-page/tool-setting.js';
+export class Bridge {
+    static main(obj) {
+        const gvc = obj.gvc;
+        const glitter = gvc.glitter;
+        return [
+            `<div style="height:5px;"></div>`,
+            ToolSetting.item({
+                gvc: gvc,
+                dd: (() => {
+                    switch (glitter.share.editorViewModel.selectItem.data.tag) {
+                        case 'c_header':
+                            return {
+                                title: '標頭選單',
+                                tag: '標頭元件',
+                                hint: `全館 (首頁,隱形賣場,一頁式網頁) 的標頭將預設為以下樣式`,
+                                toggle: true
+                            };
+                        case 'footer':
+                            return {
+                                title: '頁腳選單',
+                                tag: '頁腳元件',
+                                hint: `全館 (首頁,隱形賣場,一頁式網頁) 的頁腳將預設為以下樣式`,
+                                toggle: true
+                            };
+                        case 'SY00-normal-products':
+                        case 'SY02_page_product':
+                        case 'SY00-normal-scroll-products':
+                            return {
+                                title: '商品卡片',
+                                tag: '商品卡片',
+                                hint: `全館 (首頁,隱形賣場,一頁式網頁) 的商品卡片將預設為以下樣式`,
+                                toggle: true,
+                                editable: true
+                            };
+                    }
+                })(),
+            }),
+            `<div style="height:1px;" class="border-top mx-n3"></div>`,
+        ].join(`<div style="height:10px;"></div>`);
+    }
+}
+window.glitter.setModule(import.meta.url, Bridge);

package/lowcode/editor-components/global-widget/bridge.ts

@@ -0,0 +1,46 @@
+import { GVC } from '../../glitterBundle/GVController.js';
+import { ToolSetting } from '../../jspage/function-page/tool-setting.js';
+
+export class Bridge {
+  public static main(obj: any) {
+    const gvc: GVC = obj.gvc;
+    const glitter = gvc.glitter;
+    return [
+      `<div style="height:5px;"></div>`,
+      ToolSetting.item({
+        gvc: gvc,
+        dd: (() => {
+          switch (glitter.share.editorViewModel.selectItem.data.tag){
+            case 'c_header':
+              return  {
+                title: '標頭選單',
+                tag: '標頭元件',
+                hint: `全館 (首頁,隱形賣場,一頁式網頁) 的標頭將預設為以下樣式`,
+                toggle:true
+              };
+            case 'footer':
+              return {
+                title: '頁腳選單',
+                tag: '頁腳元件',
+                hint: `全館 (首頁,隱形賣場,一頁式網頁) 的頁腳將預設為以下樣式`,
+                toggle:true
+              };
+            case 'SY00-normal-products':
+            case 'SY02_page_product':
+            case 'SY00-normal-scroll-products':
+              return   {
+                title: '商品卡片',
+                tag: '商品卡片',
+                hint: `全館 (首頁,隱形賣場,一頁式網頁) 的商品卡片將預設為以下樣式`,
+                toggle:true,
+                editable:true
+              }
+          }
+        })(),
+      }),
+      `<div style="height:1px;" class="border-top mx-n3"></div>`,
+    ].join(`<div style="height:10px;"></div>`);
+  }
+}
+
+(window as any).glitter.setModule(import.meta.url, Bridge);

package/lowcode/editor-components/global-widget/global-widget.js

@@ -110,7 +110,7 @@ export class GlobalWidget {
                     return module_list
                         .map((dd) => {
                         return `
-<div class="d-flex align-items-center justify-content-center bgf6 hoverHidden position-relative py-4" style="">
+<div class="d-flex align-items-center justify-content-center bgf6 hoverHidden position-relative py-4" style="min-height:200px;">
 <img class="w-100" src="${dd.template_config.image[0]}">
   <div
                                     class="position-absolute w-100 h-100  align-items-center justify-content-center rounded fs-6 flex-column"

package/lowcode/editor-components/global-widget/global-widget.ts

@@ -135,7 +135,7 @@ export class GlobalWidget {
               return module_list
                 .map((dd: any) => {
                   return `
-<div class="d-flex align-items-center justify-content-center bgf6 hoverHidden position-relative py-4" style="">
+<div class="d-flex align-items-center justify-content-center bgf6 hoverHidden position-relative py-4" style="min-height:200px;">
 <img class="w-100" src="${dd.template_config.image[0]}">
   <div
                                     class="position-absolute w-100 h-100  align-items-center justify-content-center rounded fs-6 flex-column"

package/lowcode/form-view/e-commerce/product-select.js

@@ -124,9 +124,10 @@ export class ProductSelect {
                                 return [];
                             }
                         }))();
-                        resolve(html ` <div class="d-flex flex-column py-2 my-2 border-top" style="gap: 18px;">
+                        resolve(html ` <div class="d-flex flex-column py-2" style="">
+                <div class="mx-n3  border-top" ></div>
                 <div
-                  class="d-flex align-items-center gray-bottom-line-18 pb-2"
+                  class="d-flex align-items-center  pb-2"
                   style="gap: 10px; justify-content: space-between;"
                 >
                   <div class="flex-fill ">
@@ -153,14 +154,7 @@ export class ProductSelect {
                     class="${bundle.formData[bundle.key].select === 'all' ? `d-none` : ``}"
                     style="margin-top: 30px;"
                   >
-                    ${BgWidget.grayButton((() => {
-                            switch (bundle.formData[bundle.key].select) {
-                                case 'product':
-                                case 'collection':
-                                    return `選取`;
-                            }
-                            return ``;
-                        })(), gvc.event(() => {
+                    ${BgWidget.save(gvc.event(() => {
                             var _a, _b;
                             if (bundle.formData[bundle.key].select === 'product') {
                                 bundle.formData[bundle.key].value = (_a = bundle.formData[bundle.key].value) !== null && _a !== void 0 ? _a : [];
@@ -186,7 +180,14 @@ export class ProductSelect {
                                     }),
                                 });
                             }
-                        }), { textStyle: 'font-weight: 400;' })}
+                        }), (() => {
+                            switch (bundle.formData[bundle.key].select) {
+                                case 'product':
+                                case 'collection':
+                                    return `選取`;
+                            }
+                            return ``;
+                        })())}
                   </div>
                 </div>
                 <div class="d-flex flex-column gap-2" id="${subVM.containerId}">
@@ -232,6 +233,7 @@ export class ProductSelect {
                             }
                         }))}
                 </div>
+                <div class="mx-n3  border-top" ></div>
               </div>`);
                     }));
                 },

package/lowcode/form-view/e-commerce/product-select.ts

@@ -127,9 +127,10 @@ export class ProductSelect {
               }
             })();
             resolve(
-              html` <div class="d-flex flex-column py-2 my-2 border-top" style="gap: 18px;">
+              html` <div class="d-flex flex-column py-2" style="">
+                <div class="mx-n3  border-top" ></div>
                 <div
-                  class="d-flex align-items-center gray-bottom-line-18 pb-2"
+                  class="d-flex align-items-center  pb-2"
                   style="gap: 10px; justify-content: space-between;"
                 >
                   <div class="flex-fill ">
@@ -156,15 +157,7 @@ export class ProductSelect {
                     class="${bundle.formData[bundle.key].select === 'all' ? `d-none` : ``}"
                     style="margin-top: 30px;"
                   >
-                    ${BgWidget.grayButton(
-                      (() => {
-                        switch (bundle.formData[bundle.key].select) {
-                          case 'product':
-                          case 'collection':
-                            return `選取`;
-                        }
-                        return ``;
-                      })(),
+                    ${BgWidget.save(
                       gvc.event(() => {
                         if (bundle.formData[bundle.key].select === 'product') {
                           bundle.formData[bundle.key].value = bundle.formData[bundle.key].value ?? [];
@@ -190,7 +183,15 @@ export class ProductSelect {
                           });
                         }
                       }),
-                      { textStyle: 'font-weight: 400;' }
+                      (() => {
+                        switch (bundle.formData[bundle.key].select) {
+                          case 'product':
+                          case 'collection':
+                            return `選取`;
+                        }
+                        return ``;
+                      })(),
+                      
                     )}
                   </div>
                 </div>
@@ -241,6 +242,7 @@ export class ProductSelect {
                     })
                   )}
                 </div>
+                <div class="mx-n3  border-top" ></div>
               </div>`
             );
           });

package/lowcode/glitterBundle/plugins/editor-elem.js

@@ -680,7 +680,17 @@ export class EditorElem {
         return html ` <iframe class="rounded-3" style="border: none;width:${cf.width}px;height:${cf.height}px;"></iframe>`;
     }
     static codeEditor(obj) {
+        var _a;
         const codeID = obj.gvc.glitter.getUUID();
+        console.log(`codeEditor`, {
+            type: 'getData',
+            value: `${obj.structStart ? obj.structStart : `(()=>{`} ${(_a = obj.initial) !== null && _a !== void 0 ? _a : ''}
+                ${obj.structEnd ? obj.structEnd : '})()'}`,
+            language: 'javascript',
+            refactor: true,
+            structStart: obj.structStart,
+            structEnd: obj.structEnd,
+        });
         function getComponent(gvc, height) {
             return gvc.bindView(() => {
                 const id = obj.gvc.glitter.getUUID();
@@ -692,10 +702,10 @@ export class EditorElem {
                         const childWindow = (document.getElementById(frameID) || window.parent.document.getElementById(frameID)).contentWindow;
                         childWindow.postMessage({
                             type: 'getData',
-                            value: `${obj.structStart ? obj.structStart : `(()=>{`} ${(_a = obj.initial) !== null && _a !== void 0 ? _a : ''}
-                ${obj.structEnd ? obj.structEnd : '})()'}`,
+                            value: `${obj.structStart ? obj.structStart : `(()=>{`} \n${(_a = obj.initial) !== null && _a !== void 0 ? _a : ''}
+${obj.structEnd ? obj.structEnd : '})()'}`,
                             language: 'javascript',
-                            refactor: true,
+                            refactor: false,
                             structStart: obj.structStart,
                             structEnd: obj.structEnd,
                         }, domain);
@@ -974,7 +984,7 @@ export class EditorElem {
                           快速插入
                           ${obj.quick_insert
                                     .map(dd => {
-                                    return html `<div
+                                    return html ` <div
                                 style="cursor: pointer;"
                                 onclick="${gvc.event(() => {
                                         editor.selection.restore();

package/lowcode/glitterBundle/plugins/editor-elem.ts

@@ -775,6 +775,15 @@ export class EditorElem {
     structEnd?: string;
   }) {
     const codeID = obj.gvc.glitter.getUUID();
+    console.log(`codeEditor`, {
+      type: 'getData',
+      value: `${obj.structStart ? obj.structStart : `(()=>{`} ${obj.initial ?? ''}
+                ${obj.structEnd ? obj.structEnd : '})()'}`,
+      language: 'javascript',
+      refactor: true,
+      structStart: obj.structStart,
+      structEnd: obj.structEnd,
+    });
 
     function getComponent(gvc: GVC, height: number) {
       return gvc.bindView(() => {
@@ -789,10 +798,10 @@ export class EditorElem {
             childWindow.postMessage(
               {
                 type: 'getData',
-                value: `${obj.structStart ? obj.structStart : `(()=>{`} ${obj.initial ?? ''}
-                ${obj.structEnd ? obj.structEnd : '})()'}`,
+                value: `${obj.structStart ? obj.structStart : `(()=>{`} \n${obj.initial ?? ''}
+${obj.structEnd ? obj.structEnd : '})()'}`,
                 language: 'javascript',
-                refactor: true,
+                refactor: false,
                 structStart: obj.structStart,
                 structEnd: obj.structEnd,
               },
@@ -1132,7 +1141,7 @@ export class EditorElem {
                           快速插入
                           ${obj.quick_insert
                             .map(dd => {
-                              return html`<div
+                              return html` <div
                                 style="cursor: pointer;"
                                 onclick="${gvc.event(() => {
                                   editor.selection.restore();

package/lowcode/jspage/function-page/main_editor.js

@@ -1046,14 +1046,7 @@ export class Main_editor {
                 };
             })}
           <div style="height: 60px;"></div>
-          <div
-            class="${document.body.clientWidth < 800
-                ? `position-fixed`
-                : `position-absolute`} w-100 bottom-0 d-flex align-items-center p-3 shadow justify-content-end border-top bg-white "
-            style="height: 60px;${document.body.clientWidth < 800
-                ? `padding-bottom:${parseInt(glitter.share.bottom_inset, 10)}px !important;`
-                : ``}"
-          >
+         
             ${(() => {
                 const view = [];
                 if (viewModel.selectItem.deletable !== 'false') {
@@ -1098,9 +1091,20 @@ export class Main_editor {
                         glitter.htmlGenerate.deleteWidget(glitter.share.editorViewModel.selectContainer, viewModel.selectItem, () => { });
                     }), '刪除'));
                 }
-                return view.join('<div class="mx-1"></div>');
+                if (!view.join('')) {
+                    return ``;
+                }
+                else {
+                    return ` <div
+            class="${document.body.clientWidth < 800
+                        ? `position-fixed`
+                        : `position-absolute`} w-100 bottom-0 d-flex align-items-center p-3 shadow justify-content-end border-top bg-white "
+            style="height: 60px;${document.body.clientWidth < 800
+                        ? `padding-bottom:${parseInt(glitter.share.bottom_inset, 10)}px !important;`
+                        : ``}"
+          >${view.join('<div class="mx-1"></div>')}</div>`;
+                }
             })()}
-          </div>
         </div>
       `,
             gvc.bindView(() => {

package/lowcode/jspage/function-page/main_editor.ts

@@ -1137,14 +1137,7 @@ export class Main_editor {
             };
           })}
           <div style="height: 60px;"></div>
-          <div
-            class="${document.body.clientWidth < 800
-              ? `position-fixed`
-              : `position-absolute`} w-100 bottom-0 d-flex align-items-center p-3 shadow justify-content-end border-top bg-white "
-            style="height: 60px;${document.body.clientWidth < 800
-              ? `padding-bottom:${parseInt(glitter.share.bottom_inset, 10)}px !important;`
-              : ``}"
-          >
+         
             ${(() => {
               const view: any = [];
               if (viewModel.selectItem.deletable !== 'false') {
@@ -1210,9 +1203,20 @@ export class Main_editor {
                   )
                 );
               }
-              return view.join('<div class="mx-1"></div>');
+              if(!view.join('')){
+                return ``
+              }else{
+               return ` <div
+            class="${document.body.clientWidth < 800
+                  ? `position-fixed`
+                  : `position-absolute`} w-100 bottom-0 d-flex align-items-center p-3 shadow justify-content-end border-top bg-white "
+            style="height: 60px;${document.body.clientWidth < 800
+                  ? `padding-bottom:${parseInt(glitter.share.bottom_inset, 10)}px !important;`
+                  : ``}"
+          >${view.join('<div class="mx-1"></div>')}</div>`
+              }
+            
             })()}
-          </div>
         </div>
       `,
       gvc.bindView(() => {