ts-glitter 21.4.0 → 21.4.1

package/lowcode/cms-plugin/shopping-discount-setting.ts

@@ -954,55 +954,56 @@ export class ShoppingDiscountSetting {
                         .map(str => html`<div>${str}</div>`)
                         .join(BgWidget.horizontalLine())
                     ),
-                    BgWidget.mainCard(
-                      gvc.bindView(() => {
-                        const id = glitter.getUUID();
-                        const originForType = String(voucherData.for);
-                        voucherData.forKey = voucherData.forKey ?? [];
-                        let defKeys: any = {
-                          collection: JSON.parse(JSON.stringify(voucherData.forKey)),
-                          product: JSON.parse(JSON.stringify(voucherData.forKey)),
-                          manager_tag: JSON.parse(JSON.stringify(voucherData.forKey)),
-                        };
+                    ...(['shipment_free', 'add_on_items', 'giveaway'].includes(voucherData.reBackType)) ? []:[
+                      BgWidget.mainCard(
+                        gvc.bindView(() => {
+                          const id = glitter.getUUID();
+                          const originForType = String(voucherData.for);
+                          voucherData.forKey = voucherData.forKey ?? [];
+                          let defKeys: any = {
+                            collection: JSON.parse(JSON.stringify(voucherData.forKey)),
+                            product: JSON.parse(JSON.stringify(voucherData.forKey)),
+                            manager_tag: JSON.parse(JSON.stringify(voucherData.forKey)),
+                          };
 
-                        return {
-                          bind: id,
-                          dataList: [
-                            { obj: voucherData, key: 'method' },
-                            { obj: voucherData, key: 'reBackType' },
-                          ],
-                          view: () => {
-                            return [
-                              ...(() => {
-                                if (['shipment_free', 'add_on_items', 'giveaway'].includes(voucherData.reBackType)) {
-                                  return [];
-                                }
+                          return {
+                            bind: id,
+                            dataList: [
+                              { obj: voucherData, key: 'method' },
+                              { obj: voucherData, key: 'reBackType' },
+                            ],
+                            view: () => {
+                              return [
+                                ...(() => {
+                                  if (['shipment_free', 'add_on_items', 'giveaway'].includes(voucherData.reBackType)) {
+                                    return [];
+                                  }
 
-                                const valueInput = (obj: { startText?: string; endText?: string }) => {
-                                  return BgWidget.editeInput({
-                                    gvc: gvc,
-                                    type: 'number',
-                                    divStyle: 'width:150px;',
-                                    title: '',
-                                    default: voucherData.value,
-                                    placeHolder: '',
-                                    callback: text => {
-                                      const texInt = parseInt(text, 10);
-                                      if (voucherData.method === 'percent' && (texInt > 100 || texInt < 0)) {
-                                        dialog.infoMessage({ text: '數值需介於0~100' });
-                                        gvc.notifyDataChange(id);
-                                        gvc.notifyDataChange(pageVM.countingID);
-                                      } else {
-                                        voucherData.value = text;
-                                      }
-                                    },
-                                    startText: obj.startText,
-                                    endText: obj.endText,
-                                  });
-                                };
+                                  const valueInput = (obj: { startText?: string; endText?: string }) => {
+                                    return BgWidget.editeInput({
+                                      gvc: gvc,
+                                      type: 'number',
+                                      divStyle: 'width:150px;',
+                                      title: '',
+                                      default: voucherData.value,
+                                      placeHolder: '',
+                                      callback: text => {
+                                        const texInt = parseInt(text, 10);
+                                        if (voucherData.method === 'percent' && (texInt > 100 || texInt < 0)) {
+                                          dialog.infoMessage({ text: '數值需介於0~100' });
+                                          gvc.notifyDataChange(id);
+                                          gvc.notifyDataChange(pageVM.countingID);
+                                        } else {
+                                          voucherData.value = text;
+                                        }
+                                      },
+                                      startText: obj.startText,
+                                      endText: obj.endText,
+                                    });
+                                  };
 
-                                return [
-                                  html` <div>
+                                  return [
+                                    html` <div>
                                     <div class="tx_700">折扣金額</div>
                                     ${BgWidget.mbContainer(18)}
                                     ${BgWidget.multiCheckboxContainer(
@@ -1028,15 +1029,15 @@ export class ShoppingDiscountSetting {
                                       { single: true }
                                     )}
                                   </div>`,
-                                ];
-                              })(),
-                              ...(() => {
-                                if (voucherData.trigger === 'distribution') {
-                                  return [];
-                                }
+                                  ];
+                                })(),
+                                ...(() => {
+                                  if (voucherData.trigger === 'distribution') {
+                                    return [];
+                                  }
 
-                                return [
-                                  html`
+                                  return [
+                                    html`
                                     <div class="tx_700">套用至</div>
                                     ${BgWidget.mbContainer(18)}
                                     ${EditorElem.radio({
@@ -1074,35 +1075,35 @@ export class ShoppingDiscountSetting {
                                                         <div class="tx_normal">標籤列表</div>
                                                       </div>
                                                       ${BgWidget.grayButton(
-                                                        '選擇標籤',
-                                                        gvc.event(() => {
-                                                          BgProduct.useProductTags({
-                                                            gvc,
-                                                            config_key: 'product_manager_tags',
-                                                            def:
-                                                              originForType === 'manager_tag' && voucherData.forKey
-                                                                ? voucherData.forKey.map(item => `${item}`)
-                                                                : [],
-                                                            callback: async value => {
-                                                              voucherData.forKey = value;
-                                                              defKeys.manager_tag = value;
-                                                              subVM.dataList = value;
-                                                              gvc.notifyDataChange(subVM.id);
-                                                            },
-                                                          });
-                                                        }),
-                                                        { textStyle: 'font-weight: 400;' }
-                                                      )}
+                                                  '選擇標籤',
+                                                  gvc.event(() => {
+                                                    BgProduct.useProductTags({
+                                                      gvc,
+                                                      config_key: 'product_manager_tags',
+                                                      def:
+                                                        originForType === 'manager_tag' && voucherData.forKey
+                                                          ? voucherData.forKey.map(item => `${item}`)
+                                                          : [],
+                                                      callback: async value => {
+                                                        voucherData.forKey = value;
+                                                        defKeys.manager_tag = value;
+                                                        subVM.dataList = value;
+                                                        gvc.notifyDataChange(subVM.id);
+                                                      },
+                                                    });
+                                                  }),
+                                                  { textStyle: 'font-weight: 400;' }
+                                                )}
                                                     </div>
                                                     ${obj.gvc.map(
-                                                      subVM.dataList.map((opt, index) => {
-                                                        return html` <div
+                                                  subVM.dataList.map((opt, index) => {
+                                                    return html` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
                                                           <span class="tx_normal">${index + 1}. #${opt}</span>
                                                         </div>`;
-                                                      })
-                                                    )}
+                                                  })
+                                                )}
                                                   </div>
                                                 `;
                                               },
@@ -1131,35 +1132,35 @@ export class ShoppingDiscountSetting {
                                                         <div class="tx_normal">分類列表</div>
                                                       </div>
                                                       ${BgWidget.grayButton(
-                                                        '選擇分類',
-                                                        gvc.event(() => {
-                                                          BgProduct.collectionsDialog({
-                                                            gvc: gvc,
-                                                            default: voucherData.forKey ?? [],
-                                                            callback: async value => {
-                                                              voucherData.forKey = value;
-                                                              defKeys.collection = value;
-                                                              subVM.dataList = await BgProduct.getCollectiosOpts(value);
-                                                              subVM.loading = true;
-                                                              gvc.notifyDataChange(subVM.id);
-                                                            },
-                                                          });
-                                                        }),
-                                                        { textStyle: 'font-weight: 400;' }
-                                                      )}
+                                                  '選擇分類',
+                                                  gvc.event(() => {
+                                                    BgProduct.collectionsDialog({
+                                                      gvc: gvc,
+                                                      default: voucherData.forKey ?? [],
+                                                      callback: async value => {
+                                                        voucherData.forKey = value;
+                                                        defKeys.collection = value;
+                                                        subVM.dataList = await BgProduct.getCollectiosOpts(value);
+                                                        subVM.loading = true;
+                                                        gvc.notifyDataChange(subVM.id);
+                                                      },
+                                                    });
+                                                  }),
+                                                  { textStyle: 'font-weight: 400;' }
+                                                )}
                                                     </div>
                                                     ${obj.gvc.map(
-                                                      subVM.dataList.map((opt: OptionsItem, index) => {
-                                                        return html` <div
+                                                  subVM.dataList.map((opt: OptionsItem, index) => {
+                                                    return html` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
                                                           <span class="tx_normal">${index + 1}. ${opt.value}</span>
                                                           ${opt.note
-                                                            ? html` <span class="tx_gray_12 ms-2">${opt.note}</span> `
-                                                            : ''}
+                                                      ? html` <span class="tx_gray_12 ms-2">${opt.note}</span> `
+                                                      : ''}
                                                         </div>`;
-                                                      })
-                                                    )}
+                                                  })
+                                                )}
                                                   </div>
                                                 `;
                                               },
@@ -1207,45 +1208,45 @@ export class ShoppingDiscountSetting {
                                                         <div class="tx_normal">商品列表</div>
                                                       </div>
                                                       ${BgWidget.grayButton(
-                                                        '選擇商品',
-                                                        gvc.event(() => {
-                                                          BgProduct.productsDialog({
-                                                            gvc: gvc,
-                                                            default: voucherData.forKey ?? [],
-                                                            callback: async value => {
-                                                              voucherData.forKey = value;
-                                                              defKeys.product = value;
-                                                              subVM.dataList = await BgProduct.getProductOpts(
-                                                                voucherData.forKey
-                                                              );
-                                                              subVM.loading = true;
-                                                              gvc.notifyDataChange(subVM.id);
-                                                            },
-                                                          });
-                                                        }),
-                                                        { textStyle: 'font-weight: 400;' }
-                                                      )}
+                                                  '選擇商品',
+                                                  gvc.event(() => {
+                                                    BgProduct.productsDialog({
+                                                      gvc: gvc,
+                                                      default: voucherData.forKey ?? [],
+                                                      callback: async value => {
+                                                        voucherData.forKey = value;
+                                                        defKeys.product = value;
+                                                        subVM.dataList = await BgProduct.getProductOpts(
+                                                          voucherData.forKey
+                                                        );
+                                                        subVM.loading = true;
+                                                        gvc.notifyDataChange(subVM.id);
+                                                      },
+                                                    });
+                                                  }),
+                                                  { textStyle: 'font-weight: 400;' }
+                                                )}
                                                     </div>
                                                     ${subVM.dataList
-                                                      .map((opt: OptionsItem, index) => {
-                                                        return html` <div
+                                                  .map((opt: OptionsItem, index) => {
+                                                    return html` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
                                                           <span class="tx_normal">${index + 1}.</span>
                                                           ${BgWidget.validImageBox({
-                                                            gvc: gvc,
-                                                            image: opt.image,
-                                                            width: 40,
-                                                          })}
+                                                      gvc: gvc,
+                                                      image: opt.image,
+                                                      width: 40,
+                                                    })}
                                                           <div class="tx_normal ${opt.note ? 'mb-1' : ''}">
                                                             ${opt.value}
                                                           </div>
                                                           ${opt.note
-                                                            ? html` <div class="tx_gray_12">${opt.note}</div> `
-                                                            : ''}
+                                                      ? html` <div class="tx_gray_12">${opt.note}</div> `
+                                                      : ''}
                                                         </div>`;
-                                                      })
-                                                      .join(``)}
+                                                  })
+                                                  .join(``)}
                                                   </div>
                                                 `;
                                               },
@@ -1276,13 +1277,15 @@ export class ShoppingDiscountSetting {
                                       }
                                     })()}
                                   `,
-                                ];
-                              })(),
-                            ].join(BgWidget.horizontalLine());
-                          },
-                        };
-                      })
-                    ),
+                                  ];
+                                })(),
+                              ].join(BgWidget.horizontalLine());
+                            },
+                          };
+                        })
+                      )
+                    ]
+                    ,
                     ['giveaway', 'add_on_items'].includes(voucherData.reBackType)
                       ? BgWidget.mainCard(rebackProduct())
                       : '',

package/lowcode/cms-plugin/third-party-line.js

@@ -23,11 +23,14 @@ export class ThirdPartyLine {
                     id: '',
                     secret: '',
                     message_token: '',
+                    support_scope: []
                 },
             };
             ApiUser.getPublicConfig(key, 'manager').then((dd) => {
+                var _a;
                 vm.loading = false;
                 dd.response.value && (vm.data = dd.response.value);
+                vm.data.support_scope = (_a = vm.data.support_scope) !== null && _a !== void 0 ? _a : [];
                 gvc.notifyDataChange(id);
             });
             return {
@@ -79,6 +82,37 @@ export class ThirdPartyLine {
                                             vm.data.message_token = text;
                                         },
                                     }),
+                                    BgWidget.inlineCheckBox({
+                                        title: 'LINE登入請求額外資料',
+                                        gvc: gvc,
+                                        def: vm.data.support_scope,
+                                        array: [
+                                            {
+                                                value: 'phone',
+                                                title: '電話',
+                                            },
+                                            {
+                                                title: '地址',
+                                                value: 'address',
+                                            },
+                                            {
+                                                title: '真實姓名',
+                                                value: 'real_name',
+                                            },
+                                            {
+                                                title: '性別',
+                                                value: 'gender',
+                                            },
+                                            {
+                                                title: '生日',
+                                                value: 'birthdate',
+                                            },
+                                        ],
+                                        callback: (array) => {
+                                            vm.data.support_scope = array;
+                                        },
+                                        type: 'multiple',
+                                    }),
                                     html `<div
                                                         onclick="${gvc.event(() => {
                                         const dialog = new ShareDialog(gvc.glitter);

package/lowcode/cms-plugin/third-party-line.ts

@@ -18,6 +18,7 @@ export class ThirdPartyLine {
                             id: string;
                             secret: string;
                             message_token: string;
+                          support_scope:string[]
                         };
                     } = {
                         loading: true,
@@ -26,12 +27,14 @@ export class ThirdPartyLine {
                             id: '',
                             secret: '',
                             message_token: '',
+                          support_scope:[]
                         },
                     };
 
                     ApiUser.getPublicConfig(key, 'manager').then((dd) => {
                         vm.loading = false;
                         dd.response.value && (vm.data = dd.response.value);
+                        vm.data.support_scope=vm.data.support_scope ?? [];
                         gvc.notifyDataChange(id);
                     });
 
@@ -86,6 +89,37 @@ export class ThirdPartyLine {
                                                             vm.data.message_token = text;
                                                         },
                                                     }),
+                                                  BgWidget.inlineCheckBox({
+                                                    title: 'LINE登入請求額外資料',
+                                                    gvc: gvc,
+                                                    def: vm.data.support_scope,
+                                                    array: [
+                                                      {
+                                                        value: 'phone',
+                                                        title: '電話',
+                                                      },
+                                                      {
+                                                        title: '地址',
+                                                        value: 'address',
+                                                      },
+                                                      {
+                                                        title: '真實姓名',
+                                                        value: 'real_name',
+                                                      },
+                                                      {
+                                                        title: '性別',
+                                                        value: 'gender',
+                                                      },
+                                                      {
+                                                        title: '生日',
+                                                        value: 'birthdate',
+                                                      },
+                                                    ],
+                                                    callback: (array: any) => {
+                                                      vm.data.support_scope=array;
+                                                    },
+                                                    type: 'multiple',
+                                                  }),
                                                     html`<div
                                                         onclick="${gvc.event(() => {
                                                             const dialog = new ShareDialog(gvc.glitter);

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

@@ -0,0 +1,60 @@
+import { ToolSetting } from '../jspage/function-page/tool-setting.js';
+import { BgWidget } from '../backend-manager/bg-widget.js';
+export class GlobalEditor {
+    static main(obj) {
+        var _a;
+        const gvc = obj.gvc;
+        const glitter = gvc.glitter;
+        if ([
+            ...glitter.share._global_component
+                .filter((dd) => {
+                return dd.template_config.tag.includes('標頭元件');
+            })
+                .map((dd) => {
+                return dd.tag;
+            }),
+        ].includes(obj.widget.data.tag)) {
+            obj.widget.header_refer = (_a = obj.widget.header_refer) !== null && _a !== void 0 ? _a : 'def';
+            const c_view = [`<div class="mx-2 ">
+
+${[`<div class="mx-n2 border-top"></div>`,
+                    `<div class="fw-500 mb-2 mt-2">標頭樣式</div>`,
+                    BgWidget.select({
+                        gvc: gvc,
+                        callback: (text) => {
+                            obj.widget.header_refer = text;
+                            glitter.share.selectEditorItem();
+                        },
+                        default: obj.widget.header_refer,
+                        options: [
+                            {
+                                key: 'custom',
+                                value: '自定義標頭樣式',
+                            },
+                            {
+                                key: 'def',
+                                value: '全站預設樣式',
+                            },
+                        ],
+                    })
+                ].join('')}</div>`];
+            if (obj.widget.header_refer !== 'def') {
+                c_view.push(ToolSetting.item({
+                    gvc: gvc,
+                    dd: {
+                        title: '標頭選單',
+                        tag: '標頭元件',
+                        hint: ``,
+                        toggle: true,
+                    },
+                }));
+                c_view.push(obj.append);
+            }
+            return c_view.join('');
+        }
+        else {
+            return obj.append;
+        }
+    }
+}
+window.glitter.setModule(import.meta.url, GlobalEditor);

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

@@ -0,0 +1,65 @@
+import { GVC } from '../glitterBundle/GVController.js';
+import { ToolSetting } from '../jspage/function-page/tool-setting.js';
+import { BgWidget } from '../backend-manager/bg-widget.js';
+
+export class GlobalEditor {
+  public static main(obj: { gvc: GVC; widget: any; append: string }) {
+    const gvc: GVC = obj.gvc;
+    const glitter = gvc.glitter;
+    if (
+      [
+        ...glitter.share._global_component
+          .filter((dd: any) => {
+            return dd.template_config.tag.includes('標頭元件');
+          })
+          .map((dd: any) => {
+            return dd.tag;
+          }),
+      ].includes(obj.widget.data.tag)
+    ) {
+      obj.widget.header_refer=obj.widget.header_refer??'def'
+      const c_view = [`<div class="mx-2 ">
+
+${[`<div class="mx-n2 border-top"></div>`,
+        `<div class="fw-500 mb-2 mt-2">標頭樣式</div>`,
+        BgWidget.select({
+          gvc: gvc,
+          callback: (text: any) => {
+            obj.widget.header_refer = text;
+            glitter.share.selectEditorItem();
+          },
+          default: obj.widget.header_refer,
+          options: [
+            {
+              key: 'custom',
+              value: '自定義標頭樣式',
+            },
+            {
+              key: 'def',
+              value: '全站預設樣式',
+            },
+          ],
+        })
+      ].join('')
+      }</div>`];
+      if(obj.widget.header_refer !== 'def'){
+        c_view.push(ToolSetting.item({
+          gvc: gvc,
+          dd: {
+            title: '標頭選單',
+            tag: '標頭元件',
+            hint: ``,
+            toggle: true,
+          },
+        }))
+        c_view.push(obj.append)
+      }
+      return  c_view.join('')
+    } else {
+      return obj.append;
+    }
+
+  }
+}
+
+(window as any).glitter.setModule(import.meta.url, GlobalEditor);