ts-glitter 21.3.8 → 21.3.9

package/lowcode/cms-plugin/shopping-setting-advance.js

@@ -197,7 +197,7 @@ export class ShoppingSettingAdvance {
                                         BgWidget.inlineCheckBox({
                                             title: '',
                                             gvc: gvc,
-                                            def: [dd.checked ? dd.key : ``],
+                                            def: [dd.checked ? dd.key : ''],
                                             array: [
                                                 {
                                                     title: dd.title,
@@ -425,7 +425,7 @@ export class ShoppingSettingAdvance {
                                     }
                                     return stringArray.join('');
                                 })),
-                        ].join(``)),
+                        ].join('')),
                         BgWidget.mainCard([
                             html `
                     <div class="d-flex flex-column guide5-4">
@@ -449,7 +449,7 @@ export class ShoppingSettingAdvance {
                                     },
                                 ],
                             }),
-                        ].join(``)),
+                        ].join('')),
                         BgWidget.mainCard((() => {
                             const priceVM = {
                                 id: gvc.glitter.getUUID(),
@@ -558,7 +558,7 @@ export class ShoppingSettingAdvance {
                                                     gvc.notifyDataChange(priceVM.id);
                                                 }
                                             })}"
-                                          ${((_a = postMD.multi_sale_price) === null || _a === void 0 ? void 0 : _a.some(m => m.type === item.type)) ? `checked` : ``}
+                                          ${((_a = postMD.multi_sale_price) === null || _a === void 0 ? void 0 : _a.some(m => m.type === item.type)) ? `checked` : ''}
                                         />
                                       </div>
                                     </div>
@@ -836,7 +836,7 @@ export class ShoppingSettingAdvance {
                                     },
                                 };
                             }))
-                            : ``,
+                            : '',
                         BgWidget.mainCard(obj.gvc.bindView(() => {
                             const id = gvc.glitter.getUUID();
                             return {
@@ -1011,7 +1011,7 @@ export class ShoppingSettingAdvance {
                         .join(html ` <div class="my-3"></div>`);
                 },
                 divCreate: {
-                    class: `w-100`,
+                    class: 'w-100',
                 },
             };
         }));

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

@@ -31,8 +31,8 @@ export class ShoppingSettingAdvance {
       commodity: '商品',
       course: '課程',
     };
-
     const carTitle = categoryTitles[postMD.product_category] || '商品';
+
     return BgWidget.container(
       gvc.bindView(() => {
         const id = gvc.glitter.getUUID();
@@ -224,7 +224,7 @@ export class ShoppingSettingAdvance {
                           BgWidget.inlineCheckBox({
                             title: '',
                             gvc: gvc,
-                            def: [dd.checked ? dd.key : ``],
+                            def: [dd.checked ? dd.key : ''],
                             array: [
                               {
                                 title: dd.title,
@@ -476,7 +476,7 @@ export class ShoppingSettingAdvance {
                         }
                         return stringArray.join('');
                       })),
-                ].join(``)
+                ].join('')
               ),
               BgWidget.mainCard(
                 [
@@ -502,7 +502,7 @@ export class ShoppingSettingAdvance {
                       },
                     ],
                   }),
-                ].join(``)
+                ].join('')
               ),
               BgWidget.mainCard(
                 (() => {
@@ -621,7 +621,7 @@ export class ShoppingSettingAdvance {
                                               gvc.notifyDataChange(priceVM.id);
                                             }
                                           })}"
-                                          ${postMD.multi_sale_price?.some(m => m.type === item.type) ? `checked` : ``}
+                                          ${postMD.multi_sale_price?.some(m => m.type === item.type) ? `checked` : ''}
                                         />
                                       </div>
                                     </div>
@@ -912,7 +912,7 @@ export class ShoppingSettingAdvance {
                       };
                     })
                   )
-                : ``,
+                : '',
               BgWidget.mainCard(
                 obj.gvc.bindView(() => {
                   const id = gvc.glitter.getUUID();
@@ -1103,7 +1103,7 @@ export class ShoppingSettingAdvance {
               .join(html` <div class="my-3"></div>`);
           },
           divCreate: {
-            class: `w-100`,
+            class: 'w-100',
           },
         };
       })

package/lowcode/cms-plugin/shopping-setting-basic.js

@@ -167,6 +167,32 @@ export class ShoppingSettingBasic {
                 postMD.specs = Array.from(uniqueTitlesMap, ([title, option]) => ({ title, option }));
             }
         }
+        function saveImageLib(urlArray) {
+            ApiUser.getPublicConfig('image-manager', 'manager').then((data) => {
+                const newImageArray = urlArray.map((item) => {
+                    return {
+                        title: item.split('_')[item.split('_').length - 1],
+                        data: item,
+                        items: [],
+                        type: 'file',
+                        tag: [],
+                        id: gvc.glitter.getUUID(),
+                    };
+                });
+                if (data.result) {
+                    const img_lib = data.response.value;
+                    img_lib.push(...newImageArray);
+                    dialog.dataLoading({ visible: true });
+                    ApiUser.setPublicConfig({
+                        key: 'image-manager',
+                        value: img_lib,
+                        user_id: 'manager',
+                    }).then(data => {
+                        dialog.dataLoading({ visible: false });
+                    });
+                }
+            });
+        }
         ShoppingSettingBasic.updateVariants(gvc, postMD, shipment_config, variantsViewID, obj);
         const cat_title = (() => {
             switch (postMD.product_category) {
@@ -784,6 +810,7 @@ export class ShoppingSettingBasic {
                                 const addImage = (urlArray) => {
                                     if (urlArray.length > 0) {
                                         language_data.preview_image.push(...urlArray);
+                                        saveImageLib(urlArray);
                                         obj.gvc.notifyDataChange('image_view');
                                     }
                                     else {
@@ -835,6 +862,23 @@ export class ShoppingSettingBasic {
                                 EditorElem.flexMediaManagerV2({
                                     gvc: obj.gvc,
                                     data: language_data.preview_image,
+                                    event: {
+                                        delete: (index) => {
+                                            console.log('language_data -- ', language_data);
+                                            postMD.variants.forEach((variant) => {
+                                                var _a, _b;
+                                                if (variant.preview_image === language_data.preview_image[index]) {
+                                                    variant.preview_image = (_a = language_data.preview_image[0]) !== null && _a !== void 0 ? _a : BgWidget.noImageURL;
+                                                }
+                                                if (variant[`preview_image_${vm.language}`] === language_data.preview_image[index]) {
+                                                    variant[`preview_image_${vm.language}`] =
+                                                        (_b = language_data.preview_image[0]) !== null && _b !== void 0 ? _b : BgWidget.noImageURL;
+                                                }
+                                            });
+                                            console.log('language_data -- ', postMD.variants);
+                                            ShoppingSettingBasic.updateVariants(gvc, postMD, shipment_config, variantsViewID, obj);
+                                        },
+                                    },
                                 }));
                         },
                         divCreate: {

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

@@ -123,6 +123,7 @@ export class ShoppingSettingBasic {
         preview_image: '',
       });
     }
+
     postMD.variants.map((dd: any) => {
       dd.checked = undefined;
       return dd;
@@ -195,6 +196,51 @@ export class ShoppingSettingBasic {
       }
     }
 
+    function saveImageLib(urlArray: string[]) {
+      ApiUser.getPublicConfig('image-manager', 'manager').then((data: any) => {
+        const newImageArray = urlArray.map((item: string) => {
+          return {
+            title: item.split('_')[item.split('_').length - 1],
+            data: item,
+            items: [],
+            type: 'file',
+            tag: [],
+            id: gvc.glitter.getUUID(),
+          };
+        });
+        if (data.result) {
+          const img_lib = data.response.value;
+          img_lib.push(...newImageArray);
+          dialog.dataLoading({ visible: true });
+          ApiUser.setPublicConfig({
+            key: 'image-manager',
+            value: img_lib,
+            user_id: 'manager',
+          }).then(data => {
+            dialog.dataLoading({ visible: false });
+          });
+        }
+        // if (data.response.value) {
+        //   vm.link = data.response.value;
+        //
+        //   function loop(array: FileItem[]) {
+        //     array.map(dd => {
+        //       if (dd.type === 'folder') {
+        //         loop(dd.items ?? []);
+        //       }
+        //     });
+        //   }
+        //
+        //   loop(vm.link);
+        //   vm.loading = false;
+        //   callback();
+        // } else {
+        //   vm.loading = false;
+        //   callback();
+        // }
+      });
+    }
+
     ShoppingSettingBasic.updateVariants(gvc, postMD, shipment_config, variantsViewID, obj);
 
     const cat_title = (() => {
@@ -907,6 +953,7 @@ export class ShoppingSettingBasic {
                         const addImage = (urlArray: string[]) => {
                           if (urlArray.length > 0) {
                             language_data.preview_image.push(...urlArray);
+                            saveImageLib(urlArray);
                             obj.gvc.notifyDataChange('image_view');
                           } else {
                             dialog.errorMessage({ text: '請選擇至少一張圖片' });
@@ -964,6 +1011,22 @@ export class ShoppingSettingBasic {
                     EditorElem.flexMediaManagerV2({
                       gvc: obj.gvc,
                       data: language_data.preview_image,
+                      event: {
+                        delete: (index: number) => {
+                          console.log('language_data -- ', language_data);
+                          postMD.variants.forEach((variant: any) => {
+                            if (variant.preview_image === language_data.preview_image[index]) {
+                              variant.preview_image = language_data.preview_image[0] ?? BgWidget.noImageURL;
+                            }
+                            if (variant[`preview_image_${vm.language}`] === language_data.preview_image[index]) {
+                              variant[`preview_image_${vm.language}`] =
+                                language_data.preview_image[0] ?? BgWidget.noImageURL;
+                            }
+                          });
+                          console.log('language_data -- ', postMD.variants);
+                          ShoppingSettingBasic.updateVariants(gvc, postMD, shipment_config, variantsViewID, obj);
+                        },
+                      },
                     })
                   );
                 },
@@ -1348,7 +1411,6 @@ export class ShoppingSettingBasic {
                               },
                               save: () => {
                                 postMD.specs.push(temp);
-
                                 createPage.page = 'add';
                                 checkSpecSingle();
                                 ShoppingSettingBasic.updateVariants(gvc, postMD, shipment_config, variantsViewID, obj);

package/lowcode/cms-plugin/shopping-setting-stock-log.js

@@ -0,0 +1,57 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { BgWidget } from '../backend-manager/bg-widget.js';
+import { ApiUser } from '../glitter-base/route/user.js';
+import { Tool } from '../modules/tool.js';
+const html = String.raw;
+export class ShoppingSettingStockLog {
+    static main(obj) {
+        const gvc = obj.gvc;
+        const postMD = obj.postMD;
+        const vm2 = obj.vm2;
+        const vm = {
+            id: gvc.glitter.getUUID(),
+            loading: true,
+            memberList: new Map(),
+        };
+        return BgWidget.container(gvc.bindView({
+            bind: vm.id,
+            view: () => {
+                if (vm.loading) {
+                    return BgWidget.spinner();
+                }
+                postMD.records.map(log => {
+                    console.log(log);
+                    console.log(Tool.formatDateTime(log.changed_at, true));
+                    if (vm.memberList.has(`${log.changed_by}`)) {
+                        console.log(vm.memberList.get(`${log.changed_by}`));
+                    }
+                    console.log('-----');
+                });
+                return [BgWidget.mainCard('')].join('');
+            },
+            divCreate: {
+                class: 'w-100',
+            },
+            onCreate: () => __awaiter(this, void 0, void 0, function* () {
+                if (vm.loading) {
+                    const memberResp = yield ApiUser.getPermission({ page: 0, limit: 100 });
+                    if (memberResp.result && Array.isArray(memberResp.response.data)) {
+                        vm.memberList = new Map(memberResp.response.data.map((member) => {
+                            return [member.user, member];
+                        }));
+                    }
+                    vm.loading = false;
+                    gvc.notifyDataChange(vm.id);
+                }
+            }),
+        }));
+    }
+}

package/lowcode/cms-plugin/shopping-setting-stock-log.ts

@@ -0,0 +1,101 @@
+import { GVC } from '../glitterBundle/GVController.js';
+import { BgWidget } from '../backend-manager/bg-widget.js';
+import { ApiUser } from '../glitter-base/route/user.js';
+import { LanguageLocation } from '../glitter-base/global/language.js';
+import { Tool } from '../modules/tool.js';
+import { Product } from '../public-models/product.js';
+
+const html = String.raw;
+
+interface ManagementMemberConfig {
+  pin: string;
+  auth: string[];
+  name: string;
+  phone: string;
+  title: string;
+  member_id: string;
+  is_manager: boolean;
+  support_shop: string[];
+}
+
+interface ManagementMember {
+  id: number;
+  user: string;
+  appName: string;
+  config: ManagementMemberConfig;
+  email: string;
+  invited: number;
+  status: number;
+  online_time: string;
+}
+
+interface ViewModel {
+  id: string;
+  loading: boolean;
+  memberList: Map<string, ManagementMember>;
+}
+
+export class ShoppingSettingStockLog {
+  public static main(obj: {
+    gvc: GVC;
+    vm: any;
+    vm2: {
+      id: string;
+      language: LanguageLocation;
+      content_detail: any;
+    };
+    reload: () => void;
+    language_data: any;
+    postMD: Product;
+    shipment_config: any;
+  }) {
+    const gvc = obj.gvc;
+    const postMD = obj.postMD;
+    const vm2 = obj.vm2;
+
+    const vm: ViewModel = {
+      id: gvc.glitter.getUUID(),
+      loading: true,
+      memberList: new Map(),
+    };
+
+    return BgWidget.container(
+      gvc.bindView({
+        bind: vm.id,
+        view: () => {
+          if (vm.loading) {
+            return BgWidget.spinner();
+          }
+
+          postMD.records.map(log => {
+            console.log(log);
+            console.log(Tool.formatDateTime(log.changed_at, true));
+            if (vm.memberList.has(`${log.changed_by}`)) {
+              console.log(vm.memberList.get(`${log.changed_by}`));
+            }
+            console.log('-----');
+          });
+
+          return [BgWidget.mainCard('')].join('');
+        },
+        divCreate: {
+          class: 'w-100',
+        },
+        onCreate: async () => {
+          if (vm.loading) {
+            const memberResp = await ApiUser.getPermission({ page: 0, limit: 100 });
+            if (memberResp.result && Array.isArray(memberResp.response.data)) {
+              vm.memberList = new Map(
+                memberResp.response.data.map((member: ManagementMember) => {
+                  return [member.user, member];
+                })
+              );
+            }
+            vm.loading = false;
+            gvc.notifyDataChange(vm.id);
+          }
+        },
+      })
+    );
+  }
+}

package/lowcode/cms-plugin/user-list.js

@@ -84,16 +84,20 @@ export class UserList {
                     },
                     {
                         key: '上次登入時間',
-                        value: `<span class="fs-7">${glitter.ut.dateFormat(new Date(dd.online_time), 'yyyy-MM-dd hh:mm')}</span>`,
+                        value: html `<div class="fs-7" style="min-width: 160px">
+              ${glitter.ut.dateFormat(new Date(dd.online_time), 'yyyy-MM-dd hh:mm')}
+            </div>`,
                     },
                     {
                         key: '最後出貨時間',
-                        value: `<span class="d-flex w-100 d-flex align-items-center justify-content-center">${dd.firstShipment ? glitter.ut.dateFormat(new Date(dd.firstShipment.orderData.user_info.shipment_date), 'yyyy-MM-dd') : '-'}</span>`,
+                        value: html `<div class="fs-7" style="min-width: 160px">
+              ${dd.last_has_shipment_number_date ? Tool.formatDateTime(dd.last_has_shipment_number_date) : '-'}
+            </div>`,
                     },
                     {
                         key: '社群綁定',
                         value: (() => {
-                            return html `<div class="d-flex align-items-center px-2" style="gap:5px;">
+                            return html `<div class="d-flex align-items-center px-2" style="gap: 5px;">
                 ${[
                                 {
                                     type: 'fb',
@@ -386,7 +390,7 @@ export class UserList {
                                                     vmi.tableData = getUserlist();
                                                     vmi.allResult = () => __awaiter(this, void 0, void 0, function* () {
                                                         dialog.dataLoading({ visible: true });
-                                                        return ApiUser.getUserListOrders(Object.assign(Object.assign({}, vm.apiJSON), { all_result: true })).then(data => {
+                                                        return ApiUser.getUserListOrders(Object.assign(Object.assign({}, vm.apiJSON), { all_result: true, only_id: true })).then(data => {
                                                             dialog.dataLoading({ visible: false });
                                                             return data.response.allUsers;
                                                         });
@@ -1171,7 +1175,6 @@ export class UserList {
                                                                                 ].join(BgWidget.mbContainer(18));
                                                                             }
                                                                         },
-                                                                        divCreate: {},
                                                                         onCreate: () => {
                                                                             if (vmt.loading) {
                                                                                 ApiUser.getPublicConfig('user_general_tags', 'manager').then((dd) => {
@@ -1369,7 +1372,6 @@ export class UserList {
                                                 `;
                                                                         }
                                                                     },
-                                                                    divCreate: {},
                                                                     onCreate: () => {
                                                                         if (loading) {
                                                                             ApiUser.getPublicConfig('member_level_config', 'manager').then((dd) => {
@@ -1691,7 +1693,7 @@ export class UserList {
                                           </div>
                                         </div>`,
                                                                     vm.plan > 0
-                                                                        ? html ` <div class="">
+                                                                        ? html ` <div>
                                               <div class="tx_700 mb-3">社群綁定</div>
                                               ${[
                                                                             {
@@ -1787,7 +1789,6 @@ export class UserList {
                             ].join(html ` <div style="margin-top: 24px;"></div>`));
                     }
                 },
-                onCreate: () => { },
             };
         });
     }
@@ -1965,7 +1966,6 @@ export class UserList {
           </div>
         `);
             },
-            divCreate: {},
         });
     }
     static userManager(gvc, type = 'list', callback = () => { }) {
@@ -2039,6 +2039,7 @@ export class UserList {
                                         page: vmi.page - 1,
                                         limit: limit,
                                         search: vm.query || undefined,
+                                        only_id: true,
                                     }).then(data => {
                                         vm.dataList = data.response.data;
                                         vmi.pageSize = Math.ceil(data.response.total / limit);

package/lowcode/cms-plugin/user-list.ts

@@ -123,16 +123,20 @@ export class UserList {
           },
           {
             key: '上次登入時間',
-            value: `<span class="fs-7">${glitter.ut.dateFormat(new Date(dd.online_time), 'yyyy-MM-dd hh:mm')}</span>`,
+            value: html`<div class="fs-7" style="min-width: 160px">
+              ${glitter.ut.dateFormat(new Date(dd.online_time), 'yyyy-MM-dd hh:mm')}
+            </div>`,
           },
           {
             key: '最後出貨時間',
-            value: `<span class="d-flex w-100 d-flex align-items-center justify-content-center">${dd.firstShipment ? glitter.ut.dateFormat(new Date(dd.firstShipment.orderData.user_info.shipment_date), 'yyyy-MM-dd') : '-'}</span>`,
+            value: html`<div class="fs-7" style="min-width: 160px">
+              ${dd.last_has_shipment_number_date ? Tool.formatDateTime(dd.last_has_shipment_number_date) : '-'}
+            </div>`,
           },
           {
             key: '社群綁定',
             value: (() => {
-              return html`<div class="d-flex align-items-center px-2" style="gap:5px;">
+              return html`<div class="d-flex align-items-center px-2" style="gap: 5px;">
                 ${[
                   {
                     type: 'fb',
@@ -469,6 +473,7 @@ export class UserList {
                                   return ApiUser.getUserListOrders({
                                     ...vm.apiJSON,
                                     all_result: true,
+                                    only_id: true,
                                   }).then(data => {
                                     dialog.dataLoading({ visible: false });
                                     return data.response.allUsers;
@@ -1341,7 +1346,6 @@ export class UserList {
                                                         ].join(BgWidget.mbContainer(18));
                                                       }
                                                     },
-                                                    divCreate: {},
                                                     onCreate: () => {
                                                       if (vmt.loading) {
                                                         ApiUser.getPublicConfig('user_general_tags', 'manager').then(
@@ -1568,7 +1572,6 @@ export class UserList {
                                                 `;
                                               }
                                             },
-                                            divCreate: {},
                                             onCreate: () => {
                                               if (loading) {
                                                 ApiUser.getPublicConfig('member_level_config', 'manager').then(
@@ -1628,6 +1631,7 @@ export class UserList {
                                         <div style="font-size: 16px; font-weight: 400; color: #393939;">${content}</div>
                                       `;
                                     }
+
                                     const firstShipment = (
                                       await ApiShop.getOrder({
                                         page: 0,
@@ -1943,7 +1947,7 @@ export class UserList {
                                           </div>
                                         </div>`,
                                         vm.plan > 0
-                                          ? html` <div class="">
+                                          ? html` <div>
                                               <div class="tx_700 mb-3">社群綁定</div>
                                               ${[
                                                 {
@@ -2047,7 +2051,6 @@ export class UserList {
               );
           }
         },
-        onCreate: () => {},
       };
     });
   }
@@ -2253,7 +2256,6 @@ export class UserList {
           </div>
         `);
       },
-      divCreate: {},
     });
   }
 
@@ -2342,6 +2344,7 @@ export class UserList {
                         page: vmi.page - 1,
                         limit: limit,
                         search: vm.query || undefined,
+                        only_id: true,
                       }).then(data => {
                         vm.dataList = data.response.data;
                         vmi.pageSize = Math.ceil(data.response.total / limit);

package/lowcode/css/editor.css

@@ -997,7 +997,7 @@ h6 {
   display: flex;
   flex-direction: column;
   gap: 18px;
-  padding: 12px;
+  border: 12px solid var(--main-white);
   overflow-y: auto;
   max-height: 400px;
 }