@ibiz-template/runtime 0.7.39 → 0.7.40

package/out/controller/hub.controller.d.ts

@@ -1,86 +1,69 @@
-import { IAuthResult, IHubController } from '../interface';
+import { IAuthResult, IApiAppHubController } from '../interface';
 /**
- * 应用级功能
- *
- * @author chitanda
- * @date 2023-08-21 14:08:51
+ * @description 应用中心控制器
  * @export
- * @class AppController
- * @implements {IHubController}
+ * @class HubController
+ * @implements {IApiAppHubController}
  */
-export declare class HubController implements IHubController {
+export declare class HubController implements IApiAppHubController {
     /**
-     * 全局共享数据对象
-     *
-     * @author tony001
-     * @date 2024-05-14 14:05:22
+     * @description 全局共享数据对象
      * @type {IData}
+     * @memberof HubController
      */
     session: IData;
     /**
-     * 登录（包含调用登录逻辑，及跳转应用界面）
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:04
+     * @description 登录（包含调用登录逻辑，及跳转应用界面）
      * @param {string} loginName
      * @param {string} password
      * @param {(boolean | undefined)} [remember]
      * @param {(IData | undefined)} [headers]
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     login(loginName: string, password: string, remember?: boolean | undefined, headers?: IData | undefined, opts?: IData | undefined): Promise<boolean>;
     /**
-     * 登出（包含调用登录逻辑，及跳转登录页）
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:01
+     * @description 登出（包含调用登录逻辑，及跳转登录页）
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     logout(opts?: IData | undefined): Promise<boolean>;
     /**
-     * 变更密码
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:54
+     * @description 变更密码
      * @param {string} oldPwd
      * @param {string} newPwd
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<IAuthResult>}
+     * @memberof HubController
      */
     changePwd(oldPwd: string, newPwd: string, opts?: IData | undefined): Promise<IAuthResult>;
     /**
-     * 切换组织（包括界面刷新）
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:09
+     * @description 切换组织（包括界面刷新）
      * @param {string} oldOrgId
      * @param {string} newOrgId
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     switchOrg(oldOrgId: string, newOrgId: string, opts?: IData | undefined): Promise<boolean>;
     /**
-     * 切换主题
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:12
+     * @description 切换主题
      * @param {string} oldTheme
      * @param {string} newTheme
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     switchTheme(oldTheme: string, newTheme: string, opts?: IData | undefined): Promise<boolean>;
     /**
-     * 切换语言
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:01
+     * @description 切换语言
      * @param {string} oldLanguage
      * @param {string} newLanguage
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     switchLanguage(oldLanguage: string, newLanguage: string, opts?: IData | undefined): Promise<boolean>;
 }

package/out/controller/hub.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hub.controller.d.ts","sourceRoot":"","sources":["../../src/controller/hub.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3D;;;;;;;;GAQG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD;;;;;;OAMG;IACH,OAAO,EAAE,KAAK,CAAM;IAEpB;;;;;;;;;;;OAWG;IACG,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,EAC3B,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;OAOG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxD;;;;;;;;;OASG;IACG,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,WAAW,CAAC;IAKvB;;;;;;;;;OASG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;;OASG;IACG,WAAW,CACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;;OASG;IACG,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;CAIpB"}
+{"version":3,"file":"hub.controller.d.ts","sourceRoot":"","sources":["../../src/controller/hub.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,aAAc,YAAW,oBAAoB;IACxD;;;;OAIG;IACH,OAAO,EAAE,KAAK,CAAM;IAEpB;;;;;;;;;OASG;IACG,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,EAC3B,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;OAKG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxD;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,WAAW,CAAC;IAKvB;;;;;;;OAOG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;OAOG;IACG,WAAW,CACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;OAOG;IACG,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,OAAO,CAAC;CAIpB"}

package/out/controller/hub.controller.js

@@ -1,102 +1,85 @@
 /**
- * 应用级功能
- *
- * @author chitanda
- * @date 2023-08-21 14:08:51
+ * @description 应用中心控制器
  * @export
- * @class AppController
- * @implements {IHubController}
+ * @class HubController
+ * @implements {IApiAppHubController}
  */
 export class HubController {
     constructor() {
         /**
-         * 全局共享数据对象
-         *
-         * @author tony001
-         * @date 2024-05-14 14:05:22
+         * @description 全局共享数据对象
          * @type {IData}
+         * @memberof HubController
          */
         this.session = {};
     }
     /**
-     * 登录（包含调用登录逻辑，及跳转应用界面）
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:04
+     * @description 登录（包含调用登录逻辑，及跳转应用界面）
      * @param {string} loginName
      * @param {string} password
      * @param {(boolean | undefined)} [remember]
      * @param {(IData | undefined)} [headers]
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     async login(loginName, password, remember, headers, opts) {
         const bol = await ibiz.appUtil.login(loginName, password, remember, headers, opts);
         return bol;
     }
     /**
-     * 登出（包含调用登录逻辑，及跳转登录页）
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:01
+     * @description 登出（包含调用登录逻辑，及跳转登录页）
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     async logout(opts) {
         const bol = await ibiz.appUtil.logout(opts);
         return bol;
     }
     /**
-     * 变更密码
-     *
-     * @author tony001
-     * @date 2024-05-14 16:05:54
+     * @description 变更密码
      * @param {string} oldPwd
      * @param {string} newPwd
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<IAuthResult>}
+     * @memberof HubController
      */
     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
+     * @description 切换组织（包括界面刷新）
      * @param {string} oldOrgId
      * @param {string} newOrgId
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     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
+     * @description 切换主题
      * @param {string} oldTheme
      * @param {string} newTheme
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     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
+     * @description 切换语言
      * @param {string} oldLanguage
      * @param {string} newLanguage
      * @param {(IData | undefined)} [opts]
-     * @return {*}  {Promise<boolean>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof HubController
      */
     async switchLanguage(oldLanguage, newLanguage, opts) {
         const bol = await ibiz.appUtil.switchTheme(oldLanguage, newLanguage, opts);

package/out/controller/utils/counter/counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"counter.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/counter/counter.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,OAAO;IAqCN,OAAO,CAAC,QAAQ;IApC5B;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;;;;OAQG;IACH,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAY;IAE9C;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAQ;IAEnC;;;;;OAKG;gBACiB,QAAQ,EAAE,MAAM,IAAI;IAExC;;;;;OAKG;IACH,SAAS,IAAI,MAAM;IAQnB;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAsBvC;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAGhB"}
+{"version":3,"file":"counter.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/counter/counter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,qBAAa,OAAO;IAqCN,OAAO,CAAC,QAAQ;IApC5B;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;;;;OAQG;IACH,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAY;IAE9C;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAQ;IAEnC;;;;;OAKG;gBACiB,QAAQ,EAAE,MAAM,IAAI;IAExC;;;;;OAKG;IACH,SAAS,IAAI,MAAM;IAQnB;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAqBvC;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAGhB"}

package/out/controller/utils/counter/counter.js

@@ -1,4 +1,3 @@
-import { RuntimeError } from '@ibiz-template/core';
 /**
  * 计数器对象
  *
@@ -68,7 +67,8 @@ export class Counter {
             return;
         }
         if (this.count === 0) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.utils.counter.decrement'));
+            ibiz.log.warn(ibiz.i18n.t('runtime.controller.utils.counter.decrement'));
+            return;
         }
         this.count -= 1;
         if (this.count === 0) {

package/out/controller/utils/data-file-util/data-file-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAKd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAapE,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAGF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,EAElB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAoCf;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,EAElB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,gBAAgB,CAAC,CA8C3B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,YAAY,EAAE,IAAI,CAAC;IACnB,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0B5B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAuB5B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IAAE,YAAY,EAAE,gBAAgB,CAAC;IAAC,aAAa,EAAE,cAAc,CAAA;CAAE,CAAC,CAc7E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDhB;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,EAElB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAoB5B;AAID;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACjC,GAAG,gBAAgB,CAUnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACjC,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAQhC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACjC,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAQhC;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAM/B;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAM/B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAYlC"}
+{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"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"}

package/out/controller/utils/data-file-util/data-file-util.js

@@ -42,9 +42,7 @@ function listenAsyncAction(id) {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export async function asyncImportData(file, appDataEntity, dataImport, context, 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-params) {
+export async function asyncImportData(file, appDataEntity, dataImport, context, params) {
     // 异步导入开始的提示
     ibiz.notification.info({
         desc: ibiz.i18n.t('runtime.controller.utils.dataFileUtil.startImport'),
@@ -52,7 +50,7 @@ params) {
     const data = new FormData();
     data.append('file', file);
     let url = `/${appDataEntity.deapicodeName2}/${asyncImportUrl}`;
-    const queryParam = {};
+    const queryParam = Object.assign({}, (params || {}));
     if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
         Object.assign(queryParam, {
             srfimporttag: dataImport.codeName,
@@ -85,13 +83,11 @@ params) {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export async function importData(file, appDataEntity, dataImport, context, 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-params) {
+export async function importData(file, appDataEntity, dataImport, context, params) {
     const data = new FormData();
     data.append('file', file);
     let url = `/${appDataEntity.deapicodeName2}/${importUrl}`;
-    const queryParam = {};
+    const queryParam = Object.assign({}, (params || {}));
     if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
         Object.assign(queryParam, {
             srfimporttag: dataImport.codeName,
@@ -272,11 +268,9 @@ export async function openDataImport(opts) {
  * @param {IAppDEDataImport} dataImport
  * @return {*}  {Promise<void>}
  */
-export async function downloadImportTemplate(appDataEntity, dataImport, context, 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-params) {
+export async function downloadImportTemplate(appDataEntity, dataImport, context, params) {
     let templateUrl = `/${appDataEntity.codeName2.toLowerCase()}/importtemplate`;
-    const queryParam = {};
+    const queryParam = Object.assign({}, (params || {}));
     if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
         Object.assign(queryParam, { srfimporttag: dataImport.codeName });
     }

package/out/controller/utils/value-rule/value-rule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"value-rule.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/value-rule/value-rule.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAK1B;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,EAC9C,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,GACrB,KAAK,EAAE,CAyET;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,EAAE,CAiF5D"}
+{"version":3,"file":"value-rule.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/value-rule/value-rule.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAK1B;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,EAC9C,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,GACrB,KAAK,EAAE,CAyET;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,EAAE,CAgG5D"}

package/out/controller/utils/value-rule/value-rule.js

@@ -89,7 +89,7 @@ export function generateEditorRules(editor) {
         rules.push({
             validator: (rule, value, callback) => {
                 if (!isNil(value) && value.length > maxLength) {
-                    callback(new Error(ibiz.i18n.t('runtime.controller.utils.valueRule.length', {
+                    callback(new Error(ibiz.i18n.t('runtime.controller.utils.valueRule.maxLength', {
                         maxLength,
                         length: value.length,
                     })));
@@ -104,7 +104,10 @@ export function generateEditorRules(editor) {
         rules.push({
             validator: (rule, value, callback) => {
                 if (!isNil(value) && value.length < minLength) {
-                    callback(new Error(`内容长度必须大于等于${minLength},当前长度为${value.length}`));
+                    callback(new Error(ibiz.i18n.t('runtime.controller.utils.valueRule.minLength', {
+                        minLength,
+                        length: value.length,
+                    })));
                 }
                 else {
                     return true;
@@ -116,7 +119,9 @@ export function generateEditorRules(editor) {
         rules.push({
             validator: (rule, value, callback) => {
                 if (!isNil(value) && isNumber(value) && value > maxValue) {
-                    callback(new Error(`值必须小于等于${maxValue}`));
+                    callback(new Error(ibiz.i18n.t('runtime.controller.utils.valueRule.maxValue', {
+                        maxValue,
+                    })));
                 }
                 else {
                     return true;
@@ -128,7 +133,9 @@ export function generateEditorRules(editor) {
         rules.push({
             validator: (rule, value, callback) => {
                 if (!isNil(value) && isNumber(value) && value < minValue) {
-                    callback(new Error(`值必须大于等于${minValue}`));
+                    callback(new Error(ibiz.i18n.t('runtime.controller.utils.valueRule.minValue', {
+                        minValue,
+                    })));
                 }
                 else {
                     return true;

package/out/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IA+CrC,KAAK,EAAE,sBAAsB;IA9ChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED;;;;;OAKG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CA4DnE"}
+{"version":3,"file":"de-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IA+CrC,KAAK,EAAE,sBAAsB;IA9ChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED;;;;;OAKG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAoFnE"}

package/out/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { testCond } from '../../../utils';
 import { DELogicLinkCond } from '../de-logic-link-cond/de-logic-link-cond';
@@ -55,6 +56,22 @@ export class DELogicLinkSingleCond extends DELogicLinkCond {
         const dst = ctx.params[this.dstParam];
         let result;
         let compareValue;
+        if (this.op === 'CONTAINS') {
+            const dstObj = dst;
+            if (dstObj && typeof dstObj === 'object' && this.dstField) {
+                result = dstObj.hasOwnProperty(this.dstField);
+            }
+            else {
+                result = false;
+            }
+            ibiz.log.debug(ibiz.i18n.t('runtime.deLogic.deLogicLink.entityLogicalContainsConnection', {
+                name: this.model.name,
+                dstField: this.dstField,
+            }), dst[this.dstField], ibiz.i18n.t('runtime.deLogic.deLogicLink.comparisonCondition', {
+                op: this.op,
+            }), ibiz.i18n.t('runtime.deLogic.deLogicLink.compareResults'), result);
+            return result;
+        }
         switch (this.type) {
             case 'ENTITYFIELD': {
                 if (!this.value) {

package/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}

package/out/engine/md-view.engine.js

@@ -407,17 +407,20 @@ export class MDViewEngine extends ViewEngineBase {
      * @memberof MDViewEngine
      */
     calcViewSearchBarVisible() {
+        var _a, _b;
         const { model } = this.view;
         // 搜索栏
         const has = this.isExistAndInLayout('searchbar');
-        if (!has) {
+        if (!has)
             return has;
-        }
         const searchBar = getControl(model, 'searchbar');
         const visible = !!(searchBar.enableQuickSearch ||
             searchBar.enableGroup ||
             searchBar.enableFilter === true);
-        return visible;
+        // 卡片视图
+        const dataview = getControl(this.view.model, 'dataview');
+        const cardstyle = (_b = (_a = dataview === null || dataview === void 0 ? void 0 : dataview.controlParam) === null || _a === void 0 ? void 0 : _a.ctrlParams) === null || _b === void 0 ? void 0 : _b.CARDSTYLE;
+        return cardstyle === 'userstyle' ? false : visible;
     }
     /**
      * 计算移除的模型名称

package/out/engine/view-base.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,cAAc,EACf,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IA0GpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAzG3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;OAKG;IACH,SAAS,KAAK,aAAa,IAAI,qBAAqB,CAEnD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAS;IAEhD;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAK3C;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAUrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBhC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAWnC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAmC3C;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAqBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IA2BzE;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,IAAI,KAAK;IAsC7B;;;;;;OAMG;IAEG,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAmCzC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAsB1C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBzC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAU1C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAInD;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCrC;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAOhE;;;;;OAKG;cACa,qBAAqB,CACnC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
+{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,cAAc,EACf,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IA0GpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAzG3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;OAKG;IACH,SAAS,KAAK,aAAa,IAAI,qBAAqB,CAEnD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAS;IAEhD;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAK3C;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAUrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBhC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAWnC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAmC3C;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAqBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IA6BzE;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,IAAI,KAAK;IAsC7B;;;;;;OAMG;IAEG,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAmCzC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAsB1C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBzC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAU1C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAInD;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCrC;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAOhE;;;;;OAKG;cACa,qBAAqB,CACnC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}

package/out/engine/view-base.engine.js

@@ -254,12 +254,14 @@ export class ViewEngineBase {
             return null;
         }
         if (key === SysUIActionTag.SEARCH) {
-            const searchForm = this.searchForm || this.tabSearchForm;
+            const { ctrl } = _args || {};
+            const searchForm = ctrl || this.searchForm || this.tabSearchForm;
             await searchForm.search();
             return null;
         }
         if (key === SysUIActionTag.RESET) {
-            const searchForm = this.searchForm || this.tabSearchForm;
+            const { ctrl } = _args || {};
+            const searchForm = ctrl || this.searchForm || this.tabSearchForm;
             await searchForm.reset();
             return null;
         }