ts-glitter 21.1.5 → 21.1.7

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(() => {