ts-glitter 22.4.6 → 22.4.9

package/lib/glitterBundle/Glitter.css

@@ -1,82 +1,94 @@
 /*Read only*/
 /*Please dont change*/
 @media screen {
-    .hy-drawer-scrim {
-        display: block;
-        position: fixed;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        opacity: 0;
-        z-index: 2;
-        pointer-events: none;
-        background: rgba(0, 0, 0, 0.5);
-        transform: translateX(0);
-        -webkit-tap-highlight-color: transparent;
-    }
+  .hy-drawer-scrim {
+    display: block;
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    opacity: 0;
+    z-index: 2;
+    pointer-events: none;
+    background: rgba(0, 0, 0, 0.5);
+    transform: translateX(0);
+    -webkit-tap-highlight-color: transparent;
+  }
 
-    .hy-drawer-content {
-        position: fixed;
-        bottom: 0;
-        top: 0;
-        z-index: 3;
-        overflow-x: hidden;
-        overflow-y: auto;
-        contain: strict;
-        width: 300px;
-        background: #e8e8e8;
-        box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
-        transform: translateX(0);
-        -webkit-overflow-scrolling: touch;
-    }
+  .hy-drawer-content {
+    position: fixed;
+    bottom: 0;
+    top: 0;
+    z-index: 3;
+    overflow-x: hidden;
+    overflow-y: auto;
+    contain: strict;
+    width: 300px;
+    background: #fff;
+    box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
+    transform: translateX(0);
+    -webkit-overflow-scrolling: touch;
+  }
 
-    .hy-drawer-content.hy-drawer-left {
-        left: -300px;
-    }
+  .hy-drawer-content.hy-drawer-left {
+    left: -300px;
+  }
 
-    .hy-drawer-content.hy-drawer-right {
-        right: -300px;
-    }
+  .hy-drawer-content.hy-drawer-right {
+    right: -300px;
+  }
 
-    .hy-drawer-content.hy-drawer-left.hy-drawer-opened {
-        left: 0!important;
-        transform: translateX(0)!important;
-    }
+  .hy-drawer-content.hy-drawer-left.hy-drawer-opened {
+    left: 0 !important;
+    transform: translateX(0) !important;
+  }
 
-    .hy-drawer-content.hy-drawer-right.hy-drawer-opened {
-        right: 0!important;
-        transform: translateX(0)!important;
-    }
+  .hy-drawer-content.hy-drawer-right.hy-drawer-opened {
+    right: 0 !important;
+    transform: translateX(0) !important;
+  }
 }
 
 @media print {
-    .hy-drawer-scrim {
-        display: none!important;
-    }
+  .hy-drawer-scrim {
+    display: none !important;
+  }
 
-    .hy-drawer-content {
-        transform: none!important;
-    }
+  .hy-drawer-content {
+    transform: none !important;
+  }
 }
 
-.translation{
-    animation:TestMove 0.5s ; /*IE*/
-    -moz-animation:TestMove 0.5s; /*FireFox*/
-    -webkit-animation:TestMove 0.5s ; /*Chrome, Safari*/
+.translation {
+  animation: TestMove 0.5s; /*IE*/
+  -moz-animation: TestMove 0.5s; /*FireFox*/
+  -webkit-animation: TestMove 0.5s; /*Chrome, Safari*/
 }
 
-@keyframes TestMove{
-    from {left:100%;}
-    to {left:0%;}
+@keyframes TestMove {
+  from {
+    left: 100%;
+  }
+  to {
+    left: 0%;
+  }
 }
 
-@-moz-keyframes TestMove{
-    from {left:100%;}
-    to {left:0%;}
+@-moz-keyframes TestMove {
+  from {
+    left: 100%;
+  }
+  to {
+    left: 0%;
+  }
 }
 
-@-webkit-keyframes TestMove{
-    from {left:100%;}
-    to {left:0%;}
-}
+@-webkit-keyframes TestMove {
+  from {
+    left: 100%;
+  }
+  to {
+    left: 0%;
+  }
+}

package/lowcode/Entry.js

@@ -154,7 +154,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_22.4.6';
+            glitter.share.editerVersion = 'V_22.4.9';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -159,7 +159,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_22.4.6';
+      glitter.share.editerVersion = 'V_22.4.9';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

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

@@ -395,6 +395,14 @@ export class BgProduct {
                             container: { style: 'margin: 3rem 0;' },
                         });
                     }
+                    function formatOptionId(path) {
+                        const key = path
+                            .toString()
+                            .split('/')
+                            .map(segment => segment.trim())
+                            .join('_');
+                        return `_collections_opt_${key}`;
+                    }
                     return html ` <div class="bg-white shadow rounded-3" style="width: 100%; overflow-y: auto;">
               <div class="w-100 d-flex align-items-center p-3 border-bottom">
                 <div class="tx_700">${(_a = obj.title) !== null && _a !== void 0 ? _a : '商品分類'}</div>
@@ -410,47 +418,56 @@ export class BgProduct {
               <div class="c_dialog">
                 <div class="c_dialog_body">
                   <div class="c_dialog_main" style="gap: 18px; max-height: 500px;">
-                    <div class="position-sticky px-1" style="top: 0; background-color: #fff;">
-                      ${BgWidget.searchFilter(gvc.event((e, event) => {
-                        vm.query = e.value;
-                        vm.loading = true;
-                        obj.gvc.notifyDataChange(vm.id);
-                    }), vm.query || '', '搜尋')}
-                    </div>
                     ${obj.gvc.map(vm.options.map((opt) => {
+                        const id = formatOptionId(opt.key);
                         function call() {
-                            if (obj.default.includes(opt.key)) {
-                                obj.default = obj.default.filter(item => item !== opt.key);
+                            const cloneDefault = obj.default.slice();
+                            if (obj.single) {
+                                obj.default = [opt.key];
                             }
                             else {
-                                obj.default.push(opt.key);
+                                if (obj.default.includes(opt.key)) {
+                                    obj.default = obj.default.filter(item => item !== opt.key);
+                                }
+                                else {
+                                    obj.default.push(opt.key);
+                                }
                             }
-                            obj.gvc.notifyDataChange(vm.id);
+                            gvc.notifyDataChange([...cloneDefault.map(key => formatOptionId(key)), id]);
                         }
-                        return html ` <div class="d-flex align-items-center" style="gap: 24px">
-                          <input
-                            class="form-check-input mt-0 ${vm.checkClass}"
-                            type="checkbox"
-                            id="${opt.key}"
-                            name="radio_${vm.id}"
-                            onclick="${obj.gvc.event(() => call())}"
-                            ${obj.default.includes(opt.key) ? 'checked' : ''}
-                          />
-                          <div
-                            class="d-flex align-items-center form-check-label c_updown_label cursor_pointer gap-3"
-                            onclick="${obj.gvc.event(() => call())}"
-                          >
-                            <div class="tx_normal ${opt.note ? 'mb-1' : ''}">${opt.value}</div>
-                            ${opt.note ? html ` <div class="tx_gray_12">${opt.note}</div> ` : ''}
-                          </div>
-                        </div>`;
+                        return gvc.bindView({
+                            bind: id,
+                            view: () => {
+                                return html `<input
+                                class="form-check-input mt-0 ${vm.checkClass}"
+                                type="checkbox"
+                                id="${opt.key}"
+                                name="radio_${vm.id}"
+                                onclick="${obj.gvc.event(() => call())}"
+                                ${obj.default.includes(opt.key) ? 'checked' : ''}
+                              />
+                              <div
+                                class="d-flex align-items-center form-check-label c_updown_label cursor_pointer gap-3"
+                                onclick="${obj.gvc.event(() => call())}"
+                              >
+                                <div class="tx_normal ${opt.note ? 'mb-1' : ''}">${opt.value}</div>
+                                ${opt.note ? html ` <div class="tx_gray_12">${opt.note}</div> ` : ''}
+                              </div>`;
+                            },
+                            divCreate: {
+                                class: 'd-flex align-items-center',
+                                style: 'gap: 24px',
+                            },
+                        });
                     }))}
                   </div>
                   <div class="c_dialog_bar">
-                    ${BgWidget.cancel(obj.gvc.event(() => {
-                        obj.callback([]);
-                        gvc.closeDialog();
-                    }), '清除全部')}
+                    ${obj.single
+                        ? ''
+                        : BgWidget.cancel(obj.gvc.event(() => {
+                            obj.callback([]);
+                            gvc.closeDialog();
+                        }), '清除全部')}
                     ${BgWidget.cancel(obj.gvc.event(() => {
                         obj.callback(vm.def);
                         gvc.closeDialog();

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

@@ -488,6 +488,7 @@ export class BgProduct {
     title?: string;
     default: (number | string)[];
     callback: (value: any) => void;
+    single?: boolean;
   }) {
     return obj.gvc.glitter.innerDialog((gvc: GVC) => {
       const vm = {
@@ -514,6 +515,16 @@ export class BgProduct {
                 container: { style: 'margin: 3rem 0;' },
               });
             }
+
+            function formatOptionId(path: string | number) {
+              const key = path
+                .toString()
+                .split('/') // 拆分所有層級
+                .map(segment => segment.trim()) // 去除空白
+                .join('_'); // 統一格式為「底線」
+              return `_collections_opt_${key}`;
+            }
+
             return html` <div class="bg-white shadow rounded-3" style="width: 100%; overflow-y: auto;">
               <div class="w-100 d-flex align-items-center p-3 border-bottom">
                 <div class="tx_700">${obj.title ?? '商品分類'}</div>
@@ -529,56 +540,63 @@ export class BgProduct {
               <div class="c_dialog">
                 <div class="c_dialog_body">
                   <div class="c_dialog_main" style="gap: 18px; max-height: 500px;">
-                    <div class="position-sticky px-1" style="top: 0; background-color: #fff;">
-                      ${BgWidget.searchFilter(
-                        gvc.event((e, event) => {
-                          vm.query = e.value;
-                          vm.loading = true;
-                          obj.gvc.notifyDataChange(vm.id);
-                        }),
-                        vm.query || '',
-                        '搜尋'
-                      )}
-                    </div>
                     ${obj.gvc.map(
                       vm.options.map((opt: OptionsItem) => {
+                        const id = formatOptionId(opt.key);
+
                         function call() {
-                          if (obj.default.includes(opt.key)) {
-                            obj.default = obj.default.filter(item => item !== opt.key);
+                          const cloneDefault = obj.default.slice();
+
+                          if (obj.single) {
+                            obj.default = [opt.key];
                           } else {
-                            obj.default.push(opt.key);
+                            if (obj.default.includes(opt.key)) {
+                              obj.default = obj.default.filter(item => item !== opt.key);
+                            } else {
+                              obj.default.push(opt.key);
+                            }
                           }
-                          obj.gvc.notifyDataChange(vm.id);
+
+                          gvc.notifyDataChange([...cloneDefault.map(key => formatOptionId(key)), id]);
                         }
 
-                        return html` <div class="d-flex align-items-center" style="gap: 24px">
-                          <input
-                            class="form-check-input mt-0 ${vm.checkClass}"
-                            type="checkbox"
-                            id="${opt.key}"
-                            name="radio_${vm.id}"
-                            onclick="${obj.gvc.event(() => call())}"
-                            ${obj.default.includes(opt.key) ? 'checked' : ''}
-                          />
-                          <div
-                            class="d-flex align-items-center form-check-label c_updown_label cursor_pointer gap-3"
-                            onclick="${obj.gvc.event(() => call())}"
-                          >
-                            <div class="tx_normal ${opt.note ? 'mb-1' : ''}">${opt.value}</div>
-                            ${opt.note ? html` <div class="tx_gray_12">${opt.note}</div> ` : ''}
-                          </div>
-                        </div>`;
+                        return gvc.bindView({
+                          bind: id,
+                          view: () => {
+                            return html`<input
+                                class="form-check-input mt-0 ${vm.checkClass}"
+                                type="checkbox"
+                                id="${opt.key}"
+                                name="radio_${vm.id}"
+                                onclick="${obj.gvc.event(() => call())}"
+                                ${obj.default.includes(opt.key) ? 'checked' : ''}
+                              />
+                              <div
+                                class="d-flex align-items-center form-check-label c_updown_label cursor_pointer gap-3"
+                                onclick="${obj.gvc.event(() => call())}"
+                              >
+                                <div class="tx_normal ${opt.note ? 'mb-1' : ''}">${opt.value}</div>
+                                ${opt.note ? html` <div class="tx_gray_12">${opt.note}</div> ` : ''}
+                              </div>`;
+                          },
+                          divCreate: {
+                            class: 'd-flex align-items-center',
+                            style: 'gap: 24px',
+                          },
+                        });
                       })
                     )}
                   </div>
                   <div class="c_dialog_bar">
-                    ${BgWidget.cancel(
-                      obj.gvc.event(() => {
-                        obj.callback([]);
-                        gvc.closeDialog();
-                      }),
-                      '清除全部'
-                    )}
+                    ${obj.single
+                      ? ''
+                      : BgWidget.cancel(
+                          obj.gvc.event(() => {
+                            obj.callback([]);
+                            gvc.closeDialog();
+                          }),
+                          '清除全部'
+                        )}
                     ${BgWidget.cancel(
                       obj.gvc.event(() => {
                         obj.callback(vm.def);

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

@@ -281,6 +281,23 @@ export class BgWidget {
       />
     </div>`;
     }
+    static checkInput(gvc, def, callback) {
+        const id = gvc.glitter.getUUID();
+        const trueImg = html `<i class="fa-solid fa-square-check" style="width: 16px;height: 16px;" onclick="${gvc.event(e => {
+            callback(def);
+            gvc.notifyDataChange(id);
+        })}"></i>`;
+        const falseImg = html `<div style="width: 16px;height: 16px;border-radius: 3px;border: 1px solid #DDD;" onclick="${gvc.event(e => {
+            callback(def);
+            gvc.notifyDataChange(id);
+        })}"></div>`;
+        return gvc.bindView({
+            bind: id,
+            view: () => {
+                return (def) ? trueImg : falseImg;
+            }, divCreate: {}
+        });
+    }
     static switchTextButton(gvc, def, text, callback) {
         var _b, _c;
         return html ` <div style="display: flex; align-items: center;">

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

@@ -396,6 +396,24 @@ export class BgWidget {
     </div>`;
   }
 
+  static checkInput(gvc: GVC, def: boolean, callback: (value: boolean) => void) {
+    const id = gvc.glitter.getUUID()
+    const trueImg = html`<i class="fa-solid fa-square-check" style="width: 16px;height: 16px;" onclick="${gvc.event(e => {
+      callback(def);
+      gvc.notifyDataChange(id)
+    })}"></i>`;
+    const falseImg = html`<div style="width: 16px;height: 16px;border-radius: 3px;border: 1px solid #DDD;" onclick="${gvc.event(e => {
+      callback(def);
+      gvc.notifyDataChange(id)
+    })}"></div>`;
+    return gvc.bindView({
+      bind:id,
+      view:()=>{
+        return (def)?trueImg:falseImg
+      },divCreate:{}
+    });
+  }
+
   static switchTextButton(
     gvc: GVC,
     def: boolean,

package/lowcode/cms-plugin/information/information-module.js

@@ -60,7 +60,7 @@ export class InformationModule {
                                         text: '是否確認重置號碼?',
                                         callback: response => {
                                             if (response) {
-                                                vm.data.pickup_now = vm.data.pickup_start || '0';
+                                                vm.data.pickup_now = vm.data.pickup_start || 0;
                                                 gvc.recreateView();
                                             }
                                         },
@@ -76,9 +76,9 @@ export class InformationModule {
                                     BgWidget.editeInput({
                                         gvc: gvc,
                                         title: '初始號碼',
-                                        default: vm.data.pickup_start || '0',
+                                        default: `${vm.data.pickup_start || 0}`,
                                         callback: text => {
-                                            vm.data.pickup_start = text;
+                                            vm.data.pickup_start = Number(text);
                                         },
                                         placeHolder: '請輸入初始號碼',
                                         type: 'number',
@@ -88,9 +88,9 @@ export class InformationModule {
                                         title: html `<div class="d-flex flex-column">
                         ${['結束號碼', BgWidget.grayNote('輸入零則無上限')].join('')}
                       </div>`,
-                                        default: vm.data.pickup_end || '0',
+                                        default: `${vm.data.pickup_end || 0}`,
                                         callback: text => {
-                                            vm.data.pickup_end = text;
+                                            vm.data.pickup_end = Number(text);
                                         },
                                         placeHolder: '請輸入結束號碼',
                                         type: 'number',

package/lowcode/cms-plugin/information/information-module.ts

@@ -5,10 +5,14 @@ import { FilterOptions } from '../filter-options.js';
 
 type PageType = 'basic' | 'function' | 'global';
 
+
 export type ViewModel = {
   id: string;
   tableId: string;
   filterId: string;
+  webTypeId: string;
+  reverseId: string;
+  reverseEditId:string;
   type: PageType;
   data: any;
   SEOData: any;
@@ -78,7 +82,7 @@ export class InformationModule {
                             text: '是否確認重置號碼?',
                             callback: response => {
                               if (response) {
-                                vm.data.pickup_now = vm.data.pickup_start || '0';
+                                vm.data.pickup_now = vm.data.pickup_start || 0;
                                 gvc.recreateView();
                               }
                             },
@@ -94,9 +98,9 @@ export class InformationModule {
                     BgWidget.editeInput({
                       gvc: gvc,
                       title: '初始號碼',
-                      default: vm.data.pickup_start || '0',
+                      default: `${vm.data.pickup_start||0}`,
                       callback: text => {
-                        vm.data.pickup_start = text;
+                        vm.data.pickup_start = Number(text) ;
                       },
                       placeHolder: '請輸入初始號碼',
                       type: 'number',
@@ -106,9 +110,9 @@ export class InformationModule {
                       title: html`<div class="d-flex flex-column">
                         ${['結束號碼', BgWidget.grayNote('輸入零則無上限')].join('')}
                       </div>`,
-                      default: vm.data.pickup_end || '0',
+                      default:`${vm.data.pickup_end||0}`,
                       callback: text => {
-                        vm.data.pickup_end = text;
+                        vm.data.pickup_end = Number(text);
                       },
                       placeHolder: '請輸入結束號碼',
                       type: 'number',