提交 1172dead 编写于 作者: Mosher's avatar Mosher

update:更新数据看板视图

上级 62af6348
......@@ -9,16 +9,16 @@
{{#if portlet.psSysImage.imagePath}}imgPath="{{portlet.psSysImage.imagePath}}"{{else if portlet.psSysImage.cssClass}}iconClass="{{portlet.psSysImage.cssClass}}"{{/if}}
{{/if}}
:layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=portlet.psLayout layoutPos=portlet.psLayoutPos}}"
class="app-portletContainer {{portlet.psSysCss.cssName}}"
class="app-portlet-container {{portlet.psSysCss.cssName}}"
{{#if (or portlet.width portlet.height)}}
style="{{#if portlet.width}}width: {{portlet.width}}px;{{/if}}{{#if portlet.height}}height: {{portlet.height}}px;{{/if}}"
{{/if}}
>
{{#each portlet.psControls as | subPortlet | }}
{{#each portlet.psControls as | subPortlet | }}
{{#eq subPortlet.portletType 'CONTAINER'}}
{{> @macro/front-end/widgets/dashboard-detail/include-dashboard.hbs type='PORTLET_CONTAINER' portlet=subPortlet}}
{{else}}
{{> @macro/front-end/widgets/dashboard-detail/include-dashboard.hbs type='PORTLET' portlet=subPortlet}}
{{/eq}}
{{/each}}
{{/each}}
</AppPortletCard>
{{#eq portlet.portletType 'CONTAINER'}}
{{#eq portlet.portletType 'CONTAINER'}}
{{#if portlet.psControls}}
<div class="portlet-card" :bordered="false" dis-hover :padding="0">
{{else}}
......@@ -11,13 +11,14 @@
{{>(lookup 'DASHBOARD') ctrl=portlet}}
</div>
</div>
{{else}}
{{else}}
<{{codeName}}Portlet
ref="portlet"
name="{{portlet.name}}"
:context="state.context"
:viewParams="state.viewParams"
:viewSubject="state.viewSubject"
:parent="dashboardControl"
@ctrlEvent="onCtrlEvent"
></{{codeName}}Portlet>
{{/eq}}
\ No newline at end of file
{{/eq}}
<{{codeName}}Portlet
ref="portlet"
name="{{portlet.name}}"
{{#if portlet.caption}}
title="{{portlet.caption}}"
{{/if}}
:showCaption="{{#if portlet.isShowTitleBar}}true{{else}}false{{/if}}"
:layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=portlet.psLayout layoutPos=portlet.psLayoutPos}}"
{{#if portlet.psSysImage}}
{{#if portlet.psSysImage.imagePath}}imgPath="{{portlet.psSysImage.imagePath}}"{{else if portlet.psSysImage.cssClass}}iconClass="{{portlet.psSysImage.cssClass}}"{{/if}}
{{/if}}
{{#if portlet.psSysCss}}
class="{{portlet.psSysCss.cssName}}"
{{/if}}
{{#if (or portlet.width portlet.height)}}
style="{{#if portlet.width}}width: {{portlet.width}}px;{{/if}}{{#if portlet.height}}height: {{portlet.height}}px;{{/if}}"
{{/if}}
:context="state.context"
:viewParams="state.viewParams"
:viewSubject="state.viewSubject"
:parent="dashboardControl"
@ctrlEvent="onCtrlEvent"
/>
......@@ -22,22 +22,22 @@ const layout = LayoutTool.useLayout(toRef(props, "layoutOpts"));
</script>
<template>
<AppCol class="app-portletCard" :layoutOpts="layoutOpts">
<div class="app-portletCard__head">
<div class="app-portletCard__headLeft">
<AppCol class="app-portlet-card" :layoutOpts="layoutOpts">
<div class="app-portlet-card__head">
<div class="app-portlet-card__head-left">
<slot name="header-left">
<AppIconText v-if="showCaption" :text="title" :imgPath="imgPath" :iconClass="iconClass"/>
</slot>
</div>
<div class="app-portletCard__headerRight">
<div class="app-portlet-card__header-right">
<slot name="header-right"></slot>
</div>
</div>
<div class="app-portletCard__body">
<div class="app-portlet-card__body">
<AppRow v-if="isContainer" :layoutOpts="layoutOpts">
<slot></slot>
</AppRow>
<template v-else >
<template v-else>
<slot></slot>
</template>
</div>
......@@ -45,4 +45,16 @@ const layout = LayoutTool.useLayout(toRef(props, "layoutOpts"));
</template>
<style lang="scss">
.app-portlet-card {
.app-portlet-card__head {
height: 32px;
line-height: 32px;
font-weight: 600;
border-bottom: 1px solid var(--app-border-color);
margin-bottom: 6px;
}
.app-portlet-card__body {
height: calc(100% - 38px);
}
}
</style>
\ No newline at end of file
......@@ -34,5 +34,5 @@ export interface ControlPropsBase {
* @type {*}
* @memberof ControlPropsBase
*/
parent: any;
parent?: any;
}
\ No newline at end of file
......@@ -31,13 +31,14 @@ interface CtrlEmit {
const emit = defineEmits <CtrlEmit> ();
// 安装功能模块,提供状态和能力方法
const { name, state, onCtrlEvent } = new DashboardControl(ctrlState, props, emit).moduleInstall();
const dashboardControl = new DashboardControl(ctrlState, props, emit).moduleInstall();
const { name, state, onCtrlEvent } = dashboardControl;
// 暴露内部状态及能力
defineExpose({ name, state });
</script>
<template>
<div class="app-dashboard{{#if ctrl.psSysCss}} {{ctrl.psSysCss.cssName}}{{/if}}">
<AppRow class="app-dashboard{{#if ctrl.psSysCss}} {{ctrl.psSysCss.cssName}}{{/if}}" layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=ctrl.psLayout layoutPos=ctrl.psLayoutPos}}">
<template v-if="!state.isEnableCustomized">
{{#each ctrl.psControls as |portlet|}}
{{#eq portlet.portletType 'CONTAINER'}}
......@@ -47,7 +48,7 @@ defineExpose({ name, state });
{{/eq}}
{{/each}}
</template>
</div>
</AppRow>
</template>
<style lang="scss">
</style>
\ No newline at end of file
......@@ -3,14 +3,7 @@ export const ctrlState = {
controlCodeName: '{{ctrl.codeName}}',
controlName: '{{ctrl.name}}',
portletType: '{{ctrl.portletType}}',
{{#if ctrl.psLayoutPos.height}}
// 部件高度
height: {{ctrl.psLayoutPos.height}},
{{/if}}
{{#if ctrl.psLayoutPos.width}}
// 部件宽度
width: {{ctrl.psLayoutPos.width}},
{{/if}}
showCaption: {{ctrl.showTitleBar}},
{{#if ctrl.psAppDataEntity}}
// 实体名称
appEntityCodeName: '{{ctrl.psAppDataEntity.codeName}}',
......@@ -25,28 +18,49 @@ export const ctrlState = {
actionName: '{{groupDetail.psUIAction.caption}}',
icon: '{{groupDetail.psUIAction.psSysImage.cssClass}}',
imgPath: '{{groupDetail.psUIAction.psSysImage.imagePath}}',
disabled: false, visabled: true,
disabled: false,
visabled: true,
dataAccessAction: {{#if groupDetail.psUIAction.dataAccessAction}}false{{else}}true{{/if}},
getNoPrivDisplayMode: {{#if groupDetail.psUIAction.noPrivDisplayMode}}groupDetail.psUIAction.noPrivDisplayMode{{else}}6{{/if}},
codeName:'{{groupDetail.psUIAction.codeName}}',
fullCodeName:'{{groupDetail.psUIAction.fullCodeName}}',
uIActionMode:'{{groupDetail.psUIAction.uIActionMode}}',
uIActionTag:'{{groupDetail.psUIAction.uIActionTag}}',
uIActionType:'{{groupDetail.psUIAction.uIActionType}}',
uIActionType:'{{groupDetail.psUIAction.uIActionType}}'
},
{{/each}}
},
{{/if}}
{{#if ctrl.pageUrl}}
{{#and (eq ctrl.portletType 'HTML') ctrl.pageUrl}}
// 网页地址
pageUrl: '{{ctrl.pageUrl}}',
{{/if}}
{{#if ctrl.contentType}}
{{/and}}
{{#eq ctrl.portletType 'RAWITEM'}}
// 内容类型
contentType:'{{ctrl.contentType}}',
{{/if}}
contentType: '{{ctrl.contentType}}',
{{#eq ctrl.contentType 'RAW'}}
rawContent: `{{ctrl.rawContent}}`,
{{/eq}}
{{#eq ctrl.contentType 'HTML'}}
rawContent: `{{ctrl.htmlContent}}`,
{{/eq}}
{{/eq}}
{{#if ctrl.rawContent}}
// 直接内容
rawContent:'{{ctrl.rawContent}}',
rawContent: `{{ctrl.rawContent}}`,
{{/if}}
{{#eq ctrl.portletType 'LIST'}}
{{#ctrl.psControls}}
{{name}}: {
action:{
loadAction: '{{getPSControlAction.psAppDEMethod.codeName}}',
removeAction: '{{removePSControlAction.psAppDEMethod.codeName}}',
updateAction: '{{updatePSControlAction.psAppDEMethod.codeName}}',
loadDraftAction: '{{getDraftPSControlAction.psAppDEMethod.codeName}}',
createAction: '{{createPSControlAction.psAppDEMethod.codeName}}',
fetchAction:'{{fetchPSControlAction.psAppDEMethod.codeName}}'
}
}
{{/ctrl.psControls}}
{{/eq}}
};
\ No newline at end of file
<script setup lang="ts">
import { Subject } from 'rxjs';
import { ctrlState } from './{{spinalCase ctrl.codeName}}-portlet-state';
import { PortletControl, IActionParam, IParam, IContext } from '@core';
{{!-- 引入视图start --}}
{{#if (eq ctrl.portletType "VIEW")}}
{{#if ctrl.portletPSAppView}}
import { PortletControl, IActionParam, IParam, IContext, ILayoutOpts } from '@core';
{{#eq ctrl.portletType "VIEW"}}
{{#if ctrl.portletPSAppView}}
import {{ctrl.portletPSAppView.codeName}} from '@views/{{spinalCase ctrl.portletPSAppView.psAppModule.codeName}}/{{spinalCase ctrl.portletPSAppView.codeName}}';
{{/if}}
{{/if}}
{{!-- 引入视图end --}}
{{!-- 引入菜单start --}}
{{#if (eq ctrl.portletType "APPMENU")}}
{{#each ctrl.psControls as | control |}}
{{#eq control.controlType "APPMENU"}}
{{/if}}
{{/eq}}
{{#eq ctrl.portletType "APPMENU"}}
{{#each ctrl.psControls as | control |}}
{{#eq control.controlType "APPMENU"}}
import { {{control.codeName}}Menu } from '@widgets/app/{{spinalCase control.codeName}}-menu';
{{/eq}}
{{/each}}
{{/eq}}
{{#eq ctrl.portletType "LIST"}}
{{#ctrl.psControls}}
import { {{codeName}}List } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-list';
{{/ctrl.psControls}}
{{/eq}}
{{/each}}
{{/if}}
{{!-- 引入菜单end --}}
interface Props {
name:string,
......@@ -26,26 +26,12 @@ interface Props {
viewParams?: IParam;
viewSubject: Subject<IActionParam>;
showCaption?: boolean;
title?: string;
imgPath?: string;
iconClass?: string;
layoutOpts?: ILayoutOpts;
parent: IParam;
}
const props = withDefaults(defineProps < Props > (), {
viewSubject: () => new Subject < IActionParam > (),
{{#if ctrl.title}}
title: '{{ctrl.title}}',
{{/if}}
{{#if ctrl.showTitleBar}}
showCaption: '{{ctrl.showTitleBar}}',
{{/if}}
{{#if ctrl.psSysImage}}
{{#if ctrl.psSysImage.cssClass}}
iconcls: '{{ctrl.psSysImage.cssClass}}',
{{else if (ctrl.psSysImage.imagePath)}}
imgPath: '{{ctrl.psSysImage.imagePath}}',
{{/if}}
{{/if}}
viewSubject: () => new Subject < IActionParam > ()
})
// emit声明
......@@ -64,10 +50,17 @@ defineExpose({ name, state });
<template>
<AppPortletCard
class="app-portlet{{#if ctrl.psSysCss}} {{ctrl.psSysCss.cssName}}{{/if}}"
:title="title"
:iconClass="iconClass"
:imgPath="imgPath"
:showCaption="showCaption"
title="{{ctrl.title}}"
{{#if ctrl.psSysImage}}
{{#if ctrl.psSysImage.cssClass}}
iconClass="{{ctrl.psSysImage.cssClass}}"
{{/if}}
{{#if ctrl.psSysImage.imagePath}}
imgPath="ctrl.psSysImage.imagePath"
{{/if}}
{{/if}}
:showCaption="{{ctrl.showTitleBar}}"
:layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=ctrl.psLayout layoutPos=ctrl.psLayoutPos}}"
{{#if (or ctrl.width ctrl.height)}}
style="{{#if ctrl.width}}width: {{ctrl.width}}px;{{/if}}{{#if ctrl.height}}height: {{ctrl.height}}px;{{/if}}"
{{/if}}
......@@ -88,7 +81,7 @@ defineExpose({ name, state });
</template>
</span>
</template>
{{#if (eq ctrl.portletType 'VIEW') }}
{{#if (eq ctrl.portletType 'VIEW')}}
<{{ctrl.portletPSAppView.codeName}}
:context="state.context"
:viewParams="state.viewParams"
......@@ -120,7 +113,7 @@ defineExpose({ name, state });
{{else if (eq ctrl.portletType 'TOOLBAR')}}
<div>暂未支持工具栏绘制</div>
{{else if (eq ctrl.portletType 'HTML')}}
<iframe :src="state.pageUrl" :style="{height: state.height && state.height > 0 ? '100%' : '400px', width: '100%', borderWidth: '0px'}"></iframe>
<iframe :src="state.pageUrl" :style="{ height: '100%', width: '100%', borderWidth: '0px' }"></iframe>
{{else if (eq ctrl.portletType 'RAWITEM')}}
<app-raw
:name="state.controlName"
......@@ -128,9 +121,20 @@ defineExpose({ name, state });
:iconClass="state.iconcls"
:imgPath="state.imagePath"
style="{{#if ctrl.rawItemHeight}}height: {{ctrl.rawItemHeight}}px;{{/if}}{{#if ctrl.rawItemWidth}}width: {{ctrl.rawItemWidth}}px{{/if}}"
{{#if (eq ctrl.contentType 'RAW')}}value="{{ctrl.rawContent}}"{{else if (eq ctrl.contentType 'HTML')}}:value="`{{ctrl.htmlContent}}`"{{/if}}
:value="state.rawContent"
></app-raw>
{{else}}
{{else if (eq ctrl.portletType 'LIST')}}
{{#ctrl.psControls}}
<{{codeName}}List
ref="portlet"
name="{{name}}"
:controlAction="state.{{name}}.action"
:context="state.context"
:viewParams="state.viewParams"
:viewSubject="state.viewSubject"
@ctrlEvent="onCtrlEvent">
</{{codeName}}List>
{{/ctrl.psControls}}
{{/if}}
</AppPortletCard>
</template>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册