ts-glitter 18.3.2 → 18.3.4

package/lowcode/Entry.js

@@ -132,7 +132,7 @@ export class Entry {
         }
         window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_18.3.2';
+        glitter.share.editerVersion = 'V_18.3.4';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],
@@ -599,6 +599,7 @@ export class Entry {
                     backGroundColor: `transparent;`,
                 });
             }
+            console.log(`(window as any).memberType=>`, window.memberType);
             if (window.memberType !== 'noLimit' &&
                 vm.appConfig.dead_line &&
                 new Date(vm.appConfig.dead_line).getTime() < new Date().getTime() &&

package/lowcode/Entry.ts

@@ -135,7 +135,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_18.3.2';
+        glitter.share.editerVersion = 'V_18.3.4';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;
@@ -659,6 +659,7 @@ export class Entry {
                 });
             }
 
+            console.log(`(window as any).memberType=>`,(window as any).memberType)
             // 判斷APP是否過期
             if (
                 (window as any).memberType !== 'noLimit' &&

package/lowcode/backend-manager/bg-customer-message.js

@@ -362,17 +362,6 @@ export class BgCustomerMessage {
                                                     </div>
                                                     <div style="margin-top: 10px;" class="p-2">
                                                         ${[
-                                                html `
-                                                                <div class="mb-3"
-                                                                     style="display:flex; align-items: center; gap: 4px; margin-bottom: 8px;">
-                                                                    <div class="fw-500"
-                                                                         style="color: #393939;font-size: 15px;">啟用客服功能
-                                                                    </div>
-                                                                    ${BgWidget.switchButton(gvc, keyData.toggle, (bool) => {
-                                                    keyData.toggle = bool;
-                                                    gvc.notifyDataChange(vO.id);
-                                                })}
-                                                                </div>`,
                                                 ...(() => {
                                                     if (keyData.toggle) {
                                                         return [

package/lowcode/backend-manager/bg-customer-message.ts

@@ -395,17 +395,6 @@ export class BgCustomerMessage {
                                                     </div>
                                                     <div style="margin-top: 10px;" class="p-2">
                                                         ${[
-                                                            html`
-                                                                <div class="mb-3"
-                                                                     style="display:flex; align-items: center; gap: 4px; margin-bottom: 8px;">
-                                                                    <div class="fw-500"
-                                                                         style="color: #393939;font-size: 15px;">啟用客服功能
-                                                                    </div>
-                                                                    ${BgWidget.switchButton(gvc, keyData.toggle, (bool) => {
-                                                                        keyData.toggle = bool;
-                                                                        gvc.notifyDataChange(vO.id)
-                                                                    })}
-                                                                </div>`,
                                                             ...(() => {
                                                                 if (keyData.toggle) {
                                                                     return [

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

@@ -704,7 +704,8 @@ export class BgLine {
                     });
                 }
                 if (tag === 'birth') {
-                    const birthData = FilterOptions.userFunnel.find((data) => data.key === 'birth');
+                    const userFunnel = yield FilterOptions.getUserFunnel();
+                    const birthData = userFunnel.find((data) => data.key === 'birth');
                     if (birthData && Array.isArray(birthData.data)) {
                         return birthData.data.map((item) => {
                             item.value = item.name;

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

@@ -804,7 +804,8 @@ export class BgLine {
                 });
             }
             if (tag === 'birth') {
-                const birthData = FilterOptions.userFunnel.find((data) => data.key === 'birth');
+                const userFunnel = await FilterOptions.getUserFunnel();
+                const birthData = userFunnel.find((data) => data.key === 'birth');
                 if (birthData && Array.isArray(birthData.data)) {
                     return birthData.data.map((item: any) => {
                         item.value = item.name;

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

@@ -763,7 +763,8 @@ export class BgNotify {
                     });
                 }
                 if (tag === 'birth') {
-                    const birthData = FilterOptions.userFunnel.find((data) => data.key === 'birth');
+                    const userFunnel = yield FilterOptions.getUserFunnel();
+                    const birthData = userFunnel.find((data) => data.key === 'birth');
                     if (birthData && Array.isArray(birthData.data)) {
                         return birthData.data.map((item) => {
                             item.value = item.name;

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

@@ -860,7 +860,8 @@ export class BgNotify {
                 });
             }
             if (tag === 'birth') {
-                const birthData = FilterOptions.userFunnel.find((data) => data.key === 'birth');
+                const userFunnel = await FilterOptions.getUserFunnel();
+                const birthData = userFunnel.find((data) => data.key === 'birth');
                 if (birthData && Array.isArray(birthData.data)) {
                     return birthData.data.map((item: any) => {
                         item.value = item.name;

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

@@ -69,7 +69,7 @@ export class BgProduct {
                                 <div class="c_dialog_body">
                                     <div class="c_dialog_main" style="gap: 24px; max-height: 500px;">
                                         <div class="d-flex" style="gap: 12px;">
-                                            ${BgWidget.searchFilter(gvc.event((e, event) => {
+                                            ${BgWidget.searchFilter(gvc.event((e) => {
                         vm.query = e.value;
                         vm.loading = true;
                         gvc.notifyDataChange(vm.id);
@@ -318,10 +318,13 @@ export class BgProduct {
     static replaceAngle(text) {
         return text.replace(/\//g, html `<i class="fa-solid fa-angle-right mx-1"></i>`);
     }
+    static getWidthHeigth(isDesktop) {
+        return isDesktop ? ['800px', '600px', 'calc(600px - 120px) !important'] : ['95vw', '70vh', 'calc(70vh - 120px) !important'];
+    }
     static setMemberPriceSetting(obj) {
         const { gvc, postData, callback } = obj;
         const isDesktop = document.body.clientWidth > 768;
-        const [baseWidth, baseHeight, mainHeight] = isDesktop ? ['800px', '600px', 'calc(600px - 120px) !important'] : ['95vw', '70vh', 'calc(70vh - 120px) !important'];
+        const [baseWidth, baseHeight, mainHeight] = this.getWidthHeigth(isDesktop);
         const vm = {
             dataList: [],
             postData: [...postData],
@@ -389,7 +392,7 @@ export class BgProduct {
     static setStorePriceSetting(obj) {
         const { gvc, postData, callback } = obj;
         const isDesktop = document.body.clientWidth > 768;
-        const [baseWidth, baseHeight, mainHeight] = isDesktop ? ['800px', '600px', 'calc(600px - 120px) !important'] : ['95vw', '70vh', 'calc(70vh - 120px) !important'];
+        const [baseWidth, baseHeight, mainHeight] = this.getWidthHeigth(isDesktop);
         const vm = {
             dataList: [],
             postData: [...postData],
@@ -459,6 +462,70 @@ export class BgProduct {
             });
         }, 'setMemberPriceSetting');
     }
+    static setUserTagPriceSetting(obj) {
+        const { gvc, postData, callback } = obj;
+        const isDesktop = document.body.clientWidth > 768;
+        const [baseWidth, baseHeight, mainHeight] = this.getWidthHeigth(isDesktop);
+        const vm = {
+            dataList: [],
+            postData: [...postData],
+            loading: true,
+        };
+        return gvc.glitter.innerDialog((gvc) => {
+            const id = gvc.glitter.getUUID();
+            ApiUser.getPublicConfig('user_general_tags', 'manager').then((r) => {
+                if (r.result && Array.isArray(r.response.value.list)) {
+                    vm.dataList = r.response.value.list.map((tag) => ({ key: tag, name: tag }));
+                }
+                vm.loading = false;
+                gvc.notifyDataChange(id);
+            });
+            return gvc.bindView({
+                bind: id,
+                view: () => html ` <div class="bg-white shadow ${isDesktop ? 'rounded-3' : ''}" style="overflow-y: auto; width: ${baseWidth}; height: ${baseHeight};">
+                        <div class="h-100">
+                            ${vm.loading
+                    ? html `<div class="h-100 d-flex">${BgWidget.spinner()}</div>`
+                    : html ` <div class="bg-white shadow rounded-3" style="width: 100%; max-height: 100%; overflow-y: auto; position: relative;">
+                                      <div class="w-100 d-flex align-items-center p-3 border-bottom" style="position: sticky; top: 0; z-index: 2; background: #fff;">
+                                          <div class="tx_700">顧客標籤價格設定</div>
+                                          <div class="flex-fill"></div>
+                                          <i class="fa-regular fa-circle-xmark fs-5 text-dark cursor_pointer" onclick="${gvc.event(() => gvc.closeDialog())}"></i>
+                                      </div>
+                                      <div class="c_dialog h-100">
+                                          <div class="c_dialog_body h-100">
+                                              <div class="c_dialog_main h-100" style="min-height: ${mainHeight}; padding: 20px; gap: 0;">
+                                                  ${BgWidget.tripletCheckboxContainer(gvc, '顧客標籤', (() => {
+                        if (vm.postData.length === 0)
+                            return -1;
+                        return vm.postData.length === vm.dataList.length ? 1 : 0;
+                    })(), (r) => {
+                        vm.postData = r === 1 ? vm.dataList.map(({ key }) => key) : [];
+                        gvc.notifyDataChange(id);
+                    })}
+                                                  ${BgWidget.horizontalLine()}
+                                                  ${BgWidget.multiCheckboxContainer(gvc, vm.dataList, vm.postData, (text) => {
+                        vm.postData = text;
+                        gvc.notifyDataChange(id);
+                    })}
+                                                  ${BgWidget.grayNote('※只有被選取的會員才能設置專屬價格，其餘依售價計算', 'margin-top: 12px;')}
+                                              </div>
+                                              <div class="c_dialog_bar" style="z-index: 2;">
+                                                  ${BgWidget.cancel(gvc.event(() => gvc.closeDialog()))}
+                                                  ${BgWidget.save(gvc.event(() => {
+                        callback(vm.postData);
+                        gvc.closeDialog();
+                    }), '確認')}
+                                              </div>
+                                          </div>
+                                      </div>
+                                  </div>`}
+                        </div>
+                    </div>`,
+                divCreate: {},
+            });
+        }, 'setUserTagPriceSetting');
+    }
 }
 BgProduct.getProductOpts = (def, productType) => {
     return new Promise((resolve) => {

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

@@ -105,7 +105,7 @@ export class BgProduct {
                                     <div class="c_dialog_main" style="gap: 24px; max-height: 500px;">
                                         <div class="d-flex" style="gap: 12px;">
                                             ${BgWidget.searchFilter(
-                                                gvc.event((e, event) => {
+                                                gvc.event((e) => {
                                                     vm.query = e.value;
                                                     vm.loading = true;
                                                     gvc.notifyDataChange(vm.id);
@@ -449,10 +449,14 @@ export class BgProduct {
         return text.replace(/\//g, html`<i class="fa-solid fa-angle-right mx-1"></i>`);
     }
 
+    static getWidthHeigth(isDesktop: boolean): [string, string, string] {
+        return isDesktop ? ['800px', '600px', 'calc(600px - 120px) !important'] : ['95vw', '70vh', 'calc(70vh - 120px) !important'];
+    }
+
     static setMemberPriceSetting(obj: { gvc: GVC; postData: string[]; callback: (data: string[]) => void }) {
         const { gvc, postData, callback } = obj;
         const isDesktop = document.body.clientWidth > 768;
-        const [baseWidth, baseHeight, mainHeight] = isDesktop ? ['800px', '600px', 'calc(600px - 120px) !important'] : ['95vw', '70vh', 'calc(70vh - 120px) !important'];
+        const [baseWidth, baseHeight, mainHeight] = this.getWidthHeigth(isDesktop);
 
         const vm = {
             dataList: [] as { key: string; name: string }[],
@@ -532,7 +536,7 @@ export class BgProduct {
     static setStorePriceSetting(obj: { gvc: GVC; postData: string[]; callback: (data: string[]) => void }) {
         const { gvc, postData, callback } = obj;
         const isDesktop = document.body.clientWidth > 768;
-        const [baseWidth, baseHeight, mainHeight] = isDesktop ? ['800px', '600px', 'calc(600px - 120px) !important'] : ['95vw', '70vh', 'calc(70vh - 120px) !important'];
+        const [baseWidth, baseHeight, mainHeight] = this.getWidthHeigth(isDesktop);
 
         const vm = {
             dataList: [] as { key: string; name: string }[],
@@ -614,4 +618,81 @@ export class BgProduct {
             });
         }, 'setMemberPriceSetting');
     }
+
+    static setUserTagPriceSetting(obj: { gvc: GVC; postData: string[]; callback: (data: string[]) => void }) {
+        const { gvc, postData, callback } = obj;
+        const isDesktop = document.body.clientWidth > 768;
+        const [baseWidth, baseHeight, mainHeight] = this.getWidthHeigth(isDesktop);
+
+        const vm = {
+            dataList: [] as { key: string; name: string }[],
+            postData: [...postData],
+            loading: true,
+        };
+
+        return gvc.glitter.innerDialog((gvc) => {
+            const id = gvc.glitter.getUUID();
+
+            ApiUser.getPublicConfig('user_general_tags', 'manager').then((r: any) => {
+                if (r.result && Array.isArray(r.response.value.list)) {
+                    vm.dataList = r.response.value.list.map((tag: string) => ({ key: tag, name: tag }));
+                }
+                vm.loading = false;
+                gvc.notifyDataChange(id);
+            });
+
+            return gvc.bindView({
+                bind: id,
+                view: () =>
+                    html` <div class="bg-white shadow ${isDesktop ? 'rounded-3' : ''}" style="overflow-y: auto; width: ${baseWidth}; height: ${baseHeight};">
+                        <div class="h-100">
+                            ${vm.loading
+                                ? html`<div class="h-100 d-flex">${BgWidget.spinner()}</div>`
+                                : html` <div class="bg-white shadow rounded-3" style="width: 100%; max-height: 100%; overflow-y: auto; position: relative;">
+                                      <div class="w-100 d-flex align-items-center p-3 border-bottom" style="position: sticky; top: 0; z-index: 2; background: #fff;">
+                                          <div class="tx_700">顧客標籤價格設定</div>
+                                          <div class="flex-fill"></div>
+                                          <i class="fa-regular fa-circle-xmark fs-5 text-dark cursor_pointer" onclick="${gvc.event(() => gvc.closeDialog())}"></i>
+                                      </div>
+                                      <div class="c_dialog h-100">
+                                          <div class="c_dialog_body h-100">
+                                              <div class="c_dialog_main h-100" style="min-height: ${mainHeight}; padding: 20px; gap: 0;">
+                                                  ${BgWidget.tripletCheckboxContainer(
+                                                      gvc,
+                                                      '顧客標籤',
+                                                      (() => {
+                                                          if (vm.postData.length === 0) return -1;
+                                                          return vm.postData.length === vm.dataList.length ? 1 : 0;
+                                                      })(),
+                                                      (r) => {
+                                                          vm.postData = r === 1 ? vm.dataList.map(({ key }) => key) : [];
+                                                          gvc.notifyDataChange(id);
+                                                      }
+                                                  )}
+                                                  ${BgWidget.horizontalLine()}
+                                                  ${BgWidget.multiCheckboxContainer(gvc, vm.dataList, vm.postData, (text) => {
+                                                      vm.postData = text;
+                                                      gvc.notifyDataChange(id);
+                                                  })}
+                                                  ${BgWidget.grayNote('※只有被選取的會員才能設置專屬價格，其餘依售價計算', 'margin-top: 12px;')}
+                                              </div>
+                                              <div class="c_dialog_bar" style="z-index: 2;">
+                                                  ${BgWidget.cancel(gvc.event(() => gvc.closeDialog()))}
+                                                  ${BgWidget.save(
+                                                      gvc.event(() => {
+                                                          callback(vm.postData);
+                                                          gvc.closeDialog();
+                                                      }),
+                                                      '確認'
+                                                  )}
+                                              </div>
+                                          </div>
+                                      </div>
+                                  </div>`}
+                        </div>
+                    </div>`,
+                divCreate: {},
+            });
+        }, 'setUserTagPriceSetting');
+    }
 }

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

@@ -443,10 +443,6 @@ export class BgRecommend {
                                                             vm.query || '',
                                                             '搜尋推薦人'
                                                         ),
-                                                        // BgWidget.funnelFilter({
-                                                        //     gvc,
-                                                        //     callback: () => ListComp.showRightMenu(FilterOptions.userFunnel),
-                                                        // }),
                                                         BgWidget.updownFilter({
                                                             gvc,
                                                             callback: (value: any) => {

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

@@ -731,7 +731,8 @@ export class BgSNS {
                     });
                 }
                 if (tag === 'birth') {
-                    const birthData = FilterOptions.userFunnel.find((data) => data.key === 'birth');
+                    const userFunnel = yield FilterOptions.getUserFunnel();
+                    const birthData = userFunnel.find((data) => data.key === 'birth');
                     if (birthData && Array.isArray(birthData.data)) {
                         return birthData.data.map((item) => {
                             item.value = item.name;

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

@@ -831,7 +831,8 @@ export class BgSNS {
                 });
             }
             if (tag === 'birth') {
-                const birthData = FilterOptions.userFunnel.find((data) => data.key === 'birth');
+                const userFunnel = await FilterOptions.getUserFunnel();
+                const birthData = userFunnel.find((data) => data.key === 'birth');
                 if (birthData && Array.isArray(birthData.data)) {
                     return birthData.data.map((item: any) => {
                         item.value = item.name;