ts-glitter 16.0.3 → 16.0.5

package/lowcode/Entry.js

@@ -79,7 +79,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_16.0.3';
+        glitter.share.editerVersion = 'V_16.0.5';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -81,7 +81,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_16.0.3';
+        glitter.share.editerVersion = 'V_16.0.5';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

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

@@ -309,7 +309,7 @@ export class BgLine {
                                             return html ` <div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>

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

@@ -385,7 +385,7 @@ export class BgLine {
                                                             return html` <div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>

package/lowcode/backend-manager/bg-list-component.js

@@ -97,55 +97,62 @@ export class BgListComponent {
                     view: () => {
                         return html `<!-- Accordion: 篩選 -->
                             <div class="accordion" id="accordion${vmShow.id}">
-                                ${gvc.map(items.map((item) => {
-                            let contentHTML = '';
-                            switch (item.type) {
-                                case 'during':
-                                    contentHTML +=
-                                        item.data && item.data.list.length > 0
-                                            ? BgWidget.duringInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
-                                                this.vm.filter[item.key] = value;
-                                            })
-                                            : '';
-                                    break;
-                                case 'multi_checkbox':
-                                    contentHTML +=
-                                        item.data.length > 0
-                                            ? BgWidget.multiCheckboxContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
-                                                this.vm.filter[item.key] = value;
-                                            })
-                                            : '';
-                                    break;
-                                case 'radio_and_input':
-                                    contentHTML +=
-                                        item.data.length > 0
-                                            ? BgWidget.radioInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
-                                                this.vm.filter[item.key] = value;
-                                            })
-                                            : '';
-                                    break;
-                            }
-                            return contentHTML.length > 0
-                                ? html `<!-- Item -->
-                                                  <div class="accordion-item border-0 rounded-3 mb-3">
-                                                      <h3 class="accordion-header" id="heading${item.key}">
-                                                          <button
-                                                              class="accordion-button shadow-none rounded-3 p-0 collapsed"
-                                                              type="button"
-                                                              data-bs-toggle="collapse"
-                                                              data-bs-target="#collapse${item.key}"
-                                                              aria-expanded="false"
-                                                              aria-controls="collapse${item.key}"
-                                                          >
-                                                              ${item.name}
-                                                          </button>
-                                                      </h3>
-                                                      <div class="accordion-collapse collapse" id="collapse${item.key}" aria-labelledby="heading${item.key}" data-bs-parent="#accordion${vmShow.id}">
-                                                          <div class="accordion-body p-0 pt-1">${contentHTML}</div>
-                                                      </div>
-                                                  </div> `
-                                : '';
-                        }))}
+                                ${gvc.map(items.length > 0
+                            ? items.map((item) => {
+                                let contentHTML = '';
+                                switch (item.type) {
+                                    case 'during':
+                                        contentHTML +=
+                                            item.data && item.data.list.length > 0
+                                                ? BgWidget.duringInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
+                                                    this.vm.filter[item.key] = value;
+                                                })
+                                                : '';
+                                        break;
+                                    case 'multi_checkbox':
+                                        contentHTML +=
+                                            item.data.length > 0
+                                                ? BgWidget.multiCheckboxContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
+                                                    this.vm.filter[item.key] = value;
+                                                })
+                                                : '';
+                                        break;
+                                    case 'radio_and_input':
+                                        contentHTML +=
+                                            item.data.length > 0
+                                                ? BgWidget.radioInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
+                                                    this.vm.filter[item.key] = value;
+                                                })
+                                                : '';
+                                        break;
+                                }
+                                return contentHTML.length > 0
+                                    ? html `<!-- Item -->
+                                                        <div class="accordion-item border-0 rounded-3 mb-3">
+                                                            <h3 class="accordion-header" id="heading${item.key}">
+                                                                <button
+                                                                    class="accordion-button shadow-none rounded-3 p-0 collapsed"
+                                                                    type="button"
+                                                                    data-bs-toggle="collapse"
+                                                                    data-bs-target="#collapse${item.key}"
+                                                                    aria-expanded="false"
+                                                                    aria-controls="collapse${item.key}"
+                                                                >
+                                                                    ${item.name}
+                                                                </button>
+                                                            </h3>
+                                                            <div
+                                                                class="accordion-collapse collapse"
+                                                                id="collapse${item.key}"
+                                                                aria-labelledby="heading${item.key}"
+                                                                data-bs-parent="#accordion${vmShow.id}"
+                                                            >
+                                                                <div class="accordion-body p-0 pt-1">${contentHTML}</div>
+                                                            </div>
+                                                        </div> `
+                                    : '';
+                            })
+                            : ['無篩選項目'])}
                             </div>
                             <div class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4" style="gap:10px;">
                                 ${BgWidget.cancel(gvc.event(() => {

package/lowcode/backend-manager/bg-list-component.ts

@@ -108,7 +108,7 @@ export class BgListComponent {
 
     showRightMenu(items: FilterItem[]) {
         const glitter = (window.parent as any).glitter;
-        const gvc: GVC = glitter.pageConfig[glitter.pageConfig.length-1].gvc;
+        const gvc: GVC = glitter.pageConfig[glitter.pageConfig.length - 1].gvc;
         const menu = glitter.share.NormalPageEditor;
         const vmShow = { id: gvc.glitter.getUUID() };
         menu.closeEvent = () => gvc.notifyDataChange(this.vm.id);
@@ -122,57 +122,64 @@ export class BgListComponent {
                         return html`<!-- Accordion: 篩選 -->
                             <div class="accordion" id="accordion${vmShow.id}">
                                 ${gvc.map(
-                                    items.map((item: any) => {
-                                        let contentHTML = '';
-                                        switch (item.type) {
-                                            case 'during':
-                                                contentHTML +=
-                                                    item.data && item.data.list.length > 0
-                                                        ? BgWidget.duringInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
-                                                              this.vm.filter[item.key] = value;
-                                                          })
-                                                        : '';
-                                                break;
-                                            case 'multi_checkbox':
-                                                contentHTML +=
-                                                    item.data.length > 0
-                                                        ? BgWidget.multiCheckboxContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
-                                                              this.vm.filter[item.key] = value;
-                                                          })
-                                                        : '';
+                                    items.length > 0
+                                        ? items.map((item: any) => {
+                                              let contentHTML = '';
+                                              switch (item.type) {
+                                                  case 'during':
+                                                      contentHTML +=
+                                                          item.data && item.data.list.length > 0
+                                                              ? BgWidget.duringInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
+                                                                    this.vm.filter[item.key] = value;
+                                                                })
+                                                              : '';
+                                                      break;
+                                                  case 'multi_checkbox':
+                                                      contentHTML +=
+                                                          item.data.length > 0
+                                                              ? BgWidget.multiCheckboxContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
+                                                                    this.vm.filter[item.key] = value;
+                                                                })
+                                                              : '';
 
-                                                break;
-                                            case 'radio_and_input':
-                                                contentHTML +=
-                                                    item.data.length > 0
-                                                        ? BgWidget.radioInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
-                                                              this.vm.filter[item.key] = value;
-                                                          })
-                                                        : '';
-                                                break;
-                                        }
+                                                      break;
+                                                  case 'radio_and_input':
+                                                      contentHTML +=
+                                                          item.data.length > 0
+                                                              ? BgWidget.radioInputContainer(gvc, item.data, this.vm.filter[item.key], (value) => {
+                                                                    this.vm.filter[item.key] = value;
+                                                                })
+                                                              : '';
+                                                      break;
+                                              }
 
-                                        return contentHTML.length > 0
-                                            ? html`<!-- Item -->
-                                                  <div class="accordion-item border-0 rounded-3 mb-3">
-                                                      <h3 class="accordion-header" id="heading${item.key}">
-                                                          <button
-                                                              class="accordion-button shadow-none rounded-3 p-0 collapsed"
-                                                              type="button"
-                                                              data-bs-toggle="collapse"
-                                                              data-bs-target="#collapse${item.key}"
-                                                              aria-expanded="false"
-                                                              aria-controls="collapse${item.key}"
-                                                          >
-                                                              ${item.name}
-                                                          </button>
-                                                      </h3>
-                                                      <div class="accordion-collapse collapse" id="collapse${item.key}" aria-labelledby="heading${item.key}" data-bs-parent="#accordion${vmShow.id}">
-                                                          <div class="accordion-body p-0 pt-1">${contentHTML}</div>
-                                                      </div>
-                                                  </div> `
-                                            : '';
-                                    })
+                                              return contentHTML.length > 0
+                                                  ? html`<!-- Item -->
+                                                        <div class="accordion-item border-0 rounded-3 mb-3">
+                                                            <h3 class="accordion-header" id="heading${item.key}">
+                                                                <button
+                                                                    class="accordion-button shadow-none rounded-3 p-0 collapsed"
+                                                                    type="button"
+                                                                    data-bs-toggle="collapse"
+                                                                    data-bs-target="#collapse${item.key}"
+                                                                    aria-expanded="false"
+                                                                    aria-controls="collapse${item.key}"
+                                                                >
+                                                                    ${item.name}
+                                                                </button>
+                                                            </h3>
+                                                            <div
+                                                                class="accordion-collapse collapse"
+                                                                id="collapse${item.key}"
+                                                                aria-labelledby="heading${item.key}"
+                                                                data-bs-parent="#accordion${vmShow.id}"
+                                                            >
+                                                                <div class="accordion-body p-0 pt-1">${contentHTML}</div>
+                                                            </div>
+                                                        </div> `
+                                                  : '';
+                                          })
+                                        : ['無篩選項目']
                                 )}
                             </div>
                             <div class="position-absolute bottom-0 left-0 w-100 d-flex align-items-center justify-content-end p-3 border-top pe-4" style="gap:10px;">

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

@@ -309,7 +309,7 @@ export class BgNotify {
                                             return html `<div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>

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

@@ -380,7 +380,7 @@ export class BgNotify {
                                                             return html`<div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>

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

@@ -369,7 +369,7 @@ export class BgRecommend {
                                             return html ` <div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>`;

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

@@ -465,7 +465,7 @@ export class BgRecommend {
                                                             return html` <div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>`;

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

@@ -311,7 +311,7 @@ export class BgSNS {
                                             return html ` <div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>

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

@@ -387,7 +387,7 @@ export class BgSNS {
                                                             return html` <div style="display: flex; align-items: center; gap: 10px; width: 100%; justify-content: space-between">
                                                                     <div>${filterList[0]}</div>
                                                                     <div style="display: flex;">
-                                                                        <div class="me-2">${filterList[2]}</div>
+                                                                        ${filterList[2] ? `<div class="me-2">${filterList[2]}</div>` : ''}
                                                                     </div>
                                                                 </div>
                                                                 <div style="display: flex; margin-top: 8px;">${filterList[1]}</div>

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

@@ -2051,6 +2051,9 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
             bind: vm.id,
             view: () => {
                 if (vm.show) {
+                    if (obj.options.length === 0) {
+                        return '';
+                    }
                     return html ` <div class="c_absolute" style="top: 20px; right: 20px;">
                             <div class="form-check d-flex flex-column" style="gap: 16px">
                                 ${obj.gvc.map(obj.options.map((opt) => {

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

@@ -2429,6 +2429,9 @@ ${obj.default ?? ''}</textarea
                 bind: vm.id,
                 view: () => {
                     if (vm.show) {
+                        if (obj.options.length === 0) {
+                            return '';
+                        }
                         return html` <div class="c_absolute" style="top: 20px; right: 20px;">
                             <div class="form-check d-flex flex-column" style="gap: 16px">
                                 ${obj.gvc.map(

package/lowcode/cms-plugin/filter-options.js

@@ -506,3 +506,11 @@ FilterOptions.permissionOrderBy = [
     { key: 'online_time_asc', value: '最後登入時間早 > 晚' },
     { key: 'online_time_desc', value: '最後登入時間晚 > 早' },
 ];
+FilterOptions.storesFilterFrame = {};
+FilterOptions.storesSelect = [{ key: 'name', value: '庫存點名稱' }];
+FilterOptions.storesFunnel = [];
+FilterOptions.storesOrderBy = [];
+FilterOptions.vendorsFilterFrame = {};
+FilterOptions.vendorsSelect = [{ key: 'name', value: '庫存點名稱' }];
+FilterOptions.vendorsFunnel = [];
+FilterOptions.vendorsOrderBy = [];

package/lowcode/cms-plugin/filter-options.ts

@@ -203,6 +203,7 @@ export class FilterOptions {
             },
         },
     ];
+
     static invoiceFunnel = [
         {
             key: 'invoice_type',
@@ -244,6 +245,7 @@ export class FilterOptions {
             },
         },
     ];
+
     static allowanceFunnel = [
         {
             key: 'status',
@@ -287,6 +289,7 @@ export class FilterOptions {
         { key: 'order_total_desc', value: '發票金額高 > 低' },
         { key: 'order_total_asc', value: '發票金額低 > 高' },
     ];
+
     static allowanceOrderBy = [
         { key: 'created_time_desc', value: '發票時間新 > 舊' },
         { key: 'created_time_asc', value: '發票時間舊 > 新' },
@@ -319,6 +322,7 @@ export class FilterOptions {
         { key: 'product_name', value: '商品名稱' },
         { key: 'product_number', value: '商品編號' },
     ];
+
     static allowanceSelect = [
         { key: 'allowance_no', value: '折讓單編號' },
         { key: 'invoice_no', value: '原發票編號' },
@@ -565,4 +569,20 @@ export class FilterOptions {
         { key: 'online_time_asc', value: '最後登入時間早 > 晚' },
         { key: 'online_time_desc', value: '最後登入時間晚 > 早' },
     ];
+
+    static storesFilterFrame = {};
+
+    static storesSelect = [{ key: 'name', value: '庫存點名稱' }];
+
+    static storesFunnel = [];
+
+    static storesOrderBy = [];
+
+    static vendorsFilterFrame = {};
+
+    static vendorsSelect = [{ key: 'name', value: '庫存點名稱' }];
+
+    static vendorsFunnel = [];
+
+    static vendorsOrderBy = [];
 }