ts-glitter 21.3.7 → 21.3.9

package/lowcode/form-view/editor/image-selector.js

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { ApiUser } from "../../glitter-base/route/user.js";
-import { imageLibrary } from "../../modules/image-library.js";
-import { BgWidget } from "../../backend-manager/bg-widget.js";
+import { ApiUser } from '../../glitter-base/route/user.js';
+import { imageLibrary } from '../../modules/image-library.js';
+import { BgWidget } from '../../backend-manager/bg-widget.js';
 export class ImageSelector {
     static main(cf) {
         const widget = cf.widget;
@@ -25,117 +25,118 @@ export class ImageSelector {
                     }
                     const src = widget.bundle.form_data[widget.bundle.form_key];
                     function selectImage() {
-                        imageLibrary.selectImageLibrary(gvc, (urlArray) => {
+                        imageLibrary.selectImageLibrary(gvc, urlArray => {
                             widget.bundle.form_data[widget.bundle.form_key] = urlArray[0].data;
                             widget.bundle.refresh && widget.bundle.refresh();
                             gvc.notifyDataChange(id);
-                        }, html `
-                                <div class="d-flex flex-column"
-                                     style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;">圖片庫
-                                </div>`, { mul: false });
+                        }, html ` <div class="d-flex flex-column" style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;">
+                圖片庫
+              </div>`, { mul: false });
                     }
-                    return html `
-                        <div class="fw-normal mt-2 fs-6 d-flex align-items-center" style="gap:8px;">
-                            ${widget.bundle.form_title}
-                            <button
-                                    class="btn-size-sm btn-gray "
-                                    style=""
-                                    type="button"
-                                    onclick="${gvc.event(() => {
+                    return html ` <div class="fw-normal mt-2 fs-6 d-flex align-items-center" style="gap:8px;">
+              ${widget.bundle.form_title}
+              <button
+                class="btn-size-sm btn-gray "
+                style=""
+                type="button"
+                onclick="${gvc.event(() => {
                         selectImage();
                     })}"
-                            >
-                                <span class="tx_700" style="">替換</span>
-                            </button>
-                        </div>
-                        <div
-                                class="d-flex align-items-center justify-content-center rounded-3 shadow mt-2"
-
-                                style="width:145px;height:145px;cursor:pointer;background-color: lightgrey;
-background-image: url('${src || BgWidget.noImageURL}');background-size: cover;background-repeat: no-repeat;background-position: center;
+              >
+                <span class="tx_700" style="">替換</span>
+              </button>
+            </div>
+            <div
+              class="d-flex align-items-center justify-content-center rounded-3 shadow mt-2"
+              style="width:145px;height:145px;cursor:pointer;background-color: lightgrey;
+background-image: url('${src ||
+                        BgWidget.noImageURL}');background-size: cover;background-repeat: no-repeat;background-position: center;
 "
-                        >
-                            <div
-                                    class="w-100 h-100 d-flex align-items-center justify-content-center rounded-3 p-hover-image position-relative"
-                                    style="opacity:0;background: rgba(0,0,0,0.5);gap:20px;color:white;font-size:22px;"
-                            >
-                                ${(src && (src !== BgWidget.noImageURL)) ? ` <button
+            >
+              <div
+                class="w-100 h-100 d-flex align-items-center justify-content-center rounded-3 p-hover-image position-relative"
+                style="opacity:0;background: rgba(0,0,0,0.5);gap:20px;color:white;font-size:22px;"
+              >
+                ${src && src !== BgWidget.noImageURL
+                        ? ` <button
                                         class="btn-size-sm btn-gray position-absolute"
                                         style="top:5px;right:5px;"
                                         type="button"
                                         onclick="${gvc.event(() => {
-                        window.glitter.getModule(gvc.glitter.root_path + `backend-manager/bg-widget.js`, (BgWidget) => __awaiter(this, void 0, void 0, function* () {
-                            const tag = gvc.glitter.generateCheckSum(src, 9);
-                            let alt = (yield ApiUser.getPublicConfig(`alt_` + tag, 'manager')).response.value || { alt: '' };
-                            function set_alt() {
-                                return __awaiter(this, void 0, void 0, function* () {
-                                    ApiUser.setPublicConfig({
-                                        key: `alt_` + tag,
-                                        value: alt,
-                                        user_id: 'manager',
+                            window.glitter.getModule(gvc.glitter.root_path + `backend-manager/bg-widget.js`, (BgWidget) => __awaiter(this, void 0, void 0, function* () {
+                                const tag = gvc.glitter.generateCheckSum(src, 9);
+                                let alt = (yield ApiUser.getPublicConfig(`alt_` + tag, 'manager'))
+                                    .response.value || { alt: '' };
+                                function set_alt() {
+                                    return __awaiter(this, void 0, void 0, function* () {
+                                        ApiUser.setPublicConfig({
+                                            key: `alt_` + tag,
+                                            value: alt,
+                                            user_id: 'manager',
+                                        });
                                     });
+                                }
+                                BgWidget.settingDialog({
+                                    gvc: gvc,
+                                    title: '設定圖片描述',
+                                    innerHTML: (gvc) => {
+                                        return `<div>${BgWidget.textArea({
+                                            gvc: gvc,
+                                            title: `ALT描述`,
+                                            default: alt.alt,
+                                            placeHolder: `請輸入ALT描述`,
+                                            callback: (text) => {
+                                                alt.alt = text;
+                                            },
+                                        })}</div>`;
+                                    },
+                                    footer_html: (gvc) => {
+                                        let array = [
+                                            BgWidget.cancel(gvc.event(() => {
+                                                gvc.closeDialog();
+                                            })),
+                                            BgWidget.save(gvc.event(() => {
+                                                set_alt();
+                                                gvc.closeDialog();
+                                            })),
+                                        ];
+                                        return array.join('');
+                                    },
                                 });
-                            }
-                            BgWidget.settingDialog({
-                                gvc: gvc,
-                                title: '設定圖片描述',
-                                innerHTML: (gvc) => {
-                                    return `<div>${BgWidget.textArea({
-                                        gvc: gvc,
-                                        title: `ALT描述`,
-                                        default: alt.alt,
-                                        placeHolder: `請輸入ALT描述`,
-                                        callback: (text) => {
-                                            alt.alt = text;
-                                        },
-                                    })}</div>`;
-                                },
-                                footer_html: (gvc) => {
-                                    let array = [
-                                        BgWidget.cancel(gvc.event(() => {
-                                            gvc.closeDialog();
-                                        })),
-                                        BgWidget.save(gvc.event(() => {
-                                            set_alt();
-                                            gvc.closeDialog();
-                                        })),
-                                    ];
-                                    return array.join('');
-                                },
-                            });
-                        }));
-                    })}"
+                            }));
+                        })}"
                                 >
                                     <span class="tx_700" style="">ALT</span>
                                 </button>
                                 <i
                                         class="fa-regular fa-eye"
                                         onclick="${gvc.event(() => {
-                        window.parent.glitter.openDiaLog(new URL('../../dialog/image-preview.js', import.meta.url).href, 'preview', src);
-                    })}"
+                            window.parent.glitter.openDiaLog(new URL('../../dialog/image-preview.js', import.meta.url).href, 'preview', src);
+                        })}"
                                 ></i>
                                 <i
                                         class="fa-regular fa-trash"
                                         onclick="${gvc.event(() => {
-                        widget.bundle.form_data[widget.bundle.form_key] = BgWidget.noImageURL;
-                        widget.bundle.refresh && widget.bundle.refresh();
-                        gvc.notifyDataChange(id);
-                    })}"
-                                ></i>` : `
+                            widget.bundle.form_data[widget.bundle.form_key] = BgWidget.noImageURL;
+                            widget.bundle.refresh && widget.bundle.refresh();
+                            gvc.notifyDataChange(id);
+                        })}"
+                                ></i>`
+                        : `
                                 <button
                                         class="btn-size-sm btn-gray "
                                         style=""
                                         type="button"
                                         onclick="${gvc.event(() => {
-                        selectImage();
-                    })}"
+                            selectImage();
+                        })}"
                                 >
                                     <span class="tx_700" style="">選擇圖片</span>
                                 </button>
                                 `}
-                            </div>
-                        </div>`;
-                }
+              </div>
+            </div>`;
+                },
             };
         });
     }

package/lowcode/form-view/editor/image-selector.ts

@@ -1,150 +1,158 @@
-import {GVC} from "../../glitterBundle/GVController.js";
-import {ApiUser} from "../../glitter-base/route/user.js";
-import {imageLibrary} from "../../modules/image-library.js";
-import {ShareDialog} from "../../glitterBundle/dialog/ShareDialog.js";
-import {BgWidget} from "../../backend-manager/bg-widget.js";
+import { GVC } from '../../glitterBundle/GVController.js';
+import { ApiUser } from '../../glitter-base/route/user.js';
+import { imageLibrary } from '../../modules/image-library.js';
+import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
+import { BgWidget } from '../../backend-manager/bg-widget.js';
 
 export class ImageSelector {
-    public static main(cf: { gvc: GVC; formData: any; widget: any }) {
-        const widget = cf.widget;
-        const gvc = cf.gvc;
-        const id = gvc.glitter.getUUID();
-        const html = String.raw
-        return gvc.bindView(() => {
-            return {
-                bind: id,
-                view: () => {
-                    if (typeof widget.bundle.form_data[widget.bundle.form_key] === 'object') {
-                        widget.bundle.form_data[widget.bundle.form_key] = widget.bundle.form_data[widget.bundle.form_key].value
-                    }
-                    const src = widget.bundle.form_data[widget.bundle.form_key];
+  public static main(cf: { gvc: GVC; formData: any; widget: any }) {
+    const widget = cf.widget;
+    const gvc = cf.gvc;
+    const id = gvc.glitter.getUUID();
+    const html = String.raw;
+    return gvc.bindView(() => {
+      return {
+        bind: id,
+        view: () => {
+          if (typeof widget.bundle.form_data[widget.bundle.form_key] === 'object') {
+            widget.bundle.form_data[widget.bundle.form_key] = widget.bundle.form_data[widget.bundle.form_key].value;
+          }
+          const src = widget.bundle.form_data[widget.bundle.form_key];
 
-                    function selectImage() {
-                        imageLibrary.selectImageLibrary(
-                            gvc,
-                            (urlArray) => {
-                                widget.bundle.form_data[widget.bundle.form_key] = urlArray[0].data;
-                                widget.bundle.refresh && widget.bundle.refresh();
-                                gvc.notifyDataChange(id)
-                            },
-                            html`
-                                <div class="d-flex flex-column"
-                                     style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;">圖片庫
-                                </div>`,
-                            {mul: false}
-                        )
-                    }
+          function selectImage() {
+            imageLibrary.selectImageLibrary(
+              gvc,
+              urlArray => {
+                widget.bundle.form_data[widget.bundle.form_key] = urlArray[0].data;
+                widget.bundle.refresh && widget.bundle.refresh();
+                gvc.notifyDataChange(id);
+              },
+              html` <div class="d-flex flex-column" style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;">
+                圖片庫
+              </div>`,
+              { mul: false }
+            );
+          }
 
-                    return html`
-                        <div class="fw-normal mt-2 fs-6 d-flex align-items-center" style="gap:8px;">
-                            ${widget.bundle.form_title}
-                            <button
-                                    class="btn-size-sm btn-gray "
-                                    style=""
-                                    type="button"
-                                    onclick="${gvc.event(() => {
-                                        selectImage()
-                                    })}"
-                            >
-                                <span class="tx_700" style="">替換</span>
-                            </button>
-                        </div>
-                        <div
-                                class="d-flex align-items-center justify-content-center rounded-3 shadow mt-2"
-
-                                style="width:145px;height:145px;cursor:pointer;background-color: lightgrey;
-background-image: url('${src || BgWidget.noImageURL}');background-size: cover;background-repeat: no-repeat;background-position: center;
+          return html` <div class="fw-normal mt-2 fs-6 d-flex align-items-center" style="gap:8px;">
+              ${widget.bundle.form_title}
+              <button
+                class="btn-size-sm btn-gray "
+                style=""
+                type="button"
+                onclick="${gvc.event(() => {
+                  selectImage();
+                })}"
+              >
+                <span class="tx_700" style="">替換</span>
+              </button>
+            </div>
+            <div
+              class="d-flex align-items-center justify-content-center rounded-3 shadow mt-2"
+              style="width:145px;height:145px;cursor:pointer;background-color: lightgrey;
+background-image: url('${src ||
+              BgWidget.noImageURL}');background-size: cover;background-repeat: no-repeat;background-position: center;
 "
-                        >
-                            <div
-                                    class="w-100 h-100 d-flex align-items-center justify-content-center rounded-3 p-hover-image position-relative"
-                                    style="opacity:0;background: rgba(0,0,0,0.5);gap:20px;color:white;font-size:22px;"
-                            >
-                                ${(src && (src !== BgWidget.noImageURL)) ? ` <button
+            >
+              <div
+                class="w-100 h-100 d-flex align-items-center justify-content-center rounded-3 p-hover-image position-relative"
+                style="opacity:0;background: rgba(0,0,0,0.5);gap:20px;color:white;font-size:22px;"
+              >
+                ${src && src !== BgWidget.noImageURL
+                  ? ` <button
                                         class="btn-size-sm btn-gray position-absolute"
                                         style="top:5px;right:5px;"
                                         type="button"
                                         onclick="${gvc.event(() => {
-                                    (window as any).glitter.getModule(gvc.glitter.root_path + `backend-manager/bg-widget.js`, async (BgWidget: any) => {
-                                        const tag = gvc.glitter.generateCheckSum(src, 9);
-                                        let alt = (await ApiUser.getPublicConfig(`alt_` + tag, 'manager')).response.value || {alt: ''};
+                                          (window as any).glitter.getModule(
+                                            gvc.glitter.root_path + `backend-manager/bg-widget.js`,
+                                            async (BgWidget: any) => {
+                                              const tag = gvc.glitter.generateCheckSum(src, 9);
+                                              let alt = (await ApiUser.getPublicConfig(`alt_` + tag, 'manager'))
+                                                .response.value || { alt: '' };
 
-                                        async function set_alt() {
-                                            ApiUser.setPublicConfig({
-                                                key: `alt_` + tag,
-                                                value: alt,
-                                                user_id: 'manager',
-                                            });
-                                        }
+                                              async function set_alt() {
+                                                ApiUser.setPublicConfig({
+                                                  key: `alt_` + tag,
+                                                  value: alt,
+                                                  user_id: 'manager',
+                                                });
+                                              }
 
-                                        BgWidget.settingDialog({
-                                            gvc: gvc,
-                                            title: '設定圖片描述',
-                                            innerHTML: (gvc: GVC) => {
-                                                return `<div>${BgWidget.textArea({
+                                              BgWidget.settingDialog({
+                                                gvc: gvc,
+                                                title: '設定圖片描述',
+                                                innerHTML: (gvc: GVC) => {
+                                                  return `<div>${BgWidget.textArea({
                                                     gvc: gvc,
                                                     title: `ALT描述`,
                                                     default: alt.alt,
                                                     placeHolder: `請輸入ALT描述`,
                                                     callback: (text: string) => {
-                                                        alt.alt = text;
+                                                      alt.alt = text;
                                                     },
-                                                })}</div>`;
-                                            },
-                                            footer_html: (gvc: GVC) => {
-                                                let array = [
+                                                  })}</div>`;
+                                                },
+                                                footer_html: (gvc: GVC) => {
+                                                  let array = [
                                                     BgWidget.cancel(
-                                                            gvc.event(() => {
-                                                                gvc.closeDialog();
-                                                            })
+                                                      gvc.event(() => {
+                                                        gvc.closeDialog();
+                                                      })
                                                     ),
                                                     BgWidget.save(
-                                                            gvc.event(() => {
-                                                                set_alt();
-                                                                gvc.closeDialog();
-                                                            })
+                                                      gvc.event(() => {
+                                                        set_alt();
+                                                        gvc.closeDialog();
+                                                      })
                                                     ),
-                                                ];
-                                                return array.join('');
-                                            },
-                                        });
-                                    });
-                                })}"
+                                                  ];
+                                                  return array.join('');
+                                                },
+                                              });
+                                            }
+                                          );
+                                        })}"
                                 >
                                     <span class="tx_700" style="">ALT</span>
                                 </button>
                                 <i
                                         class="fa-regular fa-eye"
                                         onclick="${gvc.event(() => {
-                                    (window.parent as any).glitter.openDiaLog(new URL('../../dialog/image-preview.js', import.meta.url).href, 'preview', src);
-                                    // gvc.glitter.openDiaLog(new URL('../../dialog/image-preview.js', import.meta.url).href, 'preview', dd);
-                                })}"
+                                          (window.parent as any).glitter.openDiaLog(
+                                            new URL('../../dialog/image-preview.js', import.meta.url).href,
+                                            'preview',
+                                            src
+                                          );
+                                          // gvc.glitter.openDiaLog(new URL('../../dialog/image-preview.js', import.meta.url).href, 'preview', dd);
+                                        })}"
                                 ></i>
                                 <i
                                         class="fa-regular fa-trash"
                                         onclick="${gvc.event(() => {
-                                    widget.bundle.form_data[widget.bundle.form_key] = BgWidget.noImageURL;
-                                    widget.bundle.refresh && widget.bundle.refresh();
-                                    gvc.notifyDataChange(id);
-                                })}"
-                                ></i>` : `
+                                          widget.bundle.form_data[widget.bundle.form_key] = BgWidget.noImageURL;
+                                          widget.bundle.refresh && widget.bundle.refresh();
+                                          gvc.notifyDataChange(id);
+                                        })}"
+                                ></i>`
+                  : `
                                 <button
                                         class="btn-size-sm btn-gray "
                                         style=""
                                         type="button"
                                         onclick="${gvc.event(() => {
-                                    selectImage()
-                                })}"
+                                          selectImage();
+                                        })}"
                                 >
                                     <span class="tx_700" style="">選擇圖片</span>
                                 </button>
                                 `}
-                            </div>
-                        </div>`
-                }
-            }
-        })
-    }
+              </div>
+            </div>`;
+        },
+      };
+    });
+  }
 }
 
 (window as any).glitter.setModule(import.meta.url, ImageSelector);

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

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { BaseApi } from '../../glitterBundle/api/base.js';
 import { GlobalUser } from '../global/global-user.js';
-import { ApiShop } from './shopping.js';
 import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
 export class ApiUser {
     static register(json) {
@@ -312,16 +311,17 @@ export class ApiUser {
         });
     }
     static getUserList(json) {
-        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('&');
-                })()}`,
+        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: url,
             type: 'GET',
             headers: {
                 'g-app': getConfig().config.appName,
@@ -387,6 +387,7 @@ export class ApiUser {
                 order_string: (_d = json.orderString) !== null && _d !== void 0 ? _d : '',
                 filter_type: (_e = json.filter_type) !== null && _e !== void 0 ? _e : '',
                 all_result: json.all_result ? `${json.all_result}` : '',
+                only_id: json.only_id ? `${json.only_id}` : '',
             }).toString();
             const extraQuery = [...filterString, ...groupString].join('&');
             const finalQuery = extraQuery ? `${baseQuery}&${extraQuery}` : baseQuery;
@@ -405,31 +406,10 @@ export class ApiUser {
                         response: { data: [], total: 0 },
                     };
                 }
-                const array = data.response.data;
-                const allUsers = data.response.allUsers;
-                if (array.length > 0) {
-                    yield Promise.allSettled(array.map((item) => __awaiter(this, void 0, void 0, function* () {
-                        const firstShipment = (yield 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,
                     },
@@ -727,6 +707,19 @@ export class ApiUser {
             },
         });
     }
+    static getUserPermission() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.getPermission({ page: 0, limit: 1000 }).then(data => {
+                if (!data.result) {
+                    return undefined;
+                }
+                const find_user = data.response.data.find((data) => {
+                    return `${data.user}` === `${GlobalUser.parseJWT(GlobalUser.saas_token).payload.userID}`;
+                });
+                return find_user;
+            });
+        });
+    }
     static setPermission(json) {
         return BaseApi.create({
             url: getBaseUrl() + `/api-public/v1/user/permission`,