@ibiz-template/vue3-components 0.7.41-alpha.17 → 0.7.41-alpha.18

package/lib/editor/upload/use/use-iview-upload.cjs

@@ -9,7 +9,6 @@ function useIViewUpload(props, valueChange, c) {
   const uploadHeaders = ibiz.util.file.getUploadHeaders();
   const headers = vue.ref({ ...uploadHeaders });
   const uploadUrl = vue.ref("");
-  const downloadUrl = vue.ref("");
   const uploadCache = {
     count: 0,
     cacheFiles: []
@@ -23,6 +22,22 @@ function useIViewUpload(props, valueChange, c) {
     },
     { immediate: true }
   );
+  const getDownloadUrl = (data, file) => {
+    const editorParams = { ...c.editorParams };
+    if (editorParams.exportparams) {
+      editorParams.exportParams = JSON.parse(editorParams.exportparams);
+    }
+    if (file && file.folder) {
+      editorParams.osscat = file.folder;
+    }
+    const urls = ibiz.util.file.calcFileUpDownUrl(
+      c.context,
+      c.params,
+      data,
+      editorParams
+    );
+    return urls.downloadUrl;
+  };
   vue.watch(
     () => props.data,
     (newVal) => {
@@ -31,9 +46,6 @@ function useIViewUpload(props, valueChange, c) {
         if (editorParams.uploadparams) {
           editorParams.uploadParams = JSON.parse(editorParams.uploadparams);
         }
-        if (editorParams.exportparams) {
-          editorParams.exportParams = JSON.parse(editorParams.exportparams);
-        }
         const urls = ibiz.util.file.calcFileUpDownUrl(
           c.context,
           c.params,
@@ -41,7 +53,6 @@ function useIViewUpload(props, valueChange, c) {
           editorParams
         );
         uploadUrl.value = urls.uploadUrl;
-        downloadUrl.value = urls.downloadUrl;
       }
     },
     { immediate: true, deep: true }
@@ -86,24 +97,23 @@ function useIViewUpload(props, valueChange, c) {
   vue.watch(
     files,
     (newVal) => {
-      if ((newVal == null ? void 0 : newVal.length) && downloadUrl.value) {
+      if (newVal == null ? void 0 : newVal.length) {
         newVal.forEach((file) => {
-          file.url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-          if (file.name.split(".").pop() === "svg") {
-            calcSvgPreview(file);
-          }
-        });
-      }
-    },
-    { immediate: true }
-  );
-  vue.watch(
-    downloadUrl,
-    (newVal) => {
-      if (newVal && files.value.length) {
-        files.value.forEach((file) => {
-          file.url = downloadUrl.value.replace("%fileId%", file.id);
-          if (file.name.split(".").pop() === "svg") {
+          const downloadUrl = getDownloadUrl(props.data, file);
+          file.url = file.url || downloadUrl.replace("%fileId%", file.id);
+          if (ibiz.config.common.enableDownloadTicket) {
+            ibiz.util.file.getDownloadTicket(c.context, { fileId: file.id }).then((downloadTicket) => {
+              if (downloadTicket && downloadTicket.ticket) {
+                file.url = downloadUrl.replace(
+                  "%fileId%",
+                  downloadTicket.ticket
+                );
+                if (file.name.split(".").pop() === "svg") {
+                  calcSvgPreview(file);
+                }
+              }
+            });
+          } else if (file.name.split(".").pop() === "svg") {
             calcSvgPreview(file);
           }
         });
@@ -117,6 +127,7 @@ function useIViewUpload(props, valueChange, c) {
       _files.map((file) => ({
         name: file.name,
         id: file.id,
+        folder: file.folder,
         ...c.transformInfoMap(file, c.infoMap, true)
       }))
     ) : null;
@@ -142,9 +153,13 @@ function useIViewUpload(props, valueChange, c) {
     if (!response) {
       return;
     }
+    if (ibiz.config.common.enableDownloadTicket) {
+      ibiz.util.file.setDownloadTicket(response.id, response.ticket);
+    }
     uploadCache.cacheFiles.push({
       name: response.filename,
       id: response.fileid,
+      folder: response.folder,
       ...c.transformInfoMap(response, c.infoMap)
     });
     if (response.name.split(".").pop() === "svg") {
@@ -177,15 +192,25 @@ function useIViewUpload(props, valueChange, c) {
     emitValue();
   };
   const onDownload = (file) => {
-    const url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-    ibiz.util.file.fileDownload(url, file.name);
+    const downloadUrl = getDownloadUrl(props.data, file);
+    const url = file.url || downloadUrl.replace("%fileId%", file.id);
+    const editorParams = { ...c.editorParams };
+    if (editorParams.exportparams) {
+      editorParams.exportParams = JSON.parse(editorParams.exportparams);
+    }
+    ibiz.util.file.fileDownload(url, file.name, {
+      context: c.context,
+      params: c.params,
+      data: props.data,
+      file: { fileId: file.id, ...file },
+      extraParams: editorParams
+    });
   };
   const limit = vue.computed(() => {
     return c.multiple ? 9999 : 1;
   });
   return {
     uploadUrl,
-    downloadUrl,
     headers,
     files,
     limit,

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.cjs

@@ -4,6 +4,7 @@ var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var vueRouter = require('vue-router');
 var navBreadcrumb_controller = require('./nav-breadcrumb.controller.cjs');
+var navBreadcrumb_util = require('./nav-breadcrumb.util.cjs');
 require('./nav-breadcrumb.css');
 
 "use strict";
@@ -44,15 +45,23 @@ const NavBreadcrumb = /* @__PURE__ */ vue.defineComponent({
         breadcrumbItems
       } = c.state;
       let result = breadcrumbItems.filter((x) => x.caption);
+      const indexViewName = navBreadcrumb_util.getAppIndexViewName(c.panel.context);
       if (!c.showHome) {
-        result = result.filter((x) => x.viewName !== ibiz.hub.defaultAppIndexViewName);
+        result = result.filter((x) => x.viewName !== indexViewName);
       }
       return result;
     });
+    const onClick = (event, item) => {
+      if (item.type === "menuItem") {
+        event.stopPropagation();
+        c.openMenuItemView(item, event);
+      }
+    };
     return {
       ns,
       c,
-      items
+      items,
+      onClick
     };
   },
   render() {
@@ -67,7 +76,9 @@ const NavBreadcrumb = /* @__PURE__ */ vue.defineComponent({
         label += " - ".concat(item.dataInfo);
       }
       return vue.createVNode(vue.resolveComponent("el-breadcrumb-item"), {
-        "to": item.fullPath
+        "class": this.ns.is("link", item.type === "menuItem"),
+        "to": item.fullPath,
+        "onClick": (event) => this.onClick(event, item)
       }, _isSlot(label) ? label : {
         default: () => [label]
       });

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.controller.cjs

@@ -110,24 +110,33 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     if (this.navMode === "store") {
       const { currentRoute } = router;
+      const routePath = vue3Util.route2routePath(currentRoute.value);
       const fullPath = currentRoute.value.fullPath;
       const viewName = navBreadcrumb_util.getCurViewName(router);
+      const menuTag = navBreadcrumb_util.getMenuTag(routePath.pathNodes);
       const chacheItem = this.service.getItem({ fullPath, viewName });
+      const indexViewName = navBreadcrumb_util.getAppIndexViewName(this.panel.context);
       if (chacheItem) {
-        if (chacheItem.viewName === ibiz.hub.defaultAppIndexViewName) {
+        if (chacheItem.viewName === indexViewName) {
           this.service.setChache([
             { ...navBreadcrumb_util.getIndexBreadcrumb(this.panel.context), fullPath }
           ]);
           this.resetBreadcrumbs();
           return;
         }
+        this.service.update({ ...chacheItem, fullPath });
         const removeItems = this.service.removeAfter(fullPath);
         removeItems.forEach((item) => {
           var _a;
           (_a = this.navPos) == null ? void 0 : _a.removeCache(item.fullPath);
         });
         this.resetBreadcrumbs();
+      } else if (this.state.menuTag !== menuTag) {
+        this.setBreadcrumbByRouter(router);
+      } else {
+        this.service.add({ viewName, fullPath, type: "default" });
       }
+      this.state.menuTag = menuTag;
     }
   }
   /**
@@ -148,7 +157,7 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     if (this.navMode === "menu") {
       return;
     }
-    this.service.updateOrAdd({ fullPath, ...info });
+    this.service.update({ fullPath, type: "default", ...info });
     this.resetBreadcrumbs();
   }
   /**
@@ -164,19 +173,30 @@ class NavBreadcrumbController extends runtime.PanelItemController {
    * @param {Router} router
    * @memberof NavBreadcrumbController
    */
-  setBreadcrumbByRouter(router) {
+  async setBreadcrumbByRouter(router) {
     const { currentRoute } = router;
     const routePath = vue3Util.route2routePath(currentRoute.value);
-    const items = routePath.pathNodes.map(
-      (node, index) => {
-        const { appContext, pathNodes } = routePath;
+    const { appContext = {}, pathNodes } = routePath;
+    const menuTag = navBreadcrumb_util.getMenuTag(pathNodes);
+    let hasMenuItem = false;
+    const menuData = await navBreadcrumb_util.getMenuItemByTag(
+      menuTag,
+      this.appmenu,
+      this.panel.context
+    );
+    const calcPathNodes = routePath.pathNodes.map(
+      async (node, index) => {
+        if (this.appmenu && menuData && menuData.viewName === node.viewName) {
+          hasMenuItem = true;
+        }
         const fullPath = vue3Util.routePath2string({
           appContext,
           pathNodes: pathNodes.slice(0, index + 1)
         });
         const result = {
           viewName: node.viewName,
-          fullPath
+          fullPath,
+          type: "default"
         };
         const chacheItem = this.service.getItem({ viewName: node.viewName });
         if (chacheItem) {
@@ -185,13 +205,28 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           }
           Object.assign(result, chacheItem);
         }
-        const viewInfo = navBreadcrumb_util.getViewInfoByViewStack(node.viewName);
+        const viewInfo = navBreadcrumb_util.getViewInfoByViewStack(
+          node.viewName,
+          this.panel.context
+        );
         if (viewInfo) {
           Object.assign(result, ramda.reject(ramda.isNil, viewInfo));
         }
         return result;
       }
     );
+    const items = await Promise.all(calcPathNodes);
+    if (!hasMenuItem && menuData) {
+      this.state.menuTag = menuData.tag;
+      const item = {
+        viewName: menuData.viewName,
+        caption: menuData.menuItem.caption,
+        fullPath: "",
+        type: "menuItem",
+        menuTag: menuData.tag
+      };
+      items.splice(1, 0, item);
+    }
     this.service.setChache(items);
     this.resetBreadcrumbs();
   }
@@ -225,6 +260,7 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           return {
             caption: item.caption,
             fullPath: "",
+            type: "default",
             viewName: item.id
           };
         });
@@ -267,16 +303,14 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     if (this.appmenu) {
       this.appmenu.evt.on("onClick", async (data) => {
-        var _a;
         const { eventArg } = data;
-        const menuItem = this.appmenu.allAppMenuItems.find(
-          (x) => x.id === eventArg
+        const menuData = await navBreadcrumb_util.getMenuItemByTag(
+          eventArg,
+          this.appmenu,
+          this.panel.context
         );
-        if (menuItem) {
-          const app = ibiz.hub.getApp(this.panel.context.srfappid);
-          const appFunc = app.getAppFunc(menuItem.appFuncId);
-          const viewName = ((_a = appFunc.appViewId) == null ? void 0 : _a.split(".").pop()) || "";
-          const viewConfig = await ibiz.hub.config.view.get(viewName);
+        if (menuData) {
+          const { viewName, appFunc, viewConfig } = menuData;
           if (appFunc.openMode !== "INDEXVIEWTAB" || viewConfig && viewConfig.openMode && viewConfig.openMode !== "INDEXVIEWTAB") {
             return;
           }
@@ -287,7 +321,8 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           } else {
             items.push({
               viewName,
-              fullPath: ""
+              fullPath: "",
+              type: "default"
             });
           }
           items.unshift(navBreadcrumb_util.getIndexBreadcrumb(this.panel.context));
@@ -314,6 +349,17 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     Object.assign(this.rawItemParams, params);
   }
+  /**
+   * @description 打开菜单项视图
+   * @param {IData} item
+   * @param {MouseEvent} event
+   * @memberof NavBreadcrumbController
+   */
+  openMenuItemView(item, event) {
+    if (this.appmenu) {
+      this.appmenu.onClickMenuItem(item.menuTag, event);
+    }
+  }
 }
 
 exports.NavBreadcrumbController = NavBreadcrumbController;

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.css

@@ -1 +1 @@
-.ibiz-nav-breadcrumb{--ibiz-nav-breadcrumb-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-breadcrumb-link-color:var(--ibiz-color-link);--ibiz-nav-breadcrumb-disabled-color:var(--ibiz-color-text-0);padding:var(--ibiz-nav-breadcrumb-padding);--el-text-color-primary:var(--ibiz-nav-breadcrumb-link-color)}.ibiz-nav-breadcrumb--menu{color:var(--ibiz-nav-breadcrumb-disabled-color);--el-text-color-primary:var(--ibiz-nav-breadcrumb-disabled-color)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item{cursor:text}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item:last-child .el-breadcrumb__inner{color:var(--ibiz-color-primary)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__inner.is-link{font-weight:400;pointer-events:none}
+.ibiz-nav-breadcrumb{--ibiz-nav-breadcrumb-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-breadcrumb-link-color:var(--ibiz-color-link);--ibiz-nav-breadcrumb-disabled-color:var(--ibiz-color-text-0);padding:var(--ibiz-nav-breadcrumb-padding);--el-text-color-primary:var(--ibiz-nav-breadcrumb-link-color)}.ibiz-nav-breadcrumb--menu{color:var(--ibiz-nav-breadcrumb-disabled-color);--el-text-color-primary:var(--ibiz-nav-breadcrumb-disabled-color)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item{cursor:text}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item:last-child .el-breadcrumb__inner{color:var(--ibiz-color-primary)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__inner.is-link{font-weight:400;pointer-events:none}.ibiz-nav-breadcrumb .el-breadcrumb__item.is-link .el-breadcrumb__inner{font-weight:700;color:var(--el-text-color-primary);text-decoration:none;cursor:pointer;transition:var(--el-transition-color)}

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.service.cjs

@@ -72,7 +72,7 @@ class NavBreadcrumbService {
    * @param {BreadcrumbMsg} item
    * @memberof NavBreadcrumbService
    */
-  updateOrAdd(item) {
+  update(item) {
     if (!this.chache.length && this.navMode === "store") {
       const result = localStorage.getItem("breadcrumb");
       if (result) {
@@ -82,9 +82,7 @@ class NavBreadcrumbService {
     const index = this.chache.findIndex(
       (x) => x.fullPath && x.fullPath === item.fullPath || x.viewName.toLowerCase() === item.viewName.toLowerCase()
     );
-    if (index === -1) {
-      this.add(item);
-    } else {
+    if (index !== -1) {
       Object.assign(this.chache[index], ramda.reject(ramda.isNil, item));
       this.chache = this.chache.filter((x) => !x.isEmbed && !x.isModal);
       if (this.navMode === "store") {
@@ -100,7 +98,8 @@ class NavBreadcrumbService {
    */
   getItem(data) {
     const { viewName = "", fullPath = "" } = data;
-    if (viewName === "index") {
+    const indexViewName = navBreadcrumb_util.getAppIndexViewName(this.context);
+    if (viewName === indexViewName) {
       return navBreadcrumb_util.getIndexBreadcrumb(this.context);
     }
     const item = this.chache.find(

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.state.cjs

@@ -19,6 +19,12 @@ class NavBreadcrumbState extends runtime.PanelItemState {
      * @memberof NavBreadcrumbState
      */
     __publicField(this, "breadcrumbItems", []);
+    /**
+     * @description 菜单标识
+     * @type {string}
+     * @memberof NavBreadcrumbState
+     */
+    __publicField(this, "menuTag", "");
   }
 }
 

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.util.cjs

@@ -4,12 +4,23 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 
 "use strict";
+function getAppIndexViewName(context) {
+  const targetAppModel = ibiz.hub.getAppSourceModel(context.srfappid);
+  if (targetAppModel.getDefaultPSAppIndexView) {
+    const view = targetAppModel.getDefaultPSAppIndexView;
+    const name = view.path.split("/").pop().replace(".json", "");
+    return name;
+  }
+  return ibiz.hub.defaultAppIndexViewName;
+}
 function getIndexBreadcrumb(context) {
   const app = ibiz.hub.getApp(context.srfappid);
   const caption = app.model.caption;
+  const indexViewName = getAppIndexViewName(context);
   return {
-    viewName: ibiz.hub.defaultAppIndexViewName,
+    viewName: indexViewName,
     fullPath: "/",
+    type: "default",
     caption
   };
 }
@@ -50,7 +61,7 @@ function getCurViewName(router) {
   const routePath = vue3Util.route2routePath(currentRoute.value);
   return ((_a = routePath.pathNodes.pop()) == null ? void 0 : _a.viewName) || "";
 }
-function getViewInfoByViewStack(viewName) {
+function getViewInfoByViewStack(viewName, context) {
   if (viewName === runtime.RouteConst.ROUTE_MODAL_TAG) {
     return {
       viewName,
@@ -58,22 +69,58 @@ function getViewInfoByViewStack(viewName) {
       isModal: true
     };
   }
-  const view = ibiz.util.viewStack.getViewByCodeName(viewName);
+  const view = ibiz.appUtil.viewCacheCenter.get(viewName);
+  const indexViewName = getAppIndexViewName(context);
   if (view) {
     let isEmbed = false;
-    if (view.parentView && view.parentView.model.codeName !== ibiz.hub.defaultAppIndexViewName) {
+    if (view.parentView && view.parentView.model.codeName !== indexViewName) {
       isEmbed = true;
     }
-    return {
+    const data = view.state.srfactiveviewdata;
+    const result = {
       viewName: view.model.codeName,
       caption: view.model.caption,
       isEmbed
     };
+    if (data && data.srfkey) {
+      Object.assign(result, { dataInfo: data.srfmajortext || "" });
+    }
+    return result;
+  }
+}
+function getMenuTag(pathNodes) {
+  var _a;
+  if (pathNodes.length > 1) {
+    return ((_a = pathNodes[1].params) == null ? void 0 : _a.srfmenuitem) || "";
+  }
+  return "";
+}
+async function getMenuItemByTag(tag, appMenu, context) {
+  var _a;
+  if (!tag) {
+    return;
+  }
+  const menuItem = appMenu.allAppMenuItems.find((x) => x.id === tag);
+  if (menuItem) {
+    const app = ibiz.hub.getApp(context.srfappid);
+    const appFunc = app.getAppFunc(menuItem.appFuncId);
+    const viewName = ((_a = appFunc.appViewId) == null ? void 0 : _a.split(".").pop()) || "";
+    const viewConfig = await ibiz.hub.config.view.get(viewName);
+    return {
+      tag,
+      viewName,
+      viewConfig,
+      appFunc,
+      menuItem
+    };
   }
 }
 
 exports.getAppFuncByViewName = getAppFuncByViewName;
+exports.getAppIndexViewName = getAppIndexViewName;
 exports.getCurViewName = getCurViewName;
 exports.getIndexBreadcrumb = getIndexBreadcrumb;
+exports.getMenuItemByTag = getMenuItemByTag;
 exports.getMenuItemsByAppFunc = getMenuItemsByAppFunc;
+exports.getMenuTag = getMenuTag;
 exports.getViewInfoByViewStack = getViewInfoByViewStack;

package/lib/panel-component/user-message/async-action/async-data-export/async-data-export.cjs

@@ -31,6 +31,7 @@ const AsyncDataExport = /* @__PURE__ */ vue.defineComponent({
       beginTime: "",
       endTime: "",
       fileUrl: "",
+      fileName: "",
       isFinish: false
     });
     info.title = ibiz.i18n.t("panelComponent.userMessage.asyncDataExport.exportDetailPrompt", {
@@ -41,6 +42,7 @@ const AsyncDataExport = /* @__PURE__ */ vue.defineComponent({
     if (props.asyncAction.asyncresultdownloadurl) {
       const asyncResultDownloadObj = JSON.parse(props.asyncAction.asyncresultdownloadurl);
       info.fileUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/").concat(asyncResultDownloadObj.folder, "/").concat(asyncResultDownloadObj.fileid).replace("/{cat}", "");
+      info.fileName = asyncResultDownloadObj.filename;
     }
     if (!finishedStates.includes(props.asyncAction.actionstate)) {
       info.isFinish = false;
@@ -48,7 +50,7 @@ const AsyncDataExport = /* @__PURE__ */ vue.defineComponent({
       info.isFinish = true;
     }
     const onDownLoad = () => {
-      ibiz.util.file.fileDownload(info.fileUrl);
+      ibiz.util.file.fileDownload(info.fileUrl, info.fileName);
     };
     return {
       ns,

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.17_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/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/edit-view.engine.cjs

@@ -263,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);
+  }
   /**
    * 工作流启动
    *

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

@@ -68,10 +68,6 @@ class LoginViewEngine extends runtime.ViewEngineBase {
       await this.login(args);
       return null;
     }
-    if (key === runtime.SysUIActionTag.CANCEL_CHANGES) {
-      await this.cancelChanges();
-      return null;
-    }
     return super.call(key, args);
   }
   async login(args) {
@@ -121,7 +117,15 @@ class LoginViewEngine extends runtime.ViewEngineBase {
       }
     }
   }
-  async cancelChanges() {
+  /**
+   * @description 取消变更
+   * @param {({
+   *       targetState: 'INIT' | 'UNDO' | 'REDO';
+   *     })} [_args={ targetState: 'INIT' }] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+   * @returns {*}  {Promise<void>}
+   * @memberof LoginViewEngine
+   */
+  async cancelChanges(_args = { targetState: "INIT" }) {
     if (this.view.layoutPanel) {
       Object.keys(this.view.layoutPanel.panelItems).forEach((key) => {
         const controller = this.view.layoutPanel.panelItems[key];