ts-glitter 20.4.6 → 20.4.8

package/lowcode/Entry.js

@@ -144,7 +144,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.4.6';
+            glitter.share.editerVersion = 'V_20.4.8';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -146,7 +146,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.4.6';
+      glitter.share.editerVersion = 'V_20.4.8';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/lowcode/backend-manager/bg-widget.js

@@ -1661,7 +1661,6 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                 pageSize: 0,
                 tableData: [],
                 originalData: [],
-                allResultData: [],
                 callback: () => {
                     vm.loading = false;
                     gvc.notifyDataChange(ids.container);
@@ -1746,21 +1745,24 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                         initCheckData();
                         const selectAllObject = {
                             gvc,
-                            event: () => {
-                                if (vm.limit > 0) {
-                                    vm.checkedArray = vm.allResultData.map((item, i) => {
-                                        const index = i % vm.limit;
-                                        const page = Math.ceil(i / vm.limit) + (Boolean(index) ? 0 : 1);
-                                        item.dataPin = `${page}-${index}`;
-                                        item.checked = true;
-                                        return item;
-                                    });
-                                    vm.originalData.forEach((item) => {
-                                        item.checked = true;
-                                    });
-                                    renderRowCheckbox(true);
+                            event: () => __awaiter(this, void 0, void 0, function* () {
+                                if (vm.limit > 0 && vm.allResult) {
+                                    const allResultArray = yield vm.allResult();
+                                    if (Array.isArray(allResultArray) && allResultArray.length > 0) {
+                                        vm.checkedArray = allResultArray.map((item, i) => {
+                                            const index = i % vm.limit;
+                                            const page = Math.ceil(i / vm.limit) + (Boolean(index) ? 0 : 1);
+                                            item.dataPin = `${page}-${index}`;
+                                            item.checked = true;
+                                            return item;
+                                        });
+                                        vm.originalData.forEach((item) => {
+                                            item.checked = true;
+                                        });
+                                        renderRowCheckbox(true);
+                                    }
                                 }
-                            },
+                            }),
                         };
                         const cancelAllObject = {
                             gvc,
@@ -1813,7 +1815,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                                                             text: '',
                                                         }),
                                                     ],
-                                                    allSelectCallback: vm.allResultData.length > 0 ? selectAllObject : undefined,
+                                                    allSelectCallback: vm.allResult ? selectAllObject : undefined,
                                                     cancelCallback: cancelAllObject,
                                                 });
                                             }
@@ -1844,7 +1846,7 @@ ${(_c = obj.default) !== null && _c !== void 0 ? _c : ''}</textarea
                                                 }),
                                                 count: vm.checkedArray.length,
                                                 buttonList: [...inList, ...outList],
-                                                allSelectCallback: vm.allResultData.length > 0 ? selectAllObject : undefined,
+                                                allSelectCallback: vm.allResult ? selectAllObject : undefined,
                                                 cancelCallback: cancelAllObject,
                                             });
                                         }

package/lowcode/backend-manager/bg-widget.ts

@@ -45,7 +45,7 @@ type TableV3 = {
   originalData: any;
   callback: () => void;
   checkedArray: any[];
-  allResultData: any[];
+  allResult?: () => Promise<any[]>;
   limit: number;
 };
 
@@ -1981,7 +1981,6 @@ ${obj.default ?? ''}</textarea
         pageSize: 0,
         tableData: [],
         originalData: [],
-        allResultData: [],
         callback: () => {
           vm.loading = false;
           gvc.notifyDataChange(ids.container);
@@ -2086,19 +2085,22 @@ ${obj.default ?? ''}</textarea
             // 全選物件
             const selectAllObject = {
               gvc,
-              event: () => {
-                if (vm.limit > 0) {
-                  vm.checkedArray = vm.allResultData.map((item, i) => {
-                    const index = i % vm.limit;
-                    const page = Math.ceil(i / vm.limit) + (Boolean(index) ? 0 : 1);
-                    item.dataPin = `${page}-${index}`;
-                    item.checked = true;
-                    return item;
-                  });
-                  vm.originalData.forEach((item: any) => {
-                    item.checked = true;
-                  });
-                  renderRowCheckbox(true);
+              event: async () => {
+                if (vm.limit > 0 && vm.allResult) {
+                  const allResultArray = await vm.allResult();
+                  if (Array.isArray(allResultArray) && allResultArray.length > 0) {
+                    vm.checkedArray = allResultArray.map((item, i) => {
+                      const index = i % vm.limit;
+                      const page = Math.ceil(i / vm.limit) + (Boolean(index) ? 0 : 1);
+                      item.dataPin = `${page}-${index}`;
+                      item.checked = true;
+                      return item;
+                    });
+                    vm.originalData.forEach((item: any) => {
+                      item.checked = true;
+                    });
+                    renderRowCheckbox(true);
+                  }
                 }
               },
             };
@@ -2162,7 +2164,7 @@ ${obj.default ?? ''}</textarea
                                   text: '',
                                 }),
                               ],
-                              allSelectCallback: vm.allResultData.length > 0 ? selectAllObject : undefined,
+                              allSelectCallback: vm.allResult ? selectAllObject : undefined,
                               cancelCallback: cancelAllObject,
                             });
                           }
@@ -2201,7 +2203,7 @@ ${obj.default ?? ''}</textarea
                             }),
                             count: vm.checkedArray.length,
                             buttonList: [...inList, ...outList],
-                            allSelectCallback: vm.allResultData.length > 0 ? selectAllObject : undefined,
+                            allSelectCallback: vm.allResult ? selectAllObject : undefined,
                             cancelCallback: cancelAllObject,
                           });
                         }

package/lowcode/cms-plugin/stock-history.js

@@ -1043,6 +1043,7 @@ export class StockHistory {
                                                             title: '搜尋商品',
                                                             default: dvm.variantIds,
                                                             callback: resultData => {
+                                                                alert(JSON.stringify(resultData));
                                                                 dvm.variantIds = resultData;
                                                                 gvc.notifyDataChange(dvm.tableId);
                                                             },

package/lowcode/cms-plugin/stock-history.ts

@@ -12,6 +12,7 @@ import { StockVendors, VendorData } from './stock-vendors.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Tool } from '../modules/tool.js';
 import { BgProduct, OptionsItem } from '../backend-manager/bg-product.js';
+import { al } from '@faker-js/faker/dist/airline-CBNP41sR.js';
 
 const html = String.raw;
 
@@ -1125,11 +1126,20 @@ export class StockHistory {
                                       class="w-100 d-flex align-items-center justify-content-center cursor_pointer"
                                       style="color: #36B; font-size: 16px; font-weight: 400;"
                                       onclick="${gvc.event(() => {
+                                        // BgProduct.productsDialog({
+                                        //   gvc: gvc,
+                                        //   default:  [],
+                                        //   with_variants:true,
+                                        //   callback: async value => {
+                                        //   alert(JSON.stringify(value))
+                                        //   },
+                                        // })
                                         BgWidget.variantDialog({
                                           gvc,
                                           title: '搜尋商品',
                                           default: dvm.variantIds,
                                           callback: resultData => {
+                                            alert(JSON.stringify(resultData));
                                             dvm.variantIds = resultData;
                                             gvc.notifyDataChange(dvm.tableId);
                                           },

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

@@ -69,6 +69,7 @@ export class UserModule {
     static addTags(obj) {
         const gvc = obj.gvc;
         const dataArray = obj.dataArray;
+        const dialog = new ShareDialog(gvc.glitter);
         const vmt = {
             id: gvc.glitter.getUUID(),
             loading: true,
@@ -128,15 +129,16 @@ export class UserModule {
             清除全部
           </div>`,
                     BgWidget.cancel(gvc2.event(() => gvc2.closeDialog())),
-                    BgWidget.save(gvc2.event(() => __awaiter(this, void 0, void 0, function* () {
-                        dataArray.forEach((item) => {
-                            item.userData.tags = item.userData.tags
-                                ? [...new Set([...item.userData.tags, ...vmt.postData])]
-                                : vmt.postData;
+                    BgWidget.save(gvc2.event(() => {
+                        const ids = dataArray.map((data) => data.userID).filter(Boolean);
+                        ApiUser.batchAddTag({ userId: ids, tags: vmt.postData }).then(() => {
+                            dialog.successMessage({ text: '「新增標籤」更新完成' });
+                            gvc.notifyDataChange(obj.vm.id);
                         });
-                        obj.saveEvent(dataArray);
                         gvc2.closeDialog();
-                    }))),
+                        dialog.successMessage({ text: '準備開始更新資料，請稍後' });
+                        gvc.notifyDataChange(obj.vm.progressId);
+                    })),
                 ].join('');
             },
         });
@@ -144,19 +146,13 @@ export class UserModule {
     static removeTags(obj) {
         const gvc = obj.gvc;
         const dataArray = obj.dataArray;
+        const dialog = new ShareDialog(gvc.glitter);
         const vmt = {
             id: gvc.glitter.getUUID(),
             loading: true,
             dataList: [],
             postData: JSON.parse(JSON.stringify([])),
-            tagJoinList: {},
         };
-        dataArray.forEach((item) => {
-            const tags = item.userData.tags || [];
-            tags.forEach((tag) => {
-                vmt.tagJoinList[tag] = true;
-            });
-        });
         BgWidget.settingDialog({
             gvc,
             title: '批量刪除標籤',
@@ -180,7 +176,7 @@ export class UserModule {
                             ApiUser.getPublicConfig('user_general_tags', 'manager').then((dd) => {
                                 var _b, _c;
                                 if (dd.result && ((_c = (_b = dd.response) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.list)) {
-                                    vmt.dataList = dd.response.value.list.filter((item) => vmt.tagJoinList[item]);
+                                    vmt.dataList = dd.response.value.list;
                                     vmt.loading = false;
                                     gvc2.notifyDataChange(vmt.id);
                                 }
@@ -205,16 +201,16 @@ export class UserModule {
             清除全部
           </div>`,
                     BgWidget.cancel(gvc2.event(() => gvc2.closeDialog())),
-                    BgWidget.save(gvc2.event(() => __awaiter(this, void 0, void 0, function* () {
-                        const postMap = new Map(vmt.postData.map(tag => [tag, true]));
-                        dataArray.forEach((item) => {
-                            item.userData.tags = item.userData.tags
-                                ? item.userData.tags.filter((tag) => !postMap.get(tag))
-                                : [];
+                    BgWidget.save(gvc2.event(() => {
+                        const ids = dataArray.map((data) => data.userID).filter(Boolean);
+                        ApiUser.batchRemoveTag({ userId: ids, tags: vmt.postData }).then(() => {
+                            dialog.successMessage({ text: '「移除標籤」更新完成' });
+                            gvc.notifyDataChange(obj.vm.id);
                         });
-                        obj.saveEvent(dataArray);
                         gvc2.closeDialog();
-                    }))),
+                        dialog.successMessage({ text: '準備開始更新資料，請稍後' });
+                        gvc.notifyDataChange(obj.vm.progressId);
+                    })),
                 ].join('');
             },
         });
@@ -222,6 +218,7 @@ export class UserModule {
     static manualSetLevel(obj) {
         const gvc = obj.gvc;
         const dataArray = obj.dataArray;
+        const dialog = new ShareDialog(gvc.glitter);
         const levelVM = {
             id: gvc.glitter.getUUID(),
             loading: true,
@@ -239,11 +236,12 @@ export class UserModule {
                             return BgWidget.spinner();
                         }
                         else {
+                            levelVM.level = levelVM.options[0].key;
                             return html `
                 ${BgWidget.grayNote('此功能針對特殊會員，手動調整後將無法自動升級')}
                 ${BgWidget.select({
                                 gvc: gvc2,
-                                default: levelVM.options[0].key,
+                                default: levelVM.level,
                                 callback: key => {
                                     levelVM.level = key;
                                 },
@@ -276,12 +274,14 @@ export class UserModule {
                 return [
                     BgWidget.cancel(gvc2.event(() => gvc2.closeDialog())),
                     BgWidget.save(gvc2.event(() => __awaiter(this, void 0, void 0, function* () {
-                        dataArray.forEach((item) => {
-                            item.userData.level_status = 'manual';
-                            item.userData.level_default = levelVM.level;
+                        const ids = dataArray.map((data) => data.userID).filter(Boolean);
+                        ApiUser.batchManualLevel({ userId: ids, level: levelVM.level }).then(() => {
+                            dialog.successMessage({ text: '「手動修改會員標籤」更新完成' });
+                            gvc.notifyDataChange(obj.vm.id);
                         });
-                        obj.saveEvent(dataArray);
                         gvc2.closeDialog();
+                        dialog.successMessage({ text: '準備開始更新資料，請稍後' });
+                        gvc.notifyDataChange(obj.vm.progressId);
                     }))),
                 ].join('');
             },

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

@@ -63,9 +63,10 @@ export class UserModule {
     return vmt.dataList.map((item: any) => this.printOption(gvc, vmt, { key: item, value: item })).join('');
   }
 
-  static addTags(obj: { gvc: GVC; dataArray: any; saveEvent: (dataArray: any) => void }) {
+  static addTags(obj: { gvc: GVC; vm: any; dataArray: any }) {
     const gvc = obj.gvc;
     const dataArray = obj.dataArray;
+    const dialog = new ShareDialog(gvc.glitter);
     const vmt = {
       id: gvc.glitter.getUUID(),
       loading: true,
@@ -130,14 +131,15 @@ export class UserModule {
           </div>`,
           BgWidget.cancel(gvc2.event(() => gvc2.closeDialog())),
           BgWidget.save(
-            gvc2.event(async () => {
-              dataArray.forEach((item: any) => {
-                item.userData.tags = item.userData.tags
-                  ? [...new Set([...item.userData.tags, ...vmt.postData])]
-                  : vmt.postData;
+            gvc2.event(() => {
+              const ids = dataArray.map((data: any) => data.userID).filter(Boolean);
+              ApiUser.batchAddTag({ userId: ids, tags: vmt.postData }).then(() => {
+                dialog.successMessage({ text: '「新增標籤」更新完成' });
+                gvc.notifyDataChange(obj.vm.id);
               });
-              obj.saveEvent(dataArray);
               gvc2.closeDialog();
+              dialog.successMessage({ text: '準備開始更新資料，請稍後' });
+              gvc.notifyDataChange(obj.vm.progressId);
             })
           ),
         ].join('');
@@ -145,24 +147,17 @@ export class UserModule {
     });
   }
 
-  static removeTags(obj: { gvc: GVC; dataArray: any; saveEvent: (dataArray: any) => void }) {
+  static removeTags(obj: { gvc: GVC; vm: any; dataArray: any }) {
     const gvc = obj.gvc;
     const dataArray = obj.dataArray;
+    const dialog = new ShareDialog(gvc.glitter);
     const vmt = {
       id: gvc.glitter.getUUID(),
       loading: true,
       dataList: [] as string[],
       postData: JSON.parse(JSON.stringify([])) as string[],
-      tagJoinList: {} as Record<string, boolean>,
     };
 
-    dataArray.forEach((item: any) => {
-      const tags = item.userData.tags || [];
-      tags.forEach((tag: string) => {
-        vmt.tagJoinList[tag] = true;
-      });
-    });
-
     BgWidget.settingDialog({
       gvc,
       title: '批量刪除標籤',
@@ -184,7 +179,7 @@ export class UserModule {
             if (vmt.loading) {
               ApiUser.getPublicConfig('user_general_tags', 'manager').then((dd: any) => {
                 if (dd.result && dd.response?.value?.list) {
-                  vmt.dataList = dd.response.value.list.filter((item: string) => vmt.tagJoinList[item]);
+                  vmt.dataList = dd.response.value.list;
                   vmt.loading = false;
                   gvc2.notifyDataChange(vmt.id);
                 } else {
@@ -209,16 +204,15 @@ export class UserModule {
           </div>`,
           BgWidget.cancel(gvc2.event(() => gvc2.closeDialog())),
           BgWidget.save(
-            gvc2.event(async () => {
-              const postMap: Map<string, boolean> = new Map(vmt.postData.map(tag => [tag, true]));
-
-              dataArray.forEach((item: any) => {
-                item.userData.tags = item.userData.tags
-                  ? item.userData.tags.filter((tag: string) => !postMap.get(tag))
-                  : [];
+            gvc2.event(() => {
+              const ids = dataArray.map((data: any) => data.userID).filter(Boolean);
+              ApiUser.batchRemoveTag({ userId: ids, tags: vmt.postData }).then(() => {
+                dialog.successMessage({ text: '「移除標籤」更新完成' });
+                gvc.notifyDataChange(obj.vm.id);
               });
-              obj.saveEvent(dataArray);
               gvc2.closeDialog();
+              dialog.successMessage({ text: '準備開始更新資料，請稍後' });
+              gvc.notifyDataChange(obj.vm.progressId);
             })
           ),
         ].join('');
@@ -226,9 +220,10 @@ export class UserModule {
     });
   }
 
-  static manualSetLevel(obj: { gvc: GVC; dataArray: any; saveEvent: (dataArray: any) => void }) {
+  static manualSetLevel(obj: { gvc: GVC; vm: any; dataArray: any }) {
     const gvc = obj.gvc;
     const dataArray = obj.dataArray;
+    const dialog = new ShareDialog(gvc.glitter);
     const levelVM = {
       id: gvc.glitter.getUUID(),
       loading: true,
@@ -246,11 +241,12 @@ export class UserModule {
             if (levelVM.loading) {
               return BgWidget.spinner();
             } else {
+              levelVM.level = levelVM.options[0].key;
               return html`
                 ${BgWidget.grayNote('此功能針對特殊會員，手動調整後將無法自動升級')}
                 ${BgWidget.select({
                   gvc: gvc2,
-                  default: levelVM.options[0].key,
+                  default: levelVM.level,
                   callback: key => {
                     levelVM.level = key;
                   },
@@ -283,12 +279,14 @@ export class UserModule {
           BgWidget.cancel(gvc2.event(() => gvc2.closeDialog())),
           BgWidget.save(
             gvc2.event(async () => {
-              dataArray.forEach((item: any) => {
-                item.userData.level_status = 'manual';
-                item.userData.level_default = levelVM.level;
+              const ids = dataArray.map((data: any) => data.userID).filter(Boolean);
+              ApiUser.batchManualLevel({ userId: ids, level: levelVM.level }).then(() => {
+                dialog.successMessage({ text: '「手動修改會員標籤」更新完成' });
+                gvc.notifyDataChange(obj.vm.id);
               });
-              obj.saveEvent(dataArray);
               gvc2.closeDialog();
+              dialog.successMessage({ text: '準備開始更新資料，請稍後' });
+              gvc.notifyDataChange(obj.vm.progressId);
             })
           ),
         ].join('');

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

@@ -15,6 +15,7 @@ import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { FormWidget } from '../official_view_component/official/form.js';
 import { ApiWallet } from '../glitter-base/route/wallet.js';
 import { ApiShop } from '../glitter-base/route/shopping.js';
+import { ApiProgress } from '../glitter-base/route/progress.js';
 import { ShoppingOrderManager } from './shopping-order-manager.js';
 import { FilterOptions } from './filter-options.js';
 import { ShoppingRebate } from './shopping-rebate.js';
@@ -44,6 +45,7 @@ export class UserList {
             filterId: glitter.getUUID(),
             tableId: glitter.getUUID(),
             barId: glitter.getUUID(),
+            progressId: glitter.getUUID(),
             initial_data: {},
             group: obj && obj.group ? obj.group : undefined,
             plan: GlobalUser.getPlan().id,
@@ -171,6 +173,46 @@ export class UserList {
                         }
                         return BgWidget.title('顧客列表');
                     })()}
+              ${gvc.bindView((() => {
+                        let dataList = [];
+                        return {
+                            bind: vm.progressId,
+                            view: () => {
+                                if (dataList.length == 0) {
+                                    return '';
+                                }
+                                const progressMap = {
+                                    batchGetUser: '資料處理中',
+                                    batchAddtag: '新增標籤中',
+                                    batchRemovetag: '移除標籤中',
+                                    batchManualLevel: '手動修改會員等級中',
+                                };
+                                return dataList
+                                    .map((item) => {
+                                    const { taskTag, progress } = item;
+                                    if (Number(progress) === 100) {
+                                        return '';
+                                    }
+                                    const toFixProgress = Number(progress).toFixed(1);
+                                    return BgWidget.notifyInsignia(`${progressMap[taskTag]}: ${toFixProgress}%`);
+                                })
+                                    .join('');
+                            },
+                            divCreate: {
+                                class: 'ms-2',
+                            },
+                            onCreate: () => {
+                                setTimeout(() => {
+                                    ApiProgress.getAllProgress().then(t => {
+                                        dataList = t.result && Array.isArray(t.response) ? t.response : [];
+                                        if (dataList.length > 0) {
+                                            gvc.notifyDataChange(vm.progressId);
+                                        }
+                                    });
+                                }, 2500);
+                            },
+                        };
+                    })())}
               <div class="flex-fill"></div>
               <div class="d-flex align-items-center" style="gap: 10px;">
                 ${BgWidget.grayButton('匯入', gvc.event(() => UserExcel.importDialog(gvc, () => gvc.notifyDataChange(vm.id))))}
@@ -299,28 +341,6 @@ export class UserList {
                                         if (vm.loading) {
                                             return '';
                                         }
-                                        function batchUpdateUser(checkedData) {
-                                            return __awaiter(this, void 0, void 0, function* () {
-                                                try {
-                                                    dialog.dataLoading({ visible: true });
-                                                    const results = yield UserModule.batchProcess(checkedData, 100);
-                                                    const failedUpdates = results.filter((r) => !r.result);
-                                                    if (failedUpdates.length > 0) {
-                                                        UserModule.failedUpdateDialog(gvc, failedUpdates, checkedData.length);
-                                                    }
-                                                    else {
-                                                        dialog.successMessage({ text: '更新成功' });
-                                                    }
-                                                    dialog.dataLoading({ visible: false });
-                                                    gvc.notifyDataChange(vm.id);
-                                                }
-                                                catch (error) {
-                                                    console.error('更新失敗:', error);
-                                                    dialog.dataLoading({ visible: false });
-                                                    dialog.errorMessage({ text: '更新失敗，請稍後再試' });
-                                                }
-                                            });
-                                        }
                                         return BgWidget.tableV3({
                                             gvc: gvc,
                                             getData: vd => {
@@ -336,21 +356,25 @@ export class UserList {
                                                     filter: vm.filter,
                                                     filter_type: vm.filter_type,
                                                     group: vm.group,
-                                                    all_result: true,
                                                 };
                                                 ApiUser.getUserListOrders(vm.apiJSON).then(data => {
-                                                    var _a;
                                                     vm.dataList = data.response.data;
+                                                    vmi.limit = limit;
                                                     vmi.pageSize = Math.ceil(data.response.total / limit);
                                                     vmi.originalData = vm.dataList;
-                                                    vmi.allResultData = (_a = data.response.allUsers) !== null && _a !== void 0 ? _a : [];
-                                                    vmi.limit = limit;
                                                     vmi.tableData = getUserlist();
-                                                    vmi.loading = false;
+                                                    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 => {
+                                                            dialog.dataLoading({ visible: false });
+                                                            return data.response.allUsers;
+                                                        });
+                                                    });
                                                     if (vmi.pageSize != 0 && vmi.page > vmi.pageSize) {
                                                         UserList.vm.page = 1;
                                                         gvc.notifyDataChange(vm.id);
                                                     }
+                                                    vmi.loading = false;
                                                     vmi.callback();
                                                 });
                                             },
@@ -363,33 +387,21 @@ export class UserList {
                                                     name: '新增標籤',
                                                     option: true,
                                                     event: (dataArray) => {
-                                                        UserModule.addTags({
-                                                            gvc,
-                                                            dataArray,
-                                                            saveEvent: result => batchUpdateUser(result),
-                                                        });
+                                                        UserModule.addTags({ gvc, vm, dataArray });
                                                     },
                                                 },
                                                 {
                                                     name: '移除標籤',
                                                     option: true,
                                                     event: (dataArray) => {
-                                                        UserModule.removeTags({
-                                                            gvc,
-                                                            dataArray,
-                                                            saveEvent: result => batchUpdateUser(result),
-                                                        });
+                                                        UserModule.removeTags({ gvc, vm, dataArray });
                                                     },
                                                 },
                                                 {
                                                     name: '手動調整等級',
                                                     option: true,
                                                     event: (dataArray) => {
-                                                        UserModule.manualSetLevel({
-                                                            gvc,
-                                                            dataArray,
-                                                            saveEvent: result => batchUpdateUser(result),
-                                                        });
+                                                        UserModule.manualSetLevel({ gvc, vm, dataArray });
                                                     },
                                                 },
                                                 {
@@ -462,6 +474,7 @@ export class UserList {
             filterId: glitter.getUUID(),
             tableId: glitter.getUUID(),
             barId: glitter.getUUID(),
+            progressId: glitter.getUUID(),
             group: obj && obj.group ? obj.group : undefined,
             plan: 0,
             headerConfig: [],