From 9981c82e0e1343e3d3b669dafb47c8e036b54d86 Mon Sep 17 00:00:00 2001 From: zhangkang <57750083+zhangkang1314@users.noreply.github.com> Date: Fri, 26 May 2023 20:11:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E9=80=89=E6=8B=A9=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/control/i-list.controller.ts | 22 +++++++++- .../control/i-pickup-view-panel.controller.ts | 38 +++++++++++++++++ .../controller/controller/control/index.ts | 1 + .../control/i-pickup-view-panel.event.ts | 41 +++++++++++++++++++ .../controller/event/control/index.ts | 1 + .../controller/event/view/i-md-view.event.ts | 19 ++++++++- .../control/i-pickup-view-panel.state.ts | 34 +++++++++++++++ .../controller/state/control/index.ts | 1 + .../state/view/i-mpickup-view.state.ts | 22 ++++++++++ .../state/view/i-pickup-grid-view.state.ts | 22 ++++++++++ .../state/view/i-pickup-view.state.ts | 10 +++++ .../interface/controller/state/view/index.ts | 3 ++ 12 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 packages/runtime/src/interface/controller/controller/control/i-pickup-view-panel.controller.ts create mode 100644 packages/runtime/src/interface/controller/event/control/i-pickup-view-panel.event.ts create mode 100644 packages/runtime/src/interface/controller/state/control/i-pickup-view-panel.state.ts create mode 100644 packages/runtime/src/interface/controller/state/view/i-mpickup-view.state.ts create mode 100644 packages/runtime/src/interface/controller/state/view/i-pickup-grid-view.state.ts create mode 100644 packages/runtime/src/interface/controller/state/view/i-pickup-view.state.ts diff --git a/packages/runtime/src/interface/controller/controller/control/i-list.controller.ts b/packages/runtime/src/interface/controller/controller/control/i-list.controller.ts index 65948717c1..7b7c33afd5 100644 --- a/packages/runtime/src/interface/controller/controller/control/i-list.controller.ts +++ b/packages/runtime/src/interface/controller/controller/control/i-list.controller.ts @@ -12,4 +12,24 @@ import { IMDControlController } from './i-md-control.controller'; * @extends {IMDControlController} */ export interface IListController - extends IMDControlController {} + extends IMDControlController { + /** + * 设置列表数据 + * + * @author zk + * @date 2023-05-26 02:05:55 + * @param {IData[]} items + * @memberof IListController + */ + setData(items: IData[]): void; + + /** + * 获取列表全部数据 + * + * @author zk + * @date 2023-05-26 02:05:26 + * @return {*} {IData[]} + * @memberof IListController + */ + getAllData(): IData[]; +} diff --git a/packages/runtime/src/interface/controller/controller/control/i-pickup-view-panel.controller.ts b/packages/runtime/src/interface/controller/controller/control/i-pickup-view-panel.controller.ts new file mode 100644 index 0000000000..3ae1fe61f2 --- /dev/null +++ b/packages/runtime/src/interface/controller/controller/control/i-pickup-view-panel.controller.ts @@ -0,0 +1,38 @@ +import { IDEPickupViewPanel } from '@ibiz/model-core'; +import { IPickupViewPanelEvent } from '../../event'; +import { IPickupViewPanelState } from '../../state'; +import { IControlController } from './i-control.controller'; + +/** + * 选择视图面板控制器 + * + * @export + * @interface IPickupViewPanelController + * @extends {IControlController} + */ +export interface IPickupViewPanelController + extends IControlController< + IDEPickupViewPanel, + IPickupViewPanelState, + IPickupViewPanelEvent + > { + /** + * 获取选中数据 + * + * @author zk + * @date 2023-05-26 02:05:17 + * @return {*} {IData[]} + * @memberof IPickupViewPanelController + */ + getSelectedData(): Promise; + + /** + * 获取所有数据 + * + * @author zk + * @date 2023-05-26 02:05:17 + * @return {*} {IData[]} + * @memberof IPickupViewPanelController + */ + getAllData(): Promise; +} diff --git a/packages/runtime/src/interface/controller/controller/control/index.ts b/packages/runtime/src/interface/controller/controller/control/index.ts index 9d6d535fc8..e181ef9778 100644 --- a/packages/runtime/src/interface/controller/controller/control/index.ts +++ b/packages/runtime/src/interface/controller/controller/control/index.ts @@ -14,3 +14,4 @@ export * from './i-toolbar.controller'; export * from './i-view-layout-panel.controller'; export * from './i-caption-bar.controller'; export * from './i-data-view-control.controller'; +export * from './i-pickup-view-panel.controller'; diff --git a/packages/runtime/src/interface/controller/event/control/i-pickup-view-panel.event.ts b/packages/runtime/src/interface/controller/event/control/i-pickup-view-panel.event.ts new file mode 100644 index 0000000000..1525d6df75 --- /dev/null +++ b/packages/runtime/src/interface/controller/event/control/i-pickup-view-panel.event.ts @@ -0,0 +1,41 @@ +import { EventBase } from '../argument'; +import { IControlEvent } from './i-control.event'; + +/** + * 选择视图面板部件事件 + * + * @export + * @interface IPickupViewPanelEvent + * @extends {IControlEvent} + */ +export interface IPickupViewPanelEvent extends IControlEvent { + /** + * 选中数据变更事件 + * + * @type {{ + * event: EventBase; + * emitArgs: { data: IData[] }; + * }} + * @memberof IPickupViewPanelEvent + */ + onSelectionChange: { + event: EventBase; + emitArgs: { data: IData[] }; + }; + + /** + * 激活数据变更事件 + * + * @author zk + * @date 2023-05-26 11:05:52 + * @type {{ + * event: EventBase; + * emitArgs: { data: IData[] }; + * }} + * @memberof IPickupViewPanelEvent + */ + onDataActive: { + event: EventBase; + emitArgs: { data: IData[] }; + }; +} diff --git a/packages/runtime/src/interface/controller/event/control/index.ts b/packages/runtime/src/interface/controller/event/control/index.ts index dfb5f4d75f..518241d32a 100644 --- a/packages/runtime/src/interface/controller/event/control/index.ts +++ b/packages/runtime/src/interface/controller/event/control/index.ts @@ -15,3 +15,4 @@ export * from './i-view-layout-panel.event'; export * from './i-wizard-panel.event'; export * from './i-kanban.event'; export * from './i-caption-bar.event'; +export * from './i-pickup-view-panel.event'; diff --git a/packages/runtime/src/interface/controller/event/view/i-md-view.event.ts b/packages/runtime/src/interface/controller/event/view/i-md-view.event.ts index 0d8f193b6e..3cdfb32d90 100644 --- a/packages/runtime/src/interface/controller/event/view/i-md-view.event.ts +++ b/packages/runtime/src/interface/controller/event/view/i-md-view.event.ts @@ -1,3 +1,4 @@ +import { EventBase } from '../argument'; import { IViewEvent } from './i-view.event'; /** @@ -9,4 +10,20 @@ import { IViewEvent } from './i-view.event'; * @interface IMDViewEvent * @extends {IViewEvent} */ -export interface IMDViewEvent extends IViewEvent {} +export interface IMDViewEvent extends IViewEvent { + /** + * 数据激活事件 + * + * @author zk + * @date 2023-05-26 10:05:26 + * @type {{ + * event: EventBase; + * emitArgs: { data: IData[] }; + * }} + * @memberof IMDViewEvent + */ + onDataActive: { + event: EventBase; + emitArgs: { data: IData[] }; + }; +} diff --git a/packages/runtime/src/interface/controller/state/control/i-pickup-view-panel.state.ts b/packages/runtime/src/interface/controller/state/control/i-pickup-view-panel.state.ts new file mode 100644 index 0000000000..245a40f9f6 --- /dev/null +++ b/packages/runtime/src/interface/controller/state/control/i-pickup-view-panel.state.ts @@ -0,0 +1,34 @@ +import { IControlState } from './i-control.state'; + +/** + * 选择视图面板UI状态 + * + * @export + * @interface IPickupViewPanelState + * @extends {IControlState} + */ +export interface IPickupViewPanelState extends IControlState { + /** + * 单选 + * + * @type {boolean} + * @memberof IPickupViewPanelState + */ + singleSelect: boolean; + + /** + * 嵌入选择视图的上下文 + * + * @type {IContext} + * @memberof IPickupViewPanelState + */ + context: IContext; + + /** + * 嵌入选择视图的视图参数 + * + * @type {IParams} + * @memberof IPickupViewPanelState + */ + params: IParams; +} diff --git a/packages/runtime/src/interface/controller/state/control/index.ts b/packages/runtime/src/interface/controller/state/control/index.ts index 5a4ca494c1..7913cc2896 100644 --- a/packages/runtime/src/interface/controller/state/control/index.ts +++ b/packages/runtime/src/interface/controller/state/control/index.ts @@ -12,3 +12,4 @@ export * from './i-toolbar.state'; export * from './i-view-layout-panel.state'; export * from './i-caption-bar.state'; export * from './i-data-view-control.state'; +export * from './i-pickup-view-panel.state'; diff --git a/packages/runtime/src/interface/controller/state/view/i-mpickup-view.state.ts b/packages/runtime/src/interface/controller/state/view/i-mpickup-view.state.ts new file mode 100644 index 0000000000..9bc3b524b0 --- /dev/null +++ b/packages/runtime/src/interface/controller/state/view/i-mpickup-view.state.ts @@ -0,0 +1,22 @@ +import { IViewState } from './i-view.state'; + +/** + * 数据多项选择视图UI状态 + * + * @author zk + * @date 2023-05-25 03:05:39 + * @export + * @interface IMPickUpViewState + * @extends {IViewState} + */ +export interface IMPickupViewState extends IViewState { + /** + * 选中数据 + * + * @author zk + * @date 2023-05-25 05:05:10 + * @type {IData[]} + * @memberof IMPickupViewState + */ + selectData: IData[]; +} diff --git a/packages/runtime/src/interface/controller/state/view/i-pickup-grid-view.state.ts b/packages/runtime/src/interface/controller/state/view/i-pickup-grid-view.state.ts new file mode 100644 index 0000000000..8c18ab7add --- /dev/null +++ b/packages/runtime/src/interface/controller/state/view/i-pickup-grid-view.state.ts @@ -0,0 +1,22 @@ +import { IGridViewState } from './i-grid-view.state'; + +/** + * 表格选择视图UI状态 + * + * @author zk + * @date 2023-05-25 05:05:43 + * @export + * @interface IPickupGridViewState + * @extends {IGridViewState} + */ +export interface IPickupGridViewState extends IGridViewState { + /** + * 是否单选 + * + * @author zk + * @date 2023-05-26 05:05:02 + * @type {boolean} + * @memberof IPickupGridViewState + */ + singleSelect: boolean; +} diff --git a/packages/runtime/src/interface/controller/state/view/i-pickup-view.state.ts b/packages/runtime/src/interface/controller/state/view/i-pickup-view.state.ts new file mode 100644 index 0000000000..5e8dba2472 --- /dev/null +++ b/packages/runtime/src/interface/controller/state/view/i-pickup-view.state.ts @@ -0,0 +1,10 @@ +import { IViewState } from './i-view.state'; + +/** + * 单数据选择视图UI状态 + * + * @export + * @interface IPickupViewState + * @extends {IViewState} + */ +export interface IPickupViewState extends IViewState {} diff --git a/packages/runtime/src/interface/controller/state/view/index.ts b/packages/runtime/src/interface/controller/state/view/index.ts index eea403dfc1..7ff8c0df86 100644 --- a/packages/runtime/src/interface/controller/state/view/index.ts +++ b/packages/runtime/src/interface/controller/state/view/index.ts @@ -5,3 +5,6 @@ export * from './i-grid-view.state'; export * from './i-list-view.state'; export * from './i-data-view.state'; export * from './i-opt-view.state'; +export * from './i-mpickup-view.state'; +export * from './i-pickup-view.state'; +export * from './i-pickup-grid-view.state'; -- Gitee From 7d94cb03182ba52aaa06feba4c3925e2a9461732 Mon Sep 17 00:00:00 2001 From: zhangkang <57750083+zhangkang1314@users.noreply.github.com> Date: Fri, 26 May 2023 21:38:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=83=A8=E8=A1=8C=E4=B8=BA=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/runtime/src/constant/sys-uiaction-tag.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/runtime/src/constant/sys-uiaction-tag.ts b/packages/runtime/src/constant/sys-uiaction-tag.ts index 7ac1d700cf..9e6a3644cc 100644 --- a/packages/runtime/src/constant/sys-uiaction-tag.ts +++ b/packages/runtime/src/constant/sys-uiaction-tag.ts @@ -118,7 +118,7 @@ export enum SysUIActionTag { /** * 添加全部 */ - 'ADD_ALL' = 'RemoveAll', + 'ADD_ALL' = 'AddAll', /** * 登出 */ -- Gitee