@ibiz-template/vue3-components 0.7.41-alpha.7 → 0.7.41-alpha.9

package/lib/view-engine/opt-view.engine.cjs

@@ -42,7 +42,8 @@ class OptViewEngine extends runtime.ViewEngineBase {
    */
   async onCreated() {
     await super.onCreated();
-    this.modalEventHook = this.modalEventHook.bind(this);
+    this.modalPreDismissHook = this.modalPreDismissHook.bind(this);
+    this.modalShouldDismissHook = this.modalShouldDismissHook.bind(this);
     const { childNames, modal } = this.view;
     childNames.push("form");
     if (!this.view.slotProps.form) {
@@ -53,7 +54,8 @@ class OptViewEngine extends runtime.ViewEngineBase {
       this.view.slotProps.toolbar = {};
     }
     this.view.slotProps.toolbar.manualCalcButtonState = true;
-    modal.hooks.shouldDismiss.tapPromise(this.modalEventHook);
+    modal.hooks.preDismiss.tapPromise(this.modalPreDismissHook);
+    modal.hooks.shouldDismiss.tapPromise(this.modalShouldDismissHook);
   }
   /**
    * 视图mounted生命周期执行逻辑
@@ -120,21 +122,34 @@ class OptViewEngine extends runtime.ViewEngineBase {
   async onDestroyed() {
     super.onDestroyed();
     const { modal } = this.view;
-    modal.hooks.shouldDismiss.removeTapPromise(this.modalEventHook);
+    modal.hooks.preDismiss.removeTapPromise(this.modalPreDismissHook);
+    modal.hooks.shouldDismiss.removeTapPromise(this.modalShouldDismissHook);
   }
   /**
-   * 模态事件钩子
+   * @description 模态关闭前执行钩子
+   * @param {{ allowNext?: boolean }} context
+   * @returns {*}  {Promise<void>}
+   * @memberof OptViewEngine
+   */
+  async modalPreDismissHook(context) {
+    try {
+      if (this.form && this.form.state.modified && this.form.model.enableAutoSave) {
+        await this.form.immediateAutoSave();
+      }
+    } catch (error) {
+      context.allowNext = false;
+    }
+  }
+  /**
+   * 模态计算是否关闭钩子
    *
    * @author tony001
    * @date 2024-09-14 15:09:59
    * @param {{ allowClose?: boolean }} context
    * @return {*}  {Promise<void>}
    */
-  async modalEventHook(context) {
+  async modalShouldDismissHook(context) {
     var _a, _b;
-    if (this.form && this.form.state.modified && this.form.model.enableAutoSave) {
-      await this.form.immediateAutoSave();
-    }
     const srfSessionid = this.view.context.srfsessionid;
     const uiDomain = ibiz.uiDomainManager.get(srfSessionid);
     let isChange = this.view.model.enableDirtyChecking === true;

package/lib/view-engine/pickup-data-view.engine.cjs

@@ -29,7 +29,6 @@ class PickupDataViewEngine extends dataView_engine.DataViewEngine {
       this.view.evt.emit("onDataActive", { ...event });
     });
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.ViewCallTag.GET_ALL_DATA) {
       return this.dataview.state.items;

package/lib/view-engine/pickup-grid-view.engine.cjs

@@ -34,7 +34,6 @@ class PickupGridViewEngine extends gridView_engine.GridViewEngine {
       this.view.evt.emit("onDataActive", { ...event });
     });
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.ViewCallTag.GET_ALL_DATA) {
       return this.grid.state.items;

package/lib/view-engine/portal-view-engine.cjs

@@ -43,14 +43,6 @@ class PortalViewEngine extends runtime.DEMainViewEngine {
   getData() {
     return this.view.state.srfactiveviewdata ? [this.view.state.srfactiveviewdata] : [];
   }
-  /**
-   * 执行视图预置界面行为能力
-   *
-   * @param {string} key
-   * @param {*} args
-   * @return {*}  {(Promise<IData | null | undefined>)}
-   * @memberof PortalViewEngine
-   */
   async call(key, args) {
     if (key === runtime.SysUIActionTag.REFRESH) {
       if (args.ctrl) {

package/lib/view-engine/report-view.engine.cjs

@@ -77,7 +77,6 @@ class ReportViewEngine extends runtime.ViewEngineBase {
       this.load();
     }
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.SysUIActionTag.REFRESH) {
       await this.refresh();

package/lib/view-engine/tab-exp-view.engine.cjs

@@ -34,6 +34,7 @@ class TabExpViewEngine extends runtime.ViewEngineBase {
       (item) => item.id === "srfdefaultnav"
     )) == null ? void 0 : _a.value;
     this.view.slotProps.tabexppanel.defaultTabName = this.view.state.srfnav || srfdefaultnav;
+    this.view.slotProps.tabexppanel.hideEditItem = true;
   }
   /**
    * 分页导航视图刷新

package/lib/view-engine/tab-search-view.engine.cjs

@@ -118,7 +118,6 @@ class TabSearchViewEngine extends tabExpView_engine.TabExpViewEngine {
     this.searchBar.placeHolder = caption || "";
     this.searchBar.state.quickSearchPlaceHolder = caption || "";
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.SysUIActionTag.SEARCH) {
       await this.searchForm.search();

package/lib/view-engine/tree-exp-view.engine.cjs

@@ -26,7 +26,6 @@ class TreeExpViewEngine extends expView_engine.ExpViewEngine {
   get tree() {
     return this.expBar.xDataController;
   }
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
   async call(key, args) {
     var _a;
     if (key === runtime.SysUIActionTag.REFRESH_ALL) {

package/lib/view-engine/tree-grid-ex-view.engine.cjs

@@ -8,7 +8,6 @@ class TreeGridExViewEngine extends treeView_engine.TreeViewEngine {
   get treeGridEx() {
     return this.view.getController("treegridex");
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.SysUIActionTag.TOGGLE_ROW_EDIT) {
       this.treeGridEx.toggleRowEdit();

package/lib/view-engine/tree-grid-view.engine.cjs

@@ -29,7 +29,6 @@ class TreeGridViewEngine extends gridView_engine.GridViewEngine {
       Object.assign(this.view.slotProps.treegrid, this.view.slotProps.grid);
     }
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.SysUIActionTag.EXPAND) {
       const { srfcollapsetag } = args.params || {};

package/lib/view-engine/tree-view.engine.cjs

@@ -14,7 +14,6 @@ class TreeViewEngine extends runtime.MDViewEngine {
       this.view.slotProps.tree = {};
     }
   }
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
   async call(key, args) {
     var _a;
     if (key === runtime.SysUIActionTag.REFRESH_ALL) {

package/lib/view-engine/wf-dyna-action-view.engine.cjs

@@ -20,7 +20,6 @@ class WFDynaActionViewEngine extends wfDynaEditView_engine.WFDynaEditViewEngine
     const processForm = this.view.context.processForm ? "wfform_".concat(this.view.context.processForm) : "form";
     return processForm;
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.SysUIActionTag.OK) {
       this.onOkButtonClick();

package/lib/view-engine/wf-dyna-start-view.engine.cjs

@@ -20,7 +20,6 @@ class WFDynaStartViewEngine extends wfDynaEditView_engine.WFDynaEditViewEngine {
     const processForm = this.view.context.processForm ? "wfform_".concat(this.view.context.processForm) : "form";
     return processForm;
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === runtime.SysUIActionTag.OK) {
       this.onOkButtonClick();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.7",
+  "version": "0.7.41-alpha.9",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -34,14 +34,14 @@
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.198",
     "@ibiz-template-plugin/bi-report": "0.0.26",
     "@ibiz-template-plugin/data-view": "0.0.4",
-    "@ibiz-template/core": "0.7.41-alpha.7",
+    "@ibiz-template/core": "0.7.41-alpha.9",
     "@ibiz-template/devtool": "0.0.11",
-    "@ibiz-template/model-helper": "0.7.41-alpha.7",
-    "@ibiz-template/runtime": "0.7.41-alpha.7",
+    "@ibiz-template/model-helper": "0.7.41-alpha.9",
+    "@ibiz-template/runtime": "0.7.41-alpha.9",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.7",
-    "@ibiz-template/web-theme": "3.4.0",
-    "@ibiz/model-core": "^0.1.77",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.9",
+    "@ibiz-template/web-theme": "3.5.0",
+    "@ibiz/model-core": "^0.1.78",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -106,7 +106,7 @@
     "@ibiz-template/runtime": "^0.7.0",
     "@ibiz-template/theme": "^0.7.0",
     "@ibiz-template/vue3-util": "^0.7.0",
-    "@ibiz/model-core": "^0.1.77",
+    "@ibiz/model-core": "^0.1.78",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",