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

package/es/util/notification-util/upload-manager/upload-manager.mjs

@@ -1,7 +1,6 @@
 import { defineComponent, ref, computed, watch, onMounted, createVNode, resolveComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
-import { getCookie } from 'qx-util';
-import { CoreConst } from '@ibiz-template/core';
+import { getAppCookie, CoreConst } from '@ibiz-template/core';
 import { getFileSvgByType } from './file-type.mjs';
 import './upload-manager.css';
 
@@ -57,7 +56,7 @@ const IBizUploadManager = /* @__PURE__ */ defineComponent({
       const data = new FormData();
       data.append("file", item.file);
       const headers = {
-        ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(getCookie(CoreConst.TOKEN)),
+        ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(getAppCookie(CoreConst.TOKEN)),
         ...props.params.headers
       };
       const res = await ibiz.net.axios({

package/es/util/open-view-util/open-view-util.mjs

@@ -47,10 +47,12 @@ class OpenViewUtil {
    */
   async modal(appViewId, context, params) {
     const appView = await ibiz.hub.config.view.get(appViewId);
+    const modalOption = JSON.parse(ibiz.config.common.modalOption || "{}");
     const opts = {
       width: appView.width || "80%",
       height: appView.height || "80%",
       footerHide: true,
+      ...modalOption,
       ...appView.modalOption
     };
     return openViewModal(
@@ -95,10 +97,12 @@ class OpenViewUtil {
   async drawer(appViewId, context, params) {
     const appView = await ibiz.hub.config.view.get(appViewId);
     const placement = getDrawerPlacement(appView.openMode);
+    const drawerOption = JSON.parse(ibiz.config.common.drawerOption || "{}");
     const opts = {
       width: appView.width,
       height: appView.height,
       placement,
+      ...drawerOption,
       ...appView.modalOption
     };
     return openViewDrawer(

package/es/view/403-view/403-view.css

@@ -1 +1 @@
-.ibiz-403-view{display:flex;flex-flow:column nowrap;align-items:center;justify-content:center;width:100%;height:100%;font-size:var(--ibiz-font-size-header-6)}.ibiz-403-view .ibiz-403-view-text{margin-top:var(--ibiz-spacing-super-loose);display:flex;flex-flow:column nowrap;align-items:center;justify-content:center}.ibiz-403-view-text__text1{margin-bottom:var(--ibiz-spacing-base-loose)}.ibiz-403-view-text__text2 a{color:var(--ibiz-color-link);cursor:pointer}.ibiz-403-view.is-top{width:100vw;height:100vh}
+.ibiz-403-view{display:flex;flex-flow:column nowrap;align-items:center;justify-content:center;width:100%;height:100%;font-size:var(--ibiz-font-size-header-6)}.ibiz-403-view .ibiz-403-view-img{width:375px}.ibiz-403-view .ibiz-403-view-text{margin-top:var(--ibiz-spacing-super-loose);display:flex;flex-flow:column nowrap;align-items:center;justify-content:center}.ibiz-403-view-text__text1{margin-bottom:var(--ibiz-spacing-base-loose)}.ibiz-403-view-text__text2 a{color:var(--ibiz-color-link);cursor:pointer}.ibiz-403-view.is-top{width:100vw;height:100vh}

package/es/view/403-view/403-view.mjs

@@ -29,7 +29,7 @@ const View403 = /* @__PURE__ */ defineComponent({
       "class": [this.ns.b(), this.ns.is("top", this.isTop)]
     }, [createVNode("img", {
       "class": this.ns.b("img"),
-      "src": "./assets/images/404.png"
+      "src": "./assets/images/403.png"
     }, null), createVNode("div", {
       "class": this.ns.b("text")
     }, [createVNode("div", {

package/es/view/404-view/404-view.css

@@ -1 +1 @@
-.ibiz-404-view{display:flex;flex-flow:column nowrap;align-items:center;justify-content:center;width:100%;height:100%;font-size:var(--ibiz-font-size-header-6)}.ibiz-404-view .ibiz-404-view-text{margin-top:var(--ibiz-spacing-super-loose);display:flex;flex-flow:column nowrap;align-items:center;justify-content:center}.ibiz-404-view-text__text1{margin-bottom:var(--ibiz-spacing-base-loose)}.ibiz-404-view-text__text2 a{color:var(--ibiz-color-link);cursor:pointer}.ibiz-404-view.is-top{width:100vw;height:100vh}
+.ibiz-404-view{display:flex;flex-flow:column nowrap;align-items:center;justify-content:center;width:100%;height:100%;font-size:var(--ibiz-font-size-header-6)}.ibiz-404-view .ibiz-404-view-img{width:375px}.ibiz-404-view .ibiz-404-view-text{margin-top:var(--ibiz-spacing-super-loose);display:flex;flex-flow:column nowrap;align-items:center;justify-content:center}.ibiz-404-view-text__text1{margin-bottom:var(--ibiz-spacing-base-loose)}.ibiz-404-view-text__text2 a{color:var(--ibiz-color-link);cursor:pointer}.ibiz-404-view.is-top{width:100vw;height:100vh}

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

@@ -1,9 +1,11 @@
-import { isVNode, defineComponent, reactive, ref, resolveComponent, computed, onMounted, h, createVNode } from 'vue';
+import { isVNode, defineComponent, reactive, ref, resolveComponent, computed, onMounted, onUnmounted, h, createVNode } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { useRoute } from 'vue-router';
 import { IBizContext, LoginMode } from '@ibiz-template/core';
 import qs from 'qs';
+import '../../util/index.mjs';
 import './login-view.css';
+import { useFocusByEnter } from '../../util/keydown-util/keydown-util.mjs';
 
 "use strict";
 function _isSlot(s) {
@@ -49,7 +51,7 @@ const LoginView = /* @__PURE__ */ defineComponent({
     const getTitle = async () => {
       const app = await ibiz.hub.getAppAsync(ibiz.env.appId);
       const model = app.model;
-      if (model.caption) {
+      if (model.caption && !appTitle) {
         appTitle = model.caption;
       }
     };
@@ -94,6 +96,9 @@ const LoginView = /* @__PURE__ */ defineComponent({
         onClick();
       }
     };
+    const {
+      cleanup
+    } = useFocusByEnter(document, ["a", 'input:not([type="checkbox"])', "button", "textarea", "select", '[tabindex]:not([tabindex="-1"])']);
     onMounted(async () => {
       const search = qs.parse(window.location.search.replace("?", ""));
       if (loginFailed.value) {
@@ -123,6 +128,9 @@ const LoginView = /* @__PURE__ */ defineComponent({
       ibiz.util.hiddenAppLoading();
       isMounted.value = true;
     });
+    onUnmounted(() => {
+      cleanup();
+    });
     return () => {
       if (isMounted.value && isAnonymous.value === false) {
         let _slot;
@@ -160,8 +168,7 @@ const LoginView = /* @__PURE__ */ defineComponent({
               "modelValue": loginData.username,
               "onUpdate:modelValue": ($event) => loginData.username = $event,
               "clearable": true,
-              "placeholder": ibiz.i18n.t("app.pleaseEnterAccount"),
-              "onKeyup": (e) => onKeyUp(e)
+              "placeholder": ibiz.i18n.t("app.pleaseEnterAccount")
             }, {
               prefix: () => createVNode("ion-icon", {
                 "name": "person"
@@ -176,8 +183,7 @@ const LoginView = /* @__PURE__ */ defineComponent({
               "modelValue": loginData.password,
               "onUpdate:modelValue": ($event) => loginData.password = $event,
               "show-password": true,
-              "placeholder": ibiz.i18n.t("app.pleaseEnterPassword"),
-              "onKeyup": (e) => onKeyUp(e)
+              "placeholder": ibiz.i18n.t("app.pleaseEnterPassword")
             }, {
               prefix: () => createVNode("ion-icon", {
                 "name": "unlock-alt"
@@ -195,7 +201,8 @@ const LoginView = /* @__PURE__ */ defineComponent({
               "onClick": onClick,
               "size": "large",
               "round": true,
-              "loading": loading.value
+              "loading": loading.value,
+              "onKeyup": (e) => onKeyUp(e)
             }, _isSlot(_slot = ibiz.i18n.t("view.loginView.login")) ? _slot : {
               default: () => [_slot]
             })]

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

@@ -1,4 +1,4 @@
-import { ViewController, IEditFormController, EventBase, IEditViewState, IEditViewEvent, IPanelItemCoopPosController, DEMainViewEngine } from '@ibiz-template/runtime';
+import { ViewController, IEditFormController, EventBase, IEditViewState, IEditViewEvent, IPanelItemCoopPosController, DEMainViewEngine, FormSaveParams } from '@ibiz-template/runtime';
 import { IAppDEEditView } from '@ibiz/model-core';
 export declare class EditViewEngine extends DEMainViewEngine {
     /**
@@ -36,7 +36,7 @@ export declare class EditViewEngine extends DEMainViewEngine {
     onMounted(): Promise<void>;
     getData(): IData[];
     load(): Promise<IData>;
-    save(): Promise<IData>;
+    save(args?: FormSaveParams): Promise<IData>;
     refresh(): Promise<void>;
     call(key: string, args: any): Promise<any>;
     /**

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

@@ -48,7 +48,8 @@ class EditViewEngine extends DEMainViewEngine {
     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);
     }
@@ -157,8 +158,8 @@ class EditViewEngine extends DEMainViewEngine {
   async load() {
     return this.form.load();
   }
-  async save() {
-    return this.form.save();
+  async save(args) {
+    return this.form.save(args);
   }
   async refresh() {
     this.form.refresh();
@@ -258,7 +259,7 @@ class EditViewEngine extends DEMainViewEngine {
    */
   async wfStart() {
     var _a, _b;
-    await this.save();
+    await this.save({ silent: true });
     const entityService = await ibiz.hub.getAppDEService(
       this.view.model.appId,
       this.view.model.appDataEntityId,

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

@@ -13,11 +13,7 @@ class GridViewEngine extends MDViewEngine {
       this.grid.toggleRowEdit();
       return null;
     }
-    if (key === SysUIActionTag.SAVE_ROW) {
-      this.grid.save(args.data[0]);
-      return null;
-    }
-    if (key === SysUIActionTag.SAVE) {
+    if (key === SysUIActionTag.SAVE || key === SysUIActionTag.SAVE_ROW) {
       this.grid.saveAll();
       return null;
     }

package/es/view-engine/index.mjs

@@ -45,10 +45,15 @@ import { DEIndexViewEngine } from './de-index-view-engine.mjs';
 import { SubAppRefViewEngine } from './sub-app-ref-view.engine.mjs';
 import { TabSearchViewEngine } from './tab-search-view.engine.mjs';
 import { AppDataUploadViewEngine } from './app-data-upload-view.engine.mjs';
+import { WFStepDataViewEngine } from './wf-step-data-view.engine.mjs';
 
 "use strict";
 const IBizViewEngine = {
   install: (_v) => {
+    ibiz.engine.register(
+      "VIEW_APPWFSTEPDATAVIEW",
+      (c) => new WFStepDataViewEngine(c)
+    );
     ibiz.engine.register(
       "VIEW_AppIndexView",
       (c) => new IndexViewEngine(c)

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/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 './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

@@ -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/guard/auth-guard/auth-guard.mjs

@@ -1,7 +1,6 @@
-import { RuntimeError, CoreConst, HttpError } from '@ibiz-template/core';
+import { RuntimeError, getAppCookie, CoreConst, HttpError } from '@ibiz-template/core';
 import { mergeDeepRight } from 'ramda';
 import { AppHooks } from '@ibiz-template/vue3-util';
-import { getCookie } from 'qx-util';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -51,6 +50,7 @@ class AuthGuard {
         await this.appInit(context);
       } catch (error) {
         result = false;
+        error.tag = "APPINIT";
         ibiz.util.error.handle(error);
       }
       return result;
@@ -117,8 +117,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();

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';
@@ -33,6 +34,7 @@ async function runApp(plugins, opts) {
   });
   install();
   install$1();
+  install$2();
   ibiz.util.getGlobalParam = () => {
     return useAppStore().appStore;
   };
@@ -48,6 +50,7 @@ async function runApp(plugins, opts) {
     if (error) {
       ibiz.util.error.handle(error);
     }
+    return true;
   };
   window.addEventListener("unhandledrejection", function(event) {
     event.preventDefault();
@@ -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/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

@@ -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
@@ -54,12 +59,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;
       } 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([]);