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

package/es/control/context-menu/context-menu.d.ts

@@ -37,6 +37,7 @@ export declare const ContextMenuControl: import("vue").DefineComponent<{
     expandDetails: Ref<IDETBUIActionItem[]>;
     groupDetails: Ref<IDETBUIActionItem[]>;
     groupButtonRef: Ref<any>;
+    dropdownRef: Ref<any>;
     popoverVisible: Ref<boolean>;
     handleClick: (detail: IDETBUIActionItem, e: MouseEvent) => Promise<void>;
     calcActionItemClass: (item: IDETBUIActionItem) => string[];

package/es/control/context-menu/context-menu.mjs

@@ -53,6 +53,7 @@ const ContextMenuControl = /* @__PURE__ */ defineComponent({
     const expandDetails = ref([]);
     const groupDetails = ref([]);
     const groupButtonRef = ref();
+    const dropdownRef = ref();
     const popoverVisible = ref(false);
     if (actionDetails) {
       actionDetails == null ? void 0 : actionDetails.forEach((detail) => {
@@ -86,6 +87,11 @@ const ContextMenuControl = /* @__PURE__ */ 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();
       emit("action-click", detail, e);
     };
@@ -95,6 +101,7 @@ const ContextMenuControl = /* @__PURE__ */ defineComponent({
       expandDetails,
       groupDetails,
       groupButtonRef,
+      dropdownRef,
       popoverVisible,
       handleClick,
       calcActionItemClass,
@@ -164,6 +171,7 @@ const ContextMenuControl = /* @__PURE__ */ defineComponent({
       })]]);
     }
     return createVNode(resolveComponent("el-dropdown"), {
+      "ref": "dropdownRef",
       "onCommand": (command) => this.handleClick(command, new MouseEvent("click")),
       "class": [this.ns.b(), this.ns.m("dropdown")]
     }, {

package/es/control/context-menu/index.d.ts

@@ -33,6 +33,7 @@ export declare const IBizContextMenuControl: import("@ibiz-template/vue3-util").
     expandDetails: import("vue").Ref<import("@ibiz/model-core").IDETBUIActionItem[]>;
     groupDetails: import("vue").Ref<import("@ibiz/model-core").IDETBUIActionItem[]>;
     groupButtonRef: import("vue").Ref<any>;
+    dropdownRef: import("vue").Ref<any>;
     popoverVisible: import("vue").Ref<boolean>;
     handleClick: (detail: import("@ibiz/model-core").IDETBUIActionItem, e: MouseEvent) => Promise<void>;
     calcActionItemClass: (item: import("@ibiz/model-core").IDETBUIActionItem) => string[];

package/es/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/es/panel-component/auth-captcha/auth-captcha.controller.d.ts

@@ -10,6 +10,13 @@ import { AuthCaptchaState } from './auth-captcha.state';
  */
 export declare class AuthCaptchaController extends PanelItemController<IPanelRawItem> {
     state: AuthCaptchaState;
+    /**
+     * 验证码数据
+     *
+     * @private
+     * @memberof AuthCaptchaController
+     */
+    private captcha;
     protected createState(): AuthCaptchaState;
     /**
      * 面板状态变更通知
@@ -27,6 +34,19 @@ export declare class AuthCaptchaController extends PanelItemController<IPanelRaw
      * @memberof AuthCaptchaController
      */
     protected onInit(): Promise<void>;
+    /**
+     * 值校验
+     *
+     * @return {*}  {Promise<boolean>}
+     * @memberof AuthCaptchaController
+     */
+    validate(): Promise<boolean>;
+    /**
+     * 值改变
+     *
+     * @memberof AuthCaptchaController
+     */
+    onChange(): void;
     /**
      * 加载验证码
      *

package/es/panel-component/auth-captcha/auth-captcha.controller.mjs

@@ -1,9 +1,29 @@
+import { reactive } from 'vue';
 import { PanelItemController } from '@ibiz-template/runtime';
 import axios from 'axios';
 import { AuthCaptchaState } from './auth-captcha.state.mjs';
 
 "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 PanelItemController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 验证码数据
+     *
+     * @private
+     * @memberof AuthCaptchaController
+     */
+    __publicField(this, "captcha", reactive({
+      "Captcha-State": "",
+      "Captcha-Code": ""
+    }));
+  }
   createState() {
     var _a;
     return new AuthCaptchaState((_a = this.parent) == null ? void 0 : _a.state);
@@ -17,17 +37,7 @@ class AuthCaptchaController extends 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;
   }
   /**
    * 初始化
@@ -39,6 +49,43 @@ class AuthCaptchaController extends 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
+    });
   }
   /**
    * 加载验证码
@@ -57,12 +104,19 @@ class AuthCaptchaController extends 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/es/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/es/panel-component/auth-captcha/auth-captcha.d.ts

@@ -16,6 +16,7 @@ export declare const AuthCaptcha: import("vue").DefineComponent<{
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
     onClick: () => void;
+    onChange: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelRawItem>;

package/es/panel-component/auth-captcha/auth-captcha.mjs

@@ -21,7 +21,7 @@ const AuthCaptcha = /* @__PURE__ */ defineComponent({
     const c = props.controller;
     const classArr = 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 = () => {
@@ -29,11 +29,16 @@ const AuthCaptcha = /* @__PURE__ */ defineComponent({
         c.loadCaptcha();
       }
     };
+    const onChange = () => {
+      c.onChange();
+      c.validate();
+    };
     return {
       c,
       ns,
       classArr,
-      onClick
+      onClick,
+      onChange
     };
   },
   render() {
@@ -43,6 +48,8 @@ const AuthCaptcha = /* @__PURE__ */ 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), withDirectives(createVNode(resolveComponent("el-image"), {
       "src": this.c.state.image,
@@ -56,7 +63,9 @@ const AuthCaptcha = /* @__PURE__ */ 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"]);
       }
-    }), [[resolveDirective("loading"), this.c.state.loading]])]);
+    }), [[resolveDirective("loading"), this.c.state.loading]]), this.c.state.error && createVNode("div", {
+      "class": this.ns.e("error")
+    }, [this.c.state.error])]);
   }
 });
 

package/es/panel-component/auth-captcha/auth-captcha.state.d.ts

@@ -35,4 +35,11 @@ export declare class AuthCaptchaState extends PanelItemState {
      * @memberof AuthCaptchaState
      */
     loading: boolean;
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AuthCaptchaState
+     */
+    error?: string;
 }

package/es/panel-component/auth-captcha/auth-captcha.state.mjs

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

package/es/panel-component/auth-captcha/index.d.ts

@@ -12,6 +12,7 @@ export declare const IBizAuthCaptcha: import("@ibiz-template/vue3-util").TypeWit
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
     onClick: () => void;
+    onChange: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IPanelRawItem>;

package/es/panel-component/panel-button/panel-button.controller.mjs

@@ -99,13 +99,19 @@ class PanelButtonController extends 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 UIActionUtil.execAndResolved(
       uiactionId,
       {
         context: this.panel.context,
         params: this.panel.params,
         data: [this.data],
-        view: this.panel.view,
+        view,
         event,
         noWaitRoute: true
       },

package/es/view-engine/login-view.engine.d.ts

@@ -1,7 +1,9 @@
-import { ViewController, ViewEngineBase } from '@ibiz-template/runtime';
+import { ViewController, ViewEngineBase, AppLoginViewController, IViewState, IViewEvent } from '@ibiz-template/runtime';
 import { RouteLocationNormalizedLoaded } from 'vue-router';
+import { IAppView } from '@ibiz/model-core';
 export declare class LoginViewEngine extends ViewEngineBase {
     route: RouteLocationNormalizedLoaded;
+    protected view: AppLoginViewController<IAppView, IViewState, IViewEvent>;
     get AppLoginView(): ViewController;
     onMounted(): Promise<void>;
     onDestroyed(): Promise<void>;

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/lib/control/context-menu/context-menu.cjs

@@ -55,6 +55,7 @@ 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) => {
@@ -88,6 +89,11 @@ 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();
       emit("action-click", detail, e);
     };
@@ -97,6 +103,7 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
       expandDetails,
       groupDetails,
       groupButtonRef,
+      dropdownRef,
       popoverVisible,
       handleClick,
       calcActionItemClass,
@@ -166,6 +173,7 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
       })]]);
     }
     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/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/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/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
       },