imm-element-ui 2.5.3 → 2.5.5

package/fesm2022/imm-element-ui.mjs

@@ -8451,7 +8451,8 @@ class FormComponent {
             this.handleFieldControl(field);
         });
         this.applyDefaultValues();
-        if (this.model()) {
+        let keys = Object.keys(this.model() || {});
+        if (keys.length > 0) {
             untracked(() => this.triggerHook());
         }
     }
@@ -10586,6 +10587,7 @@ class PageFormComponent extends AmComponent {
     delRows(e) {
         const gridTab = this.resolvedGridList()[this.indexValue];
         const deleteFunc = gridTab.deleteFunc;
+        console.log('delRows----', e, gridTab);
         const subTable = gridTab.gridOptions.modelName;
         const ids = Array.isArray(e) ? e : [e];
         let prm = {
@@ -11188,10 +11190,35 @@ class PageFormComponent extends AmComponent {
             ids = selectItem.filter((v) => v.id).map((v) => v.id);
         }
         if (ids.length > 0) {
-            this.web_remove({ modelName: grid.gridOptions.modelName, ids }).subscribe((res) => {
+            const gridTab = this.resolvedGridList()[this.indexValue];
+            const deleteFunc = gridTab.deleteFunc;
+            let doneCalled = false;
+            const done = () => {
+                if (doneCalled) {
+                    return;
+                }
+                doneCalled = true;
+                typeof this.formDetail() == 'function' ? this.formDetail()(this.id) : this.getDetail(4);
                 this.pageFormService.removeData(grid.subDataKey, this.pageFormService.getSelectedRows(), grid);
-                this.pageFormService.setSelectedRows([]);
-            });
+                this.action.loading.set(false);
+            };
+            if (!deleteFunc) {
+                this.action.loading.set(true);
+                this.web_remove({ modelName: grid.gridOptions.modelName, ids }).subscribe((res) => {
+                    this.pageFormService.removeData(grid.subDataKey, this.pageFormService.getSelectedRows(), grid);
+                    this.pageFormService.setSelectedRows([]);
+                });
+            }
+            else {
+                this.action.loading.set(true);
+                const result = deleteFunc(ids, gridTab, done);
+                if (isObservable(result)) {
+                    result.subscribe(() => done());
+                }
+                else if (result && typeof result.subscribe === 'function') {
+                    result.subscribe(() => done());
+                }
+            }
         }
         else {
             this.pageFormService.removeData(grid.subDataKey, this.pageFormService.getSelectedRows(), grid);