@ibiz-template/vue3-components 0.7.13 → 0.7.14

package/lib/locale/zh-CN/index.cjs

@@ -739,7 +739,8 @@ var index = {
         interfaceBehaviorMode: "\u627E\u4E0D\u754C\u9762\u884C\u4E3A\u6A21\u5F0F{uiactionMode}\u5BF9\u5E94\u7684\u9002\u914D\u5668",
         frontEndPluginNode: "\u627E\u4E0D\u5230\u754C\u9762\u903B\u8F91\u524D\u7AEF\u63D2\u4EF6\u8282\u70B9\uFF0C\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668",
         viewPlugin: "\u627E\u4E0D\u5230\u89C6\u56FE\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668",
-        correspondViewTypeStyle: "\u627E\u4E0D\u5230\u89C6\u56FE\u7C7B\u578B\uFF1A[{viewType}]\u7684\u89C6\u56FE\u6837\u5F0F\uFF1A[{viewStyle}]\u5BF9\u5E94\u7684\u9002\u914D\u5668"
+        correspondViewTypeStyle: "\u627E\u4E0D\u5230\u89C6\u56FE\u7C7B\u578B\uFF1A[{viewType}]\u7684\u89C6\u56FE\u6837\u5F0F\uFF1A[{viewStyle}]\u5BF9\u5E94\u7684\u9002\u914D\u5668",
+        toolbarItem: "\u627E\u4E0D\u5230\u5DE5\u5177\u680F\u9879\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668"
       }
     },
     service: {

package/lib/panel-component/auth-captcha/auth-captcha.controller.cjs

@@ -26,6 +26,13 @@ class AuthCaptchaController extends runtime.PanelItemController {
       "Captcha-Code": ""
     }));
   }
+  /**
+   * 创建人机识别状态对象
+   *
+   * @protected
+   * @return {*}  {AuthCaptchaState}
+   * @memberof AuthCaptchaController
+   */
   createState() {
     var _a;
     return new authCaptcha_state.AuthCaptchaState((_a = this.parent) == null ? void 0 : _a.state);
@@ -51,18 +58,15 @@ class AuthCaptchaController extends runtime.PanelItemController {
   async onInit() {
     super.onInit();
     await this.loadCaptcha();
-    const view = this.panel.view;
-    view.hooks.beforeLogin.tapPromise(async (context) => {
-      if (!context.parentId || context.parentId === this.dataParent.model.id) {
-        context.validate = context.validate && await this.validate();
-      }
-    });
-    view.hooks.afterLogin.tap((context) => {
-      if (!context.ok) {
-        this.loadCaptcha();
-        this.state.code = "";
+    this.panel.view.evt.on(
+      "onAfterLogin",
+      (evt) => {
+        if (!evt.ok && (!evt.panelDataParent || evt.panelDataParent === this.dataParent.model.id)) {
+          this.loadCaptcha();
+          this.state.code = "";
+        }
       }
-    });
+    );
   }
   /**
    * 值校验

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

@@ -28,9 +28,10 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("short-cut");
     const vue$1 = vue.getCurrentInstance().proxy;
     const router = vueRouter.useRouter();
-    const isShowToolbar = vue.ref(false);
+    const shortCutUtil = ibiz.util.shortCut;
+    const isShowToolbar = vue.ref(true);
     const isShowMore = vue.ref(false);
-    const data = vue.reactive(ibiz.util.shortCut.data);
+    const data = vue.reactive(shortCutUtil.data);
     const dragCache = {
       newIndex: 0,
       oldIndex: 0
@@ -43,6 +44,7 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
       vue$1.$forceUpdate();
     };
     vue.onMounted(() => {
+      isShowToolbar.value = shortCutUtil.mode !== "vertical";
       ibiz.util.shortCut.onChange(onShortCutChange);
     });
     vue.onUnmounted(() => {
@@ -52,6 +54,9 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
       isShowToolbar.value = !isShowToolbar.value;
       if (isShowToolbar.value) {
         isShowMore.value = false;
+        shortCutUtil.setShortCutMode("horizontal");
+      } else {
+        shortCutUtil.setShortCutMode("vertical");
       }
     };
     const onClick = (item) => {
@@ -132,22 +137,20 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
               "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", {
-              "class": ["expand-icon", "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,
@@ -173,7 +176,7 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
           })]);
         },
         default: () => {
-          return renderDraggable(true);
+          return [renderDraggable(true), renderFoolterToolbar()];
         }
       });
     };

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-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--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__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 .caption-icon,.ibiz-short-cut__item .expand-icon{margin-right:8px}.ibiz-short-cut__item .close-icon,.ibiz-short-cut__item .drag-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 .close-icon,.ibiz-short-cut__item:hover .drag-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 .is-horizontal .ibiz-short-cut__item .drag-icon{display:none;margin-right:8px}.ibiz-short-cut .is-horizontal .ibiz-short-cut__item:hover .drag-icon{display:block}.ibiz-short-cut .is-horizontal .ibiz-short-cut__item:hover .caption-icon{display:none}.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/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.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",
-    "@ibiz-template/runtime": "0.7.13",
+    "@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",
-    "@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",