提交 60917530 编写于 作者: ibizdev's avatar ibizdev

zhujiamin 发布系统代码 [TrainSys,网页端]

上级 78607388
......@@ -203,8 +203,7 @@ export class AppDeLogicPrepareParamNode extends AppDeLogicNodeBase {
const srcFieldName: string = logicNodeParam.srcFieldName?.toLowerCase?.();
let objParam: any;
if (srcFieldName) {
// objParam = srcParam.get(srcFieldName);
objParam = srcParam.getReal();
objParam = srcParam.get(srcFieldName);
} else {
objParam = srcParam.getReal();
}
......
......@@ -41,6 +41,11 @@ export class AppGridModel {
prop: 'size',
dataType: 'QUERYPARAM'
},
{
name: 'offset',
prop: 'offset',
dataType: 'QUERYPARAM'
},
{
name: 'query',
prop: 'query',
......
......@@ -1518,6 +1518,8 @@ export class GridControlBase extends MDControlBase implements GridControlInterfa
}
return;
}
} else if (Object.is(args.type, 'custom')) {
Object.assign(page, { page: 0, offset: (args.startPage - 1) * this.limit, size: (args.endPage - args.startPage + 1) * this.limit });
}
// 设置排序
if (!this.isNoSort && Util.isExistAndNotEmpty(this.minorSortDir) && Util.isExistAndNotEmpty(this.minorSortPSDEF)) {
......@@ -1597,7 +1599,7 @@ export class GridControlBase extends MDControlBase implements GridControlInterfa
url += `?srfexporttag=${exportModel?.codeName}`
if (args.type === 'maxRowCount') {
Object.assign(params, { page: 0, size: args.maxRowCount ? args.maxRowCount : 1000 });
Object.assign(params, { page: 0 });
} else if (args.type === 'activatedPage') {
Object.assign(params, { page: this.curPage - 1, size: this.limit });
} else if (args.type === 'custom') {
......
......@@ -50,7 +50,7 @@
</changeSet>
<!--输出实体[BOOK]数据结构 -->
<changeSet author="root" id="tab-book-227-3">
<changeSet author="root" id="tab-book-229-3">
<createTable tableName="T_BOOK">
<column name="BOOKNAME" remarks="" type="VARCHAR(200)">
</column>
......
......@@ -60,34 +60,34 @@
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作",
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
"id" : "ToggleRowEdit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "表格界面_行编辑开关操作",
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlLogics" : [ {
......@@ -217,6 +217,28 @@
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
......@@ -244,28 +266,6 @@
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
} ]
},
"width" : 100,
......
......@@ -553,34 +553,34 @@
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作",
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
"id" : "ToggleRowEdit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "表格界面_行编辑开关操作",
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlHandler" : {
......@@ -797,6 +797,28 @@
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
......@@ -824,28 +846,6 @@
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
} ]
},
"width" : 100,
......
......@@ -373,34 +373,34 @@
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作",
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
"id" : "ToggleRowEdit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "表格界面_行编辑开关操作",
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlHandler" : {
......@@ -617,6 +617,28 @@
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
......@@ -644,28 +666,6 @@
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
} ]
},
"width" : 100,
......
......@@ -425,34 +425,34 @@
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作",
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
"id" : "ToggleRowEdit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "表格界面_行编辑开关操作",
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlHandler" : {
......@@ -669,6 +669,28 @@
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
......@@ -696,28 +718,6 @@
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
} ]
},
"width" : 100,
......
......@@ -1539,34 +1539,34 @@
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作",
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
"id" : "ToggleRowEdit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "表格界面_行编辑开关操作",
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlHandler" : {
......@@ -1783,6 +1783,28 @@
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
......@@ -1810,28 +1832,6 @@
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
} ]
},
"width" : 100,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册