@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.52

package/out/controller/control/search-bar/search-bar.controller.js

@@ -12,6 +12,7 @@ import { getOriginFilterNodes, calcSearchCondExs, SearchCondEx2filterNode, calcS
 import { ItemsValueOPs, isSimpleItems } from './util';
 import { SearchBarFilterSimpleItemsController } from './search-bar-filter-simple-items.controller';
 import { findFieldById } from '../../../model';
+import { CounterService } from '../../../service';
 const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
 /**
  * 搜索栏控制器
@@ -128,6 +129,18 @@ export class SearchBarController extends ControlController {
     get mdctrl() {
         return this.ctx.getController('mdctrl');
     }
+    /**
+     * @description 快速搜索提示分隔符
+     * @readonly
+     * @type {string}
+     * @memberof SearchBarController
+     */
+    get searchPhSeparator() {
+        if (this.controlParams.searchphseparator) {
+            return this.controlParams.searchphseparator;
+        }
+        return ibiz.config.common.searchPhSeparator;
+    }
     /**
      * 设置生成存储key的函数
      *
@@ -162,6 +175,7 @@ export class SearchBarController extends ControlController {
         this.enableStorage = this.controlParams.storage === 'true';
         await this.initByEntitySchema();
         await super.onCreated();
+        await this.initCounter();
         if (this.model.appDataEntityId) {
             const appDataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.context.srfappid);
             if (appDataEntity) {
@@ -265,7 +279,7 @@ export class SearchBarController extends ControlController {
                 }
             });
             if (placeHolders.length > 0) {
-                this.placeHolder = placeHolders.join('、');
+                this.placeHolder = placeHolders.join(this.searchPhSeparator);
                 this.state.quickSearchPlaceHolder = this.placeHolder;
             }
         }
@@ -357,6 +371,7 @@ export class SearchBarController extends ControlController {
      */
     resetFilter() {
         this.state.filterNodes = getOriginFilterNodes();
+        this.evt.emit('onReset', undefined);
         this.evt.emit('onSearch', undefined);
     }
     /**
@@ -490,6 +505,8 @@ export class SearchBarController extends ControlController {
                         order: (index + 1) * 100,
                         defaultSelect: false,
                         noEdit: true,
+                        counterId: item.counterId,
+                        counterMode: item.counterMode,
                     };
                     if (item.data) {
                         try {
@@ -698,6 +715,7 @@ export class SearchBarController extends ControlController {
             }
         }
         this.state.selectedSearchGroupItem = groupItem;
+        this.evt.emit('onTabChange', { data: [groupItem] });
         if (groupItem.saved || groupItem.ownerType === 'SYSTEM') {
             // 请求获取到搜索分组数据
             const res = await this.service.get(groupItem.id);
@@ -791,11 +809,84 @@ export class SearchBarController extends ControlController {
                         labels.push(item.label);
                     }
                 });
-                this.state.quickSearchPlaceHolder = labels.join('、');
+                this.state.quickSearchPlaceHolder = labels.join(this.searchPhSeparator);
             }
             else {
                 this.state.quickSearchPlaceHolder = this.placeHolder;
             }
         }
     }
+    /**
+     * @description 切换分组
+     * @param {string} tabId
+     * @memberof SearchBarController
+     */
+    selectTab(tabId) {
+        var _a, _b;
+        if (this.isBackendSearchGroup) {
+            const target = (_a = this.state.searchBarGroups) === null || _a === void 0 ? void 0 : _a.find(item => {
+                return item.name === tabId;
+            });
+            if (target) {
+                this.handleGroupClick(target);
+            }
+        }
+        else {
+            const target = (_b = this.model.searchBarGroups) === null || _b === void 0 ? void 0 : _b.find(item => {
+                return item.id === tabId;
+            });
+            if (target) {
+                this.state.selectedGroupItem = target;
+                this.evt.emit('onTabChange', { data: [target] });
+                this.onSearch();
+            }
+        }
+    }
+    /**
+     * @description 计算计数器显示状态
+     * @param {(IBackendSearchBarGroup | ISearchBarGroup)} item
+     * @returns {*}  {boolean}
+     * @memberof SearchBarController
+     */
+    calcCountVisible(item) {
+        if (!this.counter) {
+            return true;
+        }
+        const { counterId, counterMode } = item;
+        if (counterId) {
+            // 显示模式为1，且计数器数据为0时隐藏
+            const count = this.counter.getCounter(counterId);
+            if (counterMode === 1 && count === 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+    /**
+     * @description 初始化计数器
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof SearchBarController
+     */
+    async initCounter() {
+        if (this.state.isCounterDisabled)
+            return;
+        const { appCounterRefs } = this.model;
+        const appCounterRef = appCounterRefs === null || appCounterRefs === void 0 ? void 0 : appCounterRefs[0];
+        if (appCounterRef) {
+            this.counter = await CounterService.getCounterByRef(appCounterRef, this.context, Object.assign({}, this.params));
+        }
+    }
+    /**
+     * @description 监听组件销毁
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof SearchBarController
+     */
+    async onDestroyed() {
+        await super.onDestroyed();
+        if (this.counter) {
+            this.counter.destroy();
+        }
+    }
 }

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts

@@ -1,6 +1,7 @@
 import { IDETabViewPanel, ITabExpPanel } from '@ibiz/model-core';
 import { ITabExpPanelState, ITabExpPanelEvent, ITabExpPanelController, INavViewMsg } from '../../../interface';
 import { ControlController } from '../../common';
+import { AppCounter } from '../../../service';
 /**
  * 分页导航面板
  *
@@ -24,6 +25,12 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
      * @Date: 2023-09-20 10:36:46
      */
     isShowIcon: boolean;
+    /**
+     * @description 计数器对象
+     * @type {AppCounter}
+     * @memberof TabExpPanelController
+     */
+    counter?: AppCounter;
     /**
      * 是否缓存
      *
@@ -124,5 +131,31 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
      */
     getNavViewMsg(tabViewPanel: IDETabViewPanel): INavViewMsg;
     refresh(): void;
+    /**
+     * @description 初始化计数器
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof TabExpPanelController
+     */
+    protected initCounter(): Promise<void>;
+    /**
+     * @description 计数器对象数据改变
+     * @param {IData} data
+     * @memberof TabExpPanelController
+     */
+    onCounterChange(data: IData): void;
+    /**
+     * @description 设置激活项
+     * @param {string} name
+     * @memberof TabExpPanelController
+     */
+    setActive(name: string): void;
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof TabExpPanelController
+     */
+    protected onDestroyed(): Promise<void>;
 }
 //# sourceMappingURL=tab-exp-panel.controller.d.ts.map

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EAEZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IASP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;IAYhE,OAAO,IAAI,IAAI;CAKhB"}
+{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EAEZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAE9D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC;IAErB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAYhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAkBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IASP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;IAYhE,OAAO,IAAI,IAAI;IAMf;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAa5C;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK7B;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAM7C"}

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js

@@ -3,6 +3,7 @@ import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
 import { hasSubRoute } from '../../utils';
+import { CounterService } from '../../../service';
 /**
  * 分页导航面板
  *
@@ -70,6 +71,7 @@ export class TabExpPanelController extends ControlController {
         this.state.tabPages = [];
         this.state.activeName = '';
         this.state.expViewParams = {};
+        this.state.counterData = {};
     }
     /**
      * 创建完成
@@ -79,7 +81,10 @@ export class TabExpPanelController extends ControlController {
      * @memberof TabExpPanelController
      */
     async onCreated() {
+        var _a;
         await super.onCreated();
+        await this.initCounter();
+        (_a = this.counter) === null || _a === void 0 ? void 0 : _a.onChange(this.onCounterChange.bind(this));
         this.layoutPanel = this.view.layoutPanel;
         this.initTabPages();
         this.initIconCaption();
@@ -98,6 +103,7 @@ export class TabExpPanelController extends ControlController {
                 tabTag: panel.id,
                 class: panel.sysCss ? [panel.sysCss.cssName] : [],
                 sysImage: panel.sysImage,
+                counterId: panel.counterId,
             });
         });
         this.state.tabPages = tabPages;
@@ -246,4 +252,48 @@ export class TabExpPanelController extends ControlController {
         navViewMsg.key += createUUID();
         this.evt.emit('onNavViewChange', { navViewMsg });
     }
+    /**
+     * @description 初始化计数器
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof TabExpPanelController
+     */
+    async initCounter() {
+        if (this.state.isCounterDisabled)
+            return;
+        const { appCounterRefs } = this.model;
+        const appCounterRef = appCounterRefs === null || appCounterRefs === void 0 ? void 0 : appCounterRefs[0];
+        if (appCounterRef) {
+            this.counter = await CounterService.getCounterByRef(appCounterRef, this.context, Object.assign({}, this.params));
+        }
+    }
+    /**
+     * @description 计数器对象数据改变
+     * @param {IData} data
+     * @memberof TabExpPanelController
+     */
+    onCounterChange(data) {
+        this.state.counterData = data;
+    }
+    /**
+     * @description 设置激活项
+     * @param {string} name
+     * @memberof TabExpPanelController
+     */
+    setActive(name) {
+        this.state.activeName = name;
+        this.handleTabChange();
+    }
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof TabExpPanelController
+     */
+    async onDestroyed() {
+        await super.onDestroyed();
+        if (this.counter) {
+            this.counter.destroy();
+        }
+    }
 }

package/out/controller/control/toolbar/toolbar.controller.d.ts

@@ -1,5 +1,5 @@
-import { IDEToolbar, IDEToolbarItem, IControlLogic } from '@ibiz/model-core';
-import { EventBase, IToolbarState, IToolbarEvent, IToolbarController, IExtraButton, IToolbarItemProvider } from '../../../interface';
+import { IDEToolbar, IControlLogic, IDEToolbarItem } from '@ibiz/model-core';
+import { EventBase, IExtraButton, IToolbarState, IToolbarEvent, IToolbarController, IToolbarItemProvider } from '../../../interface';
 import { AppCounter } from '../../../service';
 import { ControlController } from '../../common';
 import { ControllerEvent } from '../../utils';
@@ -38,6 +38,32 @@ export declare class ToolbarController<T extends IDEToolbar = IDEToolbar, S exte
      * @type {AppCounter}
      */
     counter?: AppCounter;
+    /**
+     * @description 控制移动端工具栏在屏幕中的位置，仅工具栏样式设为自定义时生效
+     * @readonly
+     * @type {('LEFTSTART'
+     *     | 'LEFT'
+     *     | 'LEFTEND'
+     *     | 'RIGHT'
+     *     | 'RIGHTSTART'
+     *     | 'RIGHTEND')}
+     * @memberof ToolbarController
+     */
+    get placement(): 'LEFTSTART' | 'LEFT' | 'LEFTEND' | 'RIGHT' | 'RIGHTSTART' | 'RIGHTEND';
+    /**
+     * @description 控制移动端工具栏项的排列方向，仅工具栏样式设为自定义时生效
+     * @readonly
+     * @type {('VERTICAL' | 'HORIZONTAL')}
+     * @memberof ToolbarController
+     */
+    get direction(): 'VERTICAL' | 'HORIZONTAL';
+    /**
+     * @description 数据部件控制器
+     * @readonly
+     * @type {(ControlController | undefined)}
+     * @memberof ToolbarController
+     */
+    get xdataControl(): ControlController | undefined;
     protected initState(): void;
     /**
      * 执行按钮的界面行为（如果按钮存在界面行为的话）
@@ -90,6 +116,12 @@ export declare class ToolbarController<T extends IDEToolbar = IDEToolbar, S exte
      * @date 2024-12-11 15:57:00
      */
     protected onMounted(): Promise<void>;
+    /**
+     * @description 监听数据部件事件
+     * @protected
+     * @memberof ToolbarController
+     */
+    protected listenerXdataControlEvent(): void;
     /**
      * 生命周期-销毁完成，实际执行逻辑，子类重写用这个
      * @author ljx
@@ -108,7 +140,7 @@ export declare class ToolbarController<T extends IDEToolbar = IDEToolbar, S exte
      * @memberof ToolbarController
      */
     onItemClick(item: IDEToolbarItem | IExtraButton, event: MouseEvent, params?: IData): Promise<void>;
-    calcButtonState(data?: IData, appDeId?: string): Promise<void>;
+    calcButtonState(data?: IData, appDeId?: string, _params?: IParams): Promise<void>;
     setExtraButtons(position: 'before' | 'after' | number, buttons: IExtraButton[]): void;
     clearExtraButtons(position?: 'before' | 'after' | number): void;
     protected initControlScheduler(logics?: IControlLogic[]): void;

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

@@ -1 +1 @@
-{"version":3,"file":"toolbar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EAGd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,SAAS,EACT,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEZ,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,UAAU,EAAa,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAIhB,MAAM,aAAa,CAAC;AAGrB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED;;;;;;OAMG;IACH,eAAe,EAAE,cAAc,EAAE,CAAM;IAEvC;;;;;;OAMG;IACH,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAE5D;;;;;OAKG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC;IAErB,SAAS,CAAC,SAAS,IAAI,IAAI;IAS3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAqBlE;;;;;;;OAOG;cACa,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWzD;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;;;OAKG;IACH,WAAW,IAAI,IAAI;cAWH,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsE1C;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2DpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}
+{"version":3,"file":"toolbar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/toolbar/toolbar.controller.js

@@ -1,10 +1,10 @@
 import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
 import { ViewCallTag, ViewMode } from '../../../constant';
-import { getUIActionById } from '../../../model';
+import { calcUIActionDetails, getUIActionById } from '../../../model';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { ControlController } from '../../common';
-import { ButtonContainerState, UIActionButtonState, formatSeparator, } from '../../utils';
+import { formatSeparator, UIActionButtonState, ButtonContainerState, } from '../../utils';
 import { getToolbarItemProvider } from '../../../register';
 /**
  * 工具栏控制器
@@ -37,6 +37,40 @@ export class ToolbarController extends ControlController {
     get _evt() {
         return this.evt;
     }
+    /**
+     * @description 控制移动端工具栏在屏幕中的位置，仅工具栏样式设为自定义时生效
+     * @readonly
+     * @type {('LEFTSTART'
+     *     | 'LEFT'
+     *     | 'LEFTEND'
+     *     | 'RIGHT'
+     *     | 'RIGHTSTART'
+     *     | 'RIGHTEND')}
+     * @memberof ToolbarController
+     */
+    get placement() {
+        return this.controlParams.placement || 'RIGHTEND';
+    }
+    /**
+     * @description 控制移动端工具栏项的排列方向，仅工具栏样式设为自定义时生效
+     * @readonly
+     * @type {('VERTICAL' | 'HORIZONTAL')}
+     * @memberof ToolbarController
+     */
+    get direction() {
+        return this.controlParams.direction || 'HORIZONTAL';
+    }
+    /**
+     * @description 数据部件控制器
+     * @readonly
+     * @type {(ControlController | undefined)}
+     * @memberof ToolbarController
+     */
+    get xdataControl() {
+        const { xdataControlName } = this.model;
+        if (xdataControlName)
+            return this.view.getController(xdataControlName.toLowerCase());
+    }
     initState() {
         super.initState();
         this.state.buttonsState = new ButtonContainerState();
@@ -75,6 +109,10 @@ export class ToolbarController extends ControlController {
             }
             try {
                 const args = await this.getToolbarEventArgs();
+                // fix:修复工具栏项点击appid异常
+                args.context = Object.assign(args.context, {
+                    srfappid: item.appId,
+                });
                 args.params = Object.assign(param, args.params);
                 await UIActionUtil.execAndResolved(actionId, Object.assign(Object.assign({}, args), { event }), item.appId);
             }
@@ -93,12 +131,10 @@ export class ToolbarController extends ControlController {
      */
     async getToolbarEventArgs() {
         var _a;
-        const { xdataControlName } = this.model;
         const result = this.getEventArgs();
         let data = [];
-        if (xdataControlName) {
-            data =
-                ((_a = this.view.getController(xdataControlName.toLowerCase())) === null || _a === void 0 ? void 0 : _a.getData()) || [];
+        if (this.xdataControl) {
+            data = ((_a = this.xdataControl) === null || _a === void 0 ? void 0 : _a.getData()) || [];
         }
         else {
             data = (await this.ctx.view.call(ViewCallTag.GET_DATA)) || [];
@@ -137,6 +173,8 @@ export class ToolbarController extends ControlController {
      * @return {*}
      */
     initCounter() {
+        if (this.state.isCounterDisabled)
+            return;
         const { counters } = this.ctx.view;
         const { appCounterRefs } = this.ctx.view.model.viewLayoutPanel;
         if (appCounterRefs && appCounterRefs.length > 0) {
@@ -149,6 +187,8 @@ export class ToolbarController extends ControlController {
     async onCreated() {
         await super.onCreated();
         this.state.viewMode = this.ctx.view.modal.mode;
+        // 收集所有遍历过程中的异步任务
+        const asyncTasks = [];
         // 初始化工具栏状态控制对象
         recursiveIterate(this.model, (item) => {
             this.allToolbarItems.push(item);
@@ -175,18 +215,27 @@ export class ToolbarController extends ControlController {
             if (groupItem.groupExtractMode &&
                 groupItem.uiactionGroup &&
                 groupItem.uiactionGroup.uiactionGroupDetails) {
-                groupItem.uiactionGroup.uiactionGroupDetails.forEach((detail) => {
-                    const actionid = detail.uiactionId;
-                    if (actionid) {
-                        const buttonState = new UIActionButtonState(detail.id, detail.appId, actionid, detail);
-                        this.state.buttonsState.addState(detail.id, buttonState);
-                    }
-                });
+                const calcTask = calcUIActionDetails(groupItem.uiactionGroup.uiactionGroupDetails, this.context, this.params);
+                asyncTasks.push(calcTask);
             }
         }, { childrenFields: ['detoolbarItems'] });
+        // 确保工具栏状态初始化都完成后，再往下走
+        const allActionDetails = await Promise.all(asyncTasks);
+        allActionDetails.forEach(details => {
+            details.forEach(detail => {
+                const actionid = detail.uiactionId;
+                if (actionid) {
+                    const buttonState = new UIActionButtonState(detail.id, detail.appId, actionid, detail);
+                    this.state.buttonsState.addState(detail.id, buttonState);
+                }
+            });
+        });
         await this.initToolbarItemProviders();
         if (!this.state.manualCalcButtonState) {
-            await this.calcButtonState(undefined, this.model.appDataEntityId);
+            await this.calcButtonState(undefined, this.model.appDataEntityId, {
+                view: this.view,
+                ctrl: this,
+            });
         }
         else {
             await this.state.buttonsState.init();
@@ -202,8 +251,34 @@ export class ToolbarController extends ControlController {
         var _a;
         await super.onMounted();
         this.initCounter();
+        this.listenerXdataControlEvent();
         (_a = this.counter) === null || _a === void 0 ? void 0 : _a.onChange(this.onCounterChange.bind(this));
     }
+    /**
+     * @description 监听数据部件事件
+     * @protected
+     * @memberof ToolbarController
+     */
+    listenerXdataControlEvent() {
+        const { name } = this.model;
+        // 排除默认工具栏（默认工具栏和分页默认传送工具栏交由视图自行处理）
+        if (!this.xdataControl || !name || ['toolbar', 'tabtoolbar'].includes(name))
+            return;
+        const listener = (event) => {
+            var _a, _b;
+            const data = event.data[0];
+            const model = (_b = (_a = event.ctrl) === null || _a === void 0 ? void 0 : _a.model) === null || _b === void 0 ? void 0 : _b.appDataEntityId;
+            this.calcButtonState(data, model, event);
+        };
+        // 加载成功
+        this.xdataControl.evt.on('onLoadSuccess', listener);
+        // 加载草稿
+        this.xdataControl.evt.on('onLoadDraftSuccess', listener);
+        // 数据变更
+        this.xdataControl.evt.on('onDataChange', listener);
+        // 选中数据改变
+        this.xdataControl.evt.on('onSelectionChange', listener);
+    }
     /**
      * 生命周期-销毁完成，实际执行逻辑，子类重写用这个
      * @author ljx
@@ -238,7 +313,7 @@ export class ToolbarController extends ControlController {
             await this.doUIAction(item, event, params);
         }
     }
-    async calcButtonState(data, appDeId) {
+    async calcButtonState(data, appDeId, _params = {}) {
         let _data = data;
         if (data && data instanceof ControlVO) {
             _data = data.getOrigin();
@@ -254,6 +329,9 @@ export class ToolbarController extends ControlController {
         // 计算菜单项逻辑的预置逻辑
         if (this.scheduler) {
             const logicParams = {};
+            if (_params) {
+                Object.assign(logicParams, Object.assign({}, _params));
+            }
             if (_data) {
                 logicParams.data = [_data];
             }