ts-glitter 21.9.2 → 21.9.6

package/lowcode/css/editor.css

@@ -29,6 +29,7 @@
   --main-orange-2: #ffb400;
   --main-orange-3: #ff6c02;
   --main-green: #10931d;
+  --main-yellow: #FFB21C;
 
   --item-primary: #4d86db;
   --item-success: #d8ecda;
@@ -420,6 +421,18 @@ h6 {
   font-weight: 400;
 }
 
+.tx_yellow_12 {
+  font-size: 12px;
+  color: var(--main-yellow);
+  font-weight: 400;
+}
+
+.tx_yellow_14 {
+  font-size: 14px;
+  color: var(--main-yellow);
+  font-weight: 400;
+}
+
 .c_card {
   border-radius: 10px;
   background: var(--main-white);

package/lowcode/glitter-base/global/language.js

@@ -124,6 +124,8 @@ export class Language {
                 cn: '请问确定要取消此订单吗?',
                 en: `Are you sure you want to cancel this order?`,
             },
+            { key: 'order_number', tw: '訂單號碼', en: 'Order number', cn: '訂單號碼' },
+            { key: 'find_order', tw: '訂單查詢', en: 'Order inquiry', cn: '訂單查詢' },
             { key: 's_cancel_order', tw: '取消訂單成功', cn: '取消订单成功', en: `Order canceled successfully` },
             { key: 'newWebPay', tw: '藍新金流', cn: '蓝新金流', en: `NewebPay` },
             { key: 'ecPay', tw: '綠界金流', cn: '绿界金流', en: `EcPay` },
@@ -141,6 +143,10 @@ export class Language {
             { key: 'login_in_to_checkout', tw: '登入後結帳', cn: '登入后结帐', en: `Log in and checkout` },
             { key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
             { key: 'select', tw: '選取', cn: '选择', en: 'Select' },
+            { key: 'if_buyer_no_account', tw: '若你購買時未註冊會員，請從此查詢訂單，或者<span class="mx-2" style="color: #0a53be;cursor:pointer;" onclick="#login">登入</span>會員進行查詢',
+                cn: `若你购买时未注册会员，请从此查询订单，或者<span class="mx-2" style="color: #0a53be;cursor:pointer;" onclick="#login">登入</span>会员进行查询`,
+                en: `If you did not register as a member when you purchased, please check your order here, or <span class="mx-2" style="color: #0a53be;cursor:pointer;" onclick="#login">log in</span> as a member to check.`
+            },
             {
                 key: 'disable_ship',
                 tw: '無配送方式',

package/lowcode/glitter-base/global/language.ts

@@ -133,6 +133,8 @@ export class Language {
         cn: '请问确定要取消此订单吗?',
         en: `Are you sure you want to cancel this order?`,
       },
+      {key: 'order_number',tw:'訂單號碼',en:'Order number',cn: '訂單號碼'},
+      {key: 'find_order',tw:'訂單查詢',en:'Order inquiry',cn: '訂單查詢'},
       { key: 's_cancel_order', tw: '取消訂單成功', cn: '取消订单成功', en: `Order canceled successfully` },
       { key: 'newWebPay', tw: '藍新金流', cn: '蓝新金流', en: `NewebPay` },
       { key: 'ecPay', tw: '綠界金流', cn: '绿界金流', en: `EcPay` },
@@ -150,6 +152,10 @@ export class Language {
       { key: 'login_in_to_checkout', tw: '登入後結帳', cn: '登入后结帐', en: `Log in and checkout` },
       { key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
       { key: 'select', tw: '選取', cn: '选择', en: 'Select' },
+      {key: 'if_buyer_no_account',tw:'若你購買時未註冊會員，請從此查詢訂單，或者<span class="mx-2" style="color: #0a53be;cursor:pointer;" onclick="#login">登入</span>會員進行查詢',
+        cn:`若你购买时未注册会员，请从此查询订单，或者<span class="mx-2" style="color: #0a53be;cursor:pointer;" onclick="#login">登入</span>会员进行查询`,
+        en:`If you did not register as a member when you purchased, please check your order here, or <span class="mx-2" style="color: #0a53be;cursor:pointer;" onclick="#login">log in</span> as a member to check.`
+      },
       {
         key: 'disable_ship',
         tw: '無配送方式',

package/lowcode/glitter-base/route/market.js

@@ -0,0 +1,43 @@
+import { BaseApi } from '../../glitterBundle/api/base.js';
+export class ApiMarket {
+    static getAppList() {
+        return BaseApi.create({
+            url: getBaseUrl() + `/api-public/v1/app_market`,
+            type: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
+            },
+        });
+    }
+    static getInstallAppList() {
+        return BaseApi.create({
+            url: getBaseUrl() + `/api-public/v1/app_market/install`,
+            type: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
+            },
+        });
+    }
+    static getPublishedAppList() {
+        return BaseApi.create({
+            url: getBaseUrl() + `/api-public/v1/app_market/published`,
+            type: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
+            },
+        });
+    }
+}
+function getConfig() {
+    const saasConfig = window.parent.saasConfig;
+    return saasConfig;
+}
+function getBaseUrl() {
+    return getConfig().config.url;
+}

package/lowcode/glitter-base/route/market.ts

@@ -0,0 +1,47 @@
+import { BaseApi } from '../../glitterBundle/api/base.js';
+
+
+export class ApiMarket {
+  static getAppList() {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/app_market`,
+      type: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+    });
+  }
+  static getInstallAppList() {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/app_market/install`,
+      type: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+    });
+  }
+  static getPublishedAppList() {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/app_market/published`,
+      type: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+    });
+  }
+}
+
+function getConfig() {
+    const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
+    return saasConfig;
+}
+
+function getBaseUrl() {
+    return getConfig().config.url;
+}

package/lowcode/glitter-base/route/shopping.js

@@ -551,6 +551,8 @@ export class ApiShop {
                 `/api-public/v1/ec/order?${(() => {
                     var _a;
                     let par = [`limit=${json.limit}`, `page=${json.page}`];
+                    json.buyer_name && par.push(`buyer_name=${json.buyer_name}`);
+                    json.buyer_phone && par.push(`buyer_phone=${json.buyer_phone}`);
                     json.search && par.push(`search=${json.search}`);
                     json.id && par.push(`id=${json.id}`);
                     json.id_list && par.push(`id_list=${json.id_list}`);
@@ -579,6 +581,19 @@ export class ApiShop {
             },
         });
     }
+    static verifyOrderCode(verify_code) {
+        const glitter = window.glitter;
+        return BaseApi.create({
+            url: getBaseUrl() + `/api-public/v1/ec/order/verifyCode?order_id=${glitter.getUrlParameter('cart_token')}`,
+            type: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: GlobalUser.token,
+            },
+            data: JSON.stringify({ verify_code }),
+        });
+    }
     static getSearchReturnOrder(json) {
         const filterString = this.returnOrderListFilterString(json.filter);
         return BaseApi.create({

package/lowcode/glitter-base/route/shopping.ts

@@ -197,7 +197,7 @@ export class ApiShop {
     });
   }
 
-  public static postMultiProduct(cf: { data: any; token?: string }) {
+  static postMultiProduct(cf: { data: any; token?: string }) {
     return BaseApi.create({
       url: getBaseUrl() + `/api-public/v1/ec/product/multiple`,
       type: 'POST',
@@ -210,7 +210,7 @@ export class ApiShop {
     });
   }
 
-  public static putProduct(cf: { data: any; token?: string }) {
+  static putProduct(cf: { data: any; token?: string }) {
     return BaseApi.create({
       url: getBaseUrl() + `/api-public/v1/ec/product`,
       type: 'PUT',
@@ -648,6 +648,8 @@ export class ApiShop {
     valid?: boolean;
     is_shipment?: boolean;
     is_reconciliation?: boolean;
+    buyer_name?:string,
+    buyer_phone?:string
   }) {
     const filterString = this.orderListFilterString(json.filter);
     return BaseApi.create({
@@ -655,6 +657,8 @@ export class ApiShop {
         getBaseUrl() +
         `/api-public/v1/ec/order?${(() => {
           let par = [`limit=${json.limit}`, `page=${json.page}`];
+          json.buyer_name && par.push(`buyer_name=${json.buyer_name}`);
+          json.buyer_phone && par.push(`buyer_phone=${json.buyer_phone}`);
           json.search && par.push(`search=${json.search}`);
           json.id && par.push(`id=${json.id}`);
           json.id_list && par.push(`id_list=${json.id_list}`);
@@ -684,6 +688,21 @@ export class ApiShop {
     });
   }
 
+  static verifyOrderCode(verify_code: string) {
+    const glitter = (window as any).glitter;
+
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/ec/order/verifyCode?order_id=${glitter.getUrlParameter('cart_token')}`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: GlobalUser.token,
+      },
+      data: JSON.stringify({ verify_code }),
+    });
+  }
+
   static getSearchReturnOrder(json: {
     limit: number;
     page: number;
@@ -735,7 +754,7 @@ export class ApiShop {
     });
   }
 
-  public static putVoucher(json: { postData: any; token?: string; type?: 'normal' | 'manager' }) {
+  static putVoucher(json: { postData: any; token?: string; type?: 'normal' | 'manager' }) {
     return BaseApi.create({
       url: getBaseUrl() + `/api-public/v1/voucher`,
       type: 'PUT',
@@ -748,7 +767,7 @@ export class ApiShop {
     });
   }
 
-  public static postVoucher(json: { postData: any; token?: string; type: 'normal' | 'manager' }) {
+  static postVoucher(json: { postData: any; token?: string; type: 'normal' | 'manager' }) {
     return BaseApi.create({
       url: getBaseUrl() + `/api-public/v1/voucher`,
       type: 'POST',
@@ -1250,7 +1269,7 @@ export class ApiShop {
     });
   }
 
-  public static app_subscription(receipt: string, app_name: string) {
+  static app_subscription(receipt: string, app_name: string) {
     return BaseApi.create({
       url: getBaseUrl() + `/api-public/v1/ec/apple-webhook`,
       type: 'POST',

package/lowcode/glitterBundle/dialog/dialog.js

@@ -126,7 +126,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                                     var _a, _b;
                                     (_b = (_a = gBundle.obj) === null || _a === void 0 ? void 0 : _a.callback) === null || _b === void 0 ? void 0 : _b.call(_a, true);
                                     gvc.closeDialog();
-                                }
+                                },
                             },
                             width: 420,
                         });
@@ -170,7 +170,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                                 title: (_q = gBundle.notString) !== null && _q !== void 0 ? _q : Language.text('cancel'),
                                 event: () => { var _a; return (_a = gBundle.callback) === null || _a === void 0 ? void 0 : _a.call(gBundle, false); },
                             },
-                            width: (_r = gBundle.width) !== null && _r !== void 0 ? _r : 600
+                            width: (_r = gBundle.width) !== null && _r !== void 0 ? _r : 600,
                         });
                     default:
                         return '';

package/lowcode/glitterBundle/dialog/dialog.ts

@@ -12,7 +12,7 @@ interface DialogConfig {
   cancel?: ButtonConfig;
   confirm?: ButtonConfig;
   width?: number;
-  auto?:boolean;
+  auto?: boolean;
 }
 
 interface Bundle {
@@ -156,8 +156,8 @@ init(import.meta.url, (gvc, glitter, gBundle: Bundle) => {
                 title: Language.text('okay'),
                 event: () => {
                   gBundle.obj?.callback?.(true);
-                  gvc.closeDialog()
-                }
+                  gvc.closeDialog();
+                },
               },
               width: 420,
             });
@@ -165,7 +165,7 @@ init(import.meta.url, (gvc, glitter, gBundle: Bundle) => {
           case 'checkYesOrNot':
           case 'warningMessage':
             return createDialogBox({
-              icon:  icons.question,
+              icon: icons.question,
               content: gBundle.title ?? '',
               confirm: {
                 title: gBundle.yesString ?? Language.text('okay'),
@@ -204,7 +204,7 @@ init(import.meta.url, (gvc, glitter, gBundle: Bundle) => {
                 title: gBundle.notString ?? Language.text('cancel'),
                 event: () => gBundle.callback?.(false),
               },
-              width:gBundle.width??600
+              width: gBundle.width ?? 600,
             });
 
           default:

package/lowcode/jspage/function-page/main_editor.js

@@ -1195,7 +1195,7 @@ export class Main_editor {
             frame.style.height = `${frame_height}px`;
             frame.style.transform = `scale(${(container_width / frame_width).toFixed(2)})`;
             frame.style.left = document.body.clientWidth > 800 && Storage.view_type === ViewType.mobile ? '25%' : '0';
-            frame.style.top = `${tool_box + (gvc.glitter.share.top_inset ? parseInt(gvc.glitter.share.top_inset, 10) + 10 : 0)}px`;
+            frame.style.top = `${tool_box + (gvc.glitter.share.top_inset ? parseInt(gvc.glitter.share.top_inset, 10) : 0)}px`;
         };
         return gvc.bindView(() => {
             return {
@@ -1213,7 +1213,7 @@ export class Main_editor {
                         return html ` <div
               class="position-relative w-100 h-100"
               style="${parseInt(gvc.glitter.share.top_inset, 10)
-                            ? `padding-top:${parseInt(gvc.glitter.share.top_inset, 10) + 10}px;`
+                            ? `padding-top:${parseInt(gvc.glitter.share.top_inset, 10)}px;`
                             : ``}"
               id="editerCenter"
             >

package/lowcode/jspage/function-page/main_editor.ts

@@ -1320,7 +1320,7 @@ export class Main_editor {
       frame.style.height = `${frame_height}px`;
       frame.style.transform = `scale(${(container_width / frame_width).toFixed(2)})`;
       frame.style.left = document.body.clientWidth > 800 && Storage.view_type === ViewType.mobile ? '25%' : '0';
-      frame.style.top = `${tool_box + (gvc.glitter.share.top_inset ? parseInt(gvc.glitter.share.top_inset, 10) + 10 : 0)}px`;
+      frame.style.top = `${tool_box + (gvc.glitter.share.top_inset ? parseInt(gvc.glitter.share.top_inset, 10)  : 0)}px`;
     };
 
     return gvc.bindView(() => {
@@ -1338,7 +1338,7 @@ export class Main_editor {
             return html` <div
               class="position-relative w-100 h-100"
               style="${parseInt(gvc.glitter.share.top_inset, 10)
-                ? `padding-top:${parseInt(gvc.glitter.share.top_inset, 10) + 10}px;`
+                ? `padding-top:${parseInt(gvc.glitter.share.top_inset, 10)}px;`
                 : ``}"
               id="editerCenter"
             >

package/lowcode/jspage/function-page/setting_editor.js

@@ -1416,6 +1416,33 @@ Setting_editor.menuItems = () => {
             groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
             moduleName: '蝦皮',
         },
+        {
+            icon: '',
+            page: 'APP-Market-Landing',
+            group: 'APP應用',
+            title: 'APP Market',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
+            moduleName: 'APP Market',
+        },
+        {
+            icon: '',
+            page: 'APP-Market-Install',
+            group: 'APP應用',
+            title: '已安裝App',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
+            moduleName: 'APP Market',
+        },
+        {
+            icon: '',
+            page: 'APP-Market-Published',
+            group: 'APP應用',
+            title: '已發佈App',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
+            moduleName: 'APP Market',
+        },
         {
             icon: '',
             page: 'web_theme',

package/lowcode/jspage/function-page/setting_editor.ts

@@ -627,6 +627,33 @@ export class Setting_editor {
                 groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
                 moduleName: '蝦皮',
             },
+            {
+              icon: '',
+              page: 'APP-Market-Landing',
+              group: 'APP應用',
+              title: 'APP Market',
+              appName: 'cms_system',
+              groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
+              moduleName: 'APP Market',
+            },
+          {
+            icon: '',
+            page: 'APP-Market-Install',
+            group: 'APP應用',
+            title: '已安裝App',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
+            moduleName: 'APP Market',
+          },
+          {
+            icon: '',
+            page: 'APP-Market-Published',
+            group: 'APP應用',
+            title: '已發佈App',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/list-tree-regular.svg',
+            moduleName: 'APP Market',
+          },
             {
                 icon: '',
                 page: 'web_theme',