@ibiz-template/vue3-components 0.7.38-alpha.43 → 0.7.39

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

@@ -20,7 +20,7 @@ class LoginViewEngine extends ViewEngineBase {
      */
     __publicField(this, "route", useRoute());
     __publicField(this, "enterKeyListener", async (event) => {
-      if (event.key === "Enter" && this.view.layoutPanel) {
+      if (event.target.nodeName === "BUTTON" && event.key === "Enter" && this.view.layoutPanel) {
         const args = {
           data: [
             {
@@ -42,7 +42,7 @@ class LoginViewEngine extends ViewEngineBase {
    */
   async onMounted() {
     super.onMounted();
-    document.addEventListener("keydown", this.enterKeyListener);
+    document.addEventListener("keyup", this.enterKeyListener);
   }
   /**
    * 视图destroyed生命周期执行逻辑
@@ -52,7 +52,7 @@ class LoginViewEngine extends ViewEngineBase {
    */
   async onDestroyed() {
     super.onDestroyed();
-    document.removeEventListener("keydown", this.enterKeyListener);
+    document.removeEventListener("keyup", this.enterKeyListener);
   }
   async call(key, args = {}) {
     if (key === SysUIActionTag.LOGIN) {
@@ -64,10 +64,11 @@ class LoginViewEngine extends ViewEngineBase {
     return super.call(key, args);
   }
   async login(args) {
+    var _a;
     let rememberme;
     const headers = {};
     const data = args.data[0] || {};
-    const panelDataParent = args.params.panelDataParent;
+    const panelDataParent = (_a = args.params) == null ? void 0 : _a.panelDataParent;
     if (this.view.layoutPanel) {
       if (!await this.view.layoutPanel.validate(panelDataParent)) {
         return;

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

@@ -138,7 +138,8 @@ class OptViewEngine extends ViewEngineBase {
     let isChange = this.view.model.enableDirtyChecking === true;
     const isTopView = srfSessionid === this.view.id;
     if (isTopView) {
-      isChange = isChange && (((_a = this.form) == null ? void 0 : _a.state.modified) || uiDomain.dataModification);
+      const dataModification = (uiDomain == null ? void 0 : uiDomain.dataModification) || false;
+      isChange = isChange && (((_a = this.form) == null ? void 0 : _a.state.modified) || dataModification);
     } else {
       isChange = isChange && ((_b = this.form) == null ? void 0 : _b.state.modified);
     }
@@ -211,6 +212,7 @@ class OptViewEngine extends ViewEngineBase {
    * @memberof OptViewEngine
    */
   cancel() {
+    this.view.modal.ignoreDismissCheck = true;
     this.view.closeView({ ok: false, data: [] });
   }
 }

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

@@ -30,6 +30,14 @@ export declare class PortalViewEngine extends DEMainViewEngine {
      * @memberof PortalViewEngine
      */
     refresh(): Promise<void>;
+    /**
+     * 主数据
+     *
+     * @protected
+     * @return {*}  {IData[]}
+     * @memberof PortalViewEngine
+     */
+    protected getData(): IData[];
     /**
      * 执行视图预置界面行为能力
      *

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

@@ -31,6 +31,16 @@ class PortalViewEngine extends DEMainViewEngine {
   async refresh() {
     await this.dashboard.refresh();
   }
+  /**
+   * 主数据
+   *
+   * @protected
+   * @return {*}  {IData[]}
+   * @memberof PortalViewEngine
+   */
+  getData() {
+    return this.view.state.srfactiveviewdata ? [this.view.state.srfactiveviewdata] : [];
+  }
   /**
    * 执行视图预置界面行为能力
    *
@@ -62,30 +72,14 @@ class PortalViewEngine extends DEMainViewEngine {
    * @memberof PortalViewEngine
    */
   doMarkDataAction() {
-    let data;
+    super.doMarkDataAction();
     if (this.doActions.includes("VIEW")) {
-      const callback = async (_data) => {
-        this.markOpenDataCallback(_data, data == null ? void 0 : data.srfmajortext);
-      };
-      this.view.evt.on("onDataChange", async (event) => {
-        data = event.data[0];
-        const result = await this.sendMarkDataAction("VIEW", data.srfkey);
-        if (result.ok && result.data.length > 0) {
-          result.data.forEach((item) => {
-            var _a;
-            if (item.data) {
-              (_a = this.coopPos) == null ? void 0 : _a.updateMessage({
-                data: item.data
-              });
-            }
-          });
-        }
-        this.subscribeMarkDataAction(data.srfkey, callback);
-      });
+      this.view.evt.on("onDataChange", () => this.sendViewDataAction());
     }
     if (this.doActions.includes("EDIT")) {
       let isWait = false;
       this.dashboard.evt.on("onConfigChange", () => {
+        const data = this.getData()[0];
         if (!(data == null ? void 0 : data.srfkey) || isWait) {
           return;
         }
@@ -101,18 +95,12 @@ class PortalViewEngine extends DEMainViewEngine {
     }
     if (this.doActions.includes("UPDATE")) {
       this.dashboard.evt.on("onSavePortlet", () => {
+        const data = this.getData()[0];
         if (data == null ? void 0 : data.srfkey) {
           this.sendMarkDataAction("UPDATE", data == null ? void 0 : data.srfkey);
         }
       });
     }
-    if (this.doActions.includes("CLOSE")) {
-      this.view.evt.on("onCloseView", () => {
-        if (data == null ? void 0 : data.srfkey) {
-          this.sendMarkDataAction("CLOSE", data.srfkey);
-        }
-      });
-    }
   }
 }
 

package/es/view-engine/wf-dyna-action-view.engine.mjs

@@ -38,7 +38,7 @@ class WFDynaActionViewEngine extends WFDynaEditViewEngine {
    */
   async onOkButtonClick() {
     if (this.view.context.isEditable) {
-      await this.save();
+      await this.save({ silent: true });
     } else {
       this.form.state.modified = false;
     }

package/es/view-engine/wf-dyna-edit-view.engine.mjs

@@ -110,9 +110,15 @@ class WFDynaEditViewEngine extends EditViewEngine {
         ...this.view.params
       })
     );
-    this.isEditable = res.data.isEditable === "true";
+    const data = res.data;
+    this.isEditable = data.isEditable === "true";
+    if (!this.isEditable) {
+      if (data.hasOwnProperty("process-editmode") && Number(data["process-editmode"]) > 0) {
+        this.isEditable = true;
+      }
+    }
     const key = "process-".concat(ibiz.env.isMob ? "mob" : "", "form");
-    const processForm = res.data[key] ? "wfform_".concat(res.data[key]) : "form";
+    const processForm = data[key] ? "wfform_".concat(data[key]) : "form";
     return processForm;
   }
   /**
@@ -204,7 +210,7 @@ class WFDynaEditViewEngine extends EditViewEngine {
    */
   async wfSubmitByLink(link) {
     if (this.isEditable) {
-      await this.save();
+      await this.save({ silent: true });
     }
     const newContext = Object.assign(this.view.context.clone(), {
       isEditable: this.isEditable,

package/es/view-engine/wf-dyna-start-view.engine.mjs

@@ -37,7 +37,7 @@ class WFDynaStartViewEngine extends WFDynaEditViewEngine {
    * @date 2022-09-12 20:09:13
    */
   async onOkButtonClick() {
-    await this.save();
+    await this.save({ silent: true });
     await this.form.wfStart({});
     await this.view.closeView({ ok: true, data: this.getData() });
   }

package/es/view-engine/wf-step-data-view.engine.d.ts

@@ -0,0 +1,10 @@
+import { ViewEngineBase } from '@ibiz-template/runtime';
+/**
+ * 流程处理记录视图引擎
+ *
+ * @export
+ * @class WFStepDataViewEngine
+ * @extends {ViewEngineBase}
+ */
+export declare class WFStepDataViewEngine extends ViewEngineBase {
+}

package/es/view-engine/wf-step-data-view.engine.mjs

@@ -0,0 +1,7 @@
+import { ViewEngineBase } from '@ibiz-template/runtime';
+
+"use strict";
+class WFStepDataViewEngine extends ViewEngineBase {
+}
+
+export { WFStepDataViewEngine };

package/es/web-app/App.mjs

@@ -1,6 +1,5 @@
-import { defineComponent, onUnmounted, createVNode, resolveComponent } from 'vue';
-import { Modal, ViewMode } from '@ibiz-template/runtime';
-import { AppHooks } from '@ibiz-template/vue3-util';
+import { onUnmounted, resolveComponent, createVNode, defineComponent } from 'vue';
+import { ViewMode, Modal } from '@ibiz-template/runtime';
 import './App.css';
 
 "use strict";
@@ -11,15 +10,6 @@ var App = /* @__PURE__ */ defineComponent({
       viewUsage: 1,
       routeDepth: 1
     });
-    const listenDevtool = async (e) => {
-      if ((e.ctrlKey || e.metaKey) && e.code === "F12") {
-        document.removeEventListener("keydown", listenDevtool);
-        const module = await import('@ibiz-template/devtool');
-        const devtool = module.default || module;
-        AppHooks.useComponent.callSync(null, devtool);
-      }
-    };
-    document.addEventListener("keydown", listenDevtool);
     const destroyAppHub = () => {
       window.removeEventListener("unload", destroyAppHub);
       ibiz.hub.destroy();

package/es/web-app/attach-environment-config.mjs

@@ -15,7 +15,7 @@ async function attachEnvironmentConfig() {
   Object.keys(ibiz.env).forEach((key) => {
     const key2 = envMap.has(key) ? envMap.get(key) : key;
     if (env[key2] != null) {
-      if (key2 === "customParams") {
+      if (key2 === "customParams" || key2 === "devtoolConfig") {
         ibiz.env[key] = JSON.parse(env[key2]);
       } else {
         ibiz.env[key] = env[key2];
@@ -27,8 +27,8 @@ async function attachEnvironmentConfig() {
       ibiz.env.dcSystem = query.srfdcsystem;
     }
   }
-  if (env.AppTitle) {
-    document.title = env.AppTitle;
+  if (env.AppLabel) {
+    document.title = env.AppLabel;
   }
   if (env.favicon) {
     const favicon = document.getElementById("favicon");

package/es/web-app/components/modal-router-shell/modal-router-shell.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, toRaw, onUnmounted, createVNode } from 'vue';
+import { ref, toRaw, onUnmounted, createVNode, defineComponent } from 'vue';
 import { parseRouteViewData, createOverlayView, routerCallback, route2routePath } from '@ibiz-template/vue3-util';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { IBizContext } from '@ibiz-template/core';

package/es/web-app/components/router-shell/router-shell.mjs

@@ -1,7 +1,7 @@
-import { defineComponent, ref, toRaw, onUnmounted, watch, onActivated, onDeactivated, createVNode, Fragment, h, resolveComponent } from 'vue';
+import { ref, toRaw, onUnmounted, watch, onActivated, onDeactivated, Fragment, resolveComponent, h, createVNode, defineComponent } from 'vue';
 import { parseRouteViewData } from '@ibiz-template/vue3-util';
 import { useRoute, useRouter } from 'vue-router';
-import { Modal, ViewMode, RouteConst } from '@ibiz-template/runtime';
+import { ViewMode, Modal, RouteConst } from '@ibiz-template/runtime';
 import { IBizContext } from '@ibiz-template/core';
 import { mergeDeepLeft } from 'ramda';
 

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -1,7 +1,7 @@
-import { RuntimeError, CoreConst, HttpError } from '@ibiz-template/core';
+import { RuntimeError, CoreConst, getAppCookie, HttpError } from '@ibiz-template/core';
 import { mergeDeepRight } from 'ramda';
 import { AppHooks } from '@ibiz-template/vue3-util';
-import { getCookie } from 'qx-util';
+import { updateDevToolConfig } from '@ibiz-template/devtool';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -51,6 +51,7 @@ class AuthGuard {
         await this.appInit(context);
       } catch (error) {
         result = false;
+        error.tag = "APPINIT";
         ibiz.util.error.handle(error);
       }
       return result;
@@ -117,8 +118,8 @@ class AuthGuard {
       await this.loadAppData(context);
     } catch (error) {
       const responseStatus = error.status;
-      const remember = getCookie(CoreConst.TOKEN_REMEMBER);
-      const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
+      const remember = getAppCookie(CoreConst.TOKEN_REMEMBER);
+      const refreshToken = getAppCookie(CoreConst.REFRESH_TOKEN);
       if (responseStatus === 401 && remember && refreshToken != null && refreshToken !== "") {
         try {
           await ibiz.auth.refreshToken();
@@ -166,6 +167,7 @@ class AuthGuard {
     }
     if (res.ok) {
       ibiz.appData = res.data;
+      updateDevToolConfig();
     }
   }
   /**

package/es/web-app/main.mjs

@@ -1,5 +1,6 @@
 import { install } from '@ibiz-template/core';
 import { install as install$1 } from '@ibiz-template/runtime';
+import { install as install$2, listenOpenDevTool } from '@ibiz-template/devtool';
 import { AppHooks, useAppStore, route2routePath, PluginFactory, OverlayContainer } from '@ibiz-template/vue3-util';
 import { createVueApp } from './create-vue-app.mjs';
 import { attachEnvironmentConfig } from './attach-environment-config.mjs';
@@ -48,6 +49,7 @@ async function runApp(plugins, opts) {
     if (error) {
       ibiz.util.error.handle(error);
     }
+    return true;
   };
   window.addEventListener("unhandledrejection", function(event) {
     event.preventDefault();
@@ -56,6 +58,7 @@ async function runApp(plugins, opts) {
     });
   });
   await attachEnvironmentConfig();
+  install$2();
   let authGuard;
   if (opts == null ? void 0 : opts.getAuthGuard) {
     authGuard = opts.getAuthGuard();
@@ -66,6 +69,7 @@ async function runApp(plugins, opts) {
     (context, notLogin) => authGuard.verify(context, notLogin)
   );
   app.use(AppRouter.getRouter());
+  listenOpenDevTool(AppRouter.getRouter());
   ibiz.appUtil = new AppUtil(AppRouter.getRouter());
   ibiz.openView = new OpenViewUtil(AppRouter.getRouter());
   ibiz.render = new RenderUtil();

package/es/web-app/router/index.mjs

@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from 'vue-router';
+import { createWebHashHistory, createRouter } from 'vue-router';
 import qs from 'qs';
 import { AppRedirectView } from '@ibiz-template/vue3-util';
 import { RouteConst } from '@ibiz-template/runtime';

package/es/web-app/util/unauthorized-handler/unauthorized-handler.d.ts

@@ -1,3 +1,4 @@
+import { HttpError } from '@ibiz-template/core';
 import { IErrorHandler } from '@ibiz-template/runtime';
 /**
  * 没有权限的错误处理器
@@ -43,7 +44,7 @@ export declare class UnauthorizedHandler implements IErrorHandler {
      * @protected
      * @return {*}  {Promise<void>}
      */
-    protected handle403(error: unknown): Promise<void>;
+    protected handle403(error: HttpError): Promise<void>;
     /**
      * 没有权限处理
      *

package/es/web-app/util/unauthorized-handler/unauthorized-handler.mjs

@@ -82,7 +82,20 @@ class UnauthorizedHandler {
    * @return {*}  {Promise<void>}
    */
   async handle403(error) {
-    ibiz.mc.error.send(error);
+    if (error.tag === "APPINIT") {
+      const result = await ibiz.confirm.warning({
+        title: ibiz.i18n.t("webApp.unauthorizedHandler.forbiddenAccess"),
+        desc: ibiz.i18n.t("webApp.unauthorizedHandler.logoutAccount")
+      });
+      if (result) {
+        const bol = await ibiz.hub.controller.logout();
+        if (bol) {
+          window.location.reload();
+        }
+      }
+    } else {
+      ibiz.mc.error.send(error);
+    }
   }
   /**
    * 没有权限处理

package/lib/common/action-toolbar/action-toolbar.cjs

@@ -2,8 +2,8 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./action-toolbar.css');
 var core = require('@ibiz-template/core');
+require('./action-toolbar.css');
 
 "use strict";
 function _isSlot(s) {
@@ -35,7 +35,12 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
       type: Number,
       required: true
     },
-    popperClass: String
+    popperClass: String,
+    // 行为回调，和action-click事件互斥，二者只有一个生效，actionCallBack优先级大于行为回调
+    // 二者区别在于：行为回调为同步执行（主要解决pop打开视图位置异常），action-click为异步执行（不关心执行是否完成）
+    actionCallBack: {
+      type: Function
+    }
   },
   setup(props, {
     emit
@@ -43,7 +48,13 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
     var _a;
     const ns = vue3Util.useNamespace("action-toolbar");
     const dropdownRef = vue.ref();
-    const popoverVisible = vue.ref(false);
+    const groupButtonRef = vue.ref();
+    const {
+      popoverVisible,
+      setPopoverVisible
+    } = vue3Util.usePopoverVisible(groupButtonRef, (ele) => {
+      return ele.ref;
+    });
     (_a = props.actionDetails) == null ? void 0 : _a.forEach((detail) => {
       if (detail.capLanguageRes && detail.capLanguageRes.lanResTag) {
         detail.caption = ibiz.i18n.t(detail.capLanguageRes.lanResTag, detail.caption);
@@ -54,12 +65,17 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
     });
     const handleClick = async (detail, e) => {
       e.stopPropagation();
+      if (props.actionCallBack) {
+        await props.actionCallBack(detail, e);
+      }
       if (props.mode === "buttons") {
-        popoverVisible.value = false;
+        setPopoverVisible(false);
       } else if (dropdownRef.value) {
         dropdownRef.value.handleClose();
       }
-      emit("action-click", detail, e);
+      if (!props.actionCallBack) {
+        emit("action-click", detail, e);
+      }
     };
     const expandDetails = vue.ref([]);
     const groupDetails = vue.ref([]);
@@ -72,7 +88,6 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         }
       });
     }
-    const groupButtonRef = vue.ref();
     const calcActionItemClass = (item) => {
       const {
         actionLevel
@@ -145,7 +160,10 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         "text": true,
         "disabled": pdisabled,
         "ref": "groupButtonRef",
-        "class": [this.ns.e("item"), this.ns.is("expand", this.popoverVisible)]
+        "class": [this.ns.e("item"), this.ns.is("group", true), this.ns.is("expand", this.popoverVisible)],
+        "onClick": () => {
+          this.popoverVisible = !this.popoverVisible;
+        }
       }, {
         icon: () => vue.createVNode("ion-icon", {
           "class": this.ns.e("icon"),
@@ -155,9 +173,7 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
       }), vue.createVNode(vue.resolveComponent("el-popover"), {
         "placement": "bottom-start",
         "virtual-ref": this.groupButtonRef,
-        "trigger": "click",
         "visible": this.popoverVisible,
-        "onUpdate:visible": ($event) => this.popoverVisible = $event,
         "popper-class": this.ns.e("popover"),
         "virtual-triggering": true,
         "popper-style": "z-index:".concat(this.popoverIndex)