ts-glitter 21.6.2 → 21.6.5

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

@@ -1,6 +1,36 @@
 import { ToolSetting } from '../../jspage/function-page/tool-setting.js';
+const html = String.raw;
 export class Bridge {
+    static grayButton(text, event, obj) {
+        var _a;
+        return html ` <button class="btn btn-gray ${(obj === null || obj === void 0 ? void 0 : obj.class) || ''}" type="button" onclick="${event}">
+      <i class="${obj && obj.icon && obj.icon.length > 0 ? obj.icon : 'd-none'}" style="color: #393939"></i>
+      ${text.length > 0 ? html `<span class="tx_700" style="${(_a = obj === null || obj === void 0 ? void 0 : obj.textStyle) !== null && _a !== void 0 ? _a : ''}">${text}</span>` : ''}
+    </button>`;
+    }
+    static select(obj) {
+        var _a;
+        return html ` ${obj.title ? html ` <div class="tx_normal fw-normal mb-2">${obj.title}</div>` : ``}
+      <select
+        class="c_select c_select_w_100"
+        style="${(_a = obj.style) !== null && _a !== void 0 ? _a : ''}; ${obj.readonly ? 'background: #f7f7f7;' : ''}"
+        onchange="${obj.gvc.event(e => {
+            obj.callback(e.value);
+        })}"
+        ${obj.readonly ? 'disabled' : ''}
+      >
+        ${obj.gvc.map(obj.options.map(opt => html ` <option class="c_select_option" value="${opt.key}" ${obj.default === opt.key ? 'selected' : ''}>
+                ${opt.value}
+              </option>`))}
+        ${obj.options.find((opt) => {
+            return obj.default === opt.key;
+        })
+            ? ``
+            : `<option class="d-none" selected>${obj.place_holder || `請選擇項目`}</option>`}
+      </select>`;
+    }
     static main(obj) {
+        console.log(`refer_form_data=>`, obj.widget);
         const gvc = obj.gvc;
         const glitter = gvc.glitter;
         const is_sub_page = ['pages/', 'hidden/', 'shop/'].find((dd) => {

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

@@ -1,9 +1,54 @@
 import { GVC } from '../../glitterBundle/GVController.js';
 import { ToolSetting } from '../../jspage/function-page/tool-setting.js';
 import { BgWidget } from '../../backend-manager/bg-widget.js';
-
+import { ApiUser } from '../../glitter-base/route/user.js';
+import { OptionsItem } from '../../glitterBundle/html-component/global-widget.js';
+const html=String.raw;
 export class Bridge {
+
+  static grayButton(text: string, event: string, obj?: { icon?: string; textStyle?: string; class?: string }) {
+    return html` <button class="btn btn-gray ${obj?.class || ''}" type="button" onclick="${event}">
+      <i class="${obj && obj.icon && obj.icon.length > 0 ? obj.icon : 'd-none'}" style="color: #393939"></i>
+      ${text.length > 0 ? html`<span class="tx_700" style="${obj?.textStyle ?? ''}">${text}</span>` : ''}
+    </button>`;
+  }
+
+  static select(obj: {
+    gvc: GVC;
+    callback: (value: any) => void;
+    default: string;
+    options: OptionsItem[];
+    style?: string;
+    title?: string;
+    readonly?: boolean;
+    place_holder?: string;
+  }) {
+    return html` ${obj.title ? html` <div class="tx_normal fw-normal mb-2">${obj.title}</div>` : ``}
+      <select
+        class="c_select c_select_w_100"
+        style="${obj.style ?? ''}; ${obj.readonly ? 'background: #f7f7f7;' : ''}"
+        onchange="${obj.gvc.event(e => {
+      obj.callback(e.value);
+    })}"
+        ${obj.readonly ? 'disabled' : ''}
+      >
+        ${obj.gvc.map(
+      obj.options.map(
+        opt =>
+          html` <option class="c_select_option" value="${opt.key}" ${obj.default === opt.key ? 'selected' : ''}>
+                ${opt.value}
+              </option>`
+      )
+    )}
+        ${(obj.options as any).find((opt: any) => {
+      return obj.default === opt.key;
+    })
+      ? ``
+      : `<option class="d-none" selected>${obj.place_holder || `請選擇項目`}</option>`}
+      </select>`;
+  }
   public static main(obj: any) {
+    console.log(`refer_form_data=>`,obj.widget)
     const gvc: GVC = obj.gvc;
     const glitter = gvc.glitter;
     const is_sub_page = ['pages/','hidden/','shop/'].find((dd)=>{
@@ -45,7 +90,91 @@ export class Bridge {
         }
       })(),
     }))
-
+//     c_view.push(
+//       [
+//         `<div class="fs-6 mb-2" style="color: black;">選單參照內容</div>`,
+//         gvc.bindView(()=>{
+//           const bi=gvc.glitter.getUUID()
+//           return {
+//             bind:bi,
+//             view:async ()=>{
+//               try {
+//                 const vm:any={
+//                   tab:'menu',
+//                   dataList:[]
+//                 }
+//                 const tag=vm.tab==='menu' ? 'menu-setting':'footer-setting';
+//                 let menu_all= (await ApiUser.getPublicConfig('menu-setting-list','manager')).response.value;
+//                 menu_all.list = menu_all.list ?? [];
+//                 vm.dataList = [
+//                   { tag: tag, title: `系統預設
+//                         ` },
+//                   ...menu_all.list.filter((d1:any)=>{
+//                     return d1.tab===tag
+//                   })
+//                 ];
+//                 return  [
+//                   this.select({
+//                     gvc: gvc,
+//                     callback: (text: any) => {
+//                       glitter.share.refer_form['menu_refer']=text
+//                       glitter.share.refresh_global();
+//                     },
+//                     default: glitter.share.refer_form['menu_refer'] ?? tag,
+//                     options: vm.dataList.map((dd:any)=>{
+//                       return {
+//                         key:dd.tag,
+//                         value:dd.title
+//                       }
+//                     })
+//                   }),
+//                   this.grayButton(
+//                     '設定',
+//                     gvc.event(() => {
+//                       gvc.glitter.getModule(`${gvc.glitter.root_path}cms-plugin/menus-setting.js`, menu => {
+//                         gvc.glitter.innerDialog((gvc)=>{
+//                           return html`
+//                           <div class="vw-100 vh-100 bg-white">
+//                             <div class="d-flex align-items-center" style="height: 60px;width: 100vw;border-bottom: solid 1px #DDD;font-size: 16px;font-style: normal;font-weight: 700;color: #393939;">
+//                               <div class="d-flex" style="padding:19px 32px;gap:8px;cursor: pointer;border-right: solid 1px #DDD;" onclick="${gvc.event(()=>{
+//                             gvc.closeDialog()
+//                           })}">
+//                                 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+//                                   <path d="M13.7859 4.96406L8.02969 10.7203C7.69219 11.0578 7.5 11.5219 7.5 12C7.5 12.4781 7.69219 12.9422 8.02969 13.2797L13.7859 19.0359C14.0859 19.3359 14.4891 19.5 14.9109 19.5C15.7875 19.5 16.5 18.7875 16.5 17.9109V15H22.5C23.3297 15 24 14.3297 24 13.5V10.5C24 9.67031 23.3297 9 22.5 9H16.5V6.08906C16.5 5.2125 15.7875 4.5 14.9109 4.5C14.4891 4.5 14.0859 4.66875 13.7859 4.96406ZM7.5 19.5H4.5C3.67031 19.5 3 18.8297 3 18V6C3 5.17031 3.67031 4.5 4.5 4.5H7.5C8.32969 4.5 9 3.82969 9 3C9 2.17031 8.32969 1.5 7.5 1.5H4.5C2.01562 1.5 0 3.51562 0 6V18C0 20.4844 2.01562 22.5 4.5 22.5H7.5C8.32969 22.5 9 21.8297 9 21C9 20.1703 8.32969 19.5 7.5 19.5Z" fill="#393939"></path>
+//                                 </svg>
+//                                 返回
+//                               </div>
+//                               <div class="flex-fill" style="padding: 19px 32px;">編輯選單內容</div>
+//                             </div>
+//                             <div class="w-100">${
+//                             menu.main(gvc, obj.widget)
+//                           }</div>
+//                           </div>
+// `
+//                         }, 'menus-setting',{
+//                           dismiss:()=>{
+//                             glitter.share.refresh_global();
+//                           }
+//                         });
+//                       });
+//                     }),
+//                     {
+//                     }
+//                   )
+//                 ].join('')
+//               }catch (e) {
+//                 console.log(e)
+//                 return  ``
+//               }
+//             },
+//             divCreate:{
+//               class:`d-flex align-items-center`,style:`gap:5px;`
+//             }
+//           }
+//         })
+//       ].join('')
+//     );
+    // civ.push(`<div class="mx-n2 border-top mb-2 mt-3"></div>`);
     c_view.push(  `<div style="height:1px;" class="border-top mx-n3"></div>`)
     return c_view.join(`<div style="height:10px;"></div>`);
   }

package/lowcode/form-view/e-commerce/product-select.js

@@ -93,14 +93,6 @@ export class ProductSelect {
             containerId: Tool.randomString(6),
             loading: true,
         };
-        const is_page = window.parent.glitter.getUrlParameter('page').startsWith('shop') ||
-            window.parent.glitter.getUrlParameter('page').startsWith('hidden');
-        if (is_page) {
-            if (bundle.formData[bundle.key].select !== 'product') {
-                bundle.formData[bundle.key].select = 'product';
-                bundle.formData[bundle.key].value = [];
-            }
-        }
         return gvc.bindView(() => {
             return {
                 bind: subVM.id,
@@ -135,13 +127,11 @@ export class ProductSelect {
                             title: bundle.title,
                             gvc: gvc,
                             def: bundle.formData[bundle.key].select,
-                            array: is_page
-                                ? [{ value: 'product', title: '特定商品' }]
-                                : [
-                                    { value: 'collection', title: '商品系列' },
-                                    { value: 'product', title: '特定商品' },
-                                    { value: 'all', title: '所有商品' },
-                                ],
+                            array: [
+                                { value: 'collection', title: '商品系列' },
+                                { value: 'product', title: '特定商品' },
+                                { value: 'all', title: '所有商品' },
+                            ],
                             callback: text => {
                                 bundle.formData[bundle.key].select = text;
                                 bundle.formData[bundle.key].value = [];
@@ -233,7 +223,7 @@ export class ProductSelect {
                             }
                         }))}
                 </div>
-                <div class="mx-n3  border-top" ></div>
+                <div class="mx-n3  border-top mt-2" ></div>
               </div>`);
                     }));
                 },

package/lowcode/form-view/e-commerce/product-select.ts

@@ -94,16 +94,16 @@ export class ProductSelect {
       containerId: Tool.randomString(6),
       loading: true,
     };
-    const is_page =
-      (window.parent as any).glitter.getUrlParameter('page').startsWith('shop') ||
-      (window.parent as any).glitter.getUrlParameter('page').startsWith('hidden');
-    //隱形賣場和一頁商店僅能單選
-    if (is_page) {
-      if (bundle.formData[bundle.key].select !== 'product') {
-        bundle.formData[bundle.key].select = 'product';
-        bundle.formData[bundle.key].value = [];
-      }
-    }
+    // const is_page =
+    //   (window.parent as any).glitter.getUrlParameter('page').startsWith('shop') ||
+    //   (window.parent as any).glitter.getUrlParameter('page').startsWith('hidden');
+    // //隱形賣場和一頁商店僅能單選
+    // if (is_page) {
+    //   if (bundle.formData[bundle.key].select !== 'product') {
+    //     bundle.formData[bundle.key].select = 'product';
+    //     bundle.formData[bundle.key].value = [];
+    //   }
+    // }
     return gvc.bindView(() => {
       return {
         bind: subVM.id,
@@ -138,13 +138,11 @@ export class ProductSelect {
                       title: bundle.title,
                       gvc: gvc,
                       def: bundle.formData[bundle.key].select,
-                      array: is_page
-                        ? [{ value: 'product', title: '特定商品' }]
-                        : [
-                            { value: 'collection', title: '商品系列' },
-                            { value: 'product', title: '特定商品' },
-                            { value: 'all', title: '所有商品' },
-                          ],
+                      array: [
+                        { value: 'collection', title: '商品系列' },
+                        { value: 'product', title: '特定商品' },
+                        { value: 'all', title: '所有商品' },
+                      ],
                       callback: text => {
                         bundle.formData[bundle.key].select = text;
                         bundle.formData[bundle.key].value = [];
@@ -242,7 +240,7 @@ export class ProductSelect {
                     })
                   )}
                 </div>
-                <div class="mx-n3  border-top" ></div>
+                <div class="mx-n3  border-top mt-2" ></div>
               </div>`
             );
           });

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

@@ -220,6 +220,7 @@ export class Language {
             { key: 'comment', tw: '評語', cn: '评语', en: 'Comment' },
             { key: 'write_comment', tw: '撰寫評論', cn: '撰写评论', en: 'Write Comment' },
             { key: 'rating', tw: '評分', cn: '评分', en: 'Rating' },
+            { key: 'cancel_reback', tw: '取消退回', cn: '取消退回', en: 'Cancel Return' },
             { key: 'switch_language', tw: '切換語言', cn: '切换语言', en: 'Switch language' },
             { key: 'shopping_details', tw: '購物明細', cn: '购物明细', en: 'Shopping details' },
             { key: 'your_shopping_cart', tw: '您的購物車', cn: '您的购物车', en: 'Your shopping cart' },
@@ -839,6 +840,7 @@ export class Language {
             { key: 'shipping_notes', tw: '配送備註', cn: '配送备注', en: 'Shipping Notes' },
             { key: 'return_to_order_list', tw: '返回訂單列表', cn: '返回订单列表', en: 'Return to OrderEvent List' },
             { key: 'order_not_found', tw: '查無此訂單', cn: '查无此订单', en: 'OrderEvent not found' },
+            { key: 'no_account', tw: '查無此帳號', cn: '查無此帳號', en: 'Cant find account' },
             { key: 'expired', tw: '已過期', cn: '已过期', en: 'Expired' },
             { key: 'not_yet_shipped', tw: '尚未出貨', cn: '尚未出货', en: 'Not yet shipped' },
             { key: 'get_verification_code', tw: '取得驗證碼', cn: '获取验证码', en: 'Get Verification Code' },

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

@@ -229,6 +229,7 @@ export class Language {
       { key: 'comment', tw: '評語', cn: '评语', en: 'Comment' },
       { key: 'write_comment', tw: '撰寫評論', cn: '撰写评论', en: 'Write Comment' },
       { key: 'rating', tw: '評分', cn: '评分', en: 'Rating' },
+      { key: 'cancel_reback', tw: '取消退回', cn: '取消退回', en: 'Cancel Return' },
       { key: 'switch_language', tw: '切換語言', cn: '切换语言', en: 'Switch language' },
       { key: 'shopping_details', tw: '購物明細', cn: '购物明细', en: 'Shopping details' },
       { key: 'your_shopping_cart', tw: '您的購物車', cn: '您的购物车', en: 'Your shopping cart' },
@@ -849,6 +850,7 @@ export class Language {
       { key: 'shipping_notes', tw: '配送備註', cn: '配送备注', en: 'Shipping Notes' },
       { key: 'return_to_order_list', tw: '返回訂單列表', cn: '返回订单列表', en: 'Return to OrderEvent List' },
       { key: 'order_not_found', tw: '查無此訂單', cn: '查无此订单', en: 'OrderEvent not found' },
+      { key: 'no_account', tw: '查無此帳號', cn: '查無此帳號', en: 'Cant find account' },
       { key: 'expired', tw: '已過期', cn: '已过期', en: 'Expired' },
       { key: 'not_yet_shipped', tw: '尚未出貨', cn: '尚未出货', en: 'Not yet shipped' },
       { key: 'get_verification_code', tw: '取得驗證碼', cn: '获取验证码', en: 'Get Verification Code' },

package/lowcode/glitterBundle/html-component/global-widget.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Storage } from '../helper/storage.js';
 import { ApiPageConfig } from '../../api/pageConfig.js';
-import { ApiUser } from '../../glitter-base/route/user.js';
 var ViewType;
 (function (ViewType) {
     ViewType["mobile"] = "mobile";
@@ -269,79 +268,6 @@ export class GlobalWidget {
                             window.parent.document.querySelector('.' + outer_id).outerHTML = civ.join('');
                             return;
                         }
-                        civ.push(`<div class="my-2"></div>`);
-                        civ.push([
-                            `<div class="fs-6 mb-2" style="color: black;">選單參照內容</div>`,
-                            gvc.bindView(() => {
-                                const bi = gvc.glitter.getUUID();
-                                return {
-                                    bind: bi,
-                                    view: () => __awaiter(this, void 0, void 0, function* () {
-                                        var _a, _b;
-                                        const vm = {
-                                            tab: 'menu',
-                                            dataList: []
-                                        };
-                                        const tag = vm.tab === 'menu' ? 'menu-setting' : 'footer-setting';
-                                        let menu_all = (yield ApiUser.getPublicConfig('menu-setting-list', 'manager')).response.value;
-                                        menu_all.list = (_a = menu_all.list) !== null && _a !== void 0 ? _a : [];
-                                        vm.dataList = [
-                                            { tag: tag, title: `系統預設
-                        ` },
-                                            ...menu_all.list.filter((d1) => {
-                                                return d1.tab === tag;
-                                            })
-                                        ];
-                                        return [
-                                            this.select({
-                                                gvc: gvc,
-                                                callback: (text) => {
-                                                    obj.widget.data.refer_form_data['menu_refer'] = text;
-                                                    glitter.share.refresh_global();
-                                                },
-                                                default: (_b = obj.widget.data.refer_form_data['menu_refer']) !== null && _b !== void 0 ? _b : tag,
-                                                options: vm.dataList.map((dd) => {
-                                                    return {
-                                                        key: dd.tag,
-                                                        value: dd.title
-                                                    };
-                                                })
-                                            }),
-                                            this.grayButton('設定', gvc.event(() => {
-                                                gvc.glitter.getModule(`${gvc.glitter.root_path}cms-plugin/menus-setting.js`, menu => {
-                                                    gvc.glitter.innerDialog((gvc) => {
-                                                        return html `
-                          <div class="vw-100 vh-100 bg-white">
-                            <div class="d-flex align-items-center" style="height: 60px;width: 100vw;border-bottom: solid 1px #DDD;font-size: 16px;font-style: normal;font-weight: 700;color: #393939;">
-                              <div class="d-flex" style="padding:19px 32px;gap:8px;cursor: pointer;border-right: solid 1px #DDD;" onclick="${gvc.event(() => {
-                                                            gvc.closeDialog();
-                                                        })}">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                                  <path d="M13.7859 4.96406L8.02969 10.7203C7.69219 11.0578 7.5 11.5219 7.5 12C7.5 12.4781 7.69219 12.9422 8.02969 13.2797L13.7859 19.0359C14.0859 19.3359 14.4891 19.5 14.9109 19.5C15.7875 19.5 16.5 18.7875 16.5 17.9109V15H22.5C23.3297 15 24 14.3297 24 13.5V10.5C24 9.67031 23.3297 9 22.5 9H16.5V6.08906C16.5 5.2125 15.7875 4.5 14.9109 4.5C14.4891 4.5 14.0859 4.66875 13.7859 4.96406ZM7.5 19.5H4.5C3.67031 19.5 3 18.8297 3 18V6C3 5.17031 3.67031 4.5 4.5 4.5H7.5C8.32969 4.5 9 3.82969 9 3C9 2.17031 8.32969 1.5 7.5 1.5H4.5C2.01562 1.5 0 3.51562 0 6V18C0 20.4844 2.01562 22.5 4.5 22.5H7.5C8.32969 22.5 9 21.8297 9 21C9 20.1703 8.32969 19.5 7.5 19.5Z" fill="#393939"></path>
-                                </svg>
-                                返回
-                              </div>
-                              <div class="flex-fill" style="padding: 19px 32px;">編輯選單內容</div>
-                            </div>
-                            <div class="w-100">${menu.main(gvc, obj.widget)}</div>
-                          </div>
-`;
-                                                    }, 'menus-setting', {
-                                                        dismiss: () => {
-                                                            glitter.share.refresh_global();
-                                                        }
-                                                    });
-                                                });
-                                            }), {})
-                                        ].join('');
-                                    }),
-                                    divCreate: {
-                                        class: `d-flex align-items-center`, style: `gap:5px;`
-                                    }
-                                };
-                            })
-                        ].join(''));
-                        civ.push(`<div class="mx-n2 border-top mb-2 mt-3"></div>`);
                     }
                     civ.push((() => {
                         GlobalWidget.glitter_view_type = ViewType.desktop;

package/lowcode/glitterBundle/html-component/global-widget.ts

@@ -305,87 +305,7 @@ export class GlobalWidget {
               (window.parent as any).document.querySelector('.' + outer_id).outerHTML = civ.join('');
               return;
             }
-            civ.push(`<div class="my-2"></div>`);
-            civ.push(
-              [
-                `<div class="fs-6 mb-2" style="color: black;">選單參照內容</div>`,
-                gvc.bindView(()=>{
-                  const bi=gvc.glitter.getUUID()
-                  return {
-                    bind:bi,
-                    view:async ()=>{
-                      const vm:any={
-                        tab:'menu',
-                        dataList:[]
-                      }
-                      const tag=vm.tab==='menu' ? 'menu-setting':'footer-setting';
-                      let menu_all= (await ApiUser.getPublicConfig('menu-setting-list','manager')).response.value;
-                      menu_all.list = menu_all.list ?? [];
-                      vm.dataList = [
-                        { tag: tag, title: `系統預設
-                        ` },
-                        ...menu_all.list.filter((d1:any)=>{
-                          return d1.tab===tag
-                        })
-                      ];
-                      return  [
-                        this.select({
-                          gvc: gvc,
-                          callback: (text: any) => {
-                            obj.widget.data.refer_form_data['menu_refer']=text
-                            glitter.share.refresh_global();
-                          },
-                          default: obj.widget.data.refer_form_data['menu_refer'] ?? tag,
-                          options: vm.dataList.map((dd:any)=>{
-                            return {
-                              key:dd.tag,
-                              value:dd.title
-                            }
-                          })
-                        }),
-                        this.grayButton(
-                          '設定',
-                          gvc.event(() => {
-                            gvc.glitter.getModule(`${gvc.glitter.root_path}cms-plugin/menus-setting.js`, menu => {
-                              gvc.glitter.innerDialog((gvc)=>{
-                                return html`
-                          <div class="vw-100 vh-100 bg-white">
-                            <div class="d-flex align-items-center" style="height: 60px;width: 100vw;border-bottom: solid 1px #DDD;font-size: 16px;font-style: normal;font-weight: 700;color: #393939;">
-                              <div class="d-flex" style="padding:19px 32px;gap:8px;cursor: pointer;border-right: solid 1px #DDD;" onclick="${gvc.event(()=>{
-                                  gvc.closeDialog()
-                                })}">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                                  <path d="M13.7859 4.96406L8.02969 10.7203C7.69219 11.0578 7.5 11.5219 7.5 12C7.5 12.4781 7.69219 12.9422 8.02969 13.2797L13.7859 19.0359C14.0859 19.3359 14.4891 19.5 14.9109 19.5C15.7875 19.5 16.5 18.7875 16.5 17.9109V15H22.5C23.3297 15 24 14.3297 24 13.5V10.5C24 9.67031 23.3297 9 22.5 9H16.5V6.08906C16.5 5.2125 15.7875 4.5 14.9109 4.5C14.4891 4.5 14.0859 4.66875 13.7859 4.96406ZM7.5 19.5H4.5C3.67031 19.5 3 18.8297 3 18V6C3 5.17031 3.67031 4.5 4.5 4.5H7.5C8.32969 4.5 9 3.82969 9 3C9 2.17031 8.32969 1.5 7.5 1.5H4.5C2.01562 1.5 0 3.51562 0 6V18C0 20.4844 2.01562 22.5 4.5 22.5H7.5C8.32969 22.5 9 21.8297 9 21C9 20.1703 8.32969 19.5 7.5 19.5Z" fill="#393939"></path>
-                                </svg>
-                                返回
-                              </div>
-                              <div class="flex-fill" style="padding: 19px 32px;">編輯選單內容</div>
-                            </div>
-                            <div class="w-100">${
-                                  menu.main(gvc, obj.widget)
-                                }</div>
-                          </div>
-`
-                              }, 'menus-setting',{
-                                dismiss:()=>{
-                                  glitter.share.refresh_global();
-                                }
-                              });
-                            });
-                          }),
-                          {
-                          }
-                        )
-                      ].join('')
-                    },
-                    divCreate:{
-                      class:`d-flex align-items-center`,style:`gap:5px;`
-                    }
-                  }
-                })
-              ].join('')
-            );
-            civ.push(`<div class="mx-n2 border-top mb-2 mt-3"></div>`);
+
           }
           civ.push(
             (() => {

package/lowcode/official_view_component/official/component.ts

@@ -8,8 +8,6 @@ import { GlobalWidget } from '../../glitterBundle/html-component/global-widget.j
 import { NormalPageEditor } from '../../editor/normal-page-editor.js';
 import { RenderValue } from '../../glitterBundle/html-component/render-value.js';
 import { ApplicationConfig } from '../../application-config.js';
-import { ApiPageConfig } from '../../api/pageConfig.js';
-import { GlobalEditor } from '../../editor-components/global-editor.js';
 
 export const component = Plugin.createComponent(import.meta.url, (glitter: Glitter, editMode: boolean) => {
   return {

package/lowcode/public-components/checkout/index.js

@@ -2282,7 +2282,7 @@ export class CheckoutIndex {
                                                 gvc.notifyDataChange(id);
                                             });
                                         }
-                                        const checkbox = this.getCheckedClass(gvc, '#393939');
+                                        const checkbox = this.getCheckedClass(gvc);
                                         return {
                                             bind: id,
                                             view: () => __awaiter(this, void 0, void 0, function* () {

package/lowcode/public-components/checkout/index.ts

@@ -2508,7 +2508,7 @@ export class CheckoutIndex {
                                         gvc.notifyDataChange(id);
                                       });
                                     }
-                                    const checkbox = this.getCheckedClass(gvc, '#393939');
+                                    const checkbox = this.getCheckedClass(gvc);
                                     return {
                                       bind: id,
                                       view: async () => {

package/lowcode/public-components/user-manager/um-info.js

@@ -804,6 +804,7 @@ export class UMInfo {
                                 userData: update_userData,
                             }).then(res => {
                                 dialog.dataLoading({ visible: false });
+                                console.log(res);
                                 if (!res.result && res.response.data.msg === 'email-verify-false') {
                                     dialog.errorMessage({ text: Language.text('email_verification_code_incorrect') });
                                 }
@@ -816,6 +817,9 @@ export class UMInfo {
                                 else if (!res.result && res.response.data.msg === 'email-exists') {
                                     dialog.errorMessage({ text: Language.text('email_already_exists') });
                                 }
+                                else if (!res.result && res.response.message === 'User phone already exists.') {
+                                    dialog.errorMessage({ text: Language.text('phone_number_already_exists') });
+                                }
                                 else if (!res.result) {
                                     dialog.errorMessage({ text: Language.text('update_exception') });
                                 }

package/lowcode/public-components/user-manager/um-info.ts

@@ -939,6 +939,7 @@ export class UMInfo {
                     userData: update_userData,
                   }).then(res => {
                     dialog.dataLoading({ visible: false });
+                  console.log(res)
                     if (!res.result && res.response.data.msg === 'email-verify-false') {
                       dialog.errorMessage({ text: Language.text('email_verification_code_incorrect') });
                     } else if (!res.result && res.response.data.msg === 'phone-verify-false') {
@@ -947,7 +948,9 @@ export class UMInfo {
                       dialog.errorMessage({ text: Language.text('phone_number_already_exists') });
                     } else if (!res.result && res.response.data.msg === 'email-exists') {
                       dialog.errorMessage({ text: Language.text('email_already_exists') });
-                    } else if (!res.result) {
+                    }else if(!res.result && res.response.message==='User phone already exists.'){
+                      dialog.errorMessage({ text: Language.text('phone_number_already_exists') });
+                    }else if (!res.result) {
                       dialog.errorMessage({ text: Language.text('update_exception') });
                     } else {
                       dialog.successMessage({ text: Language.text('change_success') });

package/lowcode/public-components/user-manager/um-login.js

@@ -960,13 +960,13 @@ export class UMLogin {
         });
     }
     static sendResetEmail(widget, vm) {
+        const email = this.checkValue('vm-email');
+        vm.resetEmail = email;
         if (!vm.resetEmail) {
-            const email = this.checkValue('vm-email');
             if (!email) {
                 widget.event('error', { title: Language.text('email_placeholder') });
                 return;
             }
-            vm.resetEmail = email;
         }
         widget.event('loading', { visible: true });
         ApiUser.forgetPwd(vm.resetEmail).then(r => {
@@ -980,7 +980,7 @@ export class UMLogin {
                 }
             }
             else {
-                widget.event('error', { title: Language.text('system_error') });
+                widget.event('error', { title: Language.text('no_account') });
             }
         });
     }

package/lowcode/public-components/user-manager/um-login.ts

@@ -1011,17 +1011,14 @@ export class UMLogin {
   }
 
   static sendResetEmail(widget: any, vm: VM) {
+    const email = this.checkValue('vm-email');
+    vm.resetEmail = email as any;
     if (!vm.resetEmail) {
-      const email = this.checkValue('vm-email');
-
       if (!email) {
         widget.event('error', { title: Language.text('email_placeholder') });
         return;
       }
-
-      vm.resetEmail = email;
     }
-
     widget.event('loading', { visible: true });
     ApiUser.forgetPwd(vm.resetEmail).then(r => {
       widget.event('loading', { visible: false });
@@ -1033,7 +1030,7 @@ export class UMLogin {
           }, 1000);
         }
       } else {
-        widget.event('error', { title: Language.text('system_error') });
+        widget.event('error', { title: Language.text('no_account') });
       }
     });
   }