Skip to content

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

ibizdev提交

上级 cf7fe6ad
显示空白字符变更
内嵌 并排
正在显示 包含 121 行增加 和 27 行删除
app_web/src/pages/workflow/wfindex-view/page-register.ts
浏览文件 @ a0a327f0
export const PageComponents = { export const PageComponents = {
install(Vue: any, opt: any) { install(Vue: any, opt: any) {
Vue.component('wfgroup-pickup-grid-view', () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'));
Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue')); Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue')); Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'));
Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue')); Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'));
Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue')); Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'));
Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue')); Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'));
Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue')); Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
Vue.component('wfgroup-edit-view', () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue')); Vue.component('wfgroup-edit-view', () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'));
Vue.component('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.vue')); Vue.component('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.vue'));
......
app_web/src/pages/workflow/wfindex-view/router.ts
浏览文件 @ a0a327f0
...@@ -34,6 +34,19 @@ const router = new Router({ ...@@ -34,6 +34,19 @@ const router = new Router({
}, },
component: () => import('@pages/workflow/wfindex-view/wfindex-view.vue'), component: () => import('@pages/workflow/wfindex-view/wfindex-view.vue'),
children: [ children: [
{
path: 'wfgroups/:wfgroup?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.wfgroup.views.pickupgridview.caption',
parameters: [
{ pathName: 'wfindexview', parameterName: 'wfindexview' },
{ pathName: 'wfgroups', parameterName: 'wfgroup' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
},
{ {
path: 'wfusers/:wfuser?/pickupgridview/:pickupgridview?', path: 'wfusers/:wfuser?/pickupgridview/:pickupgridview?',
meta: { meta: {
...@@ -113,6 +126,32 @@ const router = new Router({ ...@@ -113,6 +126,32 @@ const router = new Router({
}, },
component: () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'), component: () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'),
}, },
{
path: 'wfusers/:wfuser?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.wfuser.views.mpickupview.caption',
parameters: [
{ pathName: 'wfindexview', parameterName: 'wfindexview' },
{ pathName: 'wfusers', parameterName: 'wfuser' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
},
{
path: 'wfgroups/:wfgroup?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.wfgroup.views.mpickupview.caption',
parameters: [
{ pathName: 'wfindexview', parameterName: 'wfindexview' },
{ pathName: 'wfgroups', parameterName: 'wfgroup' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
},
{ {
path: 'wfgroups/:wfgroup?/wfmembers/:wfmember?/gridview/:gridview?', path: 'wfgroups/:wfgroup?/wfmembers/:wfmember?/gridview/:gridview?',
meta: { meta: {
...@@ -194,6 +233,18 @@ const router = new Router({ ...@@ -194,6 +233,18 @@ const router = new Router({
}, },
component: () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'), component: () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'),
}, },
{
path: '/wfusers/:wfuser?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.wfuser.views.mpickupview.caption',
parameters: [
{ pathName: 'wfusers', parameterName: 'wfuser' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
},
{ {
path: '/wfusers/:wfuser?/pickupview/:pickupview?', path: '/wfusers/:wfuser?/pickupview/:pickupview?',
meta: { meta: {
...@@ -206,6 +257,18 @@ const router = new Router({ ...@@ -206,6 +257,18 @@ const router = new Router({
}, },
component: () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'), component: () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'),
}, },
{
path: '/wfgroups/:wfgroup?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.wfgroup.views.mpickupview.caption',
parameters: [
{ pathName: 'wfgroups', parameterName: 'wfgroup' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
},
{ {
path: '/wfprocessdefinitions/:wfprocessdefinition?/editview/:editview?', path: '/wfprocessdefinitions/:wfprocessdefinition?/editview/:editview?',
meta: { meta: {
...@@ -279,6 +342,18 @@ const router = new Router({ ...@@ -279,6 +342,18 @@ const router = new Router({
}, },
component: () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'), component: () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'),
}, },
{
path: '/wfgroups/:wfgroup?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.wfgroup.views.pickupgridview.caption',
parameters: [
{ pathName: 'wfgroups', parameterName: 'wfgroup' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
},
{ {
path: '/wfgroups/:wfgroup?/gridview/:gridview?', path: '/wfgroups/:wfgroup?/gridview/:gridview?',
meta: { meta: {
......
app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue
浏览文件 @ a0a327f0
...@@ -1087,29 +1087,43 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1087,29 +1087,43 @@ export default class WFMemberGridViewBase extends Vue {
* @memberof WFMemberGridView * @memberof WFMemberGridView
*/ */
protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
const data: any = {}; const batchAddPSAppViews=[
let curViewParam = JSON.parse(JSON.stringify(this.context)); {view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'},
if(args.length >0){ res:['WFGroup']},
Object.assign(curViewParam,args[0]); {view:{viewname:'wfuser-mpickup-view',height: 0,width: 0,title: '用户数据多项选择视图'},
res:[]}
];
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
} }
let deResParameters: any[] = []; let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
if(curViewParam.wfgroup && true){ return (item.res && (item.res[0] !== this.context.srfparentdename));
deResParameters = [ })
{ pathName: 'wfgroups', parameterName: 'wfgroup' }, let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
] container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
} }
const parameters: any[] = [ if(result.datas && result.datas.length == 0){
{ pathName: 'wfmembers', parameterName: 'wfmember' }, return;
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data);
this.$router.push(routePath);
} }
openIndexViewTab(data); let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
record[this.appEntityService.APPDEKEY] = this.context['srfparentkey'];
requestParam.push(record);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
});
} }
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ a0a327f0
...@@ -11,6 +11,8 @@ export const viewstate: any = { ...@@ -11,6 +11,8 @@ export const viewstate: any = {
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'ac7cba0b131aa74021747169735a4f90', 'ac7cba0b131aa74021747169735a4f90',
'3b32fb97ab849d5f36e8a283c85b5098',
'5db49698557288612b9247b259ffbcd7',
], ],
}, },
{ {
......
ibzwf-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ a0a327f0
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[WF_USER]数据结构 --> <!--输出实体[WF_USER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_user-25-3"> <changeSet author="a_A_5d9d78509" id="tab-wf_user-26-3">
<createTable tableName="IBZUSER"> <createTable tableName="IBZUSER">
<column name="USERID" remarks="" type="VARCHAR(100)"> <column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_USER_USERID"/> <constraints primaryKey="true" primaryKeyName="PK_WF_USER_USERID"/>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[WF_GROUP]数据结构 --> <!--输出实体[WF_GROUP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_group-23-4"> <changeSet author="a_A_5d9d78509" id="tab-wf_group-24-4">
<createTable tableName="IBZWFGROUP"> <createTable tableName="IBZWFGROUP">
<column name="GROUPID" remarks="" type="VARCHAR(100)"> <column name="GROUPID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/> <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[WF_GROUP_MEMBER]数据结构 --> <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_group_member-35-8"> <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-39-8">
<createTable tableName="IBZWFMEMBER"> <createTable tableName="IBZWFMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)"> <column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/> <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
...@@ -154,10 +154,10 @@ ...@@ -154,10 +154,10 @@
<!--输出实体[WF_TASK_WAY]外键关系 --> <!--输出实体[WF_TASK_WAY]外键关系 -->
<!--输出实体[WF_DEFINITION]外键关系 --> <!--输出实体[WF_DEFINITION]外键关系 -->
<!--输出实体[WF_GROUP_MEMBER]外键关系 --> <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-35-10"> <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-39-10">
<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"/> <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>
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-35-11"> <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-39-11">
<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"/> <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> </changeSet>
<!--输出实体[WF_TASK]外键关系 --> <!--输出实体[WF_TASK]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或