@ibiz-template/runtime 0.7.12 → 0.7.13

package/dist/index.esm.js

@@ -5135,6 +5135,7 @@ var FileUtil = class {
    * @memberof FileUtil
    */
   async fileDownload(url, name) {
+    var _a;
     const response = await ibiz.net.request(url, {
       method: "get",
       responseType: "blob",
@@ -5147,7 +5148,17 @@ var FileUtil = class {
     if (!response.data) {
       throw new RuntimeError5(ibiz.i18n.t("runtime.platform.fileStreamData"));
     } else {
-      const fileName = name;
+      let fileName = "";
+      const disposition = (_a = qs2.parse(response.headers["content-disposition"], {
+        delimiter: ";"
+      })) == null ? void 0 : _a.filename;
+      if (disposition) {
+        if (disposition.startsWith('"') && disposition.endsWith('"')) {
+          fileName = disposition.substring(1, disposition.length - 1);
+        }
+      }
+      if (name)
+        fileName = name;
       downloadFileFromBlob(response.data, fileName);
     }
   }
@@ -5181,6 +5192,7 @@ var FileUtil = class {
 };
 
 // src/utils/short-cut/short-cut-util.ts
+import { QXEvent as QXEvent2 } from "qx-util";
 var ShortCutUtil = class {
   /**
    * Creates an instance of ShortCutUtil.
@@ -5195,6 +5207,13 @@ var ShortCutUtil = class {
      * @memberof ShortCutUtil
      */
     this.$ShortCut = [];
+    /**
+     * 事件监听器
+     *
+     * @protected
+     * @memberof ShortCutUtil
+     */
+    this.evt = new QXEvent2();
     this.initShortCut();
   }
   /**
@@ -5223,8 +5242,27 @@ var ShortCutUtil = class {
    * @memberof ShortCutUtil
    */
   saveShortCut() {
+    this.evt.emit("change", this.$ShortCut);
     window.localStorage.setItem("IbizShortCut", JSON.stringify(this.$ShortCut));
   }
+  /**
+   * 订阅数据改变事件
+   *
+   * @param {(data: IShortCut) => void} callback 回调
+   * @memberof ShortCutUtil
+   */
+  onChange(callback) {
+    this.evt.on("change", callback);
+  }
+  /**
+   * 取消订阅
+   *
+   * @param {(data: IShortCut) => void} callback
+   * @memberof ShortCutUtil
+   */
+  offChange(callback) {
+    this.evt.off("change", callback);
+  }
   /**
    * 计算快捷方式key
    *
@@ -6664,7 +6702,7 @@ function getErrorViewProvider(code) {
 
 // src/service/utils/app-counter/app-counter.ts
 import { IBizContext, RuntimeError as RuntimeError14 } from "@ibiz-template/core";
-import { notNilEmpty as notNilEmpty5, QXEvent as QXEvent2 } from "qx-util";
+import { notNilEmpty as notNilEmpty5, QXEvent as QXEvent3 } from "qx-util";
 import { clone as clone3 } from "ramda";
 var AppCounter = class {
   /**
@@ -6679,7 +6717,7 @@ var AppCounter = class {
     this.destroyed = false;
     this.context = IBizContext.create();
     this.params = {};
-    this.evt = new QXEvent2();
+    this.evt = new QXEvent3();
     /**
      * 计数器数据
      *
@@ -7014,7 +7052,7 @@ import {
   RuntimeModelError as RuntimeModelError7
 } from "@ibiz-template/core";
 import { clone as clone4, isNil as isNil5 } from "ramda";
-import { QXEvent as QXEvent3, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { QXEvent as QXEvent4, notNilEmpty as notNilEmpty6 } from "qx-util";
 var DynamicCodeListCache = class {
   constructor(codeList) {
     /**
@@ -7059,7 +7097,7 @@ var DynamicCodeListCache = class {
      * @date 2024-04-10 17:04:00
      * @protected
      */
-    this.evt = new QXEvent3();
+    this.evt = new QXEvent4();
     /**
      * 常见关键字
      *
@@ -10361,8 +10399,8 @@ var AuthorityService = class {
     if (this.enablePermission) {
       const app = await ibiz.hub.getApp(this.appModel.appId);
       const opPriv = await app.getOPPriv(dataAccessAction, appDeId);
-      if (opPriv && opPriv.mapSysUniResMode && opPriv.mapSysUniResCode) {
-        return !!this.calcByResCode(opPriv.mapSysUniResCode);
+      if (this.enablePermission && (opPriv == null ? void 0 : opPriv.mapSysUniResCode) && !this.calcByResCode(opPriv.mapSysUniResCode)) {
+        return false;
       }
     }
     if (appDeId) {
@@ -10385,6 +10423,13 @@ var V7AuthService = class {
   get isAnonymous() {
     return getCookie(CoreConst.IS_ANONYMOUS) === "1";
   }
+  /**
+   * 使用匿名账号登录
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:47
+   * @return {*}  {Promise<boolean>}
+   */
   async anonymousLogin() {
     const { anonymousUser, anonymousPwd } = ibiz.env;
     if (!anonymousUser || !anonymousPwd) {
@@ -10407,8 +10452,20 @@ var V7AuthService = class {
     }
     return result;
   }
+  /**
+   * 登录
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:54
+   * @param {string} loginName
+   * @param {string} password
+   * @param {boolean} [remember]
+   * @param {IData} [headers]
+   * @return {*}  {Promise<boolean>}
+   */
   async login(loginName, password, remember, headers) {
     try {
+      this.clearAuthData();
       const res = await ibiz.net.post(
         "/v7/login",
         {
@@ -10447,16 +10504,17 @@ var V7AuthService = class {
     }
     return false;
   }
+  /**
+   * 登出
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:04
+   * @return {*}  {Promise<boolean>}
+   */
   async logout() {
     try {
       await ibiz.net.get("/v7/logout");
-      clearCookie(CoreConst.TOKEN);
-      clearCookie(CoreConst.TOKEN_EXPIRES);
-      clearCookie(CoreConst.TOKEN_REMEMBER);
-      clearCookie(CoreConst.REFRESH_TOKEN);
-      clearCookie(CoreConst.IS_ANONYMOUS);
-      ibiz.appData = void 0;
-      ibiz.orgData = void 0;
+      this.clearAuthData();
       return true;
     } catch (err) {
       ibiz.notification.error({
@@ -10466,6 +10524,33 @@ var V7AuthService = class {
     }
     return false;
   }
+  /**
+   * 变更密码
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:22
+   * @param {string} oldPwd
+   * @param {string} newPwd
+   * @return {*}  {Promise<boolean>}
+   */
+  async changePwd(oldPwd, newPwd) {
+    try {
+      await ibiz.net.post("/uaa/changepwd", {
+        oldPwd,
+        newPwd
+      });
+      return true;
+    } catch (err) {
+      return false;
+    }
+  }
+  /**
+   * 页面未关闭情况下，自动延长登录时间
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:38
+   * @return {*}  {Promise<void>}
+   */
   async extendLogin() {
     if (this.isAnonymous) {
       return;
@@ -10510,6 +10595,13 @@ var V7AuthService = class {
       }, wait);
     }
   }
+  /**
+   * 通过refreshToken换算token
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:45
+   * @return {*}  {Promise<void>}
+   */
   async refreshToken() {
     const remember = getCookie(CoreConst.TOKEN_REMEMBER);
     const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
@@ -10535,6 +10627,13 @@ var V7AuthService = class {
       }
     }
   }
+  /**
+   * 获取当前环境的权限信息（无登录则返回undefined）
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:57
+   * @return {*}  {(IAuthInfo | undefined)}
+   */
   getAuthInfo() {
     const token = getCookie(CoreConst.TOKEN);
     const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);
@@ -10556,6 +10655,22 @@ var V7AuthService = class {
       ibiz.appData = res.data;
     }
   }
+  /**
+   * 清空权限数据
+   *
+   * @author tony001
+   * @date 2024-05-14 17:05:18
+   * @protected
+   */
+  clearAuthData() {
+    clearCookie(CoreConst.TOKEN);
+    clearCookie(CoreConst.TOKEN_EXPIRES);
+    clearCookie(CoreConst.TOKEN_REMEMBER);
+    clearCookie(CoreConst.REFRESH_TOKEN);
+    clearCookie(CoreConst.IS_ANONYMOUS);
+    ibiz.appData = void 0;
+    ibiz.orgData = void 0;
+  }
 };
 
 // src/service/service/async-action/async-action.service.ts
@@ -12875,7 +12990,7 @@ var InternalMessageService = class {
     const fetchParams = {
       page: 0,
       size: 20,
-      sort: "update_time,desc"
+      sort: "timestamp,desc"
     };
     Object.assign(fetchParams, params);
     const res = await ibiz.net.post(
@@ -12939,7 +13054,7 @@ var InternalMessageService = class {
     const res = await ibiz.net.post("".concat(this.baseUrl, "/fetch_cur_receiver"), {
       page: 0,
       size: 1,
-      sort: "update_time,desc",
+      sort: "timestamp,desc",
       searchconds: [
         {
           condtype: "GROUP",
@@ -13792,7 +13907,7 @@ var MapData = class {
 };
 
 // src/service/vo/panel-data/panel-data.ts
-import { QXEvent as QXEvent4 } from "qx-util";
+import { QXEvent as QXEvent5 } from "qx-util";
 function updateKeyDefine3(target, keys) {
   keys.forEach((key) => {
     if (!Object.prototype.hasOwnProperty.call(target, key)) {
@@ -13807,7 +13922,7 @@ function updateKeyDefine3(target, keys) {
 }
 var PanelData = class {
   constructor(fields, origin) {
-    const _evt = new QXEvent4();
+    const _evt = new QXEvent5();
     const keyMap = {};
     const reverseKeyMap = {};
     fields.forEach((field) => {
@@ -14029,7 +14144,7 @@ var GanttCodeListNodeData = class extends TreeCodeListNodeData {
 };
 
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent5, createUUID as createUUID7 } from "qx-util";
+import { QXEvent as QXEvent6, createUUID as createUUID7 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -14050,7 +14165,7 @@ var MqttService = class {
      * @author chitanda
      * @date 2023-10-23 15:10:06
      */
-    this.evt = new QXEvent5();
+    this.evt = new QXEvent6();
     /**
      * 连接选项
      *
@@ -15148,7 +15263,7 @@ var LoadingState = class {
 };
 
 // src/controller/ctx/ctx.ts
-import { QXEvent as QXEvent6 } from "qx-util";
+import { QXEvent as QXEvent7 } from "qx-util";
 
 // src/controller/ctx/ctx.state.ts
 var CTXState = class {
@@ -15178,7 +15293,7 @@ var CTX = class {
      * @date 2023-04-26 07:54:46
      * @protected
      */
-    this.evt = new QXEvent6(3e3);
+    this.evt = new QXEvent7(3e3);
     /**
      * 当前视图控制器集合（包含自身视图控制器，部件控制器，和下一层级的视图的控制器）
      * @author lxm
@@ -15521,8 +15636,8 @@ var ButtonContainerState = class {
 };
 
 // src/controller/utils/event/qx-event-ex.ts
-import { clearAll, QXEvent as QXEvent7 } from "qx-util";
-var QXEventEx = class extends QXEvent7 {
+import { clearAll, QXEvent as QXEvent8 } from "qx-util";
+var QXEventEx = class extends QXEvent8 {
   constructor() {
     super(...arguments);
     this.anyEventFns = [];
@@ -17381,6 +17496,58 @@ var AppDataUploadViewController = class extends ViewController {
 var MobViewController = class extends ViewController {
 };
 
+// src/controller/common/view/app-login-view.controller.ts
+import { AsyncSeriesHook as AsyncSeriesHook2 } from "qx-util";
+var AppLoginViewController = class extends ViewController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 钩子
+     *
+     * @memberof AppLoginViewController
+     */
+    this.hooks = {
+      beforeLogin: new AsyncSeriesHook2(),
+      afterLogin: new AsyncSeriesHook2()
+    };
+  }
+  /**
+   * 校验登录视图
+   *
+   * @return {*}  {Promise<boolean>}
+   * @memberof AppLoginViewController
+   */
+  async validate(parentId) {
+    const context = {
+      validate: true,
+      parentId
+    };
+    await this.hooks.beforeLogin.call(context);
+    return context.validate;
+  }
+  /**
+   * 销毁Hooks钩子
+   *
+   * @protected
+   * @memberof AppLoginViewController
+   */
+  destroyHooks() {
+    this.hooks.beforeLogin.clear();
+    this.hooks.afterLogin.clear();
+  }
+  /**
+   * 生命周期-销毁完成
+   *
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof AppLoginViewController
+   */
+  async onDestroyed() {
+    await super.onDeactivated();
+    this.destroyHooks();
+  }
+};
+
 // src/controller/common/view/wf-step-trace-view.controller.ts
 var WFStepTraceViewController = class extends ViewController {
   initState() {
@@ -23325,10 +23492,7 @@ var LoginOutUIActionProvider = class extends UIActionProviderBase {
       desc: ibiz.i18n.t("runtime.uiAction.wantLogout")
     });
     if (confirm) {
-      const bol = await ibiz.hub.controller.logout();
-      if (bol) {
-        window.location.reload();
-      }
+      await ibiz.hub.controller.logout();
     }
     return {};
   }
@@ -39165,35 +39329,118 @@ var GanttController = class extends TreeGridExController {
 // src/controller/hub.controller.ts
 var HubController = class {
   constructor() {
+    /**
+     * 全局共享数据对象
+     *
+     * @author tony001
+     * @date 2024-05-14 14:05:22
+     * @type {IData}
+     */
     this.session = {};
   }
-  login(loginName, password) {
-    return ibiz.auth.login(loginName, password);
+  /**
+   * 登录（包含调用登录逻辑，及跳转应用界面）
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:04
+   * @param {string} loginName
+   * @param {string} password
+   * @param {(boolean | undefined)} [remember]
+   * @param {(IData | undefined)} [headers]
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async login(loginName, password, remember, headers, opts) {
+    const bol = await ibiz.appUtil.login(
+      loginName,
+      password,
+      remember,
+      headers,
+      opts
+    );
+    return bol;
   }
-  async logout() {
-    const bol = await ibiz.auth.logout();
-    if (bol) {
-      const l = window.location;
-      if (l.search.indexOf("isAnonymous=true") !== -1) {
-        const href = "".concat(l.origin).concat(l.pathname).concat(l.hash);
-        window.history.replaceState({}, "", href);
-      }
-    }
+  /**
+   * 登出（包含调用登录逻辑，及跳转登录页）
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:01
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async logout(opts) {
+    const bol = await ibiz.appUtil.logout(opts);
+    return bol;
+  }
+  /**
+   * 变更密码
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:54
+   * @param {string} oldPwd
+   * @param {string} newPwd
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async changePwd(oldPwd, newPwd, opts) {
+    const bol = await ibiz.appUtil.changePwd(oldPwd, newPwd, opts);
+    return bol;
+  }
+  /**
+   * 切换组织（包括界面刷新）
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:09
+   * @param {string} oldOrgId
+   * @param {string} newOrgId
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async switchOrg(oldOrgId, newOrgId, opts) {
+    const bol = await ibiz.appUtil.switchOrg(oldOrgId, newOrgId, opts);
+    return bol;
+  }
+  /**
+   * 切换主题
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:12
+   * @param {string} oldTheme
+   * @param {string} newTheme
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async switchTheme(oldTheme, newTheme, opts) {
+    const bol = await ibiz.appUtil.switchTheme(oldTheme, newTheme, opts);
+    return bol;
+  }
+  /**
+   * 切换语言
+   *
+   * @author tony001
+   * @date 2024-05-14 16:05:01
+   * @param {string} oldLanguage
+   * @param {string} newLanguage
+   * @param {(IData | undefined)} [opts]
+   * @return {*}  {Promise<boolean>}
+   */
+  async switchLanguage(oldLanguage, newLanguage, opts) {
+    const bol = await ibiz.appUtil.switchTheme(oldLanguage, newLanguage, opts);
     return bol;
   }
 };
 
 // src/controller/notification/notice.controller.ts
-import { QXEvent as QXEvent10 } from "qx-util";
+import { QXEvent as QXEvent11 } from "qx-util";
 
 // src/controller/notification/async-action.controller.ts
-import { QXEvent as QXEvent8 } from "qx-util";
+import { QXEvent as QXEvent9 } from "qx-util";
 import { clone as clone33 } from "ramda";
 import { isNil as isNil34, isNumber as isNumber2 } from "lodash-es";
 import dayjs8 from "dayjs";
 var AsyncActionController = class {
   constructor() {
-    this.evt = new QXEvent8();
+    this.evt = new QXEvent9();
     this.total = 0;
     this.actions = [];
     /**
@@ -39330,7 +39577,7 @@ var AsyncActionController = class {
 };
 
 // src/controller/notification/internal-message.controller.ts
-import { QXEvent as QXEvent9 } from "qx-util";
+import { QXEvent as QXEvent10 } from "qx-util";
 function isHTML(str) {
   if (str === "")
     return false;
@@ -39339,7 +39586,7 @@ function isHTML(str) {
 }
 var InternalMessageController = class {
   constructor() {
-    this.evt = new QXEvent9();
+    this.evt = new QXEvent10();
     this.total = 0;
     this.unreadCount = 0;
     /**
@@ -39402,7 +39649,7 @@ var InternalMessageController = class {
     const fetchParams = {
       page: this.page,
       size: this.size,
-      sort: "update_time,desc"
+      sort: "timestamp,desc"
     };
     if (this.unreadOnly) {
       fetchParams.searchconds = [
@@ -39499,7 +39746,7 @@ var InternalMessageController = class {
 // src/controller/notification/notice.controller.ts
 var NoticeController = class {
   constructor() {
-    this.evt = new QXEvent10();
+    this.evt = new QXEvent11();
     this.total = 0;
     this.asyncAction = new AsyncActionController();
     this.internalMessage = new InternalMessageController();
@@ -39799,7 +40046,14 @@ var AppHub = class {
   async getAppDataEntity(id, appId2 = ibiz.env.appId) {
     if (this.dataEntities.has(appId2)) {
       const map = this.dataEntities.get(appId2);
-      if (map.has(id)) {
+      if (id.indexOf(".") === -1) {
+        const targetEntity = Array.from(map.values()).find(
+          (value) => value.codeName === id
+        );
+        if (targetEntity) {
+          return targetEntity;
+        }
+      } else if (map.has(id)) {
         return map.get(id);
       }
     }
@@ -40172,11 +40426,18 @@ var ViewEngineBase = class {
     }
     return void 0;
   }
+  /**
+   * 快捷方式
+   *
+   * @param {*} args
+   * @return {*}  {(Promise<any>)}
+   * @memberof ViewEngineBase
+   */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async onShortCut(args) {
     const { data } = args;
     const { context, model, params, modal } = this.view;
-    if (!["ROUTE_MODAL", "MODAL", "DRAWER"].includes(modal.mode)) {
+    if (["EMBED", "POPOVER"].includes(modal.mode)) {
       throw new Error(
         ibiz.i18n.t("runtime.engine.minimization", { mode: modal.mode })
       );
@@ -40187,16 +40448,20 @@ var ViewEngineBase = class {
     });
     const isExist = ibiz.util.shortCut.isExist(key);
     if (!isExist) {
+      const caption = data && data[0].srfmajortext || model.caption;
       ibiz.util.shortCut.addShortCut({
         key,
-        name: data && data[0].srfmajortext,
+        caption,
+        icon: model.sysImage,
         appViewId: model.id,
         context: IBizContext7.create(context),
         params: { ...params },
-        openMode: modal.mode
+        openMode: modal.mode,
+        fullPath: window.location.hash
       });
       this.view.state.isShortCut = true;
-      return { closeView: true };
+      this.view.closeView();
+      return null;
     }
     ibiz.util.shortCut.removeShortCut(key);
     this.view.state.isShortCut = false;
@@ -42158,6 +42423,7 @@ export {
   AppDataEntity,
   AppDataUploadViewController,
   AppFuncCommand,
+  AppLoginViewController,
   AppMenuController,
   AppMenuIconViewController,
   Application,