@ibiz-template/runtime 0.1.11 → 0.1.12

package/out/service/utils/app-counter/app-counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA8CF,KAAK,EAAE,WAAW;IA7CrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,eAAe,EAAG,MAAM,CAAC;IAEnC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,OAAO,CAAwB;IAElD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAErC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9D;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS9D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAetC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK5D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA0CF,KAAK,EAAE,WAAW;IAzCrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,OAAO,CAAwB;IAElD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAErC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9D;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS9D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK5D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}

package/out/service/utils/app-counter/app-counter.js

@@ -1,8 +1,8 @@
-import { IBizContext, RuntimeModelError } from '@ibiz-template/core';
+import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { notNilEmpty, QXEvent } from 'qx-util';
 import { clone } from 'ramda';
 /**
- * 应用实体计数器
+ * 应用计数器基类
  *
  * @author chitanda
  * @date 2022-10-26 18:10:51
@@ -54,12 +54,6 @@ export class AppCounter {
      */
     async init(context, params) {
         this.setParams(context, params);
-        this.appDataEntityId = this.model.appDataEntityId;
-        const action = this.model.getAppDEActionId;
-        if (!action) {
-            throw new RuntimeModelError(this.model, `未找到获取计数器行为!`);
-        }
-        this.action = action;
         this.interval();
         await this.load();
     }
@@ -118,13 +112,7 @@ export class AppCounter {
      * @return {*}  {Promise<IData>}
      */
     async load() {
-        const app = ibiz.hub.getApp(this.context.srfappid);
-        const res = await app.deService.exec(this.appDataEntityId, this.action, this.context, this.params);
-        if (res.ok) {
-            this.data = res.data;
-            this.evt.emit('change', this.data);
-        }
-        return this.data;
+        throw new RuntimeError('未实现计数器加载方法');
     }
     /**
      * 计数器刷新

package/out/service/utils/app-counter/app-de-counter.d.ts

@@ -0,0 +1,34 @@
+import { Application } from '../../../application';
+import { AppCounter } from './app-counter';
+/**
+ * 应用实体计数器
+ *
+ * @author chitanda
+ * @date 2022-10-26 18:10:51
+ * @export
+ * @class AppCounter
+ */
+export declare class AppDECounter extends AppCounter {
+    protected app: Application;
+    protected appDataEntityId: string;
+    protected action: string;
+    /**
+     * 计数器初始化
+     *
+     * @author chitanda
+     * @date 2022-10-26 19:10:24
+     * @param {IParams} [context]
+     * @param {IParams} [params]
+     */
+    init(context?: IParams, params?: IParams): Promise<void>;
+    /**
+     * 加载计数器
+     *
+     * @author chitanda
+     * @date 2022-10-26 19:10:38
+     * @protected
+     * @return {*}  {Promise<IData>}
+     */
+    protected load(): Promise<IData>;
+}
+//# sourceMappingURL=app-de-counter.d.ts.map

package/out/service/utils/app-counter/app-de-counter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-de-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-de-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,UAAU;IAC1C,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,eAAe,EAAG,MAAM,CAAC;IAEnC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAU9D;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;CAcvC"}

package/out/service/utils/app-counter/app-de-counter.js

@@ -0,0 +1,46 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { AppCounter } from './app-counter';
+/**
+ * 应用实体计数器
+ *
+ * @author chitanda
+ * @date 2022-10-26 18:10:51
+ * @export
+ * @class AppCounter
+ */
+export class AppDECounter extends AppCounter {
+    /**
+     * 计数器初始化
+     *
+     * @author chitanda
+     * @date 2022-10-26 19:10:24
+     * @param {IParams} [context]
+     * @param {IParams} [params]
+     */
+    async init(context, params) {
+        this.appDataEntityId = this.model.appDataEntityId;
+        const action = this.model.getAppDEActionId;
+        if (!action) {
+            throw new RuntimeModelError(this.model, `未找到获取计数器行为!`);
+        }
+        this.action = action;
+        await super.init(context, params);
+    }
+    /**
+     * 加载计数器
+     *
+     * @author chitanda
+     * @date 2022-10-26 19:10:38
+     * @protected
+     * @return {*}  {Promise<IData>}
+     */
+    async load() {
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        const res = await app.deService.exec(this.appDataEntityId, this.action, this.context, this.params);
+        if (res.ok) {
+            this.data = res.data;
+            this.evt.emit('change', this.data);
+        }
+        return this.data;
+    }
+}

package/out/service/utils/app-counter/app-de-counter.provider.d.ts

@@ -0,0 +1,15 @@
+import { IAppCounter } from '@ibiz/model-core';
+import { IAppCounterProvider } from '../../../interface';
+import { AppCounter } from './app-counter';
+/**
+ * 应用实体计数器
+ * @author lxm
+ * @date 2023-08-24 12:08:24
+ * @export
+ * @class AppDECounterProvider
+ * @implements {IAppCounterProvider}
+ */
+export declare class AppDECounterProvider implements IAppCounterProvider {
+    createCounter(model: IAppCounter): AppCounter;
+}
+//# sourceMappingURL=app-de-counter.provider.d.ts.map

package/out/service/utils/app-counter/app-de-counter.provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-de-counter.provider.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-de-counter.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,mBAAmB;IAC9D,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,UAAU;CAG9C"}

package/out/service/utils/app-counter/app-de-counter.provider.js

@@ -0,0 +1,14 @@
+import { AppDECounter } from './app-de-counter';
+/**
+ * 应用实体计数器
+ * @author lxm
+ * @date 2023-08-24 12:08:24
+ * @export
+ * @class AppDECounterProvider
+ * @implements {IAppCounterProvider}
+ */
+export class AppDECounterProvider {
+    createCounter(model) {
+        return new AppDECounter(model);
+    }
+}

package/out/service/utils/app-counter/index.d.ts

@@ -0,0 +1,13 @@
+import { AppCounter } from './app-counter';
+import { AppDECounter } from './app-de-counter';
+import { AppDECounterProvider } from './app-de-counter.provider';
+/**
+ * 预置默认的应用计数器适配器
+ *
+ * @author lxm
+ * @date 2022-09-19 22:09:50
+ * @export
+ */
+export declare function presetAppCounterProvider(): void;
+export { AppCounter, AppDECounter, AppDECounterProvider };
+//# sourceMappingURL=index.d.ts.map

package/out/service/utils/app-counter/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAG/C;AAED,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC"}

package/out/service/utils/app-counter/index.js

@@ -0,0 +1,16 @@
+import { registerAppCounterProvider } from '../../../register';
+import { AppCounter } from './app-counter';
+import { AppDECounter } from './app-de-counter';
+import { AppDECounterProvider } from './app-de-counter.provider';
+/**
+ * 预置默认的应用计数器适配器
+ *
+ * @author lxm
+ * @date 2022-09-19 22:09:50
+ * @export
+ */
+export function presetAppCounterProvider() {
+    // 应用实体计数器
+    registerAppCounterProvider('DEDR', () => new AppDECounterProvider());
+}
+export { AppCounter, AppDECounter, AppDECounterProvider };

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -88,7 +88,7 @@ export class DynamicCodeListCache {
         if (this.isPredefined) {
             // 特殊处理，避免预置代码表加载不全
             if (!params.size) {
-                params.size = 10000;
+                params = Object.assign(Object.assign({}, params), { size: 10000 });
             }
             const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
             return Object.freeze(res.data.items);

package/out/service/utils/index.d.ts

@@ -1,5 +1,5 @@
-export { AppCounter } from './app-counter/app-counter';
 export * from './de-dq-cond';
+export * from './app-counter';
 export { DEDQCondUtil } from './de-dq-cond-util/de-dq-cond-util';
 export { DynamicCodeListCache } from './dynamic-code-list/dynamic-code-list';
 export { DECache } from './de-cache/de-cache';

package/out/service/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC"}

package/out/service/utils/index.js

@@ -1,5 +1,5 @@
-export { AppCounter } from './app-counter/app-counter';
 export * from './de-dq-cond';
+export * from './app-counter';
 export { DEDQCondUtil } from './de-dq-cond-util/de-dq-cond-util';
 export { DynamicCodeListCache } from './dynamic-code-list/dynamic-code-list';
 export { DECache } from './de-cache/de-cache';

package/out/ui-action/uiaction-util.js

@@ -41,7 +41,7 @@ export class UIActionUtil {
         var _a, _b;
         const result = await this.exec(actionId, params);
         if (result.closeView) {
-            params.view.closeView();
+            params.view.closeView({ ok: true });
         }
         else if (result.refresh) {
             switch (result.refreshMode) {

package/out/utils/index.d.ts

@@ -7,4 +7,5 @@ export * from './wf-helper/wf-helper';
 export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
+export { TextUtil } from './text-util/text-util';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC"}

package/out/utils/index.js

@@ -7,3 +7,4 @@ export * from './wf-helper/wf-helper';
 export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
+export { TextUtil } from './text-util/text-util';

package/out/utils/script/script-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAyC9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
+{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA4C9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}

package/out/utils/script/script-function.js

@@ -120,6 +120,9 @@ export class ScriptFunction {
                     openView: ibiz.openView,
                 };
                 break;
+            case 'viewParam': // 视图参数
+                param.viewParam = param.params;
+                break;
             case 'env': // 全局环境变量
                 param.env = ibiz.env;
                 break;

package/out/utils/text-util/text-util.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 文本工具类
+ *
+ * @author zhanghengfeng
+ * @date 2023-08-24 14:08:27
+ * @export
+ * @class TextUtil
+ */
+export declare class TextUtil {
+    /**
+     * 值格式化
+     *
+     * @author zhanghengfeng
+     * @date 2023-08-24 14:08:27
+     * @param {string} value
+     * @param {string} _code
+     * @return {*}  {string}
+     */
+    format(value: string, _code: string): string;
+}
+//# sourceMappingURL=text-util.d.ts.map

package/out/utils/text-util/text-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"text-util.d.ts","sourceRoot":"","sources":["../../../src/utils/text-util/text-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAG7C"}

package/out/utils/text-util/text-util.js

@@ -0,0 +1,22 @@
+/**
+ * 文本工具类
+ *
+ * @author zhanghengfeng
+ * @date 2023-08-24 14:08:27
+ * @export
+ * @class TextUtil
+ */
+export class TextUtil {
+    /**
+     * 值格式化
+     *
+     * @author zhanghengfeng
+     * @date 2023-08-24 14:08:27
+     * @param {string} value
+     * @param {string} _code
+     * @return {*}  {string}
+     */
+    format(value, _code) {
+        return value;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,13 +29,14 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.8",
+    "@ibiz-template/core": "^0.1.12",
     "@ibiz/model-core": "^0.0.15",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
     "@types/systemjs": "^6.13.1",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.9",
+    "echarts": "^5.4.3",
     "lodash-es": "^4.17.21",
     "path-browserify": "^1.0.1",
     "qs": "^6.11.2",
@@ -47,11 +48,12 @@
     "@ibiz/model-core": "^0.0.15",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
+    "echarts": "^5.4.3",
     "lodash-es": "^4.17.21",
     "path-browserify": "^1.0.1",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "a45429e48191f79d0b2efba18399779f43993536"
+  "gitHead": "980e348c7fa465d0a62e655991c1bb816fca100a"
 }

package/src/config/global-config.ts

@@ -29,7 +29,7 @@ export class GlobalConfig implements IGlobalConfig {
 
   // 全局菜单配置
   appMenu: IGlobalAppMenuConfig = {
-    enableEcho: false,
+    enableEcho: true,
   };
 
   // 全局代码表配置

package/src/controller/common/control/md-control.controller.ts

@@ -157,6 +157,9 @@ export class MDControlController<
       await this._evt.emit('onLoadSuccess', {
         isInitialLoad,
       });
+    } catch (error) {
+      await this._evt.emit('onLoadError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -210,6 +213,7 @@ export class MDControlController<
       }
     }
 
+    await this._evt.emit('onBeforeRemove', undefined);
     await this.startLoading();
     let needRefresh = false;
     try {
@@ -241,6 +245,9 @@ export class MDControlController<
       if (needRefresh) {
         this.refresh();
       }
+    } catch (error) {
+      await this._evt.emit('onRemoveError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -0,0 +1,172 @@
+import {
+  findRecursiveChild,
+  RuntimeError,
+  RuntimeModelError,
+} from '@ibiz-template/core';
+import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
+import { Application } from '../../../application';
+import { AppFuncCommand } from '../../../command';
+import {
+  IAppMenuState,
+  IAppMenuEvent,
+  IAppMenuController,
+} from '../../../interface';
+import { AppCounter } from '../../../service';
+import { ControlController } from '../../common';
+
+/**
+ * 应用菜单控制器
+ *
+ * @author chitanda
+ * @date 2022-07-24 15:07:07
+ * @export
+ * @class AppMenuController
+ * @extends {ControlController}
+ */
+export class AppMenuController
+  extends ControlController<IAppMenu, IAppMenuState, IAppMenuEvent>
+  implements IAppMenuController
+{
+  app!: Application;
+
+  protected initState(): void {
+    super.initState();
+    this.state.menuItemsState = {};
+  }
+
+  /**
+   * 视图层级
+   *
+   * @readonly
+   * @type {(number | undefined)}
+   * @memberof AppMenuController
+   */
+  get routeDepth(): number | undefined {
+    return this.view.modal.routeDepth;
+  }
+
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+
+    this.app = await ibiz.hub.getApp(this.context.srfappid);
+
+    // 初始化菜单项状态
+    this.model.appMenuItems?.forEach(item => {
+      this.initMenuItemState(item);
+    });
+  }
+
+  /**
+   * 菜单项点击回调，触发对应的应用功能
+   *
+   * @author chitanda
+   * @date 2022-12-22 14:12:53
+   * @param {string} id
+   * @return {*}  {Promise<void>}
+   */
+  async onClickMenuItem(
+    id: string,
+    event?: MouseEvent,
+    useDepth: boolean = true,
+  ): Promise<void> {
+    const menuItem = findRecursiveChild(this.model, id, {
+      compareField: 'id',
+      childrenFields: ['appMenuItems'],
+    }) as IAppMenuItem;
+    if (!menuItem) {
+      throw new RuntimeError(`找不到名为${id}的菜单项`);
+    }
+
+    this.evt.emit('onClick', {
+      eventArg: id,
+      event,
+    });
+
+    if (!menuItem.appFuncId) {
+      throw new RuntimeModelError(menuItem, '没有配置应用功能');
+    }
+
+    const tempContext = this.context.clone();
+    if (this.routeDepth && useDepth) {
+      Object.assign(tempContext, {
+        toRouteDepth: this.routeDepth + 1,
+      });
+    }
+
+    await ibiz.commands.execute(
+      AppFuncCommand.TAG,
+      menuItem.appFuncId,
+      tempContext,
+      this.params,
+    );
+  }
+
+  /**
+   * 初始化菜单项状态
+   *
+   * @author lxm
+   * @date 2022-10-12 20:10:37
+   * @param {AppMenuItemModel} menu
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  initMenuItemState(menu: IAppMenuItem): {
+    visible: boolean;
+    permitted: boolean;
+  } {
+    const result = { permitted: true, visible: true };
+    if (menu.hidden) {
+      result.visible = false;
+    } else {
+      let permitted = true;
+      if (menu.accessKey) {
+        permitted = this.app.authority.calcByResCode(menu.accessKey);
+      }
+      let visible = permitted;
+      // 有子的计算子状态，如果本身显示但是子都不显示则不显示
+      if (menu.appMenuItems?.length) {
+        const childrenState = menu.appMenuItems.map(child => {
+          return this.initMenuItemState(child).visible;
+        });
+        visible = visible && childrenState.includes(true);
+      }
+      result.permitted = permitted;
+      result.visible = visible;
+    }
+    this.state.menuItemsState[menu.id!] = result;
+    return result;
+  }
+
+  /**
+   * 所有项平铺
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2022-09-09 16:48:21
+   */
+  getAllItems(): IAppMenuItem[] {
+    const result: IAppMenuItem[] = [];
+    const flattenMenus = (menuItems: IAppMenuItem[]): void => {
+      menuItems.forEach(item => {
+        result.push(item);
+        if (item.appMenuItems && item.appMenuItems.length > 0) {
+          flattenMenus(item.appMenuItems);
+        }
+      });
+    };
+    flattenMenus(this.model.appMenuItems!);
+    return result;
+  }
+
+  /**
+   * 根据id去视图控制器里取得计数器对象
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-07-10 15:14:21
+   */
+  getCounter(id: string): AppCounter | null {
+    const { counters } = this.ctx.view;
+    if (counters[id]) {
+      return counters[id];
+    }
+    return null;
+  }
+}

package/src/controller/control/app-menu/index.ts

@@ -0,0 +1 @@
+export * from './app-menu.controller';

package/src/controller/control/app-menu-icon-view/app-menu-icon-view.controller.ts

@@ -0,0 +1,48 @@
+import {
+  findRecursiveChild,
+  RuntimeError,
+  RuntimeModelError,
+} from '@ibiz-template/core';
+import { IAppMenuItem } from '@ibiz/model-core';
+import { AppFuncCommand } from '../../../command';
+import { AppMenuController } from '../app-menu/app-menu.controller';
+
+export class AppMenuIconViewController extends AppMenuController {
+  async onClickMenuItem(
+    id: string,
+    event?: MouseEvent | undefined,
+  ): Promise<void> {
+    const menuItem = findRecursiveChild(this.model, id, {
+      compareField: 'id',
+      childrenFields: ['appMenuItems'],
+    }) as IAppMenuItem;
+    if (!menuItem) {
+      throw new RuntimeError(`找不到名为${id}的菜单项`);
+    }
+
+    this.evt.emit('onClick', {
+      eventArg: id,
+      event,
+    });
+
+    if (!menuItem.appFuncId) {
+      throw new RuntimeModelError(menuItem, '没有配置应用功能');
+    }
+
+    const tempContext = this.context.clone();
+
+    // 一级跳一级，其他跳默认二级
+    if (this.routeDepth === 1) {
+      Object.assign(tempContext, {
+        toRouteDepth: 1,
+      });
+    }
+
+    await ibiz.commands.execute(
+      AppFuncCommand.TAG,
+      menuItem.appFuncId,
+      tempContext,
+      this.params,
+    );
+  }
+}

package/src/controller/control/app-menu-icon-view/index.ts

@@ -0,0 +1 @@
+export * from './app-menu-icon-view.controller';