@ibiz-template/vue3-components 0.7.13-alpha.0 → 0.7.14

package/lib/panel-component/panel-button/panel-button.controller.cjs

@@ -89,7 +89,7 @@ class PanelButtonController extends runtime.PanelItemController {
   }
   /**
    * 行为点击
-   *
+   * - 在行为参数中传递panelDataParent(面板项数据父容器标识)
    * @param {MouseEvent} event
    * @return {*}  {Promise<void>}
    * @memberof PanelButtonController
@@ -101,19 +101,16 @@ class PanelButtonController extends runtime.PanelItemController {
     }
     event.stopPropagation();
     event.preventDefault();
-    const view = this.panel.view;
-    if (actionType === "UIACTION" && uiactionId === "login" && view.model.viewType === "APPLOGINVIEW" && !await view.validate(
-      this.dataParent.model.id
-    )) {
-      return;
-    }
     await runtime.UIActionUtil.execAndResolved(
       uiactionId,
       {
         context: this.panel.context,
-        params: this.panel.params,
+        params: {
+          panelDataParent: this.dataParent.model.id,
+          ...this.panel.params
+        },
         data: [this.data],
-        view,
+        view: this.panel.view,
         event,
         noWaitRoute: true
       },

package/lib/panel-component/panel-static-carousel/panel-static-carousel.cjs

@@ -25,6 +25,7 @@ const PanelStaticCarousel = /* @__PURE__ */ vue.defineComponent({
     const carouselData = vue.ref([]);
     const isAuto = vue.ref(true);
     const timeSpan = vue.ref(3e3);
+    const carouselMode = vue.ref("default");
     const getSwipeConfig = (swipeData) => {
       const autoPlay = swipeData.find((item) => Object.is(item.key, "autoplay"));
       if (autoPlay) {
@@ -34,12 +35,17 @@ const PanelStaticCarousel = /* @__PURE__ */ vue.defineComponent({
       if (span) {
         timeSpan.value = Number(span.value) || 0;
       }
+      const carouselModeItem = swipeData.find((item) => Object.is(item.key, "carouselMode"));
+      if (carouselModeItem && carouselModeItem.value) {
+        carouselMode.value = carouselModeItem.value;
+      }
     };
     if ((_a = model.rawItem) == null ? void 0 : _a.rawItemParams) {
       let swipeData = [];
       const imgData = model.rawItem.rawItemParams;
       const autoplayIndex = imgData.findIndex((item) => Object.is(item.key, "autoplay"));
       const timespanIndex = imgData.findIndex((item) => Object.is(item.key, "timespan"));
+      const carouselModeIndex = imgData.findIndex((item) => Object.is(item.key, "carouselMode"));
       let number = 0;
       if (autoplayIndex >= 0) {
         number += 1;
@@ -47,6 +53,9 @@ const PanelStaticCarousel = /* @__PURE__ */ vue.defineComponent({
       if (timespanIndex >= 0) {
         number += 1;
       }
+      if (carouselModeIndex >= 0) {
+        number += 1;
+      }
       if (number > 0) {
         swipeData = imgData.slice(0, -number);
         getSwipeConfig(imgData.slice(-number));
@@ -73,7 +82,8 @@ const PanelStaticCarousel = /* @__PURE__ */ vue.defineComponent({
       ns,
       carouselData,
       isAuto,
-      timeSpan
+      timeSpan,
+      carouselMode
     };
   },
   render() {
@@ -82,7 +92,8 @@ const PanelStaticCarousel = /* @__PURE__ */ vue.defineComponent({
     }, [vue.createVNode(vue.resolveComponent("iBizCarouselComponent"), {
       "carouselData": this.carouselData,
       "isAuto": this.isAuto,
-      "timeSpan": this.timeSpan
+      "timeSpan": this.timeSpan,
+      "carouselMode": this.carouselMode
     }, null)]);
   }
 });

package/lib/panel-component/short-cut/short-cut.cjs

@@ -1,11 +1,12 @@
 'use strict';
 
 var vue = require('vue');
+var vueRouter = require('vue-router');
 var runtime = require('@ibiz-template/runtime');
 var vue3Util = require('@ibiz-template/vue3-util');
 var draggable = require('vuedraggable');
-require('./short-cut.css');
 var core = require('@ibiz-template/core');
+require('./short-cut.css');
 
 "use strict";
 const ShortCut = /* @__PURE__ */ vue.defineComponent({
@@ -26,35 +27,52 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
   setup(props) {
     const ns = vue3Util.useNamespace("short-cut");
     const vue$1 = vue.getCurrentInstance().proxy;
-    const isShowToolbar = vue.ref(false);
+    const router = vueRouter.useRouter();
+    const shortCutUtil = ibiz.util.shortCut;
+    const isShowToolbar = vue.ref(true);
     const isShowMore = vue.ref(false);
-    const data = vue.ref(ibiz.util.shortCut.data);
+    const data = vue.reactive(shortCutUtil.data);
     const dragCache = {
       newIndex: 0,
       oldIndex: 0
     };
+    const openModeMap = /* @__PURE__ */ new Map([["ROUTE_MODAL", "INDEXVIEWTAB_POPUPMODAL"], ["MODAL", "POPUPMODAL"], ["DRAWER", "DRAWER_RIGHT"]]);
+    const onShortCutChange = (items) => {
+      if (data.length === 0 && isShowMore.value) {
+        isShowMore.value = false;
+      }
+      vue$1.$forceUpdate();
+    };
+    vue.onMounted(() => {
+      isShowToolbar.value = shortCutUtil.mode !== "vertical";
+      ibiz.util.shortCut.onChange(onShortCutChange);
+    });
+    vue.onUnmounted(() => {
+      ibiz.util.shortCut.offChange(onShortCutChange);
+    });
     const onShowChange = () => {
       isShowToolbar.value = !isShowToolbar.value;
       if (isShowToolbar.value) {
         isShowMore.value = false;
-      }
-    };
-    const getOpenMode = (openMode) => {
-      switch (openMode) {
-        case "ROUTE_MODAL":
-          return "INDEXVIEWTAB_POPUPMODAL";
-        case "MODAL":
-          return "POPUPMODAL";
-        case "DRAWER":
-          return "DRAWER_RIGHT";
-        default:
+        shortCutUtil.setShortCutMode("horizontal");
+      } else {
+        shortCutUtil.setShortCutMode("vertical");
       }
     };
     const onClick = (item) => {
       isShowMore.value = false;
-      ibiz.commands.execute(runtime.OpenAppViewCommand.TAG, item.appViewId, core.IBizContext.create(item.context), item.params, {
-        openMode: getOpenMode(item.openMode)
-      });
+      if (item.openMode === "ROUTE") {
+        const fullPath = item.fullPath.substring(1);
+        if (router.currentRoute.value.fullPath !== fullPath) {
+          router.push({
+            path: item.fullPath.substring(1)
+          });
+        }
+      } else {
+        ibiz.commands.execute(runtime.OpenAppViewCommand.TAG, item.appViewId, core.IBizContext.create(item.context), item.params, {
+          openMode: openModeMap.get(item.openMode)
+        });
+      }
     };
     const onChange = (evt) => {
       if (evt.moved) {
@@ -65,18 +83,16 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
         dragCache.oldIndex = evt.removed.oldIndex;
         ibiz.util.shortCut.changeIndex(dragCache.newIndex, dragCache.oldIndex);
       }
-      vue$1.$forceUpdate();
     };
     const onDelete = (event, key) => {
       event.stopPropagation();
       ibiz.util.shortCut.removeShortCut(key);
-      vue$1.$forceUpdate();
     };
     const renderDraggable = (isVertical) => {
       return vue.createVNode(draggable, {
         "itemKey": "key",
         "class": [ns.e("draggable"), ns.is("vertical", isVertical), ns.is("horizontal", !isVertical)],
-        "modelValue": data.value,
+        "modelValue": data,
         "group": props.controller.model.id,
         "onChange": (evt) => onChange(evt)
       }, {
@@ -87,13 +103,14 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
           if (isVertical && !isShowToolbar.value || isVertical && isShowToolbar.value && index > 5 || !isVertical && index < 6) {
             return vue.createVNode("div", {
               "class": ns.e("item"),
+              "title": element.caption,
               "onClick": () => onClick(element)
             }, [vue.createVNode("svg", {
               "viewBox": "0 0 16 16",
               "class": ["drag-icon", "icon"],
               "xmlns": "http://www.w3.org/2000/svg",
-              "height": "14px",
-              "width": "14px",
+              "height": "16px",
+              "width": "16px",
               "focusable": "false"
             }, [vue.createVNode("g", {
               "id": "drag-icon/drag--",
@@ -106,32 +123,34 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
             }, [vue.createVNode("path", {
               "d": "M1 2a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zM1 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2z",
               "id": "drag-icon-air"
-            }, null)])])]), vue.createVNode("ion-icon", {
-              "class": ["icon", "caption"],
+            }, null)])])]), element.icon ? vue.createVNode(vue.resolveComponent("iBizIcon"), {
+              "class": ["caption-icon", "icon"],
+              "icon": element.icon
+            }, null) : vue.createVNode("ion-icon", {
+              "class": ["caption-icon", "icon"],
               "name": "ellipsis-horizontal-circle-outline"
             }, null), vue.createVNode("div", {
               "class": ns.em("item", "caption")
-            }, [element.name]), vue.createVNode("ion-icon", {
-              "class": ["close-icon", "icon"],
+            }, [element.caption]), vue.createVNode("ion-icon", {
               "name": "close-outline",
+              "class": ["close-icon", "icon"],
               "onClick": (event) => onDelete(event, element.key)
             }, null)]);
           }
-        },
-        footer: () => {
-          if (isVertical && !isShowToolbar.value) {
-            return vue.createVNode("div", {
-              "class": [ns.e("item"), ns.e("action")],
-              "onClick": onShowChange
-            }, [vue.createVNode("ion-icon", {
-              "name": "chevron-back-outline"
-            }, null), vue.createVNode("div", {
-              "class": ns.em("item", "caption")
-            }, [ibiz.i18n.t("panelComponent.shortCut.expandToolbar")])]);
-          }
         }
       });
     };
+    const renderFoolterToolbar = () => {
+      return vue.createVNode("div", {
+        "class": [ns.e("action"), ns.is("hidden", isShowToolbar.value)],
+        "onClick": onShowChange
+      }, [vue.createVNode("ion-icon", {
+        "class": ["expand-icon", "icon"],
+        "name": "chevron-back-outline"
+      }, null), vue.createVNode("div", {
+        "class": ns.em("item", "caption")
+      }, [ibiz.i18n.t("panelComponent.shortCut.expandToolbar")])]);
+    };
     const renderMoreToolbar = () => {
       return vue.createVNode(vue.resolveComponent("el-popover"), {
         "visible": isShowMore.value,
@@ -150,14 +169,14 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
           }, {
             default: () => [vue.createVNode("div", null, [vue.createVNode("span", {
               "class": ns.em("more", "caption")
-            }, [isShowToolbar.value ? "6/".concat(data.value.length) : data.value.length]), vue.createVNode("i", {
+            }, [isShowToolbar.value ? "6/".concat(data.length) : data.length]), vue.createVNode("i", {
               "class": ["fa", ns.em("more", "icon"), isShowMore.value ? "fa-angle-double-down" : "fa-angle-double-up"],
               "aria-hidden": "true"
             }, null)])]
           })]);
         },
         default: () => {
-          return renderDraggable(true);
+          return [renderDraggable(true), renderFoolterToolbar()];
         }
       });
     };
@@ -173,7 +192,7 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
   },
   render() {
     return vue.createVNode("div", {
-      "class": [this.ns.b(), ...this.controller.containerClass, this.ns.is("hidden", this.data.length === 0)]
+      "class": [this.ns.b(), ...this.controller.containerClass, this.ns.is("conceal", this.data.length === 0)]
     }, [this.isShowToolbar && this.renderDraggable(false), (!this.isShowToolbar || this.data.length > 6) && this.renderMoreToolbar(), this.isShowToolbar && vue.createVNode("div", {
       "class": this.ns.e("recover"),
       "onClick": this.onShowChange
@@ -183,6 +202,7 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
       "placement": "top"
     }, {
       default: () => [vue.createVNode("ion-icon", {
+        "class": ["recover-icon", "icon"],
         "name": "chevron-forward-outline"
       }, null)]
     })])]);

package/lib/panel-component/short-cut/short-cut.css

@@ -1 +1 @@
-.ibiz-short-cut{bottom:4px;right:4px;z-index:2;position:fixed;display:flex;align-items:center;border-radius:4px;box-shadow:0 0 16px rgba(0,0,0,.0784313725);border:1px solid var(--ibiz-color-border);background:var(--ibiz-color-bg-1)}.ibiz-short-cut.is-hidden{display:none}.ibiz-short-cut__more{padding:2px;cursor:pointer}.ibiz-short-cut__more .el-tooltip__trigger{padding:8px;line-height:18px}.ibiz-short-cut__more .el-tooltip__trigger:hover{border-radius:2px;color:var(--ibiz-color-primary);background-color:var(--ibiz-color-primary-light-default)}.ibiz-short-cut__more--icon{margin-left:8px}.ibiz-short-cut__recover{padding:2px;display:flex;cursor:pointer;align-items:center}.ibiz-short-cut__recover .el-tooltip__trigger{padding:8px;line-height:18px}.ibiz-short-cut__recover .el-tooltip__trigger:hover{border-radius:2px;color:var(--ibiz-color-primary);background-color:var(--ibiz-color-primary-light-default)}.ibiz-short-cut__item{display:flex;cursor:pointer;position:relative;align-items:center;flex-flow:row nowrap;place-content:center flex-start}.ibiz-short-cut__item .icon{flex-shrink:0}.ibiz-short-cut__item .icon.caption{margin-right:8px}.ibiz-short-cut__item .drag-icon{visibility:hidden}.ibiz-short-cut__item .close-icon{visibility:hidden;font-size:18px}.ibiz-short-cut__item .close-icon:hover{color:var(--ibiz-color-danger-hover)}.ibiz-short-cut__item--caption{flex-grow:1;font-size:14px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ibiz-short-cut__item:hover .close-icon,.ibiz-short-cut__item:hover .drag-icon{visibility:visible}.ibiz-short-cut .is-horizontal{display:flex;padding:8px}.ibiz-short-cut .is-horizontal .ibiz-short-cut__item{max-width:165px;border-right:1px solid var(--ibiz-color-border)}.ibiz-short-cut .is-horizontal .ibiz-short-cut__item--caption{margin:0 8px}.ibiz-short-cut__popover.el-popover.el-popper{padding:10px 0}.ibiz-short-cut__popover .is-vertical .ibiz-short-cut__item{width:225px;height:44px;padding:9px 20px}.ibiz-short-cut__popover .is-vertical .ibiz-short-cut__item .drag-icon{left:5px;position:absolute}.ibiz-short-cut__popover .is-vertical .ibiz-short-cut__item:hover{background-color:var(--ibiz-color-fill-1)}
+.ibiz-short-cut{z-index:2;bottom:26px;display:flex;position:fixed;border-radius:4px;align-items:center;box-shadow:0 0 16px rgba(0,0,0,.0784313725);background:var(--ibiz-color-bg-1);right:var(--ibiz-spacing-base-loose);border:1px solid var(--ibiz-color-border)}.ibiz-short-cut.is-conceal{visibility:hidden}.ibiz-short-cut__more{padding:2px;cursor:pointer}.ibiz-short-cut__more .el-tooltip__trigger{padding:8px;line-height:16px}.ibiz-short-cut__more .el-tooltip__trigger:hover{border-radius:2px;color:var(--ibiz-color-primary);background-color:var(--ibiz-color-primary-light-default)}.ibiz-short-cut__more .recover-icon{font-size:16px;margin-left:8px}.ibiz-short-cut__recover{padding:2px;display:flex;cursor:pointer;align-items:center}.ibiz-short-cut__recover .el-tooltip__trigger{padding:8px;line-height:16px}.ibiz-short-cut__recover .el-tooltip__trigger:hover{border-radius:2px;color:var(--ibiz-color-primary);background-color:var(--ibiz-color-primary-light-default)}.ibiz-short-cut__action{display:flex;cursor:pointer;position:relative;align-items:center;flex-flow:row nowrap;place-content:center flex-start;width:225px;height:44px;padding:9px 20px}.ibiz-short-cut__action .expand-icon{font-size:16px;margin-right:8px}.ibiz-short-cut__item{display:flex;cursor:pointer;position:relative;align-items:center;flex-flow:row nowrap;place-content:center flex-start}.ibiz-short-cut__item .icon{flex-shrink:0;font-size:16px}.ibiz-short-cut__item .drag-icon{display:none;margin-right:8px}.ibiz-short-cut__item .caption-icon{margin-right:8px}.ibiz-short-cut__item .close-icon{visibility:hidden}.ibiz-short-cut__item .close-icon:hover{color:var(--ibiz-color-danger-hover)}.ibiz-short-cut__item--caption{flex-grow:1;font-size:14px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ibiz-short-cut__item:hover .drag-icon{display:block}.ibiz-short-cut__item:hover .caption-icon{display:none}.ibiz-short-cut__item:hover .close-icon{visibility:visible}.ibiz-short-cut .is-horizontal{display:flex;padding:8px 0}.ibiz-short-cut .is-horizontal .ibiz-short-cut__item{max-width:168px;min-width:84px;padding:0 12px;border-right:1px solid var(--ibiz-color-border)}.ibiz-short-cut .is-horizontal .ibiz-short-cut__item .close-icon{right:0;position:absolute;padding-right:4px;background-color:var(--ibiz-color-white);box-shadow:-10px 0 20px 8px var(--ibiz-color-white)}.ibiz-short-cut__popover .is-hidden{display:none}.ibiz-short-cut__popover.el-popover.el-popper{padding:10px 0}.ibiz-short-cut__popover .is-vertical{max-height:400px;overflow-y:auto}.ibiz-short-cut__popover .is-vertical .ibiz-short-cut__item{width:225px;height:44px;padding:9px 20px}.ibiz-short-cut__popover .is-vertical .ibiz-short-cut__item:hover{background-color:var(--ibiz-color-fill-1)}

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

@@ -0,0 +1,154 @@
+'use strict';
+
+"use strict";
+class AppUtil {
+  /**
+   * Creates an instance of AppUtil.
+   * @author tony001
+   * @date 2024-05-14 17:05:00
+   * @param {Router} router
+   */
+  constructor(router) {
+    this.router = router;
+  }
+  /**
+   * 登录
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:41
+   * @param {string} loginName
+   * @param {string} password
+   * @param {(boolean | undefined)} [remember]
+   * @param {(IData | undefined)} [headers]
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async login(loginName, password, remember, headers, opts) {
+    const bol = await ibiz.auth.login(loginName, password, remember, headers);
+    if (bol === true) {
+      window.location.hash = this.router.currentRoute.value.query.ru || "/";
+      window.history.pushState({}, "");
+      window.location.reload();
+    }
+    return bol;
+  }
+  /**
+   * 登出
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:02
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async logout(opts) {
+    const bol = await ibiz.auth.logout();
+    if (bol) {
+      const path = window.location;
+      if (path.search.indexOf("isAnonymous=true") !== -1) {
+        const href = "".concat(path.origin).concat(path.pathname).concat(path.hash);
+        window.history.replaceState({}, "", href);
+      }
+      await this.router.push(
+        "/login?ru=".concat(encodeURIComponent(
+          window.location.hash.replace("#/", "/")
+        ))
+      );
+      ibiz.util.showAppLoading();
+      window.location.reload();
+    }
+    return bol;
+  }
+  /**
+   * 变更密码
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:11
+   * @param {string} oldPwd
+   * @param {string} newPwd
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async changePwd(oldPwd, newPwd, opts) {
+    let bol = this.validatePwd(oldPwd, newPwd, opts);
+    if (bol) {
+      bol = await ibiz.auth.changePwd(oldPwd, newPwd);
+    }
+    return bol;
+  }
+  /**
+   * 切换组织
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:20
+   * @param {string} oldOrgId
+   * @param {string} newOrgId
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  switchOrg(oldOrgId, newOrgId, opts) {
+    throw new Error("Method not implemented.");
+  }
+  /**
+   * 切换主题
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:30
+   * @param {string} oldTheme
+   * @param {string} newTheme
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  switchTheme(oldTheme, newTheme, opts) {
+    throw new Error("Method not implemented.");
+  }
+  /**
+   * 切换语言
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:42
+   * @param {string} oldLanguage
+   * @param {string} newLanguage
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  switchLanguage(oldLanguage, newLanguage, opts) {
+    throw new Error("Method not implemented.");
+  }
+  /**
+   * 校验密码
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:31
+   * @protected
+   * @param {string} oldPwd
+   * @param {string} newPwd
+   * @param {IData} [opts={}]
+   * @return {*}  {boolean}
+   */
+  validatePwd(oldPwd, newPwd, opts = {}) {
+    const { surePwd } = opts;
+    if (!oldPwd) {
+      ibiz.message.error("\u539F\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
+      return false;
+    }
+    if (!newPwd) {
+      ibiz.message.error("\u65B0\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
+      return false;
+    }
+    if (!surePwd) {
+      ibiz.message.error("\u786E\u8BA4\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
+      return false;
+    }
+    if (oldPwd === newPwd) {
+      ibiz.message.error("\u65B0\u5BC6\u7801\u4E0D\u80FD\u4E0E\u65E7\u5BC6\u7801\u4E00\u81F4");
+      return false;
+    }
+    if (newPwd !== surePwd) {
+      ibiz.message.error("\u4E24\u6B21\u5BC6\u7801\u4E0D\u4E00\u81F4");
+      return false;
+    }
+    return true;
+  }
+}
+
+exports.AppUtil = AppUtil;

package/lib/util/index.cjs

@@ -10,6 +10,7 @@ var overlayController = require('./overlay-controller/overlay-controller.cjs');
 var usePagination = require('./pagination/use-pagination.cjs');
 var noticeUtil = require('./notice-util/notice-util.cjs');
 var renderUtil = require('./render-util/render-util.cjs');
+var appUtil = require('./app-util/app-util.cjs');
 
 "use strict";
 
@@ -23,3 +24,4 @@ exports.OverlayController = overlayController.OverlayController;
 exports.usePagination = usePagination.usePagination;
 exports.NoticeUtil = noticeUtil.NoticeUtil;
 exports.RenderUtil = renderUtil.RenderUtil;
+exports.AppUtil = appUtil.AppUtil;

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/lib/web-app/main.cjs

@@ -12,6 +12,7 @@ require('../util/index.cjs');
 require('./guard/index.cjs');
 var unauthorizedHandler = require('./util/unauthorized-handler/unauthorized-handler.cjs');
 var dynaAuthGuard = require('./guard/auth-guard/dyna-auth-guard.cjs');
+var appUtil = require('../util/app-util/app-util.cjs');
 var openViewUtil = require('../util/open-view-util/open-view-util.cjs');
 var renderUtil = require('../util/render-util/render-util.cjs');
 var messageUtil = require('../util/message-util/message-util.cjs');
@@ -64,6 +65,7 @@ async function runApp(plugins, opts) {
   }
   index.AppRouter.setAuthGuard((notLogin) => authGuard.verify(notLogin));
   app.use(index.AppRouter.getRouter());
+  ibiz.appUtil = new appUtil.AppUtil(index.AppRouter.getRouter());
   ibiz.openView = new openViewUtil.OpenViewUtil(index.AppRouter.getRouter());
   ibiz.render = new renderUtil.RenderUtil();
   ibiz.message = new messageUtil.MessageUtil();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.13-alpha.0",
+  "version": "0.7.14",
   "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-alpha.0",
-    "@ibiz-template/runtime": "0.7.13-alpha.0",
+    "@ibiz-template/model-helper": "0.7.14",
+    "@ibiz-template/runtime": "0.7.14",
     "@ibiz-template/theme": "^0.7.0",
-    "@ibiz-template/vue3-util": "0.7.13-alpha.0",
-    "@ibiz-template/web-theme": "^1.1.16",
-    "@ibiz/model-core": "^0.1.25",
+    "@ibiz-template/vue3-util": "0.7.14",
+    "@ibiz-template/web-theme": "^1.1.17",
+    "@ibiz/model-core": "^0.1.26",
     "@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.26",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",