ts-glitter 21.3.8 → 21.3.9

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

@@ -338,18 +338,20 @@ export class ApiUser {
     search_type?: string;
     only_id?: boolean;
   }) {
+    const url =
+      getBaseUrl() +
+      `/api-public/v1/user?${(() => {
+        let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
+        json.search && par.push(`search=${json.search}`);
+        json.search_type && par.push(`searchType=${json.search_type}`);
+        json.only_id && par.push(`only_id=${json.only_id}`);
+        json.id && par.push(`id=${json.id}`);
+
+        return par.join('&');
+      })()}`;
+
     return BaseApi.create({
-      url:
-        getBaseUrl() +
-        `/api-public/v1/user?${(() => {
-          let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
-          json.search && par.push(`search=${json.search}`);
-          json.search_type && par.push(`searchType=${json.search_type}`);
-          json.only_id && par.push(`only_id=${json.only_id}`);
-          json.id && par.push(`id=${json.id}`);
-          
-          return par.join('&');
-        })()}`,
+      url: url,
       type: 'GET',
       headers: {
         'g-app': getConfig().config.appName,
@@ -426,6 +428,7 @@ export class ApiUser {
     filter_type?: string;
     with_level?: boolean;
     all_result?: boolean;
+    only_id?: boolean;
   }) {
     const filterString = this.formatFilterString(json.filter);
     const groupString = this.userListGroupString(json.group);
@@ -440,6 +443,7 @@ export class ApiUser {
       order_string: json.orderString ?? '',
       filter_type: json.filter_type ?? '',
       all_result: json.all_result ? `${json.all_result}` : '',
+      only_id: json.only_id ? `${json.only_id}` : '',
     }).toString();
 
     const extraQuery = [...filterString, ...groupString].join('&');
@@ -462,37 +466,10 @@ export class ApiUser {
         };
       }
 
-      const array = data.response.data;
-      const allUsers = data.response.allUsers;
-
-      if (array.length > 0) {
-        await Promise.allSettled(
-          array.map(async (item: any) => {
-            const firstShipment = (
-              await ApiShop.getOrder({
-                page: 0,
-                limit: 1,
-                data_from: 'manager',
-                email: item.account || '-1',
-                phone: item.account || '-1',
-                valid: true,
-                is_shipment: true,
-              })
-            ).response.data[0];
-            if (!item.tag_name) {
-              item.tag_name = '一般會員'; // 失敗時提供預設值
-            }
-            if (firstShipment) {
-              item.firstShipment = firstShipment;
-            }
-          })
-        );
-      }
-
       return {
         response: {
-          data: array,
-          allUsers,
+          data: data.response.data,
+          allUsers: data.response.allUsers,
           total: data.response.total,
           extra: data.response.extra,
         },
@@ -831,6 +808,20 @@ export class ApiUser {
     });
   }
 
+  public static async getUserPermission() {
+    return await this.getPermission({ page: 0, limit: 1000 }).then(data => {
+      if (!data.result) {
+        return undefined;
+      }
+
+      const find_user = data.response.data.find((data: any) => {
+        return `${data.user}` === `${GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID}`;
+      });
+
+      return find_user;
+    });
+  }
+
   public static setPermission(json: {
     email: string;
     config: {

package/lowcode/glitterBundle/dialog/ShareDialog.js

@@ -53,6 +53,7 @@ export class ShareDialog {
         this.glitter.openDiaLog('glitterBundle/dialog/dialog.js', type, {
             type,
             title: obj.text,
+            width: obj.width,
             icon: obj.icon,
             yesString: obj.yesString,
             notString: obj.notString,

package/lowcode/glitterBundle/dialog/ShareDialog.ts

@@ -23,6 +23,7 @@ interface ConfirmDialogOptions {
   icon?: string;
   yesString?: string;
   notString?: string;
+  width?: string;
 }
 
 
@@ -97,6 +98,7 @@ export class ShareDialog {
     this.glitter.openDiaLog('glitterBundle/dialog/dialog.js', type, {
       type,
       title: obj.text,
+      width: obj.width,
       icon: obj.icon,
       yesString: obj.yesString,
       notString: obj.notString,

package/lowcode/glitterBundle/dialog/dialog.js

@@ -89,7 +89,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
   `);
     return {
         onCreateView: () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
             try {
                 switch (gBundle.type) {
                     case 'dataLoading':
@@ -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: 600
+                            width: (_r = gBundle.width) !== null && _r !== void 0 ? _r : 600
                         });
                     default:
                         return '';

package/lowcode/glitterBundle/dialog/dialog.ts

@@ -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:600
+              width:gBundle.width??600
             });
 
           default:

package/lowcode/glitterBundle/plugins/editor-elem.js

@@ -398,6 +398,10 @@ export class EditorElem {
                       <i
                         class="fa-regular fa-trash"
                         onclick="${obj.gvc.event(() => {
+                            var _a;
+                            if ((_a = obj.event) === null || _a === void 0 ? void 0 : _a.delete) {
+                                obj.event.delete(index);
+                            }
                             data.splice(index, 1);
                             obj.gvc.notifyDataChange(id);
                         })}"
@@ -680,17 +684,7 @@ export class EditorElem {
         return html ` <iframe class="rounded-3" style="border: none;width:${cf.width}px;height:${cf.height}px;"></iframe>`;
     }
     static codeEditor(obj) {
-        var _a;
         const codeID = obj.gvc.glitter.getUUID();
-        console.log(`codeEditor`, {
-            type: 'getData',
-            value: `${obj.structStart ? obj.structStart : `(()=>{`} ${(_a = obj.initial) !== null && _a !== void 0 ? _a : ''}
-                ${obj.structEnd ? obj.structEnd : '})()'}`,
-            language: 'javascript',
-            refactor: true,
-            structStart: obj.structStart,
-            structEnd: obj.structEnd,
-        });
         function getComponent(gvc, height) {
             return gvc.bindView(() => {
                 const id = obj.gvc.glitter.getUUID();
@@ -2431,7 +2425,7 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
                         .join(html ` <div style="margin-top: 12px;"></div>`);
                 },
                 divCreate: {
-                    class: `${obj.oneLine ? 'd-flex gap-2' : ''} ps-1`,
+                    class: `${obj.oneLine ? 'd-flex flex-wrap gap-2' : ''} ps-1`,
                 },
             };
         })}

package/lowcode/glitterBundle/plugins/editor-elem.ts

@@ -308,7 +308,13 @@ export class EditorElem {
     });
   }
 
-  public static flexMediaManagerV2(obj: { gvc: GVC; data: string[] }) {
+  public static flexMediaManagerV2(obj: {
+    gvc: GVC;
+    data: string[];
+    event?: {
+      delete?: (index: number) => void;
+    };
+  }) {
     const data = obj.data;
     obj.gvc.addStyle(`
       .p-hover-image:hover {
@@ -427,6 +433,9 @@ export class EditorElem {
                       <i
                         class="fa-regular fa-trash"
                         onclick="${obj.gvc.event(() => {
+                          if (obj.event?.delete) {
+                            obj.event.delete(index);
+                          }
                           data.splice(index, 1);
                           obj.gvc.notifyDataChange(id);
                         })}"
@@ -775,15 +784,6 @@ export class EditorElem {
     structEnd?: string;
   }) {
     const codeID = obj.gvc.glitter.getUUID();
-    console.log(`codeEditor`, {
-      type: 'getData',
-      value: `${obj.structStart ? obj.structStart : `(()=>{`} ${obj.initial ?? ''}
-                ${obj.structEnd ? obj.structEnd : '})()'}`,
-      language: 'javascript',
-      refactor: true,
-      structStart: obj.structStart,
-      structEnd: obj.structEnd,
-    });
 
     function getComponent(gvc: GVC, height: number) {
       return gvc.bindView(() => {
@@ -2806,7 +2806,7 @@ ${obj.structEnd ? obj.structEnd : '})()'}`,
               .join(html` <div style="margin-top: 12px;"></div>`);
           },
           divCreate: {
-            class: `${obj.oneLine ? 'd-flex gap-2' : ''} ps-1`,
+            class: `${obj.oneLine ? 'd-flex flex-wrap gap-2' : ''} ps-1`,
           },
         };
       })}