From 772430b4702e6b363a1ada2eb28b11dd34140c70 Mon Sep 17 00:00:00 2001 From: Shine-zwj <1917095344@qq.com> Date: Tue, 23 May 2023 18:37:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E8=A7=86=E5=9B=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/i-data-view-ctrl.controller.ts | 18 ++++++++++++++++++ .../controller/controller/control/index.ts | 1 + ...card.event.ts => i-data-view-ctrl.event.ts} | 6 ++---- .../controller/event/control/index.ts | 2 +- .../controller/event/view/i-card-view.event.ts | 12 ------------ .../controller/event/view/i-data-view.event.ts | 10 ++++++++++ .../interface/controller/event/view/index.ts | 2 +- .../state/control/i-data-view-ctrl.state.ts | 10 ++++++++++ .../controller/state/control/index.ts | 1 + .../controller/state/view/i-data-view.state.ts | 10 ++++++++++ 10 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 packages/runtime/src/interface/controller/controller/control/i-data-view-ctrl.controller.ts rename packages/runtime/src/interface/controller/event/control/{i-card.event.ts => i-data-view-ctrl.event.ts} (50%) delete mode 100644 packages/runtime/src/interface/controller/event/view/i-card-view.event.ts create mode 100644 packages/runtime/src/interface/controller/event/view/i-data-view.event.ts create mode 100644 packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts create mode 100644 packages/runtime/src/interface/controller/state/view/i-data-view.state.ts diff --git a/packages/runtime/src/interface/controller/controller/control/i-data-view-ctrl.controller.ts b/packages/runtime/src/interface/controller/controller/control/i-data-view-ctrl.controller.ts new file mode 100644 index 00000000000..7b11c4f2b22 --- /dev/null +++ b/packages/runtime/src/interface/controller/controller/control/i-data-view-ctrl.controller.ts @@ -0,0 +1,18 @@ +import { IDEDataView } from '@ibiz/model-core'; +import { IDataViewCtrlEvent } from '../../event'; +import { IDataViewCtrlState } from '../../state'; +import { IMDControlController } from './i-md-control.controller'; + +/** + * 数据视图(卡片)控制器 + * + * @export + * @interface IDataViewCtrlController + * @extends {IMDControlController} + */ +export interface IDataViewCtrlController + extends IMDControlController< + IDEDataView, + IDataViewCtrlState, + IDataViewCtrlEvent + > {} diff --git a/packages/runtime/src/interface/controller/controller/control/index.ts b/packages/runtime/src/interface/controller/controller/control/index.ts index bdb435ac6cd..5b5fda18853 100644 --- a/packages/runtime/src/interface/controller/controller/control/index.ts +++ b/packages/runtime/src/interface/controller/controller/control/index.ts @@ -10,3 +10,4 @@ export * from './i-search-form.controller'; export * from './i-toolbar.controller'; export * from './i-view-layout-panel.controller'; export * from './i-caption-bar.controller'; +export * from './i-data-view-ctrl.controller'; diff --git a/packages/runtime/src/interface/controller/event/control/i-card.event.ts b/packages/runtime/src/interface/controller/event/control/i-data-view-ctrl.event.ts similarity index 50% rename from packages/runtime/src/interface/controller/event/control/i-card.event.ts rename to packages/runtime/src/interface/controller/event/control/i-data-view-ctrl.event.ts index 4520aa5427b..406f12b0f95 100644 --- a/packages/runtime/src/interface/controller/event/control/i-card.event.ts +++ b/packages/runtime/src/interface/controller/event/control/i-data-view-ctrl.event.ts @@ -1,11 +1,9 @@ import { IMDControlEvent } from './i-md-control.event'; /** - * 卡片部件事件 + * 数据视图(卡片)部件事件 * - * @author lxm - * @date 2022-08-30 16:08:43 * @export * @interface IMDControlEvent */ -export type ICardEvent = IMDControlEvent; +export type IDataViewCtrlEvent = IMDControlEvent; diff --git a/packages/runtime/src/interface/controller/event/control/index.ts b/packages/runtime/src/interface/controller/event/control/index.ts index 902c2e98898..f1be99afeb3 100644 --- a/packages/runtime/src/interface/controller/event/control/index.ts +++ b/packages/runtime/src/interface/controller/event/control/index.ts @@ -9,7 +9,7 @@ export * from './i-grid.event'; export * from './i-list.event'; export * from './i-tree.event'; export * from './i-dashboard.event'; -export * from './i-card.event'; +export * from './i-data-view-ctrl.event'; export * from './i-panel.event'; export * from './i-view-layout-panel.event'; export * from './i-wizard-panel.event'; diff --git a/packages/runtime/src/interface/controller/event/view/i-card-view.event.ts b/packages/runtime/src/interface/controller/event/view/i-card-view.event.ts deleted file mode 100644 index 40a99ae167d..00000000000 --- a/packages/runtime/src/interface/controller/event/view/i-card-view.event.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { IViewEvent } from './i-view.event'; - -/** - * 卡片视图事件 - * - * @author lxm - * @date 2022-09-13 10:09:00 - * @export - * @interface ICardViewEvent - * @extends {IViewEvent} - */ -export type ICardViewEvent = IViewEvent; diff --git a/packages/runtime/src/interface/controller/event/view/i-data-view.event.ts b/packages/runtime/src/interface/controller/event/view/i-data-view.event.ts new file mode 100644 index 00000000000..5664c9b79e1 --- /dev/null +++ b/packages/runtime/src/interface/controller/event/view/i-data-view.event.ts @@ -0,0 +1,10 @@ +import { IMDViewEvent } from './i-md-view.event'; + +/** + * 数据视图事件 + * + * @export + * @interface IDataViewEvent + * @extends {IMDViewEvent} + */ +export type IDataViewEvent = IMDViewEvent; diff --git a/packages/runtime/src/interface/controller/event/view/index.ts b/packages/runtime/src/interface/controller/event/view/index.ts index 8aff84bed58..9a6775b54fd 100644 --- a/packages/runtime/src/interface/controller/event/view/index.ts +++ b/packages/runtime/src/interface/controller/event/view/index.ts @@ -4,7 +4,7 @@ export * from './i-edit-view3.event'; export * from './i-opt-view.event'; export * from './i-md-view.event'; export * from './i-grid-view.event'; -export * from './i-card-view.event'; +export * from './i-data-view.event'; export * from './i-list-view.event'; export * from './i-pickup-view.event'; export * from './i-mpickup-view.event'; diff --git a/packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts b/packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts new file mode 100644 index 00000000000..288c76a978c --- /dev/null +++ b/packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts @@ -0,0 +1,10 @@ +import { IMDControlState } from './i-md-control.state'; + +/** + * 数据视图(卡片)部件状态 + * + * @export + * @interface IDataViewCtrlState + * @extends {IMDControlState} + */ +export interface IDataViewCtrlState extends IMDControlState {} diff --git a/packages/runtime/src/interface/controller/state/control/index.ts b/packages/runtime/src/interface/controller/state/control/index.ts index 93b94b1e117..1557d2e7306 100644 --- a/packages/runtime/src/interface/controller/state/control/index.ts +++ b/packages/runtime/src/interface/controller/state/control/index.ts @@ -10,3 +10,4 @@ export * from './i-search-form.state'; export * from './i-toolbar.state'; export * from './i-view-layout-panel.state'; export * from './i-caption-bar.state'; +export * from './i-data-view-ctrl.state'; diff --git a/packages/runtime/src/interface/controller/state/view/i-data-view.state.ts b/packages/runtime/src/interface/controller/state/view/i-data-view.state.ts new file mode 100644 index 00000000000..60f2d064e5f --- /dev/null +++ b/packages/runtime/src/interface/controller/state/view/i-data-view.state.ts @@ -0,0 +1,10 @@ +import { IMDViewState } from './i-md-view.state'; + +/** + * 数据视图UI状态 + * + * @export + * @class IDataViewState + * @extends {IMDViewState} + */ +export interface IDataViewState extends IMDViewState {} -- Gitee From f4e182ce4bdb35e1118c6562b4bc437d780deec6 Mon Sep 17 00:00:00 2001 From: Shine-zwj <1917095344@qq.com> Date: Tue, 23 May 2023 18:39:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E9=80=89=E9=A1=B9=E6=93=8D=E4=BD=9C=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/event/view/i-opt-view.event.ts | 8 +++----- .../controller/state/view/i-opt-view.state.ts | 10 ++++++++++ .../src/interface/controller/state/view/index.ts | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 packages/runtime/src/interface/controller/state/view/i-opt-view.state.ts diff --git a/packages/runtime/src/interface/controller/event/view/i-opt-view.event.ts b/packages/runtime/src/interface/controller/event/view/i-opt-view.event.ts index 6c4d7c5fa05..eed1ace9165 100644 --- a/packages/runtime/src/interface/controller/event/view/i-opt-view.event.ts +++ b/packages/runtime/src/interface/controller/event/view/i-opt-view.event.ts @@ -1,12 +1,10 @@ -import { IEditViewEvent } from './i-edit-view.event'; +import { IViewEvent } from './i-view.event'; /** * 选项操作视图事件 * - * @author lxm - * @date 2022-09-13 10:09:00 * @export * @interface IOptViewEvent - * @extends {IEditViewEvent} + * @extends {IViewEvent} */ -export type IOptViewEvent = IEditViewEvent; +export type IOptViewEvent = IViewEvent; diff --git a/packages/runtime/src/interface/controller/state/view/i-opt-view.state.ts b/packages/runtime/src/interface/controller/state/view/i-opt-view.state.ts new file mode 100644 index 00000000000..df37d59dade --- /dev/null +++ b/packages/runtime/src/interface/controller/state/view/i-opt-view.state.ts @@ -0,0 +1,10 @@ +import { IViewState } from './i-view.state'; + +/** + * 选项操作视图UI状态 + * + * @export + * @class IOptViewState + * @extends {IViewState} + */ +export interface IOptViewState 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 679a74d89a2..eea403dfc13 100644 --- a/packages/runtime/src/interface/controller/state/view/index.ts +++ b/packages/runtime/src/interface/controller/state/view/index.ts @@ -3,3 +3,5 @@ export * from './i-index-view.state'; export * from './i-md-view.state'; export * from './i-grid-view.state'; export * from './i-list-view.state'; +export * from './i-data-view.state'; +export * from './i-opt-view.state'; -- Gitee From bf8f687a160dd1ae85ab6450aede23dd899b7fc8 Mon Sep 17 00:00:00 2001 From: Shine-zwj <1917095344@qq.com> Date: Wed, 24 May 2023 16:17:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A7=86=E5=9B=BE=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../state/control/i-data-view-ctrl.state.ts | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts b/packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts index 288c76a978c..eb81b858946 100644 --- a/packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts +++ b/packages/runtime/src/interface/controller/state/control/i-data-view-ctrl.state.ts @@ -7,4 +7,29 @@ import { IMDControlState } from './i-md-control.state'; * @interface IDataViewCtrlState * @extends {IMDControlState} */ -export interface IDataViewCtrlState extends IMDControlState {} +export interface IDataViewCtrlState extends IMDControlState { + /** + * 分组数据 + * + * @type {IDataViewCtrlGroup[]} + * @memberof IDataViewCtrlState + */ + groups: IDataViewCtrlGroup[]; +} +export interface IDataViewCtrlGroup { + /** + * 子数据 + * + * @type {IData[]} + * @memberof IDataViewCtrlGroup + */ + children: IData[]; + + /** + * 分组标题 + * + * @type {string} + * @memberof IDataViewCtrlGroup + */ + caption: string; +} -- Gitee From 2390eacc57cfb4fc6f6d7d81a4d879c64404e774 Mon Sep 17 00:00:00 2001 From: Shine-zwj <1917095344@qq.com> Date: Wed, 24 May 2023 18:36:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=A2=84?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runtime/src/constant/sys-uiaction-tag.ts | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/packages/runtime/src/constant/sys-uiaction-tag.ts b/packages/runtime/src/constant/sys-uiaction-tag.ts index 7531481de4a..7ac1d700cf9 100644 --- a/packages/runtime/src/constant/sys-uiaction-tag.ts +++ b/packages/runtime/src/constant/sys-uiaction-tag.ts @@ -71,4 +71,64 @@ export enum SysUIActionTag { * 工作流提交 */ 'VIEW_WF_STEP' = 'ViewWFStep', + /** + * 否 + */ + 'NO' = 'No', + /** + * 是 + */ + 'YES' = 'No', + /** + * 取消 + */ + 'CANCEL' = 'Cancel', + /** + * 确定 + */ + 'OK' = 'Ok', + /** + * 搜索 + */ + 'SEARCH' = 'Search', + /** + * 完成 + */ + 'FINISH' = 'Finish', + /** + * 下一步 + */ + 'NEXT_STEP' = 'NextStep', + /** + * 上一步 + */ + 'PREV_STEP' = 'PrevStep', + /** + * 添加选中 + */ + 'ADD_SELECTION' = 'AddSelection', + /** + * 移出选中 + */ + 'REMOVE_SELECTION' = 'RemoveSelection', + /** + * 移出全部 + */ + 'REMOVE_ALL' = 'RemoveAll', + /** + * 添加全部 + */ + 'ADD_ALL' = 'RemoveAll', + /** + * 登出 + */ + 'LOGOUT' = 'Logout', + /** + * 登录 + */ + 'LOGIN' = 'Login', + /** + * 取消变更 + */ + 'CANCEL_CHANGES' = 'CancelChanges', } -- Gitee