@ibiz-template/vue3-components 0.7.41-alpha.2 → 0.7.41-alpha.20

package/lib/panel-component/user-message/index.cjs

@@ -12,17 +12,27 @@ var asyncAction = require('./async-action/async-action/async-action.cjs');
 var asyncAction_provider = require('./async-action/async-action/async-action.provider.cjs');
 
 "use strict";
-const IBizUserMessage = vue3Util.withInstall(userMessage.UserMessage, function(v) {
-  v.component(userMessage.UserMessage.name, userMessage.UserMessage);
-  v.component(asyncAction.AsyncAction.name, asyncAction.AsyncAction);
-  runtime.registerAsyncActionProvider("DEIMPORTDATA2", () => new asyncAction_provider.AsyncActionProvider());
-  runtime.registerAsyncActionProvider("DEFAULT", () => new asyncAction_provider.AsyncActionProvider());
-  index.installInternalMessage(v);
-  runtime.registerPanelItemProvider(
-    "RAWITEM_USERMESSAGE",
-    () => new userMessage_provider.UserMessageProvider()
-  );
-});
+const IBizUserMessage = vue3Util.withInstall(
+  userMessage.UserMessage,
+  function(v) {
+    v.component(userMessage.UserMessage.name, userMessage.UserMessage);
+    v.component(asyncAction.AsyncAction.name, asyncAction.AsyncAction);
+    runtime.registerAsyncActionProvider(
+      "DEIMPORTDATA2",
+      () => new asyncAction_provider.AsyncActionProvider()
+    );
+    runtime.registerAsyncActionProvider(
+      "DEEXPORTDATA",
+      () => new asyncAction_provider.AsyncActionProvider()
+    );
+    runtime.registerAsyncActionProvider("DEFAULT", () => new asyncAction_provider.AsyncActionProvider());
+    index.installInternalMessage(v);
+    runtime.registerPanelItemProvider(
+      "RAWITEM_USERMESSAGE",
+      () => new userMessage_provider.UserMessageProvider()
+    );
+  }
+);
 
 exports.IBizUserMessage = IBizUserMessage;
 exports.default = IBizUserMessage;

package/lib/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.provider.cjs

@@ -52,6 +52,7 @@ class InternalMessageDefaultProvider {
     if (redirectUrl) {
       if (redirectUrl.startsWith("view://")) {
         const { viewId, context, params } = runtime.parseViewProtocol(redirectUrl);
+        context.srfkeepnull = true;
         ibiz.commands.execute(
           runtime.OpenAppViewCommand.TAG,
           viewId,

package/lib/util/app-modal/app-modal-component.cjs

@@ -6,8 +6,12 @@ var lodashEs = require('lodash-es');
 var runtime = require('@ibiz-template/runtime');
 require('./app-modal-component.css');
 var core = require('@ibiz-template/core');
+var icon = require('../icon/icon.cjs');
 
 "use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
+}
 const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
   props: {
     opts: {
@@ -22,6 +26,7 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       zIndex
     } = vue3Util.useUIStore();
     const modalZIndex = zIndex.increment();
+    let modalView;
     const customStyle = vue.reactive({});
     const {
       width,
@@ -57,6 +62,13 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
         ctx.emit("dismiss", data);
       }
     });
+    const viewShellHooks = new runtime.ViewShellHooks();
+    viewShellHooks.hooks.viewCreated.tapPromise(async (_event) => {
+      modalView = _event.view;
+    });
+    const handleViewCreated = (event) => {
+      modalView = event.view;
+    };
     const onBeforeClose = async (done) => {
       const isClose = await modal.dismiss();
       if (isClose) {
@@ -69,6 +81,12 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
     const present = () => {
       isShow.value = true;
     };
+    const prevRecord = () => {
+      modalView == null ? void 0 : modalView.call(runtime.SysUIActionTag.PREV_RECORD);
+    };
+    const nextRecord = () => {
+      modalView == null ? void 0 : modalView.call(runtime.SysUIActionTag.NEXT_RECORD);
+    };
     return {
       ns,
       isShow,
@@ -76,13 +94,18 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       modalZIndex,
       customStyle,
       modal,
+      viewShellHooks,
       present,
       dismiss,
-      onBeforeClose
+      onBeforeClose,
+      prevRecord,
+      nextRecord,
+      handleViewCreated
     };
   },
   render() {
     var _a, _b;
+    let _slot, _slot2;
     return vue.h(vue.resolveComponent("el-dialog"), {
       modelValue: this.isShow,
       alignCenter: true,
@@ -91,7 +114,25 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       zIndex: this.modalZIndex,
       beforeClose: this.onBeforeClose,
       ...this.options
-    }, (_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal));
+    }, [
+      // eslint-disable-next-line vue/no-multiple-slot-args
+      (_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal, this.viewShellHooks),
+      this.options.openIndicator && vue.createVNode("div", {
+        "class": this.ns.e("record")
+      }, [vue.createVNode(vue.resolveComponent("el-button"), {
+        "class": this.ns.em("record", "prev"),
+        "title": ibiz.i18n.t("util.appModal.prev"),
+        "onClick": this.prevRecord
+      }, _isSlot(_slot = icon.ArrowLeftBold()) ? _slot : {
+        default: () => [_slot]
+      }), vue.createVNode(vue.resolveComponent("el-button"), {
+        "class": this.ns.em("record", "next"),
+        "title": ibiz.i18n.t("util.appModal.next"),
+        "onClick": this.nextRecord
+      }, _isSlot(_slot2 = icon.ArrowRightBold()) ? _slot2 : {
+        default: () => [_slot2]
+      })])
+    ]);
   }
 });
 function createModal(render, opts) {

package/lib/util/app-modal/app-modal-component.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-modal{--ibiz-modal-z-index:var(--ibiz-z-index-modal);--ibiz-modal-background-color:var(--ibiz-color-bg-1)}.ibiz-modal.el-dialog{overflow:visible}.ibiz-modal .el-dialog__header{position:relative;padding:0}.ibiz-modal .el-dialog__body{height:100%;padding:0;background-color:var(--ibiz-modal-background-color)}.ibiz-modal .el-dialog__headerbtn{top:-40px;right:-60px;border:var(--ibiz-spacing-super-tight) solid var(--ibiz-color-primary-text);border-radius:var(--ibiz-border-radius-circle);display:flex;align-items:center;justify-content:center}.ibiz-modal .el-dialog__headerbtn .el-dialog__close{font-size:var(--ibiz-font-size-header-4);color:var(--ibiz-color-primary-text)}
+@charset "UTF-8";.ibiz-modal{--ibiz-modal-z-index:var(--ibiz-z-index-modal);--ibiz-modal-background-color:var(--ibiz-color-bg-1)}.ibiz-modal__record--prev{position:absolute;top:50%;left:-6px;transform:translate(-100%,-50%)}.ibiz-modal__record--next{position:absolute;top:50%;right:-6px;font-size:var(--ibiz-font-size-regular);transform:translate(100%,-50%)}.ibiz-modal__record .el-button{height:auto;padding:var(--ibiz-spacing-loose) var(--ibiz-spacing-tight);margin:0;--el-button-bg-color:var(--ibiz-color-bg-0);--el-button-text-color:var(--ibiz-color-text-2);--el-button-hover-bg-color:var(--ibiz-color-bg-1);--el-button-hover-text-color:var(--ibiz-color-text-3);--el-button-active-bg-color:var(--ibiz-color-bg-0);--el-button-active-text-color:var(--ibiz-color-text-2)}.ibiz-modal.el-dialog{overflow:visible}.ibiz-modal .el-dialog__header{position:relative;padding:0}.ibiz-modal .el-dialog__body{height:100%;padding:0;background-color:var(--ibiz-modal-background-color)}.ibiz-modal .el-dialog__headerbtn{top:-40px;right:-60px;border:var(--ibiz-spacing-super-tight) solid var(--ibiz-color-primary-text);border-radius:var(--ibiz-border-radius-circle);display:flex;align-items:center;justify-content:center}.ibiz-modal .el-dialog__headerbtn .el-dialog__close{font-size:var(--ibiz-font-size-header-4);color:var(--ibiz-color-primary-text)}

package/lib/util/app-util/app-util.cjs

@@ -7,6 +7,12 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var aiUtil = require('../ai-util/ai-util.cjs');
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class AppUtil {
   /**
    * Creates an instance of AppUtil.
@@ -16,6 +22,20 @@ class AppUtil {
    */
   constructor(router) {
     this.router = router;
+    /**
+     * @description 视图缓存中心
+     * @type {Map<string, IApiViewController>}
+     * @memberof AppUtil
+     */
+    __publicField(this, "viewCacheCenter", /* @__PURE__ */ new Map());
+  }
+  /**
+   * @description 路由是否初始化构建完成
+   * @returns {*}  {Promise<void>}
+   * @memberof AppUtil
+   */
+  async onRouteIsReady() {
+    return this.router.isReady();
   }
   /**
    * 登录
@@ -383,13 +403,7 @@ class AppUtil {
                 (options == null ? void 0 : options.params) || params,
                 {}
               );
-              const headers = {};
-              const token = core.getAppCookie(core.CoreConst.TOKEN);
-              if (token) {
-                Object.assign(headers, {
-                  ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(token)
-                });
-              }
+              const headers = ibiz.util.file.getUploadHeaders();
               const formData = new FormData();
               formData.append("file", file);
               const res = await ibiz.net.axios({
@@ -441,6 +455,41 @@ class AppUtil {
       });
     });
   }
+  /**
+   * @description 当前路由转换成路由路径对象
+   * @param {boolean} [isRouteModal]
+   * @returns {*}  {{
+   *     appContext?: IParams;
+   *     pathNodes: {
+   *       viewName: string;
+   *       context?: IParams;
+   *       params?: IParams;
+   *       srfnav?: string;
+   *     }[];
+   *   }}
+   * @memberof AppUtil
+   */
+  route2routeObject(isRouteModal) {
+    const routePath = vue3Util.route2routePath(this.router.currentRoute.value);
+    return routePath;
+  }
+  /**
+   * @description 路由路径对象转化为路由路径
+   * @param {{
+   *     appContext?: IParams;
+   *     pathNodes: {
+   *       viewName: string;
+   *       context?: IParams;
+   *       params?: IParams;
+   *       srfnav?: string;
+   *     }[];
+   *   }} routePath
+   * @returns {*}  {string}
+   * @memberof AppUtil
+   */
+  routeObject2String(routePath) {
+    return vue3Util.routePath2string(routePath);
+  }
 }
 
 exports.AppUtil = AppUtil;

package/lib/util/fullscreen/fullscreen-util.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.2_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.18_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 var fullscreenToolbar = require('../../common/fullscreen-toolbar/fullscreen-toolbar.cjs');
 
 "use strict";

package/lib/util/icon/icon.cjs

@@ -0,0 +1,28 @@
+'use strict';
+
+var vue = require('vue');
+
+"use strict";
+const ArrowLeftBold = () => vue.createVNode("svg", {
+  "data-v-9a20e128": "",
+  "xmlns": "http://www.w3.org/2000/svg",
+  "viewBox": "0 0 1024 1024",
+  "width": "1em",
+  "height": "1em"
+}, [vue.createVNode("path", {
+  "fill": "currentColor",
+  "d": "M685.248 104.704a64 64 0 0 1 0 90.496L368.448 512l316.8 316.8a64 64 0 0 1-90.496 90.496L232.704 557.248a64 64 0 0 1 0-90.496l362.048-362.048a64 64 0 0 1 90.496 0z"
+}, null)]);
+const ArrowRightBold = () => vue.createVNode("svg", {
+  "data-v-9a20e128": "",
+  "xmlns": "http://www.w3.org/2000/svg",
+  "viewBox": "0 0 1024 1024",
+  "width": "1em",
+  "height": "1em"
+}, [vue.createVNode("path", {
+  "fill": "currentColor",
+  "d": "M338.752 104.704a64 64 0 0 0 0 90.496l316.8 316.8-316.8 316.8a64 64 0 0 0 90.496 90.496l362.048-362.048a64 64 0 0 0 0-90.496L429.248 104.704a64 64 0 0 0-90.496 0z"
+}, null)]);
+
+exports.ArrowLeftBold = ArrowLeftBold;
+exports.ArrowRightBold = ArrowRightBold;

package/lib/util/index.cjs

@@ -16,6 +16,7 @@ var wangEditorUtil = require('./wang-editor-util/wang-editor-util.cjs');
 var keydownUtil = require('./keydown-util/keydown-util.cjs');
 var aiUtil = require('./ai-util/ai-util.cjs');
 var buttonUtil = require('./button-util/button-util.cjs');
+var icon = require('./icon/icon.cjs');
 
 "use strict";
 
@@ -35,3 +36,5 @@ exports.parseHtml = wangEditorUtil.parseHtml;
 exports.useFocusByEnter = keydownUtil.useFocusByEnter;
 exports.calcAiToolbarItemsByAc = aiUtil.calcAiToolbarItemsByAc;
 exports.convertBtnType = buttonUtil.convertBtnType;
+exports.ArrowLeftBold = icon.ArrowLeftBold;
+exports.ArrowRightBold = icon.ArrowRightBold;

package/lib/util/notification-util/upload-manager/upload-manager.cjs

@@ -2,7 +2,6 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-var core = require('@ibiz-template/core');
 var fileType = require('./file-type.cjs');
 require('./upload-manager.css');
 
@@ -57,10 +56,7 @@ const IBizUploadManager = /* @__PURE__ */ vue.defineComponent({
     const uploadFile = async (item) => {
       const data = new FormData();
       data.append("file", item.file);
-      const headers = {
-        ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(core.getAppCookie(core.CoreConst.TOKEN)),
-        ...props.params.headers
-      };
+      const headers = ibiz.util.file.getUploadHeaders();
       const res = await ibiz.net.axios({
         url: props.params.uploadUrl,
         method: "post",

package/lib/view-engine/app-start-view.engine.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+class AppStartViewEngine extends runtime.ViewEngineBase {
+  async onCreated() {
+    await super.onCreated();
+    ibiz.util.hiddenAppLoading();
+  }
+}
+
+exports.AppStartViewEngine = AppStartViewEngine;

package/lib/view-engine/app-welcome-view.engine.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+class AppWelcomeViewEngine extends runtime.ViewEngineBase {
+  async onCreated() {
+    await super.onCreated();
+    ibiz.util.hiddenAppLoading();
+  }
+}
+
+exports.AppWelcomeViewEngine = AppWelcomeViewEngine;

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

@@ -1,35 +1,17 @@
 'use strict';
 
-var runtime = require('@ibiz-template/runtime');
+var expView_engine = require('./exp-view.engine.cjs');
 
 "use strict";
-class CalendarExpViewEngine extends runtime.ViewEngineBase {
+class CalendarExpViewEngine extends expView_engine.ExpViewEngine {
   /**
-   * 树导航栏
-   *
+   * @description 导航栏部件名称
    * @readonly
+   * @type {string}
    * @memberof CalendarExpViewEngine
    */
-  get calendarExpBar() {
-    return this.view.getController(
-      "calendarexpbar"
-    );
-  }
-  async onCreated() {
-    await super.onCreated();
-    const { childNames } = this.view;
-    childNames.push("calendarexpbar");
-    if (!this.view.slotProps.calendarexpbar) {
-      this.view.slotProps.calendarexpbar = {};
-    }
-    this.view.slotProps.calendarexpbar.srfnav = this.view.state.srfnav;
-  }
-  async onMounted() {
-    await super.onMounted();
-    const { model } = this.view;
-    if (!this.view.state.noLoadDefault && model.loadDefault) {
-      this.calendarExpBar.load();
-    }
+  get expBarName() {
+    return "calendarexpbar";
   }
 }
 

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

@@ -15,6 +15,16 @@ class CalendarViewEngine extends runtime.MDViewEngine {
     }
     this.view.slotProps.calendar.mdctrlActiveMode = model.mdctrlActiveMode;
   }
+  async openData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.openData(data[0], event);
+    return result;
+  }
+  async newData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.newData(data[0], event);
+    return result;
+  }
 }
 
 exports.CalendarViewEngine = CalendarViewEngine;

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

@@ -1,26 +1,17 @@
 'use strict';
 
-var runtime = require('@ibiz-template/runtime');
+var expView_engine = require('./exp-view.engine.cjs');
 
 "use strict";
-class ChartExpViewEngine extends runtime.ViewEngineBase {
+class ChartExpViewEngine extends expView_engine.ExpViewEngine {
   /**
-   * 图表导航栏
-   *
+   * @description 导航栏部件名称
    * @readonly
+   * @type {string}
    * @memberof ChartExpViewEngine
    */
-  get chartExpBar() {
-    return this.view.getController("chartexpbar");
-  }
-  async onCreated() {
-    await super.onCreated();
-    const { childNames } = this.view;
-    childNames.push("chartexpbar");
-    if (!this.view.slotProps.chartexpbar) {
-      this.view.slotProps.chartexpbar = {};
-    }
-    this.view.slotProps.chartexpbar.srfnav = this.view.state.srfnav;
+  get expBarName() {
+    return "chartexpbar";
   }
 }
 

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

@@ -45,15 +45,15 @@ class CustomViewEngine extends runtime.ViewEngineBase {
       );
       control == null ? void 0 : control.evt.on(
         "onLoadSuccess",
-        () => this.calcToolbarButtonState(ctrl, void 0)
+        (evt) => this.calcToolbarButtonState(ctrl, void 0, evt)
       );
       control == null ? void 0 : control.evt.on(
         "onSelectionChange",
-        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0])
+        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0], evt)
       );
       control == null ? void 0 : control.evt.on(
         "onRefreshSuccess",
-        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0])
+        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0], evt)
       );
     });
   }
@@ -64,7 +64,7 @@ class CustomViewEngine extends runtime.ViewEngineBase {
    * @param {(IData | undefined)} data 数据
    * @memberof CustomViewEngine
    */
-  calcToolbarButtonState(control, data) {
+  calcToolbarButtonState(control, data, _params) {
     const model = this.controls.find(
       (ctrl) => {
         var _a;
@@ -75,17 +75,9 @@ class CustomViewEngine extends runtime.ViewEngineBase {
       const toolbar = this.view.getController(
         model.name
       );
-      toolbar == null ? void 0 : toolbar.calcButtonState(data, control.appDataEntityId);
+      toolbar == null ? void 0 : toolbar.calcButtonState(data, control.appDataEntityId, _params);
     }
   }
-  /**
-   * 执行视图预置界面行为能力
-   *
-   * @param {string} key
-   * @param {*} args
-   * @return {*}  {(Promise<IData | null | undefined>)}
-   * @memberof CustomViewEngine
-   */
   async call(key, args) {
     var _a;
     if (key === runtime.SysUIActionTag.REFRESH) {

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

@@ -27,7 +27,6 @@ class DataViewEngine extends runtime.MDViewEngine {
     }
     this.view.slotProps.dataview.mdctrlActiveMode = model.mdctrlActiveMode;
   }
-  // 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, srfgroup } = args.params || {};

package/lib/view-engine/de-index-view-engine.cjs

@@ -48,7 +48,7 @@ class DEIndexViewEngine extends editView_engine.EditViewEngine {
     const { evt } = this.view;
     const formDeId = this.form.model.appDataEntityId;
     const data = event.data[0];
-    (_a = this.toolbar) == null ? void 0 : _a.calcButtonState(data, formDeId);
+    (_a = this.toolbar) == null ? void 0 : _a.calcButtonState(data, formDeId, event);
     if (data.srfkey) {
       evt.emit("onViewInfoChange", { dataInfo: data.srfmajortext || "" });
     }

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

@@ -30,17 +30,29 @@ class EditViewEngine extends runtime.DEMainViewEngine {
     }
   }
   /**
-   * 模态事件钩子
+   * @description 模态关闭前执行钩子
+   * @param {{ allowNext?: boolean }} context
+   * @returns {*}  {Promise<void>}
+   * @memberof EditViewEngine
+   */
+  async modalPreDismissHook(context) {
+    try {
+      if (this.form && this.form.state.modified && this.form.model.enableAutoSave) {
+        await this.form.immediateAutoSave();
+      }
+    } catch (error) {
+      context.allowNext = false;
+    }
+  }
+  /**
+   * 模态计算是否关闭钩子
    *
    * @param {{ allowClose?: boolean }} context
    * @return {*}  {Promise<void>}
    * @memberof EditViewEngine
    */
-  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;
@@ -65,7 +77,8 @@ class EditViewEngine extends runtime.DEMainViewEngine {
   }
   async onCreated() {
     await super.onCreated();
-    this.modalEventHook = this.modalEventHook.bind(this);
+    this.modalPreDismissHook = this.modalPreDismissHook.bind(this);
+    this.modalShouldDismissHook = this.modalShouldDismissHook.bind(this);
     this.formDataStateChange = this.formDataStateChange.bind(this);
     const { childNames, modal } = this.view;
     childNames.push("form");
@@ -77,7 +90,8 @@ class EditViewEngine extends runtime.DEMainViewEngine {
       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);
   }
   /**
    * @description 监控form事件
@@ -89,7 +103,7 @@ class EditViewEngine extends runtime.DEMainViewEngine {
     const { model, evt } = this.view;
     const formDeId = this.form.model.appDataEntityId;
     const data = event.data[0];
-    (_a = this.toolbar) == null ? void 0 : _a.calcButtonState(data, formDeId);
+    (_a = this.toolbar) == null ? void 0 : _a.calcButtonState(data, formDeId, event);
     if (model.showDataInfoBar) {
       if (data.srfkey) {
         evt.emit("onViewInfoChange", { dataInfo: data.srfmajortext || "" });
@@ -205,6 +219,7 @@ class EditViewEngine extends runtime.DEMainViewEngine {
     }
     if (key === runtime.ViewCallTag.WF_WITHDRAW) {
       await this.wfWithdraw();
+      return null;
     }
     if (key === runtime.SysUIActionTag.EXPAND) {
       const { srfcollapsetag, srfgroupid } = args.params || {};
@@ -248,6 +263,18 @@ class EditViewEngine extends runtime.DEMainViewEngine {
     this.view.context[runtime.calcDeCodeNameById(this.view.model.appDataEntityId)] = void 0;
     await this.form.load();
   }
+  /**
+   * @description 取消变更
+   * @param {({
+   *       targetState: 'INIT' | 'UNDO' | 'REDO';
+   *     })} [_args={ targetState: 'INIT' }] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+   * @returns {*}  {Promise<void>}
+   * @memberof EditViewEngine
+   */
+  async cancelChanges(_args = { targetState: "INIT" }) {
+    await super.cancelChanges(_args);
+    await this.form.cancelChanges(_args.targetState);
+  }
   /**
    * 工作流启动
    *
@@ -502,7 +529,8 @@ class EditViewEngine extends runtime.DEMainViewEngine {
   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);
   }
 }
 

package/lib/view-engine/edit-view4.engine.cjs

@@ -8,6 +8,10 @@ class EditView4Engine extends editView_engine.EditViewEngine {
     await super.onCreated();
     const { childNames } = this.view;
     childNames.push("drtab");
+    if (!this.view.slotProps.drtab) {
+      this.view.slotProps.drtab = {};
+    }
+    this.view.slotProps.drtab.hideEditItem = true;
   }
   /**
    * 数据分页栏