From f68a9c88930d2e2d1f18617ac02e9ea9195f5d91 Mon Sep 17 00:00:00 2001 From: Shine-zwj <1917095344@qq.com> Date: Thu, 25 May 2023 09:19:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E9=83=A8=E4=BB=B6=E5=90=8D=E7=A7=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/data-view/data-view-provider.ts | 6 +-- src/control/data-view/data-view.controller.ts | 52 +++++++++---------- src/control/data-view/data-view.service.ts | 6 +-- src/control/data-view/data-view.tsx | 14 ++--- src/control/data-view/index.ts | 14 ++--- src/index.ts | 4 +- src/view-engine/data-view.engine.ts | 4 +- 7 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/control/data-view/data-view-provider.ts b/src/control/data-view/data-view-provider.ts index 97345c989..ece7086ef 100644 --- a/src/control/data-view/data-view-provider.ts +++ b/src/control/data-view/data-view-provider.ts @@ -3,9 +3,9 @@ import { IControlProvider } from '@ibiz-template/runtime'; * 数据视图（卡片）部件适配器 * * @export - * @class DataViewCtrlProvider + * @class DataViewControlProvider * @implements {IControlProvider} */ -export class DataViewCtrlProvider implements IControlProvider { - component: string = 'IBizDataViewCtrlControl'; +export class DataViewControlProvider implements IControlProvider { + component: string = 'IBizDataViewControlControl'; } diff --git a/src/control/data-view/data-view.controller.ts b/src/control/data-view/data-view.controller.ts index d9d9744e5..cb1fe02d7 100644 --- a/src/control/data-view/data-view.controller.ts +++ b/src/control/data-view/data-view.controller.ts @@ -1,13 +1,13 @@ import { RuntimeModelError } from '@ibiz-template/core'; import { MDControlController, - IDataViewCtrlEvent, - IDataViewCtrlController, - IDataViewCtrlState, + IDataViewControlEvent, + IDataViewControlController, + IDataViewControlState, ButtonContainerState, UIActionButtonState, UIActionUtil, - IDataViewCtrlGroup, + IDataViewControlGroupState, CodeListItem, } from '@ibiz-template/runtime'; import { @@ -15,29 +15,29 @@ import { IDEDataViewItem, IUIActionGroupDetail, } from '@ibiz/model-core'; -import { DataViewCtrlService } from './data-view.service'; +import { DataViewControlService } from './data-view.service'; -export class DataViewCtrlController +export class DataViewControlController extends MDControlController< IDEDataView, - IDataViewCtrlState, - IDataViewCtrlEvent + IDataViewControlState, + IDataViewControlEvent > - implements IDataViewCtrlController + implements IDataViewControlController { /** * 数据视图（卡片）部件服务 * - * @type {DataViewCtrlService} - * @memberof DataViewCtrlController + * @type {DataViewControlService} + * @memberof DataViewControlController */ - declare service: DataViewCtrlService; + declare service: DataViewControlService; /** * 加载的数据是否附加在items之后 * * @type {boolean} - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ isAddBehind: boolean = false; @@ -45,7 +45,7 @@ export class DataViewCtrlController * 初始化State * * @protected - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ protected initState(): void { super.initState(); @@ -58,12 +58,12 @@ export class DataViewCtrlController * * @protected * @return {*} {Promise} - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ protected async doCreated(): Promise { await super.doCreated(); this.state.size = this.model.pagingSize || 20; - this.service = new DataViewCtrlService(this.model); + this.service = new DataViewControlService(this.model); await this.service.init(this.context); } @@ -71,7 +71,7 @@ export class DataViewCtrlController * 加载更多 * * @return {*} {Promise} - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ async loadMore(): Promise { if (this.state.total > this.state.items.length) { @@ -88,7 +88,7 @@ export class DataViewCtrlController * * @param {IData[]} items * @return {*} {Promise} - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ async afterLoad(items: IData[]): Promise { // 决定传入父的afterLoad是否为附加items后的数组 @@ -104,7 +104,7 @@ export class DataViewCtrlController * 获取操作项模型 * * @return {*} {(IDEDataViewItem | null)} - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ getOptItemModel(): IDEDataViewItem | null { let optItemModel: IDEDataViewItem | null = null; @@ -124,7 +124,7 @@ export class DataViewCtrlController * * @param {IData} item * @return {*} - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ getOptItemAction(item: IData): ButtonContainerState { const containerState = new ButtonContainerState(); @@ -160,7 +160,7 @@ export class DataViewCtrlController * @param {IData} item * @param {MouseEvent} event * @return {*} {Promise} - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ async onActionClick( detail: IUIActionGroupDetail, @@ -180,7 +180,7 @@ export class DataViewCtrlController /** * 处理数据分组 * - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ async handleDataGroup() { const { enableGroup, groupMode } = this.model; @@ -196,7 +196,7 @@ export class DataViewCtrlController /** * 处理自动分组 * - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ handleAutoGroup() { const { groupAppDEFieldId } = this.model; @@ -208,7 +208,7 @@ export class DataViewCtrlController children.push(item); childrenMap.set(item[groupAppDEFieldId], children); }); - const groups: IDataViewCtrlGroup[] = []; + const groups: IDataViewControlGroupState[] = []; childrenMap.forEach((value: IData[], key: string) => { groups.push({ caption: key, @@ -222,13 +222,13 @@ export class DataViewCtrlController /** * 处理代码表分组 * - * @memberof DataViewCtrlController + * @memberof DataViewControlController */ async handleCodeListGroup() { const { groupAppDEFieldId, groupCodeListId } = this.model; if (groupAppDEFieldId && groupCodeListId) { const { items } = this.state; - const groups: IDataViewCtrlGroup[] = []; + const groups: IDataViewControlGroupState[] = []; const app = ibiz.hub.getApp(this.context.srfappid); const codeList = await app.codeList.get( groupCodeListId, diff --git a/src/control/data-view/data-view.service.ts b/src/control/data-view/data-view.service.ts index b2a79c0a7..6e313b3d8 100644 --- a/src/control/data-view/data-view.service.ts +++ b/src/control/data-view/data-view.service.ts @@ -5,14 +5,14 @@ import { IDEDataView } from '@ibiz/model-core'; * 数据视图（卡片）部件服务 * * @export - * @class DataViewCtrlService + * @class DataViewControlService * @extends {MDControlService} */ -export class DataViewCtrlService extends MDControlService { +export class DataViewControlService extends MDControlService { /** * 初始化属性映射 * - * @memberof DataViewCtrlService + * @memberof DataViewControlService */ initUIDataMap() { super.initUIDataMap(); diff --git a/src/control/data-view/data-view.tsx b/src/control/data-view/data-view.tsx index aefe6bcca..71b04dc50 100644 --- a/src/control/data-view/data-view.tsx +++ b/src/control/data-view/data-view.tsx @@ -1,19 +1,19 @@ import { useControlController, useNamespace } from '@ibiz-template/vue3-util'; import { defineComponent, PropType } from 'vue'; import { IDEDataView, IUIActionGroupDetail } from '@ibiz/model-core'; -import { DataViewCtrlController } from './data-view.controller'; -import { IDataViewCtrlGroup } from '@ibiz-template/runtime'; +import { DataViewControlController } from './data-view.controller'; +import { IDataViewControlGroupState } from '@ibiz-template/runtime'; import './data-view.scss'; -export const DataViewCtrlControl = defineComponent({ - name: 'IBizDataViewCtrlControl', +export const DataViewControlControl = defineComponent({ + name: 'IBizDataViewControlControl', props: { modelData: { type: Object as PropType, required: true }, context: { type: Object as PropType, required: true }, params: { type: Object as PropType, default: () => ({}) }, }, setup() { - const c = useControlController((...args) => new DataViewCtrlController(...args)); + const c = useControlController((...args) => new DataViewControlController(...args)); const ns = useNamespace(`control-${c.model.controlType!.toLowerCase()}`); // 绘制项行为 @@ -86,7 +86,7 @@ export const DataViewCtrlControl = defineComponent({ }; // 绘制分组 - const renderGroup = (group: IDataViewCtrlGroup) => { + const renderGroup = (group: IDataViewControlGroupState) => { return ( { @@ -139,7 +139,7 @@ export const DataViewCtrlControl = defineComponent({ render() { return ( - {this.c.state.hasCreated && [ + {this.c.state.isCreated && [ this.renderDataViewContent(), this.renderLoadMore(), ]} diff --git a/src/control/data-view/index.ts b/src/control/data-view/index.ts index 44e81102c..d6f498f15 100644 --- a/src/control/data-view/index.ts +++ b/src/control/data-view/index.ts @@ -1,21 +1,21 @@ import { registerControlProvider, ControlType } from '@ibiz-template/runtime'; import { withInstall } from '@ibiz-template/vue3-util'; import { App } from 'vue'; -import { DataViewCtrlControl } from './data-view'; -import { DataViewCtrlProvider } from './data-view-provider'; +import { DataViewControlControl } from './data-view'; +import { DataViewControlProvider } from './data-view-provider'; export * from './data-view-provider'; export * from './data-view.controller'; -export const IBizDataViewCtrlControl = withInstall( - DataViewCtrlControl, +export const IBizDataViewControlControl = withInstall( + DataViewControlControl, function (v: App) { - v.component(DataViewCtrlControl.name, DataViewCtrlControl); + v.component(DataViewControlControl.name, DataViewControlControl); registerControlProvider( ControlType.DATAVIEW, - () => new DataViewCtrlProvider(), + () => new DataViewControlProvider(), ); }, ); -export default IBizDataViewCtrlControl; +export default IBizDataViewControlControl; diff --git a/src/index.ts b/src/index.ts index ed3791296..8e521b4ee 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,7 +11,7 @@ import { IBizSearchFormControl, IBizListControl, IBizCaptionBarControl, - IBizDataViewCtrlControl, + IBizDataViewControlControl, } from './control'; import IBizEditor from './editor'; import { IBizView } from './view'; @@ -29,7 +29,7 @@ export default { v.use(IBizPanelComponents); v.use(IBizView); // 部件 - v.use(IBizDataViewCtrlControl); + v.use(IBizDataViewControlControl); v.use(IBizAppMenuControl); v.use(IBizGridControl); v.use(IBizListControl); diff --git a/src/view-engine/data-view.engine.ts b/src/view-engine/data-view.engine.ts index eb7cb7bbc..7352e1204 100644 --- a/src/view-engine/data-view.engine.ts +++ b/src/view-engine/data-view.engine.ts @@ -3,7 +3,7 @@ import { ViewController, IDataViewState, IDataViewEvent, - IDataViewCtrlController, + IDataViewControlController, } from '@ibiz-template/runtime'; import { IAppDEDataView } from '@ibiz/model-core'; @@ -28,7 +28,7 @@ export class DataViewEngine extends MDViewEngine { * @memberof DataViewEngine */ get dataview() { - return this.view.getController('dataview') as IDataViewCtrlController; + return this.view.getController('dataview') as IDataViewControlController; } /** -- Gitee From f5d9c30e1c0048ed810b4b8473ddd9749a7521ea Mon Sep 17 00:00:00 2001 From: Shine-zwj <1917095344@qq.com> Date: Thu, 25 May 2023 10:54:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=80=82=E9=85=8D=E5=99=A8=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel-button/panel-button.provider.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/panel-component/panel-button/panel-button.provider.ts b/src/panel-component/panel-button/panel-button.provider.ts index f3ee04474..9a6b218c2 100644 --- a/src/panel-component/panel-button/panel-button.provider.ts +++ b/src/panel-component/panel-button/panel-button.provider.ts @@ -4,13 +4,11 @@ import { PanelController, PanelItemController } from '../../control'; import { PanelButtonController } from './panel-button.controller'; /** - * 导航标签页占位适配器 + * 面板按钮适配器 * - * @author lxm - * @date 2022-09-19 22:09:03 * @export - * @class NavTabsProvider - * @implements {EditorProvider} + * @class PanelButtonProvider + * @implements {IPanelItemProvider} */ export class PanelButtonProvider implements IPanelItemProvider { component: string = 'IBizPanelButton'; @@ -19,7 +17,7 @@ export class PanelButtonProvider implements IPanelItemProvider { panelItem: IPanelItem, panel: PanelController, parent: PanelItemController | undefined, - ): Promise { + ): Promise { const c = new PanelButtonController(panelItem, panel, parent); await c.init(); return c; -- Gitee From 7b64a587bd6d205f8967113da3ee2276c2d13fd4 Mon Sep 17 00:00:00 2001 From: Shine-zwj <1917095344@qq.com> Date: Thu, 25 May 2023 18:45:19 +0800 Subject: [PATCH 3/3] =?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 --- src/view-engine/opt-view.engine.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/view-engine/opt-view.engine.ts b/src/view-engine/opt-view.engine.ts index d7f6235bb..d8997b7c9 100644 --- a/src/view-engine/opt-view.engine.ts +++ b/src/view-engine/opt-view.engine.ts @@ -116,9 +116,8 @@ export class OptViewEngine extends ViewEngineBase { * @memberof OptViewEngine */ async confirm() { - const { evt } = this.view; await this.form.save(); - evt.emit('onCloseView', { ok: true, result: this.getData() }); + this.view.closeView({ ok: true, data: this.getData() }); } /** @@ -127,7 +126,6 @@ export class OptViewEngine extends ViewEngineBase { * @memberof OptViewEngine */ cancel() { - const { evt } = this.view; - evt.emit('onCloseView', { ok: false, result: undefined }); + this.view.closeView({ ok: false, data: [] }); } } -- Gitee