@ibiz-template/runtime 0.7.41-alpha.10 → 0.7.41-alpha.100

package/out/controller/common/editor/editor.controller.js

@@ -75,10 +75,42 @@ export class EditorController {
      * @memberof EditorController
      */
     get emptyShowPlaceholder() {
+        var _a, _b;
         if (!this.placeHolder)
             return false;
+        // 表单控件参数
+        if ((_b = (_a = this.parent.form) === null || _a === void 0 ? void 0 : _a.controlParams) === null || _b === void 0 ? void 0 : _b.emptyshowmode) {
+            return (this.parent.form.controlParams.emptyshowmode ===
+                'PLACEHOLDER');
+        }
         return ibiz.config.common.emptyShowMode === 'PLACEHOLDER';
     }
+    /**
+     * @description 获取下载凭证参数
+     * @readonly
+     * @type {{
+     *     appEntityTag?: string;
+     *     dataFieldTag?: string;
+     *   }}
+     * @memberof EditorController
+     */
+    get downloadTicketParams() {
+        const downloadTicketParams = {};
+        if (!this.model.editorParams) {
+            return downloadTicketParams;
+        }
+        if (this.model.editorParams.appentitytag) {
+            Object.assign(downloadTicketParams, {
+                appEntityTag: this.model.editorParams.appentitytag,
+            });
+        }
+        if (this.model.editorParams.datafieldtag) {
+            Object.assign(downloadTicketParams, {
+                dataFieldTag: this.model.editorParams.datafieldtag,
+            });
+        }
+        return downloadTicketParams;
+    }
     /**
      * @description 当前视图
      * @readonly
@@ -158,10 +190,14 @@ export class EditorController {
         await this.onInit();
     }
     async onInit() {
+        var _a, _b;
         // 异步初始化
         if (this.model.placeHolder) {
             this.placeHolder = this.model.placeHolder;
         }
+        if ((_a = this.model.phlanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag) {
+            this.placeHolder = ibiz.i18n.t((_b = this.model.phlanguageRes) === null || _b === void 0 ? void 0 : _b.lanResTag, this.placeHolder);
+        }
         if (this.model.editorParams) {
             Object.keys(this.model.editorParams).forEach(key => {
                 this.editorParams[key] = this.model.editorParams[key];
@@ -201,6 +237,34 @@ export class EditorController {
         if (this.model.editorItems) {
             this.model.editorItems = this.model.editorItems.filter((item) => item.id !== this.model.id);
         }
+        this.initExtraParams();
+    }
+    /**
+     * @description 初始化额外参数
+     * @protected
+     * @memberof FormItemController
+     */
+    initExtraParams() {
+        var _a, _b;
+        // 额外参数
+        const extraParams = {};
+        // 是否隐藏无值的单位
+        let emptyHiddenUnit = true;
+        if (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.emptyHiddenUnit) === false) {
+            emptyHiddenUnit = (_b = this.parent) === null || _b === void 0 ? void 0 : _b.emptyHiddenUnit;
+        }
+        // 编辑器参数优先级最高
+        const { EMPTYHIDDENUNIT, emptyhiddenunit } = this.editorParams;
+        if (EMPTYHIDDENUNIT) {
+            emptyHiddenUnit = Object.is(EMPTYHIDDENUNIT, 'true');
+        }
+        if (emptyhiddenunit) {
+            emptyHiddenUnit = Object.is(emptyhiddenunit, 'true');
+        }
+        Object.assign(extraParams, {
+            emptyHiddenUnit,
+        });
+        this.extraParams = extraParams;
     }
     /**
      * 公共参数处理，计算上下文和视图参数

package/out/controller/common/index.d.ts

@@ -2,6 +2,8 @@ export { AppDataUploadViewController } from './view/app-data-upload-view.control
 export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
 export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';
+export { MDCustomViewController } from './view/md-custom-view.controller';
+export { HtmlViewController } from './view/html-view.controller';
 export { BaseController } from './base.controller';
 export { EditorController } from './editor/editor.controller';
 export { CodeListEditorController } from './editor/code-list-editor.controller';

package/out/controller/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}

package/out/controller/common/index.js

@@ -2,6 +2,8 @@ export { AppDataUploadViewController } from './view/app-data-upload-view.control
 export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
 export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';
+export { MDCustomViewController } from './view/md-custom-view.controller';
+export { HtmlViewController } from './view/html-view.controller';
 export { BaseController } from './base.controller';
 export { EditorController } from './editor/editor.controller';
 export { CodeListEditorController } from './editor/code-list-editor.controller';

package/out/controller/common/view/app-data-upload-view.controller.d.ts

@@ -1,4 +1,5 @@
 import { IAppView } from '@ibiz/model-core';
+import { SelectFileOpts } from '@ibiz-template/core';
 import { IAppDataUploadViewState, IViewController, IViewEvent } from '../../../interface';
 import { ViewController } from './view.controller';
 import { ImportDataResult } from '../../utils';
@@ -13,11 +14,12 @@ export declare class AppDataUploadViewController<T extends IAppView = IAppView,
     downloadTemplate(): void;
     /**
      * 选中导入文件并导入
+     * @param {SelectFileOpts} [fileOpts]
      * @author lxm
      * @date 2024-04-16 03:54:19
      * @return {*}
      */
-    selectAndImport(): Promise<ImportDataResult>;
+    selectAndImport(fileOpts?: SelectFileOpts): Promise<ImportDataResult>;
     /**
      * 自定义导入数据方法
      * @author lxm

package/out/controller/common/view/app-data-upload-view.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-upload-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/app-data-upload-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,gBAAgB,EAKjB,MAAM,aAAa,CAAC;AAErB,qBAAa,2BAA2B,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,EAC3D,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAUxB;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAclD;;;;;;;;;OASG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;CAQlB"}
+{"version":3,"file":"app-data-upload-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/app-data-upload-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,gBAAgB,EAKjB,MAAM,aAAa,CAAC;AAErB,qBAAa,2BAA2B,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,EAC3D,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAUxB;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAe3E;;;;;;;;;OASG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;CAQlB"}

package/out/controller/common/view/app-data-upload-view.controller.js

@@ -27,16 +27,18 @@ export class AppDataUploadViewController extends ViewController {
     }
     /**
      * 选中导入文件并导入
+     * @param {SelectFileOpts} [fileOpts]
      * @author lxm
      * @date 2024-04-16 03:54:19
      * @return {*}
      */
-    async selectAndImport() {
+    async selectAndImport(fileOpts) {
         const result = await selectAndImport({
             appDataEntity: this.state.appDataEntity,
             dataImport: this.state.deDataImport,
             context: this.context,
             params: this.params,
+            fileOpts,
         });
         // 异步导入的时候直接关闭视图
         if (result.isAsync === true) {

package/out/controller/common/view/html-view.controller.d.ts

@@ -0,0 +1,17 @@
+import { IAppDEHtmlView } from '@ibiz/model-core';
+import { IHtmlViewState, IViewController, IViewEvent } from '../../../interface';
+import { ViewController } from './view.controller';
+/**
+ * @description 实体html视图
+ * @export
+ * @class HtmlViewController
+ * @extends {ViewController<T, S, E>}
+ * @implements {IViewController<T, S, E>}
+ * @template T
+ * @template S
+ * @template E
+ */
+export declare class HtmlViewController<T extends IAppDEHtmlView = IAppDEHtmlView, S extends IHtmlViewState = IHtmlViewState, E extends IViewEvent = IViewEvent> extends ViewController<T, S, E> implements IViewController<T, S, E> {
+    protected initState(): void;
+}
+//# sourceMappingURL=html-view.controller.d.ts.map

package/out/controller/common/view/html-view.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"html-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/html-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EACL,cAAc,EACd,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD;;;;;;;;;GASG;AACH,qBAAa,kBAAkB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;CAO5B"}

package/out/controller/common/view/html-view.controller.js

@@ -0,0 +1,21 @@
+import { StringUtil } from '@ibiz-template/core';
+import { ViewController } from './view.controller';
+/**
+ * @description 实体html视图
+ * @export
+ * @class HtmlViewController
+ * @extends {ViewController<T, S, E>}
+ * @implements {IViewController<T, S, E>}
+ * @template T
+ * @template S
+ * @template E
+ */
+export class HtmlViewController extends ViewController {
+    initState() {
+        const { htmlUrl } = this.model;
+        super.initState();
+        this.state.htmlUrl = htmlUrl
+            ? StringUtil.fill(htmlUrl, this.context, this.params)
+            : '';
+    }
+}

package/out/controller/common/view/md-custom-view.controller.d.ts

@@ -0,0 +1,17 @@
+import { IAppDECustomView } from '@ibiz/model-core';
+import { IMDCustomViewState, IViewController, IViewEvent } from '../../../interface';
+import { ViewController } from './view.controller';
+/**
+ * @description 实体多数据自定义视图
+ * @export
+ * @class MDCustomViewController
+ * @extends {ViewController<T, S, E>}
+ * @implements {IViewController<T, S, E>}
+ * @template T
+ * @template S
+ * @template E
+ */
+export declare class MDCustomViewController<T extends IAppDECustomView = IAppDECustomView, S extends IMDCustomViewState = IMDCustomViewState, E extends IViewEvent = IViewEvent> extends ViewController<T, S, E> implements IViewController<T, S, E> {
+    protected initState(): void;
+}
+//# sourceMappingURL=md-custom-view.controller.d.ts.map

package/out/controller/common/view/md-custom-view.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"md-custom-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/md-custom-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD;;;;;;;;;GASG;AACH,qBAAa,sBAAsB,CAC/B,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,EACjD,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;CAI5B"}

package/out/controller/common/view/md-custom-view.controller.js

@@ -0,0 +1,17 @@
+import { ViewController } from './view.controller';
+/**
+ * @description 实体多数据自定义视图
+ * @export
+ * @class MDCustomViewController
+ * @extends {ViewController<T, S, E>}
+ * @implements {IViewController<T, S, E>}
+ * @template T
+ * @template S
+ * @template E
+ */
+export class MDCustomViewController extends ViewController {
+    initState() {
+        super.initState();
+        this.state.xdatacontrolname = '';
+    }
+}

package/out/controller/common/view/view.controller.d.ts

@@ -2,7 +2,7 @@
 import { IPortalMessage } from '@ibiz-template/core';
 import { IAppView } from '@ibiz/model-core';
 import { LoadingState } from '../../utils/loading/loading.state';
-import { IViewController, IViewEvent, IViewLayoutPanelController, IControlProvider, IModal, IModalData, IUIActionResult, IUILogicParams, IViewEngine, IViewMessage, IRedrawData, IApiViewMapping, IApiControlMapping } from '../../../interface';
+import { IViewController, IViewEvent, IViewLayoutPanelController, IControlProvider, IModal, IModalData, IUIActionResult, IUILogicParams, IViewEngine, IViewMessage, IRedrawData, IApiViewMapping, IApiControlMapping, ICtrlEngine } from '../../../interface';
 import { CTX } from '../../ctx';
 import { ControllerEvent } from '../../utils';
 import { BaseController } from '../base.controller';
@@ -26,6 +26,7 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
         [key: string]: IControlProvider;
     };
     engines: IViewEngine[];
+    ctrlEngines: ICtrlEngine[];
     error: IData;
     slotProps: {
         [key: string]: IData;
@@ -82,6 +83,13 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
      * @memberof ViewController
      */
     protected intervalTimer: NodeJS.Timeout | undefined;
+    /**
+     * @description 是否存在403错误未处理
+     * @protected
+     * @type {boolean}
+     * @memberof ViewController
+     */
+    protected hasPermErrPending: boolean;
     /**
      * 超时周期
      * - 默认300秒
@@ -122,6 +130,12 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
      * @type {ViewMsgController}
      */
     viewMsgController?: ViewMsgController;
+    /**
+     * @description 父视图数据
+     * @type {IData[]}
+     * @memberof ViewController
+     */
+    parentData?: IData[];
     /**
      * Creates an instance of ViewController.
      * @author lxm
@@ -203,7 +217,7 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
     callUIAction(key: string, args?: Partial<IUILogicParams>): Promise<IUIActionResult | null>;
     closeView(modalData?: IModalData): Promise<void>;
     redrawView(redrawData: IRedrawData): void;
-    startLoading(): void;
+    startLoading(loadingText?: string): void;
     endLoading(): void;
     /**
      * 设置布局面板控制器

package/out/controller/common/view/view.controller.d.ts.map

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

package/out/controller/common/view/view.controller.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { notNilEmpty } from 'qx-util';
-import { HttpError, IBizContext, Namespace, RuntimeError, } from '@ibiz-template/core';
+import { HttpError, IBizContext, Namespace, } from '@ibiz-template/core';
 import { isEmpty, isNil, isNotNil } from 'ramda';
 import { LoadingState } from '../../utils/loading/loading.state';
 import { SysUIActionTag } from '../../../constant';
@@ -9,7 +9,7 @@ import { CTX } from '../../ctx';
 import { BaseController } from '../base.controller';
 import { getControlProvider } from '../../../register';
 import { CounterService } from '../../../service';
-import { getControlsByView, getViewEngines, getViewLogics, } from '../../../model';
+import { getControlsByView, getCtrlEngines, getViewEngines, getViewLogics, } from '../../../model';
 import { ViewMsgController } from '../../utils/view-msg';
 /**
  * 视图控制器
@@ -65,6 +65,16 @@ export class ViewController extends BaseController {
      * @param {CTX} [ctx]
      */
     constructor(model, context, params, ctx) {
+        let parentData;
+        if (params && params.parentData) {
+            try {
+                parentData = JSON.parse(params.parentData);
+            }
+            catch (err) {
+                ibiz.log.error(err);
+            }
+            delete params.parentData;
+        }
         // 预置模型合并。
         const _model = ibiz.util.layoutPanel.fill(model);
         super(_model, IBizContext.create({}, context), params || {}, new CTX(ctx));
@@ -72,6 +82,8 @@ export class ViewController extends BaseController {
         this.modal = new Modal({});
         this.providers = {};
         this.engines = [];
+        // 部件引擎
+        this.ctrlEngines = [];
         this.error = {};
         this.slotProps = {};
         this.counters = {};
@@ -116,6 +128,16 @@ export class ViewController extends BaseController {
          * @memberof ViewController
          */
         this.lastActivityTime = Date.now();
+        /**
+         * @description 是否存在403错误未处理
+         * @protected
+         * @type {boolean}
+         * @memberof ViewController
+         */
+        this.hasPermErrPending = false;
+        if (parentData) {
+            this.parentData = parentData;
+        }
         // 如果视图有上层ctx，作为上层的子在上层注册自身
         if (ctx) {
             ctx.registerController(this.model.name, this);
@@ -123,6 +145,10 @@ export class ViewController extends BaseController {
         this.ctx.init(this);
         this.initEngines();
         this.handleViewError = this.handleViewError.bind(this);
+        // 添加至视图控制器缓存中心
+        if (this.model.codeName) {
+            ibiz.appUtil.viewCacheCenter.set(this.model.codeName.toLowerCase(), this);
+        }
     }
     /**
      * 设置操作状态
@@ -231,6 +257,16 @@ export class ViewController extends BaseController {
                 this.engines.push(ins);
             }
         }
+        // 初始化部件引擎
+        const ctrlEngines = getCtrlEngines(this.model);
+        if (ctrlEngines.length) {
+            ctrlEngines.forEach(engine => {
+                const ins = ibiz.engine.getCtrlEngine(engine, this);
+                if (ins) {
+                    this.ctrlEngines.push(ins);
+                }
+            });
+        }
     }
     /**
      * 初始化计数器
@@ -240,7 +276,11 @@ export class ViewController extends BaseController {
      */
     async initCounters() {
         const viewLayoutPanel = this.model.viewLayoutPanel;
-        const { appCounterRefs } = viewLayoutPanel;
+        let { appCounterRefs } = viewLayoutPanel;
+        // 无预置界面布局未做参数转化
+        if (!appCounterRefs) {
+            appCounterRefs = this.model.appCounterRefs;
+        }
         if (appCounterRefs && appCounterRefs.length > 0) {
             try {
                 await Promise.all(appCounterRefs.map(async (counterRef) => {
@@ -257,6 +297,7 @@ export class ViewController extends BaseController {
         super.initState();
         this.state.activated = true;
         this.state.isLoading = false;
+        this.state.loadingText = '';
         this.state.caption = this.model.caption;
         this.state.srfactiveviewdata = null;
         this.state.viewMessages = {};
@@ -266,6 +307,13 @@ export class ViewController extends BaseController {
         this.state.presetClassList = [];
     }
     async onCreated() {
+        var _a;
+        // 新增识别srfloadingtext视图动态参数，用于指定视图加载时的提示文本，优先级高于全局配置
+        const { appViewParams } = this.model;
+        const LoaddingTextValue = (_a = appViewParams === null || appViewParams === void 0 ? void 0 : appViewParams.find(item => item.id.toLowerCase() === 'srfloadingtext')) === null || _a === void 0 ? void 0 : _a.value;
+        this.state.loadingText = LoaddingTextValue
+            ? ibiz.appUtil.resolveI18nText(LoaddingTextValue)
+            : ibiz.config.view.loadingText;
         this.state.isLoading = true;
         await super.onCreated();
         // 给modal的关闭前回调注入视图关闭事件
@@ -321,6 +369,10 @@ export class ViewController extends BaseController {
         });
         // 初始化视图消息
         this.initViewMsg();
+        // 执行部件引擎的onCreated
+        if (this.ctrlEngines.length) {
+            await Promise.all(this.ctrlEngines.map(engine => engine.onCreated()));
+        }
         // 执行视图引擎的doCreated
         if (this.engines.length) {
             await Promise.all(this.engines.map(engine => engine.onCreated()));
@@ -332,6 +384,10 @@ export class ViewController extends BaseController {
     async onMounted() {
         var _a;
         await super.onMounted();
+        // 执行部件引擎的onMounted
+        if (this.ctrlEngines.length) {
+            await Promise.all(this.ctrlEngines.map(engine => engine.onMounted()));
+        }
         // 执行视图引擎的doMounted
         if (this.engines.length) {
             await Promise.all(this.engines.map(engine => engine.onMounted()));
@@ -358,6 +414,10 @@ export class ViewController extends BaseController {
     async onDestroyed() {
         const srfSessionId = this.context.srfsessionid;
         await super.onDestroyed();
+        // 执行部件引擎的onDestroyed
+        if (this.ctrlEngines.length) {
+            await Promise.all(this.ctrlEngines.map(engine => engine.onDestroyed()));
+        }
         // 执行视图引擎的doDestroyed
         if (this.engines.length) {
             await Promise.all(this.engines.map(engine => engine.onDestroyed()));
@@ -382,6 +442,10 @@ export class ViewController extends BaseController {
         ibiz.mc.error.off(this.handleViewError);
         // 删除触发源
         ibiz.util.record.removeTriggerLogic(this.id);
+        // 从视图控制器缓存中心删除
+        if (this.model.codeName) {
+            ibiz.appUtil.viewCacheCenter.delete(this.model.codeName.toLowerCase());
+        }
     }
     /**
      * 处理上下文和导航参数相关的，如自定义导航参数的处理
@@ -401,7 +465,7 @@ export class ViewController extends BaseController {
             isEmpty(this.context.srfsessionid) ||
             renewSessionValue === 'true') {
             // 生成一个界面域，界面域标识为当前控制器实例的标识
-            const domain = ibiz.uiDomainManager.create(this.id);
+            const domain = ibiz.uiDomainManager.create(this.id, this.model.appDataEntityId);
             this.context.srfsessionid = domain.id;
         }
         // 视图标识添加到上下文中
@@ -447,9 +511,9 @@ export class ViewController extends BaseController {
         return result;
     }
     async callUIAction(key, args) {
-        const result = this.call(key, args);
+        const result = await this.call(key, args);
         if (result === undefined) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.view.noSupportBehavior', {
+            ibiz.log.warn(ibiz.i18n.t('runtime.controller.common.view.noSupportBehavior', {
                 key,
             }));
         }
@@ -461,9 +525,20 @@ export class ViewController extends BaseController {
     redrawView(redrawData) {
         this._evt.emit('onRedrawView', { redrawData });
     }
-    startLoading() {
+    startLoading(loadingText) {
+        var _a;
         this.viewLoading.begin();
         this.state.isLoading = this.viewLoading.isLoading;
+        if (isNotNil(loadingText)) {
+            this.state.loadingText = loadingText;
+        }
+        else {
+            const { appViewParams } = this.model;
+            const LoaddingTextValue = (_a = appViewParams === null || appViewParams === void 0 ? void 0 : appViewParams.find(item => item.id.toLowerCase() === 'srfloadingtext')) === null || _a === void 0 ? void 0 : _a.value;
+            this.state.loadingText = LoaddingTextValue
+                ? ibiz.appUtil.resolveI18nText(LoaddingTextValue)
+                : ibiz.config.view.loadingText;
+        }
     }
     endLoading() {
         this.viewLoading.end();
@@ -573,7 +648,8 @@ export class ViewController extends BaseController {
      * @protected
      */
     convertMultipleLanguages() {
-        if (this.model.capLanguageRes && this.model.capLanguageRes.lanResTag) {
+        var _a;
+        if ((_a = this.model.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag) {
             this.model.caption = ibiz.i18n.t(this.model.capLanguageRes.lanResTag, this.model.caption);
         }
     }
@@ -593,10 +669,19 @@ export class ViewController extends BaseController {
                 this.state.hasError = true;
             }
             else if (data.status && data.status === 403) {
-                ibiz.confirm.warning({
+                // 存在403错误用户未确认，再次触发403错误时不做处理
+                if (this.hasPermErrPending) {
+                    return;
+                }
+                this.hasPermErrPending = true;
+                ibiz.confirm
+                    .warning({
                     title: ibiz.i18n.t('runtime.controller.common.view.forbiddenAccess'),
                     desc: ibiz.i18n.t('runtime.controller.common.view.logoutAccount'),
                     options: { showCancelButton: false },
+                })
+                    .then(_result => {
+                    this.hasPermErrPending = false;
                 });
             }
             else {