@ibiz-template/vue3-components 0.7.13 → 0.7.15

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

@@ -14,14 +14,21 @@ var __publicField = (obj, key, value) => {
 class LoginViewEngine extends runtime.ViewEngineBase {
   constructor() {
     super(...arguments);
+    /**
+     * 路由对象
+     *
+     * @type {RouteLocationNormalizedLoaded}
+     * @memberof LoginViewEngine
+     */
     __publicField(this, "route", vueRouter.useRoute());
     __publicField(this, "enterKeyListener", async (event) => {
-      if (event.key === "Enter" && this.AppLoginView.layoutPanel) {
+      if (event.key === "Enter" && this.view.layoutPanel) {
         const args = {
           data: [
             {
-              username: this.AppLoginView.layoutPanel.data.username,
-              password: this.AppLoginView.layoutPanel.data.password
+              username: this.view.layoutPanel.data.username,
+              password: this.view.layoutPanel.data.password,
+              captcha: this.view.layoutPanel.data.captcha
             }
           ]
         };
@@ -29,13 +36,22 @@ class LoginViewEngine extends runtime.ViewEngineBase {
       }
     });
   }
-  get AppLoginView() {
-    return this.view.getController("AppLoginView");
-  }
+  /**
+   * 视图mounted生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof LoginViewEngine
+   */
   async onMounted() {
     super.onMounted();
     document.addEventListener("keydown", this.enterKeyListener);
   }
+  /**
+   * 视图destroyed生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof LoginViewEngine
+   */
   async onDestroyed() {
     super.onDestroyed();
     document.removeEventListener("keydown", this.enterKeyListener);
@@ -53,8 +69,12 @@ class LoginViewEngine extends runtime.ViewEngineBase {
     let rememberme;
     const headers = {};
     const data = args.data[0] || {};
-    if (this.AppLoginView.layoutPanel) {
-      const panelData = this.AppLoginView.layoutPanel.data;
+    const panelDataParent = args.params.panelDataParent;
+    if (this.view.layoutPanel) {
+      if (!await this.view.layoutPanel.validate(panelDataParent)) {
+        return;
+      }
+      const panelData = this.view.layoutPanel.data;
       if (typeof panelData.isRemember === "boolean") {
         rememberme = panelData.isRemember;
       }
@@ -75,16 +95,16 @@ class LoginViewEngine extends runtime.ViewEngineBase {
       rememberme,
       headers
     );
-    this.view.hooks.afterLogin.call({ ok: bol });
+    this.view.evt.emit("onAfterLogin", { ok: bol, panelDataParent });
     if (bol === true) {
       window.location.hash = this.route.query.ru || "/";
       window.location.reload();
     }
   }
   async cancelChanges() {
-    if (this.AppLoginView.layoutPanel) {
-      Object.keys(this.AppLoginView.layoutPanel.panelItems).forEach((key) => {
-        const controller = this.AppLoginView.layoutPanel.panelItems[key];
+    if (this.view.layoutPanel) {
+      Object.keys(this.view.layoutPanel.panelItems).forEach((key) => {
+        const controller = this.view.layoutPanel.panelItems[key];
         const { viewFieldName } = controller.model;
         if (viewFieldName) {
           controller.setDataValue("", viewFieldName);

package/lib/web-app/components/modal-router-shell/modal-router-shell.cjs

@@ -20,10 +20,11 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
     }
   },
   setup(props) {
-    const route = vueRouter.useRoute();
+    const routeObj = vueRouter.useRoute();
     const router = vueRouter.useRouter();
     const isDestroyed = vue.ref(false);
     const viewData = vue.ref({});
+    const pathHistory = [];
     const destroyContext = () => {
       if (viewData.value.context) {
         const {
@@ -43,9 +44,12 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
       }
       destroyContext();
     });
-    const openView = async () => {
+    const openView = async (route) => {
       var _a;
       viewData.value = await vue3Util.parseRouteViewData(route, routeDepth, true);
+      if (isDestroyed.value) {
+        return;
+      }
       if (!(viewData.value.context instanceof core.IBizContext)) {
         viewData.value.context = core.IBizContext.create(viewData.value.context);
       }
@@ -99,6 +103,7 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
       };
       overlay = ibiz.overlay.createModal(component, void 0, opts);
       overlay.present();
+      pathHistory.push(route.fullPath);
       const result = await overlay.onWillDismiss();
       overlay = null;
       if (isDestroyed.value === false) {
@@ -114,7 +119,16 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
         });
       }
     };
-    openView();
+    vueRouter.onBeforeRouteUpdate((to, from) => {
+      if (!isDestroyed.value && pathHistory.length > 0 && pathHistory.indexOf(from.fullPath) !== -1 && pathHistory.indexOf(to.fullPath) === -1) {
+        const pathNodes = vue3Util.route2routePath(to).pathNodes;
+        const lastNode = pathNodes[pathNodes.length - 1];
+        if (lastNode && lastNode.viewName === runtime.RouteConst.ROUTE_MODAL_TAG) {
+          openView(to);
+        }
+      }
+    });
+    openView(routeObj);
     return {};
   },
   render() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.13",
+  "version": "0.7.15",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -32,12 +32,12 @@
     "@ibiz-template-plugin/gantt": "0.1.4",
     "@ibiz-template/core": "0.7.7-dev.0",
     "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.7.13",
-    "@ibiz-template/runtime": "0.7.13",
+    "@ibiz-template/model-helper": "0.7.15",
+    "@ibiz-template/runtime": "0.7.15",
     "@ibiz-template/theme": "^0.7.0",
-    "@ibiz-template/vue3-util": "0.7.13",
-    "@ibiz-template/web-theme": "^1.1.16",
-    "@ibiz/model-core": "^0.1.25",
+    "@ibiz-template/vue3-util": "0.7.15",
+    "@ibiz-template/web-theme": "^1.1.17",
+    "@ibiz/model-core": "^0.1.27",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -101,7 +101,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.25",
+    "@ibiz/model-core": "^0.1.27",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",