Skip to content

I
ibzrt
提交 a609a30b 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 73dff23d
隐藏空白字符变更
内嵌 并排
正在显示 包含 281 行增加 和 24 行删除
app_Web/public/assets/json/view-config.json
浏览文件 @ a609a30b
......@@ -39,6 +39,22 @@
"viewname": "SYS_ROLEGridView",
"viewtag": "13c174556f45e9b10b66dc51834a6ab5"
},
"wfgrouppickupgridview": {
"title": "角色/用户组选择表格视图",
"caption": "角色/用户组",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupPickupGridView",
"viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
},
"sys_usermpickupview": {
"title": "用户表数据多项选择视图",
"caption": "系统用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa",
"viewname": "SYS_USERMPickupView",
"viewtag": "1f8cf7e78d6d88588d1d568d1866cc77"
},
"ibzdicteditview": {
"title": "实体编辑视图",
"caption": "数据字典",
......@@ -167,6 +183,30 @@
"viewname": "IBZDictItemGridView",
"viewtag": "83c4af00425c6647a1ce25c2c0831aae"
},
"wfusermpickupview": {
"title": "用户数据多项选择视图",
"caption": "用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFUserMPickupView",
"viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
},
"sys_permissionmpickupview": {
"title": "权限表数据多项选择视图",
"caption": "权限/资源",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa",
"viewname": "SYS_PERMISSIONMPickupView",
"viewtag": "86bd4f6d4f771870e10b9717046a1b14"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupMPickupView",
"viewtag": "90a777962337daaf4cffd846eecb1f0f"
},
"ibzdepartmenteditview": {
"title": "部门编辑视图",
"caption": "部门",
......@@ -207,6 +247,14 @@
"viewname": "IBZEmployeeOptionView",
"viewtag": "9cf7a70099bff83a10f6ae65c4d54692"
},
"sys_rolempickupview": {
"title": "角色数据多项选择视图",
"caption": "系统角色",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa",
"viewname": "SYS_ROLEMPickupView",
"viewtag": "a1f8d44a9d7be49687062c63434b0f3f"
},
"sys_role_permissioneditview": {
"title": "角色权限关系表编辑视图",
"caption": "角色权限关系",
......
app_Web/src/locale/lanres/sys-permission/sys-permission_en_US.ts
浏览文件 @ a609a30b
......@@ -14,6 +14,10 @@ export default {
views: {
pickupview: {
caption: "<>",
title: '权限/资源',
},
mpickupview: {
caption: "<>",
title: '权限/资源',
},
pickupgridview: {
......
app_Web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts
浏览文件 @ a609a30b
......@@ -13,6 +13,10 @@ export default {
views: {
pickupview: {
caption: '权限/资源',
title: '权限/资源',
},
mpickupview: {
caption: '权限/资源',
title: '权限/资源',
},
pickupgridview: {
......
app_Web/src/locale/lanres/sys-role/sys-role_en_US.ts
浏览文件 @ a609a30b
......@@ -24,6 +24,10 @@ export default {
caption: "Start workflow",
title: 'Tables Information',
},
mpickupview: {
caption: "Start workflow",
title: 'Others',
},
},
main_form: {
details: {
......
app_Web/src/locale/lanres/sys-role/sys-role_zh_CN.ts
浏览文件 @ a609a30b
......@@ -21,6 +21,10 @@ export default {
},
pickupgridview: {
caption: '系统角色',
title: '系统角色',
},
mpickupview: {
caption: '系统角色',
title: '系统角色',
},
},
......
app_Web/src/locale/lanres/sys-user/sys-user_en_US.ts
浏览文件 @ a609a30b
......@@ -7,6 +7,10 @@ export default {
password: '密码',
},
views: {
mpickupview: {
caption: "Internal Error",
title: 'Condition',
},
pickupview: {
caption: "Internal Error",
title: 'Workflow',
......
app_Web/src/locale/lanres/sys-user/sys-user_zh_CN.ts
浏览文件 @ a609a30b
......@@ -6,6 +6,10 @@ export default {
password: '密码',
},
views: {
mpickupview: {
caption: '系统用户',
title: '系统用户',
},
pickupview: {
caption: '系统用户',
title: '系统用户',
......
app_Web/src/locale/lanres/wfgroup/wfgroup_en_US.ts
浏览文件 @ a609a30b
......@@ -6,6 +6,14 @@ export default {
groupscope: '范围',
},
views: {
pickupgridview: {
caption: "角色/用户组",
title: '角色/用户组',
},
mpickupview: {
caption: "角色/用户组",
title: '角色/用户组',
},
editview: {
caption: "角色/用户组",
title: '角色/用户组',
......
app_Web/src/locale/lanres/wfgroup/wfgroup_zh_CN.ts
浏览文件 @ a609a30b
......@@ -5,6 +5,14 @@ export default {
groupscope: '范围',
},
views: {
pickupgridview: {
caption: '角色/用户组',
title: '角色/用户组',
},
mpickupview: {
caption: '角色/用户组',
title: '角色/用户组',
},
editview: {
caption: '角色/用户组',
title: '角色/用户组',
......
app_Web/src/locale/lanres/wfuser/wfuser_en_US.ts
浏览文件 @ a609a30b
......@@ -8,6 +8,10 @@ export default {
views: {
pickupview: {
caption: "用户",
title: '用户',
},
mpickupview: {
caption: "用户",
title: '用户',
},
pickupgridview: {
......
app_Web/src/locale/lanres/wfuser/wfuser_zh_CN.ts
浏览文件 @ a609a30b
......@@ -7,6 +7,10 @@ export default {
views: {
pickupview: {
caption: '用户',
title: '用户',
},
mpickupview: {
caption: '用户',
title: '用户',
},
pickupgridview: {
......
app_Web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ a609a30b
......@@ -47,6 +47,22 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_ROLEGridView",
"viewtag": "13c174556f45e9b10b66dc51834a6ab5"
},
"wfgrouppickupgridview": {
"title": "角色/用户组选择表格视图",
"caption": "角色/用户组",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupPickupGridView",
"viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
},
"sys_usermpickupview": {
"title": "用户表数据多项选择视图",
"caption": "系统用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa",
"viewname": "SYS_USERMPickupView",
"viewtag": "1f8cf7e78d6d88588d1d568d1866cc77"
},
"ibzdicteditview": {
"title": "实体编辑视图",
"caption": "数据字典",
......@@ -175,6 +191,30 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "IBZDictItemGridView",
"viewtag": "83c4af00425c6647a1ce25c2c0831aae"
},
"wfusermpickupview": {
"title": "用户数据多项选择视图",
"caption": "用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFUserMPickupView",
"viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
},
"sys_permissionmpickupview": {
"title": "权限表数据多项选择视图",
"caption": "权限/资源",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa",
"viewname": "SYS_PERMISSIONMPickupView",
"viewtag": "86bd4f6d4f771870e10b9717046a1b14"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupMPickupView",
"viewtag": "90a777962337daaf4cffd846eecb1f0f"
},
"ibzdepartmenteditview": {
"title": "部门编辑视图",
"caption": "部门",
......@@ -215,6 +255,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "IBZEmployeeOptionView",
"viewtag": "9cf7a70099bff83a10f6ae65c4d54692"
},
"sys_rolempickupview": {
"title": "角色数据多项选择视图",
"caption": "系统角色",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa",
"viewname": "SYS_ROLEMPickupView",
"viewtag": "a1f8d44a9d7be49687062c63434b0f3f"
},
"sys_role_permissioneditview": {
"title": "角色权限关系表编辑视图",
"caption": "角色权限关系",
......
app_Web/src/pages/rt/index/page-register.ts
浏览文件 @ a609a30b
......@@ -2,12 +2,15 @@ export const PageComponents = {
install(Vue: any, opt: any) {
Vue.component('ibzorganization-grid-view', () => import('@pages/ou/ibzorganization-grid-view/ibzorganization-grid-view.vue'));
Vue.component('ibzdict-item-grid-view', () => import('@pages/dict/ibzdict-item-grid-view/ibzdict-item-grid-view.vue'));
Vue.component('sys-rolempickup-view', () => import('@pages/uaa/sys-rolempickup-view/sys-rolempickup-view.vue'));
Vue.component('ibzdict-edit-view', () => import('@pages/dict/ibzdict-edit-view/ibzdict-edit-view.vue'));
Vue.component('ibzorganization-edit-view', () => import('@pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.vue'));
Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
Vue.component('ibzemployee-option-view', () => import('@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'));
Vue.component('sys-userpickup-view', () => import('@pages/uaa/sys-userpickup-view/sys-userpickup-view.vue'));
Vue.component('sys-permissionpickup-view', () => import('@pages/uaa/sys-permissionpickup-view/sys-permissionpickup-view.vue'));
Vue.component('ibzemployee-grid-view', () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'));
Vue.component('sys-usermpickup-view', () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue'));
Vue.component('sys-permissionpickup-grid-view', () => import('@pages/uaa/sys-permissionpickup-grid-view/sys-permissionpickup-grid-view.vue'));
Vue.component('sys-user-rolegrid-view', () => import('@pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view.vue'));
Vue.component('ibzdepartment-pickup-grid-view', () => import('@pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view.vue'));
......@@ -21,6 +24,8 @@ export const PageComponents = {
Vue.component('sys-roleedit-view', () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue'));
Vue.component('ibzemployee-edit-view', () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'));
Vue.component('sys-role-permissiongrid-view', () => import('@pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view.vue'));
Vue.component('wfgroup-pickup-grid-view', () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'));
Vue.component('sys-permissionmpickup-view', () => import('@pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view.vue'));
Vue.component('ibzdepartment-edit-view', () => import('@pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view.vue'));
Vue.component('ibzdepartment-option-view', () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'));
Vue.component('sys-user-roleedit-view', () => import('@pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view.vue'));
......@@ -28,12 +33,13 @@ export const PageComponents = {
Vue.component('ibzdict-item-edit-view', () => import('@pages/dict/ibzdict-item-edit-view/ibzdict-item-edit-view.vue'));
Vue.component('sys-rolepickup-view', () => import('@pages/uaa/sys-rolepickup-view/sys-rolepickup-view.vue'));
Vue.component('sys-rolegrid-view', () => import('@pages/uaa/sys-rolegrid-view/sys-rolegrid-view.vue'));
Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
Vue.component('sys-role-permissionedit-view', () => import('@pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view.vue'));
Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'));
Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'));
Vue.component('ibzorganization-pickup-grid-view', () => import('@pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view.vue'));
Vue.component('sys-userpickup-grid-view', () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue'));
Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'));
Vue.component('sys-userpickup-grid-view', () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue'));
Vue.component('ibzdepartment-grid-view', () => import('@pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view.vue'));
}
};
\ No newline at end of file
app_Web/src/pages/rt/index/router.ts
浏览文件 @ a609a30b
......@@ -74,6 +74,19 @@ const router = new Router({
},
component: () => import('@pages/dict/ibzdict-item-grid-view/ibzdict-item-grid-view.vue'),
},
{
path: 'sys_roles/:sys_role?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.sys_role.views.mpickupview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'sys_roles', parameterName: 'sys_role' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/uaa/sys-rolempickup-view/sys-rolempickup-view.vue'),
},
{
path: 'ibzdicts/:ibzdict?/editview/:editview?',
meta: {
......@@ -100,6 +113,19 @@ const router = new Router({
},
component: () => import('@pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.vue'),
},
{
path: 'wfusers/:wfuser?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.wfuser.views.mpickupview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'wfusers', parameterName: 'wfuser' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
},
{
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/optionview/:optionview?',
meta: {
......@@ -238,6 +264,19 @@ const router = new Router({
},
component: () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'),
},
{
path: 'sys_users/:sys_user?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.sys_user.views.mpickupview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'sys_users', parameterName: 'sys_user' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue'),
},
{
path: 'sys_permissions/:sys_permission?/pickupgridview/:pickupgridview?',
meta: {
......@@ -590,6 +629,32 @@ const router = new Router({
},
component: () => import('@pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view.vue'),
},
{
path: 'wfgroups/:wfgroup?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.wfgroup.views.pickupgridview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'wfgroups', parameterName: 'wfgroup' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
},
{
path: 'sys_permissions/:sys_permission?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.sys_permission.views.mpickupview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'sys_permissions', parameterName: 'sys_permission' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view.vue'),
},
{
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/editview/:editview?',
meta: {
......@@ -751,6 +816,19 @@ const router = new Router({
},
component: () => import('@pages/uaa/sys-rolegrid-view/sys-rolegrid-view.vue'),
},
{
path: 'wfgroups/:wfgroup?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.wfgroup.views.mpickupview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'wfgroups', parameterName: 'wfgroup' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
},
{
path: 'sys_roles/:sys_role?/sys_role_permissions/:sys_role_permission?/editview/:editview?',
meta: {
......@@ -832,30 +910,30 @@ const router = new Router({
component: () => import('@pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view.vue'),
},
{
path: 'sys_users/:sys_user?/pickupgridview/:pickupgridview?',
path: 'wfusers/:wfuser?/pickupview/:pickupview?',
meta: {
caption: 'entities.sys_user.views.pickupgridview.caption',
caption: 'entities.wfuser.views.pickupview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'sys_users', parameterName: 'sys_user' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
{ pathName: 'wfusers', parameterName: 'wfuser' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue'),
component: () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'),
},
{
path: 'wfusers/:wfuser?/pickupview/:pickupview?',
path: 'sys_users/:sys_user?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.wfuser.views.pickupview.caption',
caption: 'entities.sys_user.views.pickupgridview.caption',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'wfusers', parameterName: 'wfuser' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
{ pathName: 'sys_users', parameterName: 'sys_user' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'),
component: () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue'),
},
{
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/gridview/:gridview?',
......
app_Web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue
浏览文件 @ a609a30b
......@@ -1089,6 +1089,14 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
* @memberof SYS_ROLE_PERMISSIONGridView
*/
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
const batchAddPSAppViews=[
{view:{viewname:'sys-permissionmpickup-view',height: 0,width: 0,title: '权限表数据多项选择视图'},
res:['SYS_PERMISSION'],
'resAppKey':'permissionid'},
{view:{viewname:'sys-rolempickup-view',height: 0,width: 0,title: '角色数据多项选择视图'},
res:['SYS_ROLE'],
'resAppKey':'roleid'}
];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
......
app_Web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
浏览文件 @ a609a30b
......@@ -1089,6 +1089,14 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
* @memberof SYS_USER_ROLEGridView
*/
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
const batchAddPSAppViews=[
{view:{viewname:'sys-rolempickup-view',height: 0,width: 0,title: '角色数据多项选择视图'},
res:['SYS_ROLE'],
'resAppKey':'roleid'},
{view:{viewname:'sys-usermpickup-view',height: 0,width: 0,title: '用户表数据多项选择视图'},
res:['SYS_USER'],
'resAppKey':'userid'}
];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
......
app_Web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue
浏览文件 @ a609a30b
......@@ -1092,6 +1092,14 @@ export default class WFMemberGridViewBase extends Vue {
* @memberof WFMemberGridView
*/
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
const batchAddPSAppViews=[
{view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'},
res:['WFGroup'],
'resAppKey':'groupid'},
{view:{viewname:'wfuser-mpickup-view',height: 0,width: 0,title: '用户数据多项选择视图'},
res:['WFUser'],
'resAppKey':'userid'}
];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
......
app_Web/src/store/modules/view-action/state.ts
浏览文件 @ a609a30b
......@@ -41,7 +41,9 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'84e5a5b589b434dfdc60a3d0ad087d37',
'6e1b35989dd6470b5c890369ab87b545',
'90a777962337daaf4cffd846eecb1f0f',
],
},
{
......@@ -81,6 +83,8 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'a1f8d44a9d7be49687062c63434b0f3f',
'86bd4f6d4f771870e10b9717046a1b14',
'a93a129850b81c3c921aa1911ec9eb8c',
],
},
......@@ -151,6 +155,8 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'1f8cf7e78d6d88588d1d568d1866cc77',
'a1f8d44a9d7be49687062c63434b0f3f',
'edde313015e1db7c366028307d88d20c',
],
},
......
app_Web/src/uiservice/sys-permission/sys-permission-ui-service-base.ts
浏览文件 @ a609a30b
......@@ -80,6 +80,7 @@ export default class SYS_PERMISSIONUIServiceBase extends UIService {
*/
public initViewMap(){
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'sys_permissions'});
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'sys_permissions'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'sys_permissions'});
}
......
app_Web/src/uiservice/sys-role/sys-role-ui-service-base.ts
浏览文件 @ a609a30b
......@@ -83,6 +83,7 @@ export default class SYS_ROLEUIServiceBase extends UIService {
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'sys_roles'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'sys_roles'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'sys_roles'});
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'sys_roles'});
}
/**
......
app_Web/src/uiservice/sys-user/sys-user-ui-service-base.ts
浏览文件 @ a609a30b
......@@ -79,6 +79,7 @@ export default class SYS_USERUIServiceBase extends UIService {
* @memberof SYS_USERUIServiceBase
*/
public initViewMap(){
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'sys_users'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'sys_users'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'sys_users'});
}
......
app_Web/src/uiservice/wfgroup/wfgroup-ui-service-base.ts
浏览文件 @ a609a30b
......@@ -79,6 +79,8 @@ export default class WFGroupUIServiceBase extends UIService {
* @memberof WFGroupUIServiceBase
*/
public initViewMap(){
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfgroups'});
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfgroups'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfgroups'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfgroups'});
}
......
app_Web/src/uiservice/wfuser/wfuser-ui-service-base.ts
浏览文件 @ a609a30b
......@@ -80,6 +80,7 @@ export default class WFUserUIServiceBase extends UIService {
*/
public initViewMap(){
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfusers'});
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfusers'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfusers'});
}
......
config.xml
浏览文件 @ a609a30b
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzrt/
mvn clean package -Pweb
cd ibzrt-app/ibzrt-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
浏览文件 @ a609a30b
......@@ -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 /ibzrt-app-web.jar
EXPOSE 30000
EXPOSE 8080
ADD ibzrt-app-web.jar /ibzrt-app-web.jar
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
浏览文件 @ a609a30b
......@@ -3,11 +3,9 @@ services:
ibzrt-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports:
- "30000:30000"
- "8080:8080"
networks:
- agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
deploy:
mode: replicated
replicas: 1
......
ibzrt-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ a609a30b
......@@ -192,7 +192,7 @@
</createTable>
</changeSet>
<!--输出实体[WF_GROUP_MEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_group_member-3-10">
<changeSet author="a_A_5d9d78509" id="tab-wf_group_member-5-10">
<createTable tableName="IBZWFMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
......@@ -289,7 +289,7 @@
</changeSet>
<!--输出实体[WF_USER]数据结构 -->
<!--输出实体[WF_GROUP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_group-4-16">
<changeSet author="a_A_5d9d78509" id="tab-wf_group-6-16">
<createTable tableName="IBZWFGROUP">
<column name="GROUPID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
......@@ -528,10 +528,10 @@
<!--输出实体[WF_TASK_WAY]外键关系 -->
<!--输出实体[WF_TASK]外键关系 -->
<!--输出实体[WF_GROUP_MEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-3-27">
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-5-27">
<addForeignKeyConstraint baseColumnNames="GROUPID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_GROUP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="GROUPID" referencedTableName="IBZWFGROUP" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-3-28">
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-5-28">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_USER_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZUSER" validate="true"/>
</changeSet>
<!--输出实体[SYS_PSAPPMENUITEM]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或