@ibiz-template/runtime 0.7.38-alpha.57 → 0.7.39

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

@@ -24,14 +24,14 @@ export class ViewController extends BaseController {
         return this.evt;
     }
     /**
-     * 设置操作状态
-     *
-     * @author tony001
-     * @date 2025-01-17 17:01:13
-     * @param {('DEFAULT' | 'MANUAL')} state
+     * 超时周期
+     * - 默认300秒
+     * @readonly
+     * @type {number}
+     * @memberof ViewController
      */
-    setOperateState(state) {
-        this.operateState = state;
+    get timeoutDuration() {
+        return ibiz.config.view.timeoutDuration;
     }
     /**
      * 上层视图控制器
@@ -100,6 +100,22 @@ export class ViewController extends BaseController {
          * @type {('DEFAULT' | 'MANUAL')}
          */
         this.operateState = 'DEFAULT';
+        /**
+         * 定时器开始时间
+         *
+         * @protected
+         * @type {number}
+         * @memberof ViewController
+         */
+        this.startTime = Date.now();
+        /**
+         * 用户上次活动时间
+         *
+         * @protected
+         * @type {number}
+         * @memberof ViewController
+         */
+        this.lastActivityTime = Date.now();
         // 如果视图有上层ctx，作为上层的子在上层注册自身
         if (ctx) {
             ctx.registerController(this.model.name, this);
@@ -108,6 +124,55 @@ export class ViewController extends BaseController {
         this.initEngines();
         this.handleViewError = this.handleViewError.bind(this);
     }
+    /**
+     * 设置操作状态
+     *
+     * @author tony001
+     * @date 2025-01-17 17:01:13
+     * @param {('DEFAULT' | 'MANUAL')} state
+     */
+    setOperateState(state) {
+        this.operateState = state;
+        this.lastActivityTime = Date.now();
+        // 超时时用户活动则更新用户访问状态
+        if (this.lastActivityTime - this.startTime > this.timeoutDuration)
+            this.updateAccessState();
+    }
+    /**
+     * 更新用户访问状态
+     *
+     * @memberof ViewController
+     */
+    async updateAccessState() {
+        // 清除定时器
+        clearInterval(this.intervalTimer);
+        // 发送更新通知
+        await this._evt.emit('onUpdateAccessState', undefined);
+    }
+    /**
+     * 初始化定时器监听用户活动
+     *
+     * @memberof ViewController
+     */
+    initTimeoutTimer() {
+        // 计时
+        let time = 0;
+        this.startTime = Date.now();
+        this.intervalTimer = setInterval(() => {
+            time += 1000;
+            if (this.lastActivityTime) {
+                const lastActivity = this.lastActivityTime - this.startTime;
+                // 如果临界时间用户活动则更新用户访问状态(临界时间60秒)
+                if (lastActivity >= this.timeoutDuration - 60 * 1000 &&
+                    lastActivity <= this.timeoutDuration) {
+                    this.updateAccessState();
+                }
+            }
+            // 超时清除定时器
+            if (time > this.timeoutDuration)
+                clearInterval(this.intervalTimer);
+        }, 1000);
+    }
     /**
      * 视图重新激活
      *
@@ -326,10 +391,15 @@ export class ViewController extends BaseController {
      * @protected
      */
     handleContextParams() {
+        var _a;
         this.context.srfappid = this.model.appId || ibiz.env.appId;
+        // 新增识别srfrenewsession视图动态参数，值为true时，强制重新构建界面域
+        const { appViewParams } = this.model;
+        const renewSessionValue = (_a = appViewParams === null || appViewParams === void 0 ? void 0 : appViewParams.find(item => item.id.toLowerCase() === 'srfrenewsession')) === null || _a === void 0 ? void 0 : _a.value;
         // 只要上下文中无 srfsessionid 则生成一个
         if (isNil(this.context.srfsessionid) ||
-            isEmpty(this.context.srfsessionid)) {
+            isEmpty(this.context.srfsessionid) ||
+            renewSessionValue === 'true') {
             // 生成一个界面域，界面域标识为当前控制器实例的标识
             const domain = ibiz.uiDomainManager.create(this.id);
             this.context.srfsessionid = domain.id;

package/out/controller/control/app-menu/app-menu.controller.js

@@ -168,7 +168,7 @@ export class AppMenuController extends ControlController {
                 toRouteDepth: this.routeDepth + 1,
             });
         }
-        await ibiz.commands.execute(AppFuncCommand.TAG, menuItem.appFuncId, tempContext, this.params, opts);
+        await ibiz.commands.execute(AppFuncCommand.TAG, menuItem.appFuncId, tempContext, this.params, Object.assign(Object.assign({}, opts), { view: this.view }));
     }
     /**
      * 初始化菜单项状态

package/out/controller/control/chart/chart.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAyBpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IA8B7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA4ElD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAalE;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}
+{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cAUX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAyBpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IA8B7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA4ElD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAanC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlE;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}

package/out/controller/control/chart/chart.controller.js

@@ -22,6 +22,7 @@ export class ChartController extends MDControlController {
         this.state.gridHeaders = [];
         this.state.gridData = [];
         this.state.gridPosition = 'bottom';
+        this.state.optionsReady = false;
     }
     async onCreated() {
         await super.onCreated();
@@ -377,6 +378,9 @@ export class ChartController extends MDControlController {
                 this.setActive(activeData);
             }
         });
+        if (this.state.optionsReady) {
+            this.updateChart();
+        }
     }
     /**
      * 根据数据计算最终的options
@@ -391,7 +395,10 @@ export class ChartController extends MDControlController {
             // 开启图表表格后才会计算表格的数据
             this.computeGridData();
         }
-        this.updateChart();
+        this.state.optionsReady = true;
+        if (this.chart) {
+            this.updateChart();
+        }
     }
     /**
      * 更新echart图表

package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAQxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EACf,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACI,MAAM,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAkBtC;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,GAAG,SAAS;IAKtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACH,UAAU,IAAI,IAAI;IAalB;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7C;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAcnB;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAc1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}
+{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAQxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EACf,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACI,MAAM,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAkBtC;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,GAAG,SAAS;IAKtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACH,UAAU,IAAI,IAAI;IAalB;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7C;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAcnB;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAc1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}

package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.js

@@ -263,7 +263,8 @@ export class PortletPartController {
                 containerState.addState(detail.id, buttonState);
             }
         });
-        await containerState.update(this.dashboard.context);
+        const viewData = this.dashboard.view.state.srfactiveviewdata || undefined;
+        await containerState.update(this.dashboard.context, viewData);
         this.state.actionGroupState = containerState;
         // 实体门户视图监听视图数据变更，刷新界面行为组的状态。
         const { appDataEntityId } = this.dashboard.view.model;

package/out/controller/control/form/edit-form/edit-form.controller.d.ts

@@ -39,6 +39,14 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @memberof EditFormController
      */
     anchorData: IData[];
+    /**
+     * 是否打开消息弹窗
+     *
+     * @protected
+     * @type {boolean}
+     * @memberof EditFormController
+     */
+    protected hasOpenConfirm: boolean;
     /**
      * 初始化方法
      *
@@ -166,6 +174,14 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @param {IData} data
      */
     setSimpleData(data: IData): void;
+    /**
+     * 刷新确认
+     *
+     * @protected
+     * @return {*}  {Promise<boolean>}
+     * @memberof ControlController
+     */
+    protected reloadConfirm(): Promise<boolean>;
     /**
      * 检测实体数据变更
      *
@@ -176,5 +192,13 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @return {*}  {void}
      */
     protected onDEDataChange(msg: IPortalMessage): void;
+    /**
+     * 过滤成员
+     *
+     * @param {string} filter 过滤值
+     * @return {*}  {void}
+     * @memberof EditFormController
+     */
+    filterDetail(filter: string): void;
 }
 //# sourceMappingURL=edit-form.controller.d.ts.map

package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI5E,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAS,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;OAKG;IACI,UAAU,EAAE,KAAK,EAAE,CAAM;IAEhC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAW7B;;;;;OAKG;IACI,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,GAAE,KAAK,EAAO,GAAG,IAAI;cAevD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAgC1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAkDrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAuFjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAwDzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiE7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgClD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B/B;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BxC;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,SAAS;IAiBlC;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAyBhC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CA2BpD"}
+{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/form/edit-form/edit-form.controller.js

@@ -2,7 +2,7 @@ import { awaitTimeout, IBizContext, isElementSame, mergeInLeft, RuntimeError, }
 import { debounce } from 'lodash-es';
 import { createUUID } from 'qx-util';
 import { clone, isNil } from 'ramda';
-import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
+import { calcDeCodeNameById, findChildFormDetails, hasDeCodeName, } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
 import { ScriptFactory } from '../../../../utils';
 import { FormNotifyState } from '../../../constant';
@@ -37,6 +37,14 @@ export class EditFormController extends FormController {
          * @memberof EditFormController
          */
         this.anchorData = [];
+        /**
+         * 是否打开消息弹窗
+         *
+         * @protected
+         * @type {boolean}
+         * @memberof EditFormController
+         */
+        this.hasOpenConfirm = false;
     }
     get view() {
         return this.ctx.view;
@@ -268,6 +276,12 @@ export class EditFormController extends FormController {
             await this.startLoading();
         }
         const { context, data } = this.handlerAbilityParams(args);
+        // 表单未修改则阻止触发界面域变更，防止自动保存引发界面域状态异常状态（场景：仅值项填充文本触发表单自动保存）
+        if (!this.state.modified) {
+            Object.assign(context, {
+                srfactiontrusted: false,
+            });
+        }
         const saveData = data[0];
         await this.checkIgnoreInput(saveData);
         const isCreate = saveData.srfuf === Srfuf.CREATE;
@@ -653,6 +667,27 @@ export class EditFormController extends FormController {
             this.dataChangeNotify(Object.keys(diffData));
         }
     }
+    /**
+     * 刷新确认
+     *
+     * @protected
+     * @return {*}  {Promise<boolean>}
+     * @memberof ControlController
+     */
+    async reloadConfirm() {
+        // 如果之前已经打开了则直接返回false
+        if (this.hasOpenConfirm)
+            return false;
+        // 标记已打开消息弹窗
+        this.hasOpenConfirm = true;
+        const result = await ibiz.confirm.info({
+            title: ibiz.i18n.t('runtime.controller.control.form.refreshPrompt'),
+            desc: ibiz.i18n.t('runtime.controller.control.form.refreshPagePrompt'),
+        });
+        // 标记已关闭消息弹窗
+        this.hasOpenConfirm = false;
+        return result;
+    }
     /**
      * 检测实体数据变更
      *
@@ -663,27 +698,79 @@ export class EditFormController extends FormController {
      * @return {*}  {void}
      */
     onDEDataChange(msg) {
-        var _a;
+        var _a, _b;
+        const { appDataEntityId } = this.model;
         // 表单只关心更新
-        if (msg.subtype !== 'OBJECTUPDATED') {
+        if (msg.subtype !== 'OBJECTUPDATED' || !appDataEntityId)
             return;
-        }
         // msg.triggerKey 不为空，且与当前控制器的triggerKey一致时，则不处理
-        if (!isNil(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+        if (!isNil(msg.triggerKey) && msg.triggerKey === this.triggerKey)
             return;
+        let data;
+        try {
+            data = msg.data || (msg.content ? JSON.parse(msg.content) : undefined);
         }
-        // 非这个实体的数据变更，则不处理
-        // 非当前主键的变更不处理
-        if (this.model.appDataEntityId) {
-            const dename = calcDeCodeNameById(this.model.appDataEntityId);
-            if (!msg.data ||
-                ((_a = msg.data.srfdecodename) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== dename ||
-                msg.data.srfkey !== this.data.srfkey) {
-                return;
-            }
-            this.doNextActive(() => !this.ctx.isDestroyed && this.load(), {
+        catch (error) {
+            ibiz.log.error(error);
+        }
+        // 没有信息内容不处理
+        if (!data)
+            return;
+        // 当前实体名称
+        const dename = calcDeCodeNameById(appDataEntityId);
+        // 是否启用脏检查(后台消息启用脏检查)
+        const enableDirtyChecking = !msg.data;
+        // 是否重载(必须同实体同主键才做刷新处理)
+        const isReload = (((_a = data.srfdecodename) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === dename ||
+            ((_b = data.srfdename) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === dename) &&
+            data.srfkey === this.data.srfkey;
+        if (isReload) {
+            this.doNextActive(async () => {
+                if (!this.ctx.isDestroyed) {
+                    if (enableDirtyChecking && this.state.modified) {
+                        const result = await this.reloadConfirm();
+                        if (!result)
+                            return;
+                    }
+                    this.load();
+                }
+            }, {
                 key: 'load',
             });
         }
     }
+    /**
+     * 过滤成员
+     *
+     * @param {string} filter 过滤值
+     * @return {*}  {void}
+     * @memberof EditFormController
+     */
+    filterDetail(filter) {
+        const { deformPages } = this.model;
+        if (!deformPages || !deformPages.length)
+            return;
+        // 递归计算成员显示状态
+        const clacVisible = (detail) => {
+            var _a;
+            // 默认设置为不可见
+            let visible = false;
+            // 如果成员标题包含过滤值，设置为可见
+            if ((_a = detail.caption) === null || _a === void 0 ? void 0 : _a.includes(filter)) {
+                visible = true;
+            }
+            // 递归处理子成员
+            const childDetails = findChildFormDetails(detail);
+            if (childDetails.length) {
+                const children = childDetails.map(clacVisible);
+                // 如果子成员中有可见的，父成员也必须可见
+                if (children.some(_v => _v))
+                    visible = true;
+            }
+            if (this.details[detail.id])
+                this.details[detail.id].state.visible = visible;
+            return visible;
+        };
+        deformPages.forEach(clacVisible);
+    }
 }

package/out/controller/control/form/form-detail/form-button/form-button.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-button.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAIpE;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IACnE,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7D;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAUrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAQpC;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBlD;;;;;;;;OAQG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BzD"}
+{"version":3,"file":"form-button.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAIpE;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IACnE,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAUrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAQpC;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBlD;;;;;;;;OAQG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BzD"}

package/out/controller/control/form/form-detail/form-button/form-button.controller.js

@@ -54,7 +54,7 @@ export class FormButtonController extends FormDetailController {
      */
     async formStateNotify(_state) {
         if (this.actionState) {
-            const deCodeName = calcDeCodeNameById(this.form.model.appDataEntityId);
+            const deCodeName = calcDeCodeNameById(this.form.model.appDataEntityId || '');
             await this.actionState.update(this.context, this.data, deCodeName);
         }
         await super.formStateNotify(_state);

package/out/controller/control/form/form-detail/form-button-list/form-button-list.controller.d.ts

@@ -1,4 +1,4 @@
-import { IDEFormButtonList } from '@ibiz/model-core';
+import { IDEFormButton, IDEFormButtonList } from '@ibiz/model-core';
 import { FormDetailController } from '../form-detail';
 import { FormNotifyState } from '../../../../constant';
 import { FormButtonListState } from './form-button-list.state';
@@ -54,6 +54,15 @@ export declare class FormButtonListController extends FormDetailController<IDEFo
      * @memberof FormButtonListController
      */
     calcDetailVisible(data: IData): void;
+    /**
+     * 通过项标识获取项模型
+     *
+     * @private
+     * @param {string} id
+     * @return {*}  {(IDEFormButton | IUIActionGroupDetail | undefined)}
+     * @memberof FormButtonListController
+     */
+    private getModelById;
     /**
      * 执行界面行为
      *
@@ -62,6 +71,37 @@ export declare class FormButtonListController extends FormDetailController<IDEFo
      * @return {*}  {Promise<void>}
      * @memberof FormButtonListController
      */
-    doUIAction(actionId: string, event?: MouseEvent): Promise<void>;
+    doUIAction(actionId: string, appId: string, event?: MouseEvent): Promise<void>;
+    /**
+     * 处理公共参数
+     *
+     * @param {IData} data
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {{ context: IContext; params: IParams }}
+     * @memberof FormButtonListController
+     */
+    handlePublicParams(model: IDEFormButton, data: IData, context: IContext, params: IParams): {
+        context: IContext;
+        params: IParams;
+    };
+    /**
+     * 执行表单项更新
+     *
+     * @param {IDEFormButton} model
+     * @param {MouseEvent} [event]
+     * @return {*}  {Promise<void>}
+     * @memberof FormButtonListController
+     */
+    doFormItemUpdate(model: IDEFormButton, event?: MouseEvent): Promise<void>;
+    /**
+     * 处理按钮点击
+     *
+     * @param {string} id
+     * @param {MouseEvent} [event]
+     * @return {*}  {Promise<void>}
+     * @memberof FormButtonListController
+     */
+    handleClick(id: string, event?: MouseEvent): Promise<void>;
 }
 //# sourceMappingURL=form-button-list.controller.d.ts.map

package/out/controller/control/form/form-detail/form-button-list/form-button-list.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-button-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button-list/form-button-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAE1E;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB,CAAC,iBAAiB,CAAC;IAC3E,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;;;OAMG;gBAED,KAAK,EAAE,iBAAiB,EACxB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;cAMzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;OAMG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASrC;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASpC;;;;;;;OAOG;IACG,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAetE"}
+{"version":3,"file":"form-button-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button-list/form-button-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACL,8BAA8B,EAE/B,MAAM,0BAA0B,CAAC;AAKlC;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB,CAAC,iBAAiB,CAAC;IAC3E,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;;;OAMG;gBAED,KAAK,EAAE,iBAAiB,EACxB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;cAMzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;OAMG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASrC;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASpC;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY;IAWpB;;;;;;;OAOG;IACG,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;;;;OAQG;IACI,kBAAkB,CACvB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;;OAOG;IACG,gBAAgB,CACpB,KAAK,EAAE,aAAa,EACpB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;;;;;OAOG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CASjE"}

package/out/controller/control/form/form-detail/form-button-list/form-button-list.controller.js

@@ -2,6 +2,8 @@ import { UIActionUtil } from '../../../../../ui-action';
 import { FormDetailController } from '../form-detail';
 import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
 import { FormButtonListState } from './form-button-list.state';
+import { OpenAppViewCommand } from '../../../../../command';
+import { convertNavData } from '../../../../../utils';
 /**
  * 表单按钮组控制器
  *
@@ -41,7 +43,7 @@ export class FormButtonListController extends FormDetailController {
         if (buttonListType === 'UIACTIONGROUP') {
             (_a = uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.forEach(detail => {
                 if (detail.uiactionId) {
-                    const buttonState = new UIActionButtonState(detail.id, this.model.appId, detail.uiactionId, detail);
+                    const buttonState = new UIActionButtonState(detail.id, detail.appId, detail.uiactionId, detail);
                     this.state.buttonsState.addState(detail.id, buttonState);
                 }
             });
@@ -97,6 +99,21 @@ export class FormButtonListController extends FormDetailController {
         }
         super.calcDetailVisible(data);
     }
+    /**
+     * 通过项标识获取项模型
+     *
+     * @private
+     * @param {string} id
+     * @return {*}  {(IDEFormButton | IUIActionGroupDetail | undefined)}
+     * @memberof FormButtonListController
+     */
+    getModelById(id) {
+        var _a;
+        const { buttonListType, uiactionGroup, deformButtons } = this.model;
+        if (buttonListType === 'UIACTIONGROUP')
+            return (_a = uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.find(detail => detail.id === id);
+        return deformButtons === null || deformButtons === void 0 ? void 0 : deformButtons.find(button => button.id === id);
+    }
     /**
      * 执行界面行为
      *
@@ -105,7 +122,7 @@ export class FormButtonListController extends FormDetailController {
      * @return {*}  {Promise<void>}
      * @memberof FormButtonListController
      */
-    async doUIAction(actionId, event) {
+    async doUIAction(actionId, appId, event) {
         await UIActionUtil.execAndResolved(actionId, {
             context: this.form.context,
             params: this.form.params,
@@ -114,6 +131,72 @@ export class FormButtonListController extends FormDetailController {
             ctrl: this.form,
             event,
             noWaitRoute: true,
-        }, this.model.appId);
+        }, appId || this.model.appId);
+    }
+    /**
+     * 处理公共参数
+     *
+     * @param {IData} data
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {{ context: IContext; params: IParams }}
+     * @memberof FormButtonListController
+     */
+    handlePublicParams(model, data, context, params) {
+        const { navigateContexts, navigateParams } = model;
+        let selfContext = {};
+        if (navigateContexts && data) {
+            selfContext = convertNavData(navigateContexts, data, params, context);
+        }
+        const _context = Object.assign(context.clone(), selfContext);
+        let _params = {};
+        if (navigateParams && data) {
+            _params = convertNavData(navigateParams, data, params, context);
+        }
+        return { context: _context, params: _params };
+    }
+    /**
+     * 执行表单项更新
+     *
+     * @param {IDEFormButton} model
+     * @param {MouseEvent} [event]
+     * @return {*}  {Promise<void>}
+     * @memberof FormButtonListController
+     */
+    async doFormItemUpdate(model, event) {
+        const { deformItemUpdateId, paramPickupAppViewId, actionType } = model;
+        if (!deformItemUpdateId || actionType !== 'FIUPDATE')
+            return;
+        if (paramPickupAppViewId) {
+            const { context, params } = this.handlePublicParams(model, this.data, this.context, this.params);
+            const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, paramPickupAppViewId, context, params, { event, noWaitRoute: true });
+            if ((res === null || res === void 0 ? void 0 : res.ok) && res.data) {
+                this.data.srfactionparam = res.data;
+                await this.form.updateFormItem(deformItemUpdateId);
+                this.data.srfactionparam = undefined;
+            }
+        }
+        else {
+            await this.form.updateFormItem(deformItemUpdateId);
+        }
+    }
+    /**
+     * 处理按钮点击
+     *
+     * @param {string} id
+     * @param {MouseEvent} [event]
+     * @return {*}  {Promise<void>}
+     * @memberof FormButtonListController
+     */
+    async handleClick(id, event) {
+        const action = this.getModelById(id);
+        if (!action)
+            return;
+        if (action.uiactionId) {
+            await this.doUIAction(action.uiactionId, action.appId, event);
+        }
+        else {
+            await this.doFormItemUpdate(action, event);
+        }
     }
 }

package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts

@@ -107,6 +107,13 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
      * @type {(number | undefined)}
      */
     get dataType(): number | undefined;
+    /**
+     * tips缓存标识
+     *
+     * @private
+     * @memberof FormItemController
+     */
+    private TIPS_CHCHE;
     /**
      * 初始化
      *
@@ -116,6 +123,13 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
      * @returns {*}  {Promise<void>}
      */
     protected onInit(): Promise<void>;
+    /**
+     * 初始化tips
+     *
+     * @protected
+     * @memberof FormItemController
+     */
+    protected initTips(): void;
     /**
      * 初始化值规则
      *
@@ -185,5 +199,12 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
      * @date 2024-08-06 10:03:26
      */
     onClick(event?: MouseEvent, params?: IParams): Promise<void>;
+    /**
+     * 加载输入提示信息
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof FormItemController
+     */
+    loadInputTip(): Promise<void>;
 }
 //# sourceMappingURL=form-item.controller.d.ts.map