ibizdev提交

app_web/src/locale/lanres/sys-permission/sys-permission_en_US.ts

@@ -85,10 +85,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -97,14 +93,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -117,34 +105,6 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
@@ -179,40 +139,16 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -221,14 +157,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -241,33 +169,5 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts

@@ -84,10 +84,6 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -96,14 +92,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -116,34 +104,6 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
@@ -178,40 +138,16 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -220,14 +156,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -240,33 +168,5 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-role-permission/sys-role-permission_en_US.ts

@@ -111,40 +111,16 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -153,14 +129,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -173,44 +141,12 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -219,14 +155,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -239,33 +167,5 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-role-permission/sys-role-permission_zh_CN.ts

@@ -110,40 +110,16 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -152,14 +128,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -172,44 +140,12 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -218,14 +154,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -238,33 +166,5 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-role/sys-role_en_US.ts

@@ -114,40 +114,16 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -156,14 +132,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -176,44 +144,12 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -222,14 +158,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -242,33 +170,5 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-role/sys-role_zh_CN.ts

@@ -113,40 +113,16 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -155,14 +131,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -175,44 +143,12 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -221,14 +157,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -241,33 +169,5 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-user-role/sys-user-role_en_US.ts

@@ -111,40 +111,16 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -153,14 +129,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -173,44 +141,12 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -219,14 +155,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -239,33 +167,5 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-user-role/sys-user-role_zh_CN.ts

@@ -110,40 +110,16 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -152,14 +128,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -172,44 +140,12 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -218,14 +154,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -238,33 +166,5 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-user/sys-user_en_US.ts

@@ -75,10 +75,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -87,14 +83,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -107,34 +95,6 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
@@ -169,40 +129,16 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
 		tbitem5: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
@@ -211,14 +147,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem12: {
 			caption: "New",
 			tip: "New",
@@ -231,33 +159,5 @@ export default {
 			caption: "Copy",
 			tip: "Copy {0}",
 		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-user/sys-user_zh_CN.ts

@@ -74,10 +74,6 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -86,14 +82,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -106,34 +94,6 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
@@ -168,40 +128,16 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
 		tbitem5: {
 			caption: '保存并关闭',
 			tip: '保存并关闭',
@@ -210,14 +146,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem12: {
 			caption: '新建',
 			tip: '新建',
@@ -230,33 +158,5 @@ export default {
 			caption: '拷贝',
 			tip: '拷贝',
 		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 };
\ No newline at end of file

app_web/src/mock/app/main-appmenu/main-appmenu.ts

@@ -22,7 +22,7 @@ mock.onGet('v7/mainappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto5',
@@ -40,7 +40,7 @@ mock.onGet('v7/mainappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user-secret',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto10',
@@ -76,7 +76,7 @@ mock.onGet('v7/mainappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-certificate',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto7',

app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/widgets/app/main-appmenu/main-appmenu-model.ts

@@ -26,7 +26,7 @@ export default class MainModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto5',
@@ -44,7 +44,7 @@ export default class MainModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-user-secret',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto10',
@@ -80,7 +80,7 @@ export default class MainModel {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-certificate',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto7',

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
+      mvn clean package -Pweb
+      cd ibzuaa-app/ibzuaa-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30002
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "8080:8080"
+      - "30002:30002"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 30002
\ No newline at end of file

ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30002
 
 #zuul网关路由设置
 zuul:

ibzuaa-core/src/main/resources/mapper/uaa/sys_pssysunires/SYS_PSSYSUNIRESMapper.xml

@@ -11,6 +11,7 @@
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="SYS_PSSYSUNIRESResultMap" type="cn.ibizlab.core.uaa.domain.SYS_PSSYSUNIRES" autoMapping="true">
         <id property="sysPssysuniresid" column="sys_pssysuniresid" /><!--主键字段映射-->
+		<result property="sysPssysuniresname" column="sys_pssysuniresname" />
             
 		
     </resultMap>