提交 20c9b272 编写于 作者: chitanda's avatar chitanda

feat: 补充日历、选择、选择表格视图

上级 debbae6e
...@@ -7,6 +7,12 @@ ...@@ -7,6 +7,12 @@
## [Unreleased] ## [Unreleased]
### Added
- 日历视图布局面板
- 选择视图布局面板
- 选择表格视图布局面板
## [1.0.9] - 2023-05-22 ## [1.0.9] - 2023-05-22
### Added ### Added
......
import AppIndexViewLayout from './app-index-view-layout'; import AppIndexViewLayout from './app-index-view-layout';
import DEGridView from './view-layout-model-repository/view-layout-model-repository-de-grid-view-layout'; import DECalendarView from './view-layout-model-repository/view-layout-model-repository-de-calendar-view-layout';
import DEDataView from './view-layout-model-repository/view-layout-model-repository-de-data-view-layout';
import DEEditView from './view-layout-model-repository/view-layout-model-repository-de-edit-view-layout'; import DEEditView from './view-layout-model-repository/view-layout-model-repository-de-edit-view-layout';
import DEGridView from './view-layout-model-repository/view-layout-model-repository-de-grid-view-layout';
import DEListView from './view-layout-model-repository/view-layout-model-repository-de-list-view-layout'; import DEListView from './view-layout-model-repository/view-layout-model-repository-de-list-view-layout';
import DEDataView from './view-layout-model-repository/view-layout-model-repository-de-data-view-layout';
import DEOptView from './view-layout-model-repository/view-layout-model-repository-de-option-view-layout'; import DEOptView from './view-layout-model-repository/view-layout-model-repository-de-option-view-layout';
import DEPickupGirdView from './view-layout-model-repository/view-layout-model-repository-de-pickup-grid-view-layout';
import DEPickupView from './view-layout-model-repository/view-layout-model-repository-de-pickup-view-layout';
/** /**
* 安装视图默认布局 * 安装视图默认布局
...@@ -15,9 +18,12 @@ import DEOptView from './view-layout-model-repository/view-layout-model-reposito ...@@ -15,9 +18,12 @@ import DEOptView from './view-layout-model-repository/view-layout-model-reposito
*/ */
export function install(callBack: (key: string, model: any) => void): void { export function install(callBack: (key: string, model: any) => void): void {
callBack('APPINDEXVIEW_DEFAULT', AppIndexViewLayout); callBack('APPINDEXVIEW_DEFAULT', AppIndexViewLayout);
callBack('DEGRIDVIEW_DEFAULT', DEGridView); callBack('DECALENDARVIEW_DEFAULT', DECalendarView);
callBack('DEDATAVIEW_DEFAULT', DEDataView);
callBack('DEEDITVIEW_DEFAULT', DEEditView); callBack('DEEDITVIEW_DEFAULT', DEEditView);
callBack('DEGRIDVIEW_DEFAULT', DEGridView);
callBack('DELISTVIEW_DEFAULT', DEListView); callBack('DELISTVIEW_DEFAULT', DEListView);
callBack('DEDATAVIEW_DEFAULT', DEDataView);
callBack('DEOPTVIEW_DEFAULT', DEOptView); callBack('DEOPTVIEW_DEFAULT', DEOptView);
callBack('DEPICKUPGRIDVIEW_DEFAULT', DEPickupGirdView);
callBack('DEPICKUPVIEW_DEFAULT', DEPickupView);
} }
\ No newline at end of file
export default {
"layoutMode": "FLEX",
"rootPanelItems": [
{
"panelItems": [
{
"panelItems": [
{
"caption": "页面标题",
"itemStyle": "DEFAULT",
"itemType": "CTRLPOS",
"layoutPos": {
"layout": "FLEX"
},
"showCaption": true,
"id": "captionbar"
}
],
"layout": {
"layout": "FLEX"
},
"dataRegionType": "INHERIT",
"caption": "容器",
"itemStyle": "DEFAULT",
"itemType": "CONTAINER",
"layoutPos": {
"layout": "FLEX"
},
"id": "page_header_left"
}
],
"layout": {
"dir": "row",
"layout": "FLEX"
},
"dataRegionType": "INHERIT",
"caption": "容器",
"contentHeight": 54,
"height": 54,
"itemStyle": "DEFAULT",
"itemType": "CONTAINER",
"layoutPos": {
"height": 54,
"heightMode": "PX",
"layout": "FLEX"
},
"id": "page_header"
},
{
"panelItems": [
{
"caption": "日历",
"itemStyle": "DEFAULT",
"itemType": "CTRLPOS",
"layoutPos": {
"layout": "FLEX"
},
"showCaption": true,
"id": "calendar"
}
],
"layout": {
"layout": "FLEX"
},
"dataRegionType": "INHERIT",
"caption": "容器",
"itemStyle": "DEFAULT",
"itemType": "CONTAINER",
"layoutPos": {
"grow": 1,
"layout": "FLEX"
},
"id": "container2"
}
],
"layoutPanel": true,
"codeName": "DECalendarViewLayout",
"controlType": "VIEWLAYOUTPANEL",
"logicName": "日历视图布局面板",
"appDataEntityId": "web.viewlayoutmodelrepository",
"controlParam": {},
"name": "layoutpanel",
"id": "decalendarviewlayout"
}
export default { export default {
"layoutMode": "TABLE_24COL", "layoutMode": "FLEX",
"rootPanelItems": [ "rootPanelItems": [
{ {
"panelItems": [ "panelItems": [
...@@ -75,8 +75,7 @@ export default { ...@@ -75,8 +75,7 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24, "layout": "FLEX"
"layout": "TABLE_24COL"
}, },
"id": "page_header" "id": "page_header"
}, },
...@@ -101,8 +100,7 @@ export default { ...@@ -101,8 +100,7 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24, "layout": "FLEX"
"layout": "TABLE_24COL"
}, },
"id": "page_search_content" "id": "page_search_content"
}, },
...@@ -127,8 +125,8 @@ export default { ...@@ -127,8 +125,8 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24, "grow": 1,
"layout": "TABLE_24COL" "layout": "FLEX"
}, },
"id": "page_content" "id": "page_content"
} }
......
export default { export default {
"layoutMode": "TABLE_24COL", "layoutMode": "FLEX",
"rootPanelItems": [ "rootPanelItems": [
{ {
"panelItems": [ "panelItems": [
...@@ -67,10 +67,9 @@ export default { ...@@ -67,10 +67,9 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24,
"height": 54, "height": 54,
"heightMode": "PX", "heightMode": "PX",
"layout": "TABLE_24COL" "layout": "FLEX"
}, },
"id": "page_header" "id": "page_header"
}, },
...@@ -95,8 +94,8 @@ export default { ...@@ -95,8 +94,8 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24, "grow": 1,
"layout": "TABLE_24COL" "layout": "FLEX"
}, },
"id": "page_content" "id": "page_content"
} }
......
export default { export default {
"layoutMode": "TABLE_24COL", "layoutMode": "FLEX",
"rootPanelItems": [ "rootPanelItems": [
{ {
"panelItems": [ "panelItems": [
...@@ -77,10 +77,9 @@ export default { ...@@ -77,10 +77,9 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24,
"height": 54, "height": 54,
"heightMode": "PX", "heightMode": "PX",
"layout": "TABLE_24COL" "layout": "FLEX"
}, },
"id": "page_header" "id": "page_header"
}, },
...@@ -105,8 +104,7 @@ export default { ...@@ -105,8 +104,7 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24, "layout": "FLEX"
"layout": "TABLE_24COL"
}, },
"id": "page_search_content" "id": "page_search_content"
}, },
...@@ -131,8 +129,8 @@ export default { ...@@ -131,8 +129,8 @@ export default {
"itemStyle": "DEFAULT", "itemStyle": "DEFAULT",
"itemType": "CONTAINER", "itemType": "CONTAINER",
"layoutPos": { "layoutPos": {
"colMD": 24, "grow": 1,
"layout": "TABLE_24COL" "layout": "FLEX"
}, },
"id": "page_content" "id": "page_content"
} }
......
export default {
"layoutMode": "FLEX",
"rootPanelItems": [
{
"caption": "表格",
"itemStyle": "DEFAULT",
"itemType": "CTRLPOS",
"layoutPos": {
"grow": 1,
"layout": "FLEX"
},
"showCaption": true,
"id": "grid"
}
],
"layoutPanel": true,
"codeName": "PickupGridViewLayout",
"controlType": "VIEWLAYOUTPANEL",
"logicName": "实体选择表格视图布局面板",
"appDataEntityId": "web.viewlayoutmodelrepository",
"controlParam": {},
"name": "layoutpanel",
"id": "pickupgridviewlayout"
}
export default {
"layoutMode": "FLEX",
"rootPanelItems": [
{
"panelItems": [
{
"caption": "控件占位",
"itemStyle": "DEFAULT",
"itemType": "CTRLPOS",
"layoutPos": {
"layout": "FLEX"
},
"showCaption": true,
"id": "pickupviewpanel"
}
],
"layout": {
"layout": "FLEX"
},
"dataRegionType": "INHERIT",
"caption": "容器",
"itemStyle": "DEFAULT",
"itemType": "CONTAINER",
"layoutPos": {
"grow": 1,
"layout": "FLEX"
},
"id": "page_content"
},
{
"panelItems": [
{
"actionType": "UIACTION",
"uiactionId": "panel_pickupviewlayout_ok_click@viewlayoutmodelrepository",
"tooltip": "确认",
"uiactionTarget": "NONE",
"caption": "确认",
"itemStyle": "DEFAULT",
"itemType": "BUTTON",
"layoutPos": {
"layout": "FLEX"
},
"showCaption": true,
"id": "ok"
},
{
"actionType": "UIACTION",
"uiactionId": "panel_pickupviewlayout_cancel_click@viewlayoutmodelrepository",
"tooltip": "取消",
"uiactionTarget": "NONE",
"caption": "取消",
"itemStyle": "DEFAULT",
"itemType": "BUTTON",
"layoutPos": {
"layout": "FLEX"
},
"showCaption": true,
"id": "cancel"
}
],
"layout": {
"dir": "row-reverse",
"layout": "FLEX"
},
"dataRegionType": "INHERIT",
"caption": "容器",
"contentHeight": 54,
"height": 54,
"itemStyle": "DEFAULT",
"itemType": "CONTAINER",
"layoutPos": {
"height": 54,
"heightMode": "PX",
"layout": "FLEX"
},
"id": "page_bottom"
}
],
"layoutPanel": true,
"codeName": "PickupViewLayout",
"controlType": "VIEWLAYOUTPANEL",
"logicName": "选择视图布局面板布局面板",
"appDataEntityId": "web.viewlayoutmodelrepository",
"controlParam": {},
"name": "layoutpanel",
"id": "pickupviewlayout"
}
import AppIndexViewLayout from './app-index-view-layout'; import AppIndexViewLayout from './app-index-view-layout';
import DEGridView from './view-layout-model-repository/view-layout-model-repository-de-grid-view-layout'; import DECalendarView from './view-layout-model-repository/view-layout-model-repository-de-calendar-view-layout';
import DEDataView from './view-layout-model-repository/view-layout-model-repository-de-data-view-layout';
import DEEditView from './view-layout-model-repository/view-layout-model-repository-de-edit-view-layout'; import DEEditView from './view-layout-model-repository/view-layout-model-repository-de-edit-view-layout';
import DEGridView from './view-layout-model-repository/view-layout-model-repository-de-grid-view-layout';
import DEListView from './view-layout-model-repository/view-layout-model-repository-de-list-view-layout'; import DEListView from './view-layout-model-repository/view-layout-model-repository-de-list-view-layout';
import DEDataView from './view-layout-model-repository/view-layout-model-repository-de-data-view-layout';
import DEOptView from './view-layout-model-repository/view-layout-model-repository-de-option-view-layout'; import DEOptView from './view-layout-model-repository/view-layout-model-repository-de-option-view-layout';
import DEPickupGirdView from './view-layout-model-repository/view-layout-model-repository-de-pickup-grid-view-layout';
import DEPickupView from './view-layout-model-repository/view-layout-model-repository-de-pickup-view-layout';
/** /**
* 安装视图默认布局 * 安装视图默认布局
...@@ -15,9 +18,12 @@ import DEOptView from './view-layout-model-repository/view-layout-model-reposito ...@@ -15,9 +18,12 @@ import DEOptView from './view-layout-model-repository/view-layout-model-reposito
*/ */
export function install(callBack: (key: string, model: any) => void): void { export function install(callBack: (key: string, model: any) => void): void {
callBack('APPINDEXVIEW_DEFAULT', AppIndexViewLayout); callBack('APPINDEXVIEW_DEFAULT', AppIndexViewLayout);
callBack('DEGRIDVIEW_DEFAULT', DEGridView); callBack('DECALENDARVIEW_DEFAULT', DECalendarView);
callBack('DEDATAVIEW_DEFAULT', DEDataView);
callBack('DEEDITVIEW_DEFAULT', DEEditView); callBack('DEEDITVIEW_DEFAULT', DEEditView);
callBack('DEGRIDVIEW_DEFAULT', DEGridView);
callBack('DELISTVIEW_DEFAULT', DEListView); callBack('DELISTVIEW_DEFAULT', DEListView);
callBack('DEDATAVIEW_DEFAULT', DEDataView);
callBack('DEOPTVIEW_DEFAULT', DEOptView); callBack('DEOPTVIEW_DEFAULT', DEOptView);
callBack('DEPICKUPGRIDVIEW_DEFAULT', DEPickupGirdView);
callBack('DEPICKUPVIEW_DEFAULT', DEPickupView);
} }
\ No newline at end of file
{{#eq page.codeName 'ViewLayoutModelRepositoryDECalendarViewLayout'}}
export default {{jsonStringify pageDSL.viewLayoutPanel 2}}
{{/eq}}
{{#eq page.codeName 'ViewLayoutModelRepositoryDEPickupGridViewLayout'}}
export default {{jsonStringify pageDSL.viewLayoutPanel 2}}
{{/eq}}
{{#eq page.codeName 'ViewLayoutModelRepositoryDEPickupViewLayout'}}
export default {{jsonStringify pageDSL.viewLayoutPanel 2}}
{{/eq}}
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册