imm-element-ui 1.4.3 → 1.4.5

package/fesm2022/imm-element-ui.mjs

@@ -235,21 +235,21 @@ class AmComponent {
         return this.http.post(apiPath + '/goam/api/webget', param).pipe(map((response) => {
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     websave(param) {
         return this.http.post(apiPath + '/goam/api/websave', param).pipe(map((response) => {
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     webdel(param) {
         return this.http.post(apiPath + 'webdel', param).pipe(map((response) => {
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     upsert(prm, cb) {
@@ -319,7 +319,7 @@ class AmComponent {
             }
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //自处理逻辑
@@ -337,7 +337,7 @@ class AmComponent {
             this.dealPrm = { data: response, ...this.dealPrm };
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //传入map，根据ID，更新map数据
@@ -360,7 +360,7 @@ class AmComponent {
             }
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //根据ID删除
@@ -380,7 +380,7 @@ class AmComponent {
             }
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //根据ID获取一条数据
@@ -405,7 +405,7 @@ class AmComponent {
             this.id = response?.id;
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //获取多条数据，根据传入的条件自动组织sql
@@ -424,7 +424,7 @@ class AmComponent {
             console.log('upsey-----', this.upsertPrm);
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     searchmap(prm) {
@@ -442,7 +442,7 @@ class AmComponent {
             console.log('upsey-----', this.upsertPrm);
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //获取多条数据，根据传入的条件自动组织sql
@@ -460,7 +460,7 @@ class AmComponent {
             this.searchPrm = { ...response };
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //excel导入
@@ -507,7 +507,7 @@ class AmComponent {
             FileSaver.saveAs(data, fileName);
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //人工处理导入
@@ -532,7 +532,7 @@ class AmComponent {
             FileSaver.saveAs(data, fileName);
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //下载导入的模板
@@ -554,7 +554,7 @@ class AmComponent {
             FileSaver.saveAs(data, fileName);
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //删除图片
@@ -572,7 +572,7 @@ class AmComponent {
             this.messageService.add({ severity: 'success', summary: 'Success', detail: response });
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //删除图片
@@ -590,7 +590,7 @@ class AmComponent {
             this.messageService.add({ severity: 'success', summary: 'Success', detail: response });
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //刷新token
@@ -599,7 +599,7 @@ class AmComponent {
             this.dealPrm = { data: response, ...this.dealPrm };
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     //创建表
@@ -617,7 +617,7 @@ class AmComponent {
             // this.messageService.add({severity: 'success',summary: 'Success',detail: response})
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     // 暂无确定是否重置其他公共变量
@@ -652,7 +652,7 @@ class AmComponent {
             this.dealPrm = { data: response, ...this.dealPrm };
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     dealCustom(prm) {
@@ -669,7 +669,7 @@ class AmComponent {
             this.dealPrm = { data: response, ...this.dealPrm };
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     dealSubmit(prm) {
@@ -686,7 +686,7 @@ class AmComponent {
             this.dealPrm = { data: response, ...this.dealPrm };
             return response;
         }), finalize(() => {
-            this.loadingService.setLoading(false);
+            // this.loadingService.setLoading(false);
         }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: AmComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
@@ -5743,7 +5743,8 @@ class GridComponent {
     }
     getData() {
         untracked(() => {
-            if (!this.toOptions().modelName)
+            console.log('this.toOptions()', this.toOptions());
+            if (!this.searchPrm().modelName && !this.rowData())
                 return;
             this.cancelSelect();
             const search = this.action.getSearch(this.toOptions().modelName);
@@ -8334,7 +8335,7 @@ class UserHistoryService {
             i18nKey = i18nKey == '' && code != '' ? `menus.${code}` : i18nKey;
         }
         const paramsKeys = Object.keys(child.params);
-        console.log('title', child, configPath, url);
+        // console.log('title',child,configPath,url)
         if (title && configPath) {
             let isExit = this.historyList().filter(v => v.configPath == configPath);
             // configPath.indexOf(':') > -1 && paramsKeys.length > 0 && ( title = this.detailName)