@ibiz-template/vue3-components 0.7.12 → 0.7.13

package/es/view-engine/login-view.engine.mjs

@@ -50,19 +50,19 @@ class LoginViewEngine extends ViewEngineBase {
   async login(args) {
     let rememberme;
     const headers = {};
+    const data = args.data[0] || {};
     if (this.AppLoginView.layoutPanel) {
       const panelData = this.AppLoginView.layoutPanel.data;
       if (typeof panelData.isRemember === "boolean") {
         rememberme = panelData.isRemember;
       }
-      if (panelData.captcha) {
-        Object.assign(headers, panelData.captcha);
+      if (data.captcha) {
+        Object.assign(headers, data.captcha);
       }
       if (panelData.srfheaders) {
         Object.assign(headers, panelData.srfheaders);
       }
     }
-    const data = args.data[0] || {};
     let username = data.username;
     if (notNilEmpty(data.orgid)) {
       username = "".concat(data.username, "@").concat(data.orgid);
@@ -73,6 +73,7 @@ class LoginViewEngine extends ViewEngineBase {
       rememberme,
       headers
     );
+    this.view.hooks.afterLogin.call({ ok: bol });
     if (bol === true) {
       window.location.hash = this.route.query.ru || "/";
       window.location.reload();

package/es/web-app/main.mjs

@@ -10,6 +10,7 @@ import '../util/index.mjs';
 import './guard/index.mjs';
 import { UnauthorizedHandler } from './util/unauthorized-handler/unauthorized-handler.mjs';
 import { DynaAuthGuard } from './guard/auth-guard/dyna-auth-guard.mjs';
+import { AppUtil } from '../util/app-util/app-util.mjs';
 import { OpenViewUtil } from '../util/open-view-util/open-view-util.mjs';
 import { RenderUtil } from '../util/render-util/render-util.mjs';
 import { MessageUtil } from '../util/message-util/message-util.mjs';
@@ -62,6 +63,7 @@ async function runApp(plugins, opts) {
   }
   AppRouter.setAuthGuard((notLogin) => authGuard.verify(notLogin));
   app.use(AppRouter.getRouter());
+  ibiz.appUtil = new AppUtil(AppRouter.getRouter());
   ibiz.openView = new OpenViewUtil(AppRouter.getRouter());
   ibiz.render = new RenderUtil();
   ibiz.message = new MessageUtil();

package/lib/control/app-menu/app-menu.cjs

@@ -280,7 +280,7 @@ const AppMenuControl = /* @__PURE__ */ vue.defineComponent({
         "onSelect": this.onClick,
         "theme": "light",
         "mode": this.menuMode,
-        "ellipsis": false
+        "ellipsis": this.menuMode === "horizontal"
       }, _isSlot(_slot = this.menus.map((item) => {
         var _a;
         if (((_a = item.children) == null ? void 0 : _a.length) > 0) {

package/lib/control/context-menu/context-menu.cjs

@@ -55,18 +55,26 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
     const expandDetails = vue.ref([]);
     const groupDetails = vue.ref([]);
     const groupButtonRef = vue.ref();
+    const dropdownRef = vue.ref();
     const popoverVisible = vue.ref(false);
-    if (actionDetails) {
-      actionDetails == null ? void 0 : actionDetails.forEach((detail) => {
+    const transformLanguage = (items) => {
+      if (!Array.isArray(items)) {
+        return;
+      }
+      items.forEach((detail) => {
         if (detail.capLanguageRes && detail.capLanguageRes.lanResTag) {
           detail.caption = ibiz.i18n.t(detail.capLanguageRes.lanResTag, detail.caption);
         }
         if (detail.tooltipLanguageRes && detail.tooltipLanguageRes.lanResTag) {
           detail.tooltip = ibiz.i18n.t(detail.tooltipLanguageRes.lanResTag, detail.tooltip);
         }
+        transformLanguage(detail.detoolbarItems);
       });
+    };
+    if (actionDetails) {
+      transformLanguage(actionDetails);
       actionDetails.forEach((detail) => {
-        if (props.groupLevelKeys.findIndex((item) => item === detail.actionLevel) !== -1) {
+        if (!detail.actionLevel || props.groupLevelKeys.findIndex((item) => item === detail.actionLevel) !== -1) {
           groupDetails.value.push(detail);
         } else {
           expandDetails.value.push(detail);
@@ -88,7 +96,13 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
       await c.calcButtonState(props.nodeData._deData || (props.nodeData.srfkey ? props.nodeData : void 0), props.nodeModel.appDataEntityId);
     });
     const handleClick = async (detail, e) => {
+      if (props.mode === "buttons") {
+        popoverVisible.value = false;
+      } else if (dropdownRef.value) {
+        dropdownRef.value.handleClose();
+      }
       e.stopPropagation();
+      popoverVisible.value = false;
       emit("action-click", detail, e);
     };
     return {
@@ -97,6 +111,7 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
       expandDetails,
       groupDetails,
       groupButtonRef,
+      dropdownRef,
       popoverVisible,
       handleClick,
       calcActionItemClass,
@@ -114,8 +129,14 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
     };
     const renderActions = (items, isExpand = true) => {
       return items.map((detail) => {
-        var _a;
-        if ((_a = this.c.state.buttonsState[detail.id]) == null ? void 0 : _a.visible) {
+        var _a, _b;
+        if (!((_a = this.c.state.buttonsState[detail.id]) == null ? void 0 : _a.visible)) {
+          return null;
+        }
+        if (detail.itemType === "SEPERATOR") {
+          return renderDivider(isExpand);
+        }
+        if (detail.itemType === "DEUIACTION" || detail.itemType === "ITEMS" && !((_b = detail.detoolbarItems) == null ? void 0 : _b.length)) {
           return [detail.addSeparator && renderDivider(isExpand), vue.createVNode(vue.resolveComponent("el-button"), {
             "text": true,
             "size": "small",
@@ -135,6 +156,40 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
             }, [detail.caption]) : ""])]
           })];
         }
+        if (detail.itemType === "ITEMS") {
+          return vue.createVNode(vue.resolveComponent("el-popover"), {
+            "placement": "right-start",
+            "popper-class": this.ns.e("popover"),
+            "teleported": false
+          }, {
+            reference: () => {
+              return [detail.addSeparator && renderDivider(isExpand), vue.createVNode(vue.resolveComponent("el-button"), {
+                "text": true,
+                "size": "small",
+                "onClick": (e) => this.handleClick(detail, e),
+                "title": detail.tooltip,
+                "disabled": this.c.state.buttonsState[detail.id].disabled,
+                "class": this.calcActionItemClass(detail)
+              }, {
+                default: () => [vue.createVNode("div", {
+                  "class": this.ns.e("action-content")
+                }, [detail.showIcon && detail.sysImage && vue.createVNode("div", {
+                  "class": this.ns.e("action-content-icon")
+                }, [vue.createVNode(vue.resolveComponent("iBizIcon"), {
+                  "icon": detail.sysImage
+                }, null)]), detail.showCaption ? vue.createVNode("div", {
+                  "class": [this.ns.e("action-content-caption"), this.ns.e("action-content-group-caption")]
+                }, [detail.caption]) : "", vue.createVNode("ion-icon", {
+                  "class": this.ns.e("action-content-group-icon"),
+                  "name": "chevron-forward-outline"
+                }, null)])]
+              })];
+            },
+            default: () => {
+              return renderActions(detail.detoolbarItems || [], isExpand);
+            }
+          });
+        }
         return null;
       });
     };
@@ -160,12 +215,14 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
         "visible": this.popoverVisible,
         "onUpdate:visible": ($event) => this.popoverVisible = $event,
         "popper-class": this.ns.e("popover"),
-        "virtual-triggering": true
+        "virtual-triggering": true,
+        "transition": "none"
       }, _isSlot(_slot = renderActions(this.groupDetails, false)) ? _slot : {
         default: () => [_slot]
       })]]);
     }
     return vue.createVNode(vue.resolveComponent("el-dropdown"), {
+      "ref": "dropdownRef",
       "onCommand": (command) => this.handleClick(command, new MouseEvent("click")),
       "class": [this.ns.b(), this.ns.m("dropdown")]
     }, {

package/lib/control/context-menu/context-menu.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-context-menu{--ibiz-context-menu-item-margin:0 0 0 4px;--ibiz-context-menu-separator-height:20px;--ibiz-context-menu-separator-width:2px;--ibiz-context-menu-separator-color:var(--ibiz-color-border);--ibiz-context-menu-popover-padding:8px 0;--ibiz-context-menu-popover-button-padding:8px 20px;--ibiz-context-menu-popover-button-color:var(--ibiz-color-text-2);--ibiz-context-menu-popover-button-hover-bg:var(--ibiz-color-bg-0)}.ibiz-context-menu__item{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-context-menu__item+.ibiz-context-menu__item{margin:var(--ibiz-context-menu-item-margin)}.ibiz-context-menu__item .ibiz-context-menu__action-content-icon{margin-right:3px}.ibiz-context-menu__action-content{display:flex}.ibiz-context-menu__action-content-icon{display:flex;align-items:center;justify-content:center;width:20px}.ibiz-context-menu__action-content-caption{display:flex;align-items:center;justify-content:center}.ibiz-context-menu__popover{--ibiz-context-menu-item-margin:0 0 0 4px;--ibiz-context-menu-separator-height:20px;--ibiz-context-menu-separator-width:2px;--ibiz-context-menu-separator-color:var(--ibiz-color-border);--ibiz-context-menu-popover-padding:8px 0;--ibiz-context-menu-popover-button-padding:8px 20px;--ibiz-context-menu-popover-button-color:var(--ibiz-color-text-2);--ibiz-context-menu-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-context-menu-popover-padding)}.ibiz-context-menu__popover .el-button{--el-button-size:40px;display:block;width:100%;padding:var(--ibiz-context-menu-popover-button-padding);margin:0;font-size:14px;color:var(--ibiz-context-menu-popover-button-color);text-align:left;border-radius:0}.ibiz-context-menu__popover .el-button:hover{background-color:var(--ibiz-context-menu-popover-button-hover-bg)}.ibiz-context-menu__popover .el-button .ibiz-context-menu__action-content-icon{margin-right:6px}.ibiz-context-menu__separator{margin:0}.ibiz-context-menu--dropdown .ibiz-context-menu__caption{cursor:pointer}.ibiz-context-menu--dropdown .ibiz-context-menu__caption-icon{vertical-align:bottom}
+@charset "UTF-8";.ibiz-context-menu{--ibiz-context-menu-item-margin:0 0 0 4px;--ibiz-context-menu-separator-height:20px;--ibiz-context-menu-separator-width:2px;--ibiz-context-menu-separator-color:var(--ibiz-color-border);--ibiz-context-menu-popover-padding:8px 0;--ibiz-context-menu-popover-button-padding:8px 20px;--ibiz-context-menu-popover-button-color:var(--ibiz-color-text-2);--ibiz-context-menu-popover-button-hover-bg:var(--ibiz-color-bg-0)}.ibiz-context-menu__item{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-context-menu__item+.ibiz-context-menu__item{margin:var(--ibiz-context-menu-item-margin)}.ibiz-context-menu__item .ibiz-context-menu__action-content-icon{margin-right:3px}.ibiz-context-menu__action-content{display:flex}.ibiz-context-menu__action-content-icon{display:flex;align-items:center;justify-content:center;width:20px}.ibiz-context-menu__action-content-caption{display:flex;align-items:center;justify-content:center}.ibiz-context-menu__popover{--ibiz-context-menu-item-margin:0 0 0 4px;--ibiz-context-menu-separator-height:20px;--ibiz-context-menu-separator-width:2px;--ibiz-context-menu-separator-color:var(--ibiz-color-border);--ibiz-context-menu-popover-padding:8px 0;--ibiz-context-menu-popover-button-padding:8px 20px;--ibiz-context-menu-popover-button-color:var(--ibiz-color-text-2);--ibiz-context-menu-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-context-menu-popover-padding)}.ibiz-context-menu__popover .el-button{--el-button-size:40px;display:block;width:100%;padding:var(--ibiz-context-menu-popover-button-padding);margin:0;font-size:14px;color:var(--ibiz-context-menu-popover-button-color);text-align:left;border-radius:0}.ibiz-context-menu__popover .el-button:hover{background-color:var(--ibiz-context-menu-popover-button-hover-bg)}.ibiz-context-menu__popover .el-button .ibiz-context-menu__action-content-icon{margin-right:6px}.ibiz-context-menu__popover .el-button .ibiz-context-menu__action-content-group-caption{margin-right:var(--ibiz-spacing-base-loose)}.ibiz-context-menu__popover .el-button .ibiz-context-menu__action-content-group-icon{position:absolute;right:var(--ibiz-spacing-base-loose);font-size:var(--ibiz-font-size-header-6)}.ibiz-context-menu__separator{margin:0}.ibiz-context-menu__separator.el-divider--horizontal{width:calc(100% - 2 * var(--ibiz-spacing-base-loose));margin:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-base-loose)}.ibiz-context-menu--dropdown .ibiz-context-menu__caption{cursor:pointer}.ibiz-context-menu--dropdown .ibiz-context-menu__caption-icon{vertical-align:bottom}

package/lib/control/form/form/form.css

@@ -1 +1 @@
-.ibiz-control-form{width:100%;padding-bottom:var(--ibiz-spacing-tight)}
+.ibiz-control-form{width:100%;height:100%;padding-bottom:var(--ibiz-spacing-tight)}

package/lib/control/form/form-detail/form-page/form-page.cjs

@@ -18,10 +18,15 @@ const FormPage = /* @__PURE__ */ vue.defineComponent({
       required: true
     }
   },
-  setup() {
+  setup(props) {
     const ns = vue3Util.useNamespace("form-page");
+    let position = "top";
+    if (props.modelData.tabHeaderPos) {
+      position = props.modelData.tabHeaderPos.toLowerCase();
+    }
     return {
-      ns
+      ns,
+      position
     };
   },
   render() {
@@ -37,8 +42,9 @@ const FormPage = /* @__PURE__ */ vue.defineComponent({
       }, [defaultSlots]);
     }
     return vue.createVNode(vue.resolveComponent("el-tabs"), {
-      "class": [this.ns.b(), this.ns.b("tab")],
-      "model-value": (_d = defaultSlots[0]) == null ? void 0 : _d.key
+      "class": [this.ns.b(), this.ns.b("tab"), this.ns.e(this.position)],
+      "model-value": (_d = defaultSlots[0]) == null ? void 0 : _d.key,
+      "tab-position": this.position
     }, _isSlot(_slot = defaultSlots.map((slot) => {
       const props = slot.props;
       if (!props || !props.controller) {

package/lib/control/form/form-detail/form-page/form-page.css

@@ -1 +1 @@
-.ibiz-form-page{--ibiz-form-page-font-size:var(--ibiz-font-size-header-4);--ibiz-form-page-header-border-color:var(--ibiz-color-border);--ibiz-form-page-text-color:var(--ibiz-color-text-2);--ibiz-form-page-bg-color:transparent;--ibiz-form-page-hover-text-color:var(--ibiz-color-primary);--ibiz-form-page-hover-bg-color:transparent;--ibiz-form-page-active-text-color:var(--ibiz-color-primary);--ibiz-form-page-active-bg-color:transparent;--ibiz-form-page-active-border-color:var(--ibiz-color-primary)}.ibiz-form-page--no-tab-header .ibiz-form-page-item{padding-top:0}.ibiz-form-page-tab>.el-tabs__header.is-top{margin-bottom:var(--ibiz-spacing-tight)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-page-font-size);color:var(--ibiz-form-page-text-color);background-color:var(--ibiz-form-page-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-page-hover-text-color);background-color:var(--ibiz-form-page-hover-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-page-active-text-color);background-color:var(--ibiz-form-page-active-bg-color)}.ibiz-form-page-tab .el-tabs__nav-wrap::after{background-color:var(--ibiz-form-page-header-border-color)}.ibiz-form-page-tab .el-tabs__active-bar{background-color:var(--ibiz-form-page-active-border-color)}.ibiz-form-page-item{padding-top:var(--ibiz-padding-top)}.ibiz-form-page-item-child{margin-bottom:var(--ibiz-margin-bottom)}
+.ibiz-form-page{--ibiz-form-page-font-size:var(--ibiz-font-size-header-4);--ibiz-form-page-header-border-color:var(--ibiz-color-border);--ibiz-form-page-text-color:var(--ibiz-color-text-2);--ibiz-form-page-bg-color:transparent;--ibiz-form-page-hover-text-color:var(--ibiz-color-primary);--ibiz-form-page-hover-bg-color:transparent;--ibiz-form-page-active-text-color:var(--ibiz-color-primary);--ibiz-form-page-active-bg-color:transparent;--ibiz-form-page-active-border-color:var(--ibiz-color-primary)}.ibiz-form-page__left{height:100%}.ibiz-form-page__left>.el-tabs__header{height:100%}.ibiz-form-page__left>.el-tabs__content{height:100%;overflow:auto}.ibiz-form-page__right{height:100%}.ibiz-form-page__right>.el-tabs__header{height:100%}.ibiz-form-page__right>.el-tabs__content{height:100%;overflow:auto}.ibiz-form-page--no-tab-header .ibiz-form-page-item{padding-top:0}.ibiz-form-page-tab>.el-tabs__header.is-top{margin-bottom:var(--ibiz-spacing-tight)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-page-font-size);color:var(--ibiz-form-page-text-color);background-color:var(--ibiz-form-page-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-page-hover-text-color);background-color:var(--ibiz-form-page-hover-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-page-active-text-color);background-color:var(--ibiz-form-page-active-bg-color)}.ibiz-form-page-tab .el-tabs__nav-wrap::after{background-color:var(--ibiz-form-page-header-border-color)}.ibiz-form-page-tab .el-tabs__active-bar{background-color:var(--ibiz-form-page-active-border-color)}.ibiz-form-page-item{padding-top:var(--ibiz-padding-top)}.ibiz-form-page-item-child{margin-bottom:var(--ibiz-margin-bottom)}

package/lib/control/toolbar/export-excel/export-excel.css

@@ -1 +1 @@
-.ibiz-export-excel{width:270px}.ibiz-export-excel__custom{display:flex;align-items:center;justify-content:center}.ibiz-export-excel__custom>*+*{margin-left:10px}.ibiz-export-excel__custom.el-dropdown-menu__item:focus{color:var(--el-text-color-regular);background-color:transparent}.ibiz-export-excel__custom .el-input{--el-input-text-color:var(--ibiz-color-white)}.ibiz-export-excel__button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-export-excel__button>span{display:flex;align-items:center;justify-content:center;font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-control-toolbar-icon-max-width);height:var(--ibiz-control-toolbar-icon-max-height)}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon .ibiz-icon{display:flex;align-items:center;justify-content:center}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon i{font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon img{display:inline-block;width:100%;height:100%}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon+.ibiz-toolbar-item-text{margin:var(--ibiz-control-toolbar-text-margin)}.ibiz-export-excel-submenu-button{justify-content:flex-start;width:100%;height:36px;padding:0 10px;border-radius:0}.ibiz-export-excel-submenu-button>span{font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-control-toolbar-icon-max-width);height:var(--ibiz-control-toolbar-icon-max-height)}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon .ibiz-icon{display:flex;align-items:center;justify-content:center}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon i{font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon img{display:inline-block;width:100%;height:100%}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon+.ibiz-toolbar-item-text{margin:var(--ibiz-control-toolbar-text-margin)}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .el-sub-menu__title{padding:0}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .el-sub-menu__title .el-sub-menu__icon-arrow{display:none}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu.hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .ibiz-export-excel-submenu-popper{width:270px;color:var(--ibiz-color-primary-text);background-color:var(--ibiz-color-primary)}
+.ibiz-export-excel{width:270px}.ibiz-export-excel__custom{display:flex;align-items:center;justify-content:center}.ibiz-export-excel__custom>*+*{margin-left:10px}.ibiz-export-excel__custom.el-dropdown-menu__item:focus{color:var(--el-text-color-regular);background-color:transparent}.ibiz-export-excel__custom .el-input{--el-input-text-color:var(--ibiz-color-white)}.ibiz-export-excel__button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-export-excel__button>span{display:flex;align-items:center;justify-content:center;font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-control-toolbar-icon-max-width);height:var(--ibiz-control-toolbar-icon-max-height)}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon .ibiz-icon{display:flex;align-items:center;justify-content:center}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon i{font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon img{display:inline-block;width:100%;height:100%}.ibiz-export-excel__button>span .ibiz-toolbar-item-icon+.ibiz-toolbar-item-text{margin:var(--ibiz-control-toolbar-text-margin)}.ibiz-export-excel-submenu-button{justify-content:flex-start;width:100%;height:36px;padding:0 10px;border-radius:0}.ibiz-export-excel-submenu-button>span{font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-control-toolbar-icon-max-width);height:var(--ibiz-control-toolbar-icon-max-height)}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon .ibiz-icon{display:flex;align-items:center;justify-content:center}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon i{font-size:var(--ibiz-font-size-regular)}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon img{display:inline-block;width:100%;height:100%}.ibiz-export-excel-submenu-button>span .ibiz-toolbar-item-icon+.ibiz-toolbar-item-text{margin:var(--ibiz-control-toolbar-text-margin)}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .el-sub-menu__title{padding:0}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu.hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-control-toolbar-submenu-popper .ibiz-export-excel-submenu .ibiz-export-excel-submenu-popper{width:270px;color:var(--ibiz-color-primary-text);background-color:var(--ibiz-color-primary)}

package/lib/control/toolbar/short-cut-button/short-cut-button.cjs

@@ -0,0 +1,73 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./short-cut-button.css');
+
+"use strict";
+const IBizShortCutButton = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizShortCutButton",
+  props: {
+    mode: {
+      type: String,
+      required: false
+    },
+    size: {
+      type: String,
+      required: false
+    },
+    item: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: Object,
+      required: true
+    }
+  },
+  emits: ["click"],
+  setup(props, {
+    emit
+  }) {
+    var _a;
+    const ns = vue3Util.useNamespace("short-cut-button");
+    const ns2 = vue3Util.useNamespace("toolbar-item");
+    const onClick = (e) => {
+      emit("click", e);
+    };
+    const buttonType = (_a = props.item.buttonStyle) == null ? void 0 : _a.toLowerCase();
+    const buttonState = vue.computed(() => props.controller.state.buttonsState[props.item.id]);
+    const isShortCut = vue.computed(() => props.controller.view.state.isShortCut);
+    return {
+      ns,
+      ns2,
+      buttonState,
+      buttonType,
+      isShortCut,
+      onClick
+    };
+  },
+  render() {
+    return vue.createVNode("div", {
+      "class": [this.ns.b(), this.ns.is("short-cut", this.isShortCut)]
+    }, [vue.createVNode(vue.resolveComponent("el-button"), {
+      "title": this.isShortCut ? "".concat(ibiz.i18n.t("app.cancel")).concat(this.item.tooltip) : this.item.tooltip,
+      "size": this.size,
+      "text": Object.is(this.buttonType, "inverse"),
+      "type": this.buttonType,
+      "loading": this.buttonState.loading,
+      "disabled": this.buttonState.disabled,
+      "onClick": this.onClick
+    }, {
+      default: () => [this.item.showIcon && this.item.sysImage && vue.createVNode("span", {
+        "class": this.ns2.b("icon")
+      }, [vue.createVNode(vue.resolveComponent("iBizIcon"), {
+        "icon": this.item.sysImage
+      }, null)]), this.item.showCaption && vue.createVNode("span", {
+        "class": this.ns2.b("text")
+      }, [this.isShortCut ? "".concat(ibiz.i18n.t("app.cancel")).concat(this.item.caption) : this.item.caption])]
+    })]);
+  }
+});
+
+exports.IBizShortCutButton = IBizShortCutButton;

package/lib/control/toolbar/toolbar.cjs

@@ -4,6 +4,7 @@ var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 var exportExcel = require('./export-excel/export-excel.cjs');
+var shortCutButton = require('./short-cut-button/short-cut-button.cjs');
 require('./toolbar.css');
 
 "use strict";
@@ -204,6 +205,16 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
             }
           }, null);
         }
+        if (actionId === "shortcut") {
+          return vue.createVNode(shortCutButton.IBizShortCutButton, {
+            "key": itemId,
+            "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonType), calcCssName(item)],
+            "item": item,
+            "controller": c,
+            "size": btnSize.value,
+            "onClick": (e) => handleClick(item, e)
+          }, null);
+        }
         return vue.createVNode("div", {
           "key": itemId,
           "class": [ns.e("item"), ns.e("item-deuiaction"), ns.em("item", buttonType), calcCssName(item), ns.is("loading", c.state.buttonsState[itemId].loading)]

package/lib/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.cjs

@@ -359,6 +359,15 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
         }
       }
     };
+    const arrow = () => {
+      return vue.createVNode("svg", {
+        "viewBox": "0 0 1024 1024",
+        "xmlns": "http://www.w3.org/2000/svg"
+      }, [vue.createVNode("path", {
+        "fill": "currentColor",
+        "d": "M831.872 340.864 512 652.672 192.128 340.864a30.592 30.592 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.592 30.592 0 0 0-42.752 0z"
+      }, null)]);
+    };
     return {
       ns,
       c,
@@ -390,7 +399,8 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
       onVisibleChange,
       showView,
       selectedData,
-      handleDropDownKeyDown
+      handleDropDownKeyDown,
+      arrow
     };
   },
   render() {
@@ -425,7 +435,9 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
             }, null), this.c.model.linkAppViewId && vue.createVNode("ion-icon", {
               "onClick": this.openLinkView,
               "name": "link-arrow"
-            }, null)];
+            }, null), this.c.model.showTrigger && vue.createVNode("div", {
+              "class": [this.ns.e("arrow"), this.showView ? "overturn" : ""]
+            }, [this.arrow()])];
           }
         }) : vue.createVNode(vue.resolveComponent("el-select"), {
           "popper-class": this.ns.b("select-popover"),

package/lib/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.css

@@ -1 +1 @@
-.ibiz-picker-select-view{width:100%}.ibiz-picker-select-view .el-dropdown{width:100%}.ibiz-picker-select-view .el-select{width:100%}.ibiz-picker-select-view--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-picker-select-view-popper.el-popper.el-dropdown__popper{width:100%;min-height:100px;max-height:500px;overflow:auto}.ibiz-picker-select-view-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background:var(--ibiz-color-primary-text)}.ibiz-picker-select-view-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu{background:var(--ibiz-color-primary-text)}.ibiz-picker-select-view-form-default-content{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default:hover .ibiz-picker-select-view-form-default-content{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default:hover .ibiz-picker-select-view-select{display:block}.ibiz-form-item .ibiz-picker-select-view.is-show-default .ibiz-picker-select-view-form-default-content{display:flex;align-items:center;width:100%;height:var(--ibiz-editor-default-line-height);padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-picker-select-view.is-show-default .ibiz-picker-select-view-form-default-content .ibiz-picker-select-view-content-item{height:22px;padding:0 9px;margin:2px 6px 2px 0;font-size:var(--ibiz-font-size-small);line-height:22px;color:var(--ibiz-editor-default-text-color);background-color:var(--ibiz-color-fill-0);border:1px solid transparent;border-radius:var(--ibiz-border-radius-small)}.ibiz-form-item .ibiz-picker-select-view.is-show-default .ibiz-picker-select-view-select{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default.is-editable .ibiz-picker-select-view-form-default-content{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default.is-editable .ibiz-picker-select-view-select{display:block}.ibiz-picker-select-view-select-popover{display:none}
+.ibiz-picker-select-view{width:100%}.ibiz-picker-select-view .el-dropdown{width:100%}.ibiz-picker-select-view .el-select{width:100%}.ibiz-picker-select-view__arrow{display:flex;transition:transform .3s;transform:rotateZ(0);transform-origin:center center}.ibiz-picker-select-view__arrow>svg{width:14px;height:14px}.ibiz-picker-select-view__arrow.overturn{transform:rotateZ(-180deg)}.ibiz-picker-select-view--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-picker-select-view-popper.el-popper.el-dropdown__popper{width:100%;min-height:100px;max-height:500px;overflow:auto}.ibiz-picker-select-view-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background:var(--ibiz-color-primary-text)}.ibiz-picker-select-view-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu{background:var(--ibiz-color-primary-text)}.ibiz-picker-select-view-form-default-content{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default:hover .ibiz-picker-select-view-form-default-content{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default:hover .ibiz-picker-select-view-select{display:block}.ibiz-form-item .ibiz-picker-select-view.is-show-default .ibiz-picker-select-view-form-default-content{display:flex;align-items:center;width:100%;height:var(--ibiz-editor-default-line-height);padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-picker-select-view.is-show-default .ibiz-picker-select-view-form-default-content .ibiz-picker-select-view-content-item{height:22px;padding:0 9px;margin:2px 6px 2px 0;font-size:var(--ibiz-font-size-small);line-height:22px;color:var(--ibiz-editor-default-text-color);background-color:var(--ibiz-color-fill-0);border:1px solid transparent;border-radius:var(--ibiz-border-radius-small)}.ibiz-form-item .ibiz-picker-select-view.is-show-default .ibiz-picker-select-view-select{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default.is-editable .ibiz-picker-select-view-form-default-content{display:none}.ibiz-form-item .ibiz-picker-select-view.is-show-default.is-editable .ibiz-picker-select-view-select{display:block}.ibiz-picker-select-view-select-popover{display:none}

package/lib/index.cjs

@@ -123,6 +123,7 @@ var overlayController = require('./util/overlay-controller/overlay-controller.cj
 var usePagination = require('./util/pagination/use-pagination.cjs');
 var noticeUtil = require('./util/notice-util/notice-util.cjs');
 var renderUtil = require('./util/render-util/render-util.cjs');
+var appUtil = require('./util/app-util/app-util.cjs');
 var authGuard = require('./web-app/guard/auth-guard/auth-guard.cjs');
 var main = require('./web-app/main.cjs');
 var index$17 = require('./web-app/router/index.cjs');
@@ -252,6 +253,7 @@ exports.OverlayController = overlayController.OverlayController;
 exports.usePagination = usePagination.usePagination;
 exports.NoticeUtil = noticeUtil.NoticeUtil;
 exports.RenderUtil = renderUtil.RenderUtil;
+exports.AppUtil = appUtil.AppUtil;
 exports.AuthGuard = authGuard.AuthGuard;
 exports.runApp = main.runApp;
 exports.AppRouter = index$17.AppRouter;

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

@@ -23,7 +23,7 @@ const AuthCaptcha = /* @__PURE__ */ vue.defineComponent({
     const c = props.controller;
     const classArr = vue.computed(() => {
       let result = [ns.b(), ns.m(c.model.id)];
-      result = [...result, ...props.controller.containerClass, ns.is("hidden", !props.controller.state.visible)];
+      result = [...result, ...props.controller.containerClass, ns.is("hidden", !props.controller.state.visible), ns.is("error", !!c.state.error)];
       return result;
     });
     const onClick = () => {
@@ -31,11 +31,16 @@ const AuthCaptcha = /* @__PURE__ */ vue.defineComponent({
         c.loadCaptcha();
       }
     };
+    const onChange = () => {
+      c.onChange();
+      c.validate();
+    };
     return {
       c,
       ns,
       classArr,
-      onClick
+      onClick,
+      onChange
     };
   },
   render() {
@@ -45,6 +50,8 @@ const AuthCaptcha = /* @__PURE__ */ vue.defineComponent({
       "modelValue": this.c.state.code,
       "onUpdate:modelValue": ($event) => this.c.state.code = $event,
       "class": this.ns.e("captcha"),
+      "onInput": this.onChange,
+      "onBlur": this.onChange,
       "placeholder": "\u9A8C\u8BC1\u7801"
     }, null), vue.withDirectives(vue.createVNode(vue.resolveComponent("el-image"), {
       "src": this.c.state.image,
@@ -58,7 +65,9 @@ const AuthCaptcha = /* @__PURE__ */ vue.defineComponent({
           "class": [this.ns.em("image", "hint"), this.ns.is("loading", this.c.state.loading)]
         }, [this.c.state.loading ? "\u52A0\u8F7D\u4E2D..." : "\u52A0\u8F7D\u5931\u8D25"]);
       }
-    }), [[vue.resolveDirective("loading"), this.c.state.loading]])]);
+    }), [[vue.resolveDirective("loading"), this.c.state.loading]]), this.c.state.error && vue.createVNode("div", {
+      "class": this.ns.e("error")
+    }, [this.c.state.error])]);
   }
 });
 

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

@@ -1,11 +1,31 @@
 'use strict';
 
+var vue = require('vue');
 var runtime = require('@ibiz-template/runtime');
 var axios = require('axios');
 var authCaptcha_state = require('./auth-captcha.state.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 AuthCaptchaController extends runtime.PanelItemController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 验证码数据
+     *
+     * @private
+     * @memberof AuthCaptchaController
+     */
+    __publicField(this, "captcha", vue.reactive({
+      "Captcha-State": "",
+      "Captcha-Code": ""
+    }));
+  }
   createState() {
     var _a;
     return new authCaptcha_state.AuthCaptchaState((_a = this.parent) == null ? void 0 : _a.state);
@@ -19,17 +39,7 @@ class AuthCaptchaController extends runtime.PanelItemController {
    */
   async panelStateNotify(_state) {
     super.panelStateNotify(_state);
-    const that = this;
-    Object.defineProperty(that.panel.state.data, "captcha", {
-      enumerable: true,
-      configurable: true,
-      get() {
-        return {
-          captcha_state: that.state.state,
-          captcha_code: that.state.code
-        };
-      }
-    });
+    this.data.captcha = this.captcha;
   }
   /**
    * 初始化
@@ -41,6 +51,43 @@ 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 = "";
+      }
+    });
+  }
+  /**
+   * 值校验
+   *
+   * @return {*}  {Promise<boolean>}
+   * @memberof AuthCaptchaController
+   */
+  async validate() {
+    if (this.state.code) {
+      this.state.error = void 0;
+      return true;
+    }
+    this.state.error = "\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801";
+    return false;
+  }
+  /**
+   * 值改变
+   *
+   * @memberof AuthCaptchaController
+   */
+  onChange() {
+    Object.assign(this.captcha, {
+      "Captcha-State": this.state.state,
+      "Captcha-Code": this.state.code
+    });
   }
   /**
    * 加载验证码
@@ -59,12 +106,19 @@ class AuthCaptchaController extends runtime.PanelItemController {
       },
       data: {}
     };
-    const res = await axios(requestConfig);
-    if (res.status === 200 && res.data) {
-      this.state.state = res.data.state;
-      this.state.image = res.data.image;
+    try {
+      const res = await axios(requestConfig);
+      if (res.status === 200 && res.data) {
+        this.state.state = res.data.state;
+        this.state.image = res.data.image;
+      }
+    } catch (error) {
+      this.state.state = "";
+      this.state.image = "";
+    } finally {
+      this.state.loading = false;
+      this.onChange();
     }
-    this.state.loading = false;
   }
 }
 

package/lib/panel-component/auth-captcha/auth-captcha.css

@@ -1 +1 @@
-.ibiz-auth-captcha{display:flex}.ibiz-auth-captcha__captcha{width:calc(100% - 120px)}.ibiz-auth-captcha__image{flex-shrink:0;width:120px;height:100%;cursor:pointer}.ibiz-auth-captcha__image--hint{display:flex;align-items:center;justify-content:center;width:100%;height:100%}
+.ibiz-auth-captcha{display:flex;position:relative}.ibiz-auth-captcha__captcha{width:calc(100% - 120px)}.ibiz-auth-captcha__image{flex-shrink:0;width:120px;height:100%;cursor:pointer}.ibiz-auth-captcha__image--hint{width:100%;height:100%;display:flex;align-items:center;justify-content:center;color:var(--ibiz-color-text-3);background-color:var(--ibiz-color-fill-0)}.ibiz-auth-captcha__error{left:0;top:100%;line-height:1;font-size:12px;padding-top:2px;position:absolute;color:var(--ibiz-color-danger)}.ibiz-auth-captcha.is-error .el-input__wrapper{box-shadow:0 0 0 1px var(--ibiz-color-danger) inset}

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

@@ -40,6 +40,13 @@ class AuthCaptchaState extends runtime.PanelItemState {
      * @memberof AuthCaptchaState
      */
     __publicField(this, "loading", false);
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AuthCaptchaState
+     */
+    __publicField(this, "error");
   }
 }
 

package/lib/panel-component/auth-userinfo/auth-userinfo.cjs

@@ -35,13 +35,8 @@ const AuthUserinfo = /* @__PURE__ */ vue.defineComponent({
       }
       return "LEFT";
     });
-    const onClick = async () => {
-      const bol = await ibiz.hub.controller.logout();
-      if (bol) {
-        await router.push("/login?ru=".concat(encodeURIComponent(window.location.hash.replace("#/", "/"))));
-        ibiz.util.showAppLoading();
-        window.location.reload();
-      }
+    const onClick = () => {
+      ibiz.hub.controller.logout();
     };
     const isCollapse = vue.computed(() => {
       return c.panel.view.state.isCollapse;

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

@@ -101,13 +101,19 @@ 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,
         data: [this.data],
-        view: this.panel.view,
+        view,
         event,
         noWaitRoute: true
       },