Skip to content

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

ibizdev提交

上级 666e7e33
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 2880 行增加 和 174 行删除
app_web/public/assets/json/view-config.json
浏览文件 @ 384c2438
......@@ -15,6 +15,14 @@
"viewname": "WFIndexView",
"viewtag": "380EA9D7-5F04-46C1-9E82-2877EE29336A"
},
"wfusermpickupview": {
"title": "用户数据多项选择视图",
"caption": "用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFUserMPickupView",
"viewtag": "3b32fb97ab849d5f36e8a283c85b5098"
},
"wfuserpickupview": {
"title": "用户数据选择视图",
"caption": "用户",
......@@ -23,6 +31,14 @@
"viewname": "WFUserPickupView",
"viewtag": "5592ca3571d551675c5306a0a9f1352e"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupMPickupView",
"viewtag": "5db49698557288612b9247b259ffbcd7"
},
"wfusereditview": {
"title": "用户编辑视图",
"caption": "用户",
......
app_web/src/locale/lanres/wfgroup/wfgroup_en_US.ts
浏览文件 @ 384c2438
......@@ -6,6 +6,10 @@ export default {
groupscope: '范围',
},
views: {
mpickupview: {
caption: "角色/用户组",
title: '角色/用户组',
},
editview: {
caption: "角色/用户组",
title: '角色/用户组',
......
app_web/src/locale/lanres/wfgroup/wfgroup_zh_CN.ts
浏览文件 @ 384c2438
......@@ -5,6 +5,10 @@ export default {
groupscope: '范围',
},
views: {
mpickupview: {
caption: '角色/用户组',
title: '角色/用户组',
},
editview: {
caption: '角色/用户组',
title: '角色/用户组',
......
app_web/src/locale/lanres/wfuser/wfuser_en_US.ts
浏览文件 @ 384c2438
......@@ -6,6 +6,10 @@ export default {
displayname: '用户名称',
},
views: {
mpickupview: {
caption: "用户",
title: '用户',
},
pickupview: {
caption: "用户",
title: '用户',
......@@ -27,8 +31,6 @@ export default {
details: {
group1: "用户基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "用户标识",
srfmajortext: "用户名称",
......@@ -36,6 +38,8 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
personname: "用户名称",
username: "用户全局名",
userid: "用户标识",
},
uiactions: {
......@@ -43,6 +47,9 @@ export default {
},
main_grid: {
columns: {
userid: "用户标识",
personname: "用户名称",
username: "用户全局名",
},
uiactions: {
},
......@@ -50,6 +57,7 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_personname_like: "用户名称(文本包含(%))",
},
uiactions: {
},
......
app_web/src/locale/lanres/wfuser/wfuser_zh_CN.ts
浏览文件 @ 384c2438
......@@ -5,6 +5,10 @@ export default {
displayname: '用户名称',
},
views: {
mpickupview: {
caption: '用户',
title: '用户',
},
pickupview: {
caption: '用户',
title: '用户',
......@@ -26,8 +30,6 @@ export default {
details: {
group1: '用户基本信息',
formpage1: '基本信息',
group2: '操作信息',
formpage2: '其它',
srforikey: '',
srfkey: '用户标识',
srfmajortext: '用户名称',
......@@ -35,6 +37,8 @@ export default {
srfuf: '',
srfdeid: '',
srfsourcekey: '',
personname: '用户名称',
username: '用户全局名',
userid: '用户标识',
},
uiactions: {
......@@ -42,6 +46,9 @@ export default {
},
main_grid: {
columns: {
userid: '用户标识',
personname: '用户名称',
username: '用户全局名',
},
uiactions: {
},
......@@ -49,6 +56,7 @@ export default {
default_searchform: {
details: {
formpage1: '常规条件',
n_personname_like: '用户名称(文本包含(%))',
},
uiactions: {
},
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 384c2438
......@@ -23,6 +23,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "WFIndexView",
"viewtag": "380EA9D7-5F04-46C1-9E82-2877EE29336A"
},
"wfusermpickupview": {
"title": "用户数据多项选择视图",
"caption": "用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFUserMPickupView",
"viewtag": "3b32fb97ab849d5f36e8a283c85b5098"
},
"wfuserpickupview": {
"title": "用户数据选择视图",
"caption": "用户",
......@@ -31,6 +39,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "WFUserPickupView",
"viewtag": "5592ca3571d551675c5306a0a9f1352e"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupMPickupView",
"viewtag": "5db49698557288612b9247b259ffbcd7"
},
"wfusereditview": {
"title": "用户编辑视图",
"caption": "用户",
......
app_web/src/pages/workflow/wfgroup-edit-view/wfgroup-edit-view-base.vue
浏览文件 @ 384c2438
......@@ -471,17 +471,17 @@ export default class WFGroupEditViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view-base.vue
浏览文件 @ 384c2438
......@@ -497,17 +497,17 @@ export default class WFGroupGridViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.less 0 → 100644
浏览文件 @ 384c2438
.wfgroup-mpickup-view{
position: relative;
}
.pickup-view {
>.translate-contant {
flex-grow: 1;
display: flex;
justify-content: flex-end;
height: calc(100% - 64px);
.translate-buttons {
width: 80px;
display: flex;
align-items: center;
text-align: center;
button {
margin-bottom: 5px;
}
}
.left, .right {
width: 300px;
}
.right {
border: 1px solid #e9e9e9;
.mpicker-select {
font-family: helvetica, sans-serif;
font-size: 16px;
text-align: justify;
word-spacing: -3.8pt;
line-height: 1.6;
font-weight: bold;
word-spacing: 10px;
height: 100%;
overflow: auto;
}
.mpicker-select > div {
padding: 3px 10px;
font-size: 14px;
color: rgba(0, 0, 0, 0.85);
font-weight: initial;
cursor: pointer;
min-height: 28px;
border: 1px solid #e9e9e9;
margin: 4px 4px;
transition: all .3s;
}
.mpicker-select > div:hover {
background: #ecf6fd;
}
.mpicker-select > .select{
color: #108ee9;
background: #ecf6fd;
}
}
.center{
width: calc(100% - 380px);
.pickupviewpanel {
width: 100%;
height: 100%;
}
}
}
>.footer {
height: 64px;
}
}
\ No newline at end of file
app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue 0 → 100644
浏览文件 @ 384c2438
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import WFGroupMPickupViewBase from './wfgroup-mpickup-view-base.vue';
import view_pickupviewpanel from '@widgets/wfgroup/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
@Component({
components: {
view_pickupviewpanel,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class WFGroupMPickupView extends WFGroupMPickupViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view-base.vue
浏览文件 @ 384c2438
......@@ -356,17 +356,17 @@ export default class WFGroupPickupGridViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view-base.vue
浏览文件 @ 384c2438
......@@ -350,17 +350,17 @@ export default class WFGroupPickupViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfindex-view/page-register.ts
浏览文件 @ 384c2438
export const PageComponents = {
install(Vue: any, opt: any) {
Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
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('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('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('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('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'));
......
app_web/src/pages/workflow/wfindex-view/router.ts
浏览文件 @ 384c2438
......@@ -34,6 +34,19 @@ const router = new Router({
},
component: () => import('@pages/workflow/wfindex-view/wfindex-view.vue'),
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?',
meta: {
......@@ -113,6 +126,32 @@ const router = new Router({
},
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?',
meta: {
......@@ -194,6 +233,18 @@ const router = new Router({
},
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?',
meta: {
......@@ -206,6 +257,18 @@ const router = new Router({
},
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?',
meta: {
......@@ -279,6 +342,18 @@ const router = new Router({
},
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?',
meta: {
......
app_web/src/pages/workflow/wfindex-view/wfindex-view-base.vue
浏览文件 @ 384c2438
......@@ -333,17 +333,17 @@ export default class WFIndexViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfmember-edit-view/wfmember-edit-view-base.vue
浏览文件 @ 384c2438
......@@ -471,17 +471,17 @@ export default class WFMemberEditViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue
浏览文件 @ 384c2438
......@@ -497,17 +497,17 @@ export default class WFMemberGridViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......@@ -1087,29 +1087,43 @@ export default class WFMemberGridViewBase extends Vue {
* @memberof WFMemberGridView
*/
protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context));
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
let deResParameters: any[] = [];
if(curViewParam.wfgroup && true){
deResParameters = [
{ pathName: 'wfgroups', parameterName: 'wfgroup' },
]
}
const parameters: any[] = [
{ pathName: 'wfmembers', parameterName: 'wfmember' },
{ pathName: 'editview', parameterName: 'editview' },
const batchAddPSAppViews=[
{view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'},
res:['WFGroup']},
{view:{viewname:'wfuser-mpickup-view',height: 0,width: 0,title: '用户数据多项选择视图'},
res:[]}
];
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);
if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
return;
}
openIndexViewTab(data);
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
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;
}
if(result.datas && result.datas.length == 0){
return;
}
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/pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view-base.vue
浏览文件 @ 384c2438
......@@ -471,17 +471,17 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view-base.vue
浏览文件 @ 384c2438
......@@ -497,17 +497,17 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfuser-edit-view/wfuser-edit-view-base.vue
浏览文件 @ 384c2438
......@@ -471,17 +471,17 @@ export default class WFUserEditViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-view-base.vue
浏览文件 @ 384c2438
......@@ -497,17 +497,17 @@ export default class WFUserGridViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.less 0 → 100644
浏览文件 @ 384c2438
.wfuser-mpickup-view{
position: relative;
}
.pickup-view {
>.translate-contant {
flex-grow: 1;
display: flex;
justify-content: flex-end;
height: calc(100% - 64px);
.translate-buttons {
width: 80px;
display: flex;
align-items: center;
text-align: center;
button {
margin-bottom: 5px;
}
}
.left, .right {
width: 300px;
}
.right {
border: 1px solid #e9e9e9;
.mpicker-select {
font-family: helvetica, sans-serif;
font-size: 16px;
text-align: justify;
word-spacing: -3.8pt;
line-height: 1.6;
font-weight: bold;
word-spacing: 10px;
height: 100%;
overflow: auto;
}
.mpicker-select > div {
padding: 3px 10px;
font-size: 14px;
color: rgba(0, 0, 0, 0.85);
font-weight: initial;
cursor: pointer;
min-height: 28px;
border: 1px solid #e9e9e9;
margin: 4px 4px;
transition: all .3s;
}
.mpicker-select > div:hover {
background: #ecf6fd;
}
.mpicker-select > .select{
color: #108ee9;
background: #ecf6fd;
}
}
.center{
width: calc(100% - 380px);
.pickupviewpanel {
width: 100%;
height: 100%;
}
}
}
>.footer {
height: 64px;
}
}
\ No newline at end of file
app_web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue 0 → 100644
浏览文件 @ 384c2438
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import WFUserMPickupViewBase from './wfuser-mpickup-view-base.vue';
import view_pickupviewpanel from '@widgets/wfuser/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
@Component({
components: {
view_pickupviewpanel,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class WFUserMPickupView extends WFUserMPickupViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view-base.vue
浏览文件 @ 384c2438
......@@ -356,17 +356,17 @@ export default class WFUserPickupGridViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/pages/workflow/wfuser-pickup-view/wfuser-pickup-view-base.vue
浏览文件 @ 384c2438
......@@ -350,17 +350,17 @@ export default class WFUserPickupViewBase extends Vue {
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(this.context[curNavData.value]){
if(this.context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.context[curNavData.value],
value: this.context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(this.viewparams[curNavData.value]){
if(this.viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item, {
value: this.viewparams[curNavData.value],
value: this.viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ 384c2438
......@@ -11,6 +11,8 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'ac7cba0b131aa74021747169735a4f90',
'3b32fb97ab849d5f36e8a283c85b5098',
'5db49698557288612b9247b259ffbcd7',
],
},
{
......@@ -24,6 +26,16 @@ export const viewstate: any = {
'f11ad9a3b9260fb68a2a2e870419bffa',
],
},
{
viewtag: '3b32fb97ab849d5f36e8a283c85b5098',
viewmodule: 'workflow',
viewname: 'WFUserMPickupView',
viewaction: '',
viewdatachange: false,
refviews: [
'a9dfca1bcb877df49bfed9a2bd177d14',
],
},
{
viewtag: '5592ca3571d551675c5306a0a9f1352e',
viewmodule: 'workflow',
......@@ -34,6 +46,16 @@ export const viewstate: any = {
'a9dfca1bcb877df49bfed9a2bd177d14',
],
},
{
viewtag: '5db49698557288612b9247b259ffbcd7',
viewmodule: 'workflow',
viewname: 'WFGroupMPickupView',
viewaction: '',
viewdatachange: false,
refviews: [
'c539c8d177b0401b79fa0808de6f13dd',
],
},
{
viewtag: '77dd35badedcc0f6b98e83ee1ff82bda',
viewmodule: 'workflow',
......
app_web/src/uiservice/wfgroup/wfgroup-ui-service-base.ts
浏览文件 @ 384c2438
......@@ -79,6 +79,7 @@ export default class WFGroupUIServiceBase extends UIService {
* @memberof WFGroupUIServiceBase
*/
public initViewMap(){
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfgroups'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfgroups'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfgroups'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfgroups'});
......
app_web/src/uiservice/wfuser/wfuser-ui-service-base.ts
浏览文件 @ 384c2438
......@@ -79,6 +79,7 @@ export default class WFUserUIServiceBase extends UIService {
* @memberof WFUserUIServiceBase
*/
public initViewMap(){
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfusers'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfusers'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfusers'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfusers'});
......
app_web/src/widgets/wfgroup/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue 0 → 100644
浏览文件 @ 384c2438
<template>
<div class='pickupviewpanel'>
<component
v-if="inited && view.viewname && !Object.is(view.viewname, '')"
:is="view.viewname"
class="viewcontainer3"
:viewdata="viewdata"
:viewparam="viewparam"
:viewDefaultUsage="false"
:isSingleSelect="isSingleSelect"
:selectedData="selectedData"
:isShowButton="isShowButton"
@viewdataschange="onViewDatasChange"
@viewdatasactivated="viewDatasActivated"
@viewload="onViewLoad">
</component>
</div>
</template>
<script lang='tsx'>
import { Vue, Component, Prop, Provide, Emit, Watch, Model } from 'vue-property-decorator';
import { CreateElement } from 'vue';
import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import WFGroupService from '@/service/wfgroup/wfgroup-service';
import MPickupViewpickupviewpanelService from './mpickup-viewpickupviewpanel-pickupviewpanel-service';
import MPickupViewpickupviewpanelModel from './mpickup-viewpickupviewpanel-pickupviewpanel-model';
@Component({
components: {
}
})
export default class MPickupViewpickupviewpanelBase extends Vue implements ControlInterface {
/**
* 名称
*
* @type {string}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected name?: string;
/**
* 视图通讯对象
*
* @type {Subject<ViewState>}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected viewState!: Subject<ViewState>;
/**
* 应用上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected context: any;
/**
* 视图参数
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected viewparams: any;
/**
* 视图状态事件
*
* @protected
* @type {(Subscription | undefined)}
* @memberof MPickupViewpickupviewpanel
*/
protected viewStateEvent: Subscription | undefined;
/**
* 获取部件类型
*
* @returns {string}
* @memberof MPickupViewpickupviewpanel
*/
protected getControlType(): string {
return 'PICKUPVIEWPANEL'
}
/**
* 建构部件服务对象
*
* @type {MPickupViewpickupviewpanelService}
* @memberof MPickupViewpickupviewpanel
*/
protected service: MPickupViewpickupviewpanelService = new MPickupViewpickupviewpanelService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {WFGroupService}
* @memberof MPickupViewpickupviewpanel
*/
protected appEntityService: WFGroupService = new WFGroupService({ $store: this.$store });
/**
* 关闭视图
*
* @param {any} args
* @memberof MPickupViewpickupviewpanel
*/
protected closeView(args: any): void {
let _this: any = this;
_this.$emit('closeview', [args]);
}
/**
* 计数器刷新
*
* @memberof MPickupViewpickupviewpanel
*/
public counterRefresh(){
const _this:any =this;
if(_this.counterServiceArray && _this.counterServiceArray.length >0){
_this.counterServiceArray.forEach((item:any) =>{
if(item.refreshData && item.refreshData instanceof Function){
item.refreshData();
}
})
}
}
/**
* 选中数据字符串
*
* @type {string}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected selectedData?: string;
/**
* 获取多项数据
*
* @returns {any[]}
* @memberof MPickupViewpickupviewpanel
*/
public getDatas(): any[] {
return [];
}
/**
* 获取单项树
*
* @returns {*}
* @memberof MPickupViewpickupviewpanel
*/
public getData(): any {
return {};
}
/**
* 视图名称
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
protected view: any = {
viewname: 'wfgroup-pickup-grid-view',
data: {},
}
/**
* 视图数据
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
protected viewdata: string = JSON.stringify(this.context);
/**
* 视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
protected viewparam: string = JSON.stringify(this.viewparams);
/**
* 是否显示按钮
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
@Prop({default: true}) protected isShowButton!: boolean;
/**
* 是否单选
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected isSingleSelect?: boolean;
/**
* 初始化完成
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
protected inited: boolean = false;
/**
* 视图数据变化
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
protected onViewDatasChange($event: any): void {
if($event.length>0){
$event.forEach((item:any,index:any) => {
let srfmajortext = item['name'];
if(srfmajortext){
Object.assign($event[index],{srfmajortext: srfmajortext});
}
});
}
this.$emit('selectionchange', $event);
}
/**
* 视图数据被激活
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
protected viewDatasActivated($event: any): void {
this.$emit('activated', $event);
}
/**
* 视图加载完成
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
protected onViewLoad($event: any): void {
this.$emit('load', $event);
}
/**
* vue 生命周期
*
* @memberof MPickupViewpickupviewpanel
*/
protected created() {
this.afterCreated();
}
/**
* 执行created后的逻辑
*
* @memberof MPickupViewpickupviewpanel
*/
protected afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
return;
}
if (Object.is('load', action)) {
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
this.inited = true;
}
});
}
}
/**
* vue 生命周期
*
* @memberof MPickupViewpickupviewpanel
*/
protected destroyed() {
this.afterDestroy();
}
/**
* 执行destroyed后的逻辑
*
* @memberof MPickupViewpickupviewpanel
*/
protected afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
}
}
</script>
<style lang='less'>
@import './mpickup-viewpickupviewpanel-pickupviewpanel.less';
</style>
\ No newline at end of file
app_web/src/widgets/wfgroup/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts 0 → 100644
浏览文件 @ 384c2438
/**
* MPickupViewpickupviewpanel 部件模型
*
* @export
* @class MPickupViewpickupviewpanelModel
*/
export default class MPickupViewpickupviewpanelModel {
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof MPickupViewpickupviewpanelModel
*/
public getDataItems(): any[] {
return [
{
name: 'wfgroup',
prop: 'id',
},
{
name: 'name',
},
{
name: 'groupscope',
},
]
}
}
\ No newline at end of file
app_web/src/widgets/wfgroup/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-service.ts 0 → 100644
浏览文件 @ 384c2438
import { Http } from '@/utils';
import ControlService from '@/widgets/control-service';
/**
* MPickupViewpickupviewpanel 部件服务对象
*
* @export
* @class MPickupViewpickupviewpanelService
*/
export default class MPickupViewpickupviewpanelService extends ControlService {
}
\ No newline at end of file
app_web/src/widgets/wfgroup/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue 0 → 100644
浏览文件 @ 384c2438
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import MPickupViewpickupviewpanelBase from './mpickup-viewpickupviewpanel-pickupviewpanel-base.vue';
@Component({
components: {
}
})
export default class MPickupViewpickupviewpanel extends MPickupViewpickupviewpanelBase {
}
</script>
\ No newline at end of file
app_web/src/widgets/wfuser/default-searchform/default-searchform-base.vue
浏览文件 @ 384c2438
......@@ -4,7 +4,13 @@
<row>
<i-col span="20">
<row>
</row>
<i-col v-show="detailsModel.n_personname_like.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_personname_like' :itemRules="this.rules.n_personname_like" class='' :caption="$t('entities.wfuser.default_searchform.details.n_personname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_personname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_personname_like" @enter="onEnter($event)" :disabled="detailsModel.n_personname_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
</row>
</i-col>
<i-col span="4">
<row v-show="Object.keys(data).length>0">
......@@ -244,6 +250,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
protected data: any = {
n_personname_like: null,
};
/**
......@@ -253,6 +260,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
protected rules: any = {
n_personname_like: [
{ type: 'string', message: '用户名称(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户名称(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户名称(文本包含(%)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户名称(文本包含(%)) 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -263,9 +276,23 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
protected detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_personname_like: new FormItemModel({ caption: '用户名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_personname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_personname_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_personname_like')
onN_personname_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_personname_like', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -287,6 +314,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
private formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
}
/**
......
app_web/src/widgets/wfuser/default-searchform/default-searchform-model.ts
浏览文件 @ 384c2438
......@@ -25,6 +25,11 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_personname_like',
prop: 'displayname',
dataType: 'TEXT',
},
]
}
......
app_web/src/widgets/wfuser/main-form/main-form-base.vue
浏览文件 @ 384c2438
......@@ -2,49 +2,29 @@
<i-form :model="this.data" class='app-form' ref='form' id='form' style="">
<input style="display:none;" />
<row >
<tabs :animated="false" name='form' :value="detailsModel.form.activiedPage"
@on-click="detailsModel.form.clickPage($event)">
<tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='form' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.wfuser.main_form.details.formpage1')
])
}">
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfuser.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
</row>
</app-form-group>
<i-col v-show="detailsModel.personname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='personname' :itemRules="this.rules.personname" class='' :caption="$t('entities.wfuser.main_form.details.personname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.personname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.personname" @enter="onEnter($event)" unit="" :disabled="detailsModel.personname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.username.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='username' :itemRules="this.rules.username" class='' :caption="$t('entities.wfuser.main_form.details.username')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.username.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.username" @enter="onEnter($event)" unit="" :disabled="detailsModel.username.disabled" type='text' style=""></input-box>
</app-form-item>
</tab-pane>
<tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='form' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.wfuser.main_form.details.formpage2')
])
}">
<i-col v-show="detailsModel.group2.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfuser.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
</i-col>
</row>
</app-form-group>
</i-col>
</tab-pane>
</tabs>
</row>
</i-form>
</template>
......@@ -342,6 +322,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null,
srfdeid: null,
srfsourcekey: null,
personname: null,
username: null,
userid: null,
wfuser:null,
};
......@@ -427,6 +409,18 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
personname: [
{ type: 'string', message: '用户名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户名称 值不能为空', trigger: 'blur' },
],
username: [
{ type: 'string', message: '用户全局名 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户全局名 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户全局名 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户全局名 值不能为空', trigger: 'blur' },
],
userid: [
{ type: 'string', message: '用户标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户标识 值必须为字符串类型', trigger: 'blur' },
......@@ -445,10 +439,6 @@ export default class MainBase extends Vue implements ControlInterface {
group1: new FormGroupPanelModel({ caption: '用户基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.wfuser.main_form', extractMode: 'ITEM', details: [] } })
,
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.wfuser.main_form', extractMode: 'ITEM', details: [] } })
,
formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this })
,
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
......@@ -463,10 +453,13 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
personname: new FormItemModel({ caption: '用户名称', detailType: 'FORMITEM', name: 'personname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
username: new FormItemModel({ caption: '用户全局名', detailType: 'FORMITEM', name: 'username', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
userid: new FormItemModel({ caption: '用户标识', detailType: 'FORMITEM', name: 'userid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
};
/**
......@@ -553,6 +546,30 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 personname 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.personname')
onPersonnameChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'personname', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 username 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.username')
onUsernameChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'username', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 userid 值
*
......
app_web/src/widgets/wfuser/main-form/main-form-model.ts
浏览文件 @ 384c2438
......@@ -50,6 +50,16 @@ export default class MainModel {
{
name: 'srfsourcekey',
},
{
name: 'personname',
prop: 'displayname',
dataType: 'TEXT',
},
{
name: 'username',
prop: 'firstname',
dataType: 'TEXT',
},
{
name: 'userid',
prop: 'id',
......
app_web/src/widgets/wfuser/main-grid/main-grid-base.vue
浏览文件 @ 384c2438
......@@ -16,6 +16,27 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('userid')">
<el-table-column show-overflow-tooltip :prop="'userid'" :label="$t('entities.wfuser.main_grid.columns.userid')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}">
<span>{{row.userid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('personname')">
<el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.wfuser.main_grid.columns.personname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}">
<span>{{row.personname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('username')">
<el-table-column show-overflow-tooltip :prop="'username'" :label="$t('entities.wfuser.main_grid.columns.username')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}">
<span>{{row.username}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -487,6 +508,27 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
protected allColumns: any[] = [
{
name: 'userid',
label: '用户标识',
langtag: 'entities.wfuser.main_grid.columns.userid',
show: true,
util: 'PX'
},
{
name: 'personname',
label: '用户名称',
langtag: 'entities.wfuser.main_grid.columns.personname',
show: true,
util: 'PX'
},
{
name: 'username',
label: '用户全局名',
langtag: 'entities.wfuser.main_grid.columns.username',
show: true,
util: 'PX'
},
]
/**
......
app_web/src/widgets/wfuser/main-grid/main-grid-model.ts
浏览文件 @ 384c2438
......@@ -26,6 +26,21 @@ export default class MainModel {
]
}else{
return [
{
name: 'username',
prop: 'firstname',
dataType: 'TEXT',
},
{
name: 'userid',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'personname',
prop: 'displayname',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'displayname',
......@@ -45,6 +60,11 @@ export default class MainModel {
name: 'wfuser',
prop: 'id',
},
{
name: 'n_personname_like',
prop: 'n_personname_like',
dataType: 'TEXT',
},
{
name:'size',
......
app_web/src/widgets/wfuser/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue 0 → 100644
浏览文件 @ 384c2438
<template>
<div class='pickupviewpanel'>
<component
v-if="inited && view.viewname && !Object.is(view.viewname, '')"
:is="view.viewname"
class="viewcontainer3"
:viewdata="viewdata"
:viewparam="viewparam"
:viewDefaultUsage="false"
:isSingleSelect="isSingleSelect"
:selectedData="selectedData"
:isShowButton="isShowButton"
@viewdataschange="onViewDatasChange"
@viewdatasactivated="viewDatasActivated"
@viewload="onViewLoad">
</component>
</div>
</template>
<script lang='tsx'>
import { Vue, Component, Prop, Provide, Emit, Watch, Model } from 'vue-property-decorator';
import { CreateElement } from 'vue';
import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import WFUserService from '@/service/wfuser/wfuser-service';
import MPickupViewpickupviewpanelService from './mpickup-viewpickupviewpanel-pickupviewpanel-service';
import MPickupViewpickupviewpanelModel from './mpickup-viewpickupviewpanel-pickupviewpanel-model';
@Component({
components: {
}
})
export default class MPickupViewpickupviewpanelBase extends Vue implements ControlInterface {
/**
* 名称
*
* @type {string}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected name?: string;
/**
* 视图通讯对象
*
* @type {Subject<ViewState>}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected viewState!: Subject<ViewState>;
/**
* 应用上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected context: any;
/**
* 视图参数
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected viewparams: any;
/**
* 视图状态事件
*
* @protected
* @type {(Subscription | undefined)}
* @memberof MPickupViewpickupviewpanel
*/
protected viewStateEvent: Subscription | undefined;
/**
* 获取部件类型
*
* @returns {string}
* @memberof MPickupViewpickupviewpanel
*/
protected getControlType(): string {
return 'PICKUPVIEWPANEL'
}
/**
* 建构部件服务对象
*
* @type {MPickupViewpickupviewpanelService}
* @memberof MPickupViewpickupviewpanel
*/
protected service: MPickupViewpickupviewpanelService = new MPickupViewpickupviewpanelService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {WFUserService}
* @memberof MPickupViewpickupviewpanel
*/
protected appEntityService: WFUserService = new WFUserService({ $store: this.$store });
/**
* 关闭视图
*
* @param {any} args
* @memberof MPickupViewpickupviewpanel
*/
protected closeView(args: any): void {
let _this: any = this;
_this.$emit('closeview', [args]);
}
/**
* 计数器刷新
*
* @memberof MPickupViewpickupviewpanel
*/
public counterRefresh(){
const _this:any =this;
if(_this.counterServiceArray && _this.counterServiceArray.length >0){
_this.counterServiceArray.forEach((item:any) =>{
if(item.refreshData && item.refreshData instanceof Function){
item.refreshData();
}
})
}
}
/**
* 选中数据字符串
*
* @type {string}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected selectedData?: string;
/**
* 获取多项数据
*
* @returns {any[]}
* @memberof MPickupViewpickupviewpanel
*/
public getDatas(): any[] {
return [];
}
/**
* 获取单项树
*
* @returns {*}
* @memberof MPickupViewpickupviewpanel
*/
public getData(): any {
return {};
}
/**
* 视图名称
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
protected view: any = {
viewname: 'wfuser-pickup-grid-view',
data: {},
}
/**
* 视图数据
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
protected viewdata: string = JSON.stringify(this.context);
/**
* 视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
protected viewparam: string = JSON.stringify(this.viewparams);
/**
* 是否显示按钮
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
@Prop({default: true}) protected isShowButton!: boolean;
/**
* 是否单选
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
@Prop() protected isSingleSelect?: boolean;
/**
* 初始化完成
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
protected inited: boolean = false;
/**
* 视图数据变化
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
protected onViewDatasChange($event: any): void {
if($event.length>0){
$event.forEach((item:any,index:any) => {
let srfmajortext = item['displayname'];
if(srfmajortext){
Object.assign($event[index],{srfmajortext: srfmajortext});
}
});
}
this.$emit('selectionchange', $event);
}
/**
* 视图数据被激活
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
protected viewDatasActivated($event: any): void {
this.$emit('activated', $event);
}
/**
* 视图加载完成
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
protected onViewLoad($event: any): void {
this.$emit('load', $event);
}
/**
* vue 生命周期
*
* @memberof MPickupViewpickupviewpanel
*/
protected created() {
this.afterCreated();
}
/**
* 执行created后的逻辑
*
* @memberof MPickupViewpickupviewpanel
*/
protected afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
return;
}
if (Object.is('load', action)) {
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
this.inited = true;
}
});
}
}
/**
* vue 生命周期
*
* @memberof MPickupViewpickupviewpanel
*/
protected destroyed() {
this.afterDestroy();
}
/**
* 执行destroyed后的逻辑
*
* @memberof MPickupViewpickupviewpanel
*/
protected afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
}
}
</script>
<style lang='less'>
@import './mpickup-viewpickupviewpanel-pickupviewpanel.less';
</style>
\ No newline at end of file
app_web/src/widgets/wfuser/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts 0 → 100644
浏览文件 @ 384c2438
/**
* MPickupViewpickupviewpanel 部件模型
*
* @export
* @class MPickupViewpickupviewpanelModel
*/
export default class MPickupViewpickupviewpanelModel {
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof MPickupViewpickupviewpanelModel
*/
public getDataItems(): any[] {
return [
{
name: 'wfuser',
prop: 'id',
},
{
name: 'firstname',
},
{
name: 'displayname',
},
]
}
}
\ No newline at end of file
app_web/src/widgets/wfuser/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-service.ts 0 → 100644
浏览文件 @ 384c2438
import { Http } from '@/utils';
import ControlService from '@/widgets/control-service';
/**
* MPickupViewpickupviewpanel 部件服务对象
*
* @export
* @class MPickupViewpickupviewpanelService
*/
export default class MPickupViewpickupviewpanelService extends ControlService {
}
\ No newline at end of file
app_web/src/widgets/wfuser/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue 0 → 100644
浏览文件 @ 384c2438
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import MPickupViewpickupviewpanelBase from './mpickup-viewpickupviewpanel-pickupviewpanel-base.vue';
@Component({
components: {
}
})
export default class MPickupViewpickupviewpanel extends MPickupViewpickupviewpanelBase {
}
</script>
\ No newline at end of file
ibzwf-core/src/main/resources/deprivs/DEPrivs.json
浏览文件 @ 384c2438
{
"unires":[
],
"predefineddatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
"entities":[
{
......@@ -40,4 +41,3 @@
]
}
ibzwf-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 384c2438
......@@ -26,7 +26,7 @@
</createTable>
</changeSet>
<!--输出实体[WF_USER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_user-20-3">
<changeSet author="a_A_5d9d78509" id="tab-wf_user-24-3">
<createTable tableName="IBZUSER">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_USER_USERID"/>
......@@ -38,7 +38,7 @@
</createTable>
</changeSet>
<!--输出实体[WF_GROUP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_group-21-4">
<changeSet author="a_A_5d9d78509" id="tab-wf_group-22-4">
<createTable tableName="IBZWFGROUP">
<column name="GROUPID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
......@@ -114,7 +114,7 @@
</createTable>
</changeSet>
<!--输出实体[WF_GROUP_MEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-wf_group_member-27-8">
<changeSet author="a_A_5d9d78509" id="tab-wf_group_member-31-8">
<createTable tableName="IBZWFMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
......@@ -154,10 +154,10 @@
<!--输出实体[WF_TASK_WAY]外键关系 -->
<!--输出实体[WF_DEFINITION]外键关系 -->
<!--输出实体[WF_GROUP_MEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-27-10">
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-31-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"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-27-11">
<changeSet author="a_A_5d9d78509" id="fk-wf_group_member-31-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"/>
</changeSet>
<!--输出实体[WF_TASK]外键关系 -->
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/config/apiSecurityConfig.java
浏览文件 @ 384c2438
......@@ -88,7 +88,10 @@ public class apiSecurityConfig extends WebSecurityConfigurerAdapter {
"/**/fonts/**",
"/**/js/**",
"/**/img/**",
"/"
"/",
"/webjars/**",
"/swagger-resources/**",
"/v2/**"
).permitAll()
// 服务中暂时只为重构用户身份，不进行身份认证
.anyRequest().permitAll()
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java
浏览文件 @ 384c2438
......@@ -61,7 +61,7 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.save(wfgroupMapping.toDomain(wfgroupdto)));
}
@ApiOperation(value = "SaveBatch", tags = {"SaveBatch" }, notes = "SaveBatch")
@ApiOperation(value = "SaveBatch", tags = {"WFGroup" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.saveBatch(wfgroupMapping.toDomain(wfgroupdtos));
......@@ -84,8 +84,8 @@ public class WFGroupResource {
}
@PreAuthorize("hasPermission(#wfgroup_id,'Update',{this.getEntity(),'Sql'})")
@ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/updatebatch")
@ApiOperation(value = "UpdateBatch", tags = {"WFGroup" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.updateBatch(wfgroupMapping.toDomain(wfgroupdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -124,8 +124,8 @@ public class WFGroupResource {
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
@ApiOperation(value = "createBatch", tags = {"createBatch" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/createbatch")
@ApiOperation(value = "createBatch", tags = {"WFGroup" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.createBatch(wfgroupMapping.toDomain(wfgroupdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -142,8 +142,8 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.remove(wfgroup_id));
}
@ApiOperation(value = "RemoveBatch", tags = {"RemoveBatch" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/removebatch")
@ApiOperation(value = "RemoveBatch", tags = {"WFGroup" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfgroupService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFProcessDefinitionResource.java
浏览文件 @ 384c2438
......@@ -61,7 +61,7 @@ public class WFProcessDefinitionResource {
return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.save(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondto)));
}
@ApiOperation(value = "SaveBatch", tags = {"SaveBatch" }, notes = "SaveBatch")
@ApiOperation(value = "SaveBatch", tags = {"WFProcessDefinition" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.saveBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
......@@ -84,8 +84,8 @@ public class WFProcessDefinitionResource {
}
@PreAuthorize("hasPermission(#wfprocessdefinition_id,'Update',{this.getEntity(),'Sql'})")
@ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/updatebatch")
@ApiOperation(value = "UpdateBatch", tags = {"WFProcessDefinition" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.updateBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -136,8 +136,8 @@ public class WFProcessDefinitionResource {
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
@ApiOperation(value = "createBatch", tags = {"createBatch" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/createbatch")
@ApiOperation(value = "createBatch", tags = {"WFProcessDefinition" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.createBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -154,8 +154,8 @@ public class WFProcessDefinitionResource {
return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.remove(wfprocessdefinition_id));
}
@ApiOperation(value = "RemoveBatch", tags = {"RemoveBatch" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/removebatch")
@ApiOperation(value = "RemoveBatch", tags = {"WFProcessDefinition" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfprocessdefinitionService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFSystemResource.java
浏览文件 @ 384c2438
......@@ -63,8 +63,8 @@ public class WFSystemResource {
return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.remove(wfsystem_id));
}
@ApiOperation(value = "RemoveBatch", tags = {"RemoveBatch" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/removebatch")
@ApiOperation(value = "RemoveBatch", tags = {"WFSystem" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfsystemService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -86,8 +86,8 @@ public class WFSystemResource {
}
@PreAuthorize("hasPermission(#wfsystem_id,'Update',{this.getEntity(),'Sql'})")
@ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/updatebatch")
@ApiOperation(value = "UpdateBatch", tags = {"WFSystem" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.updateBatch(wfsystemMapping.toDomain(wfsystemdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -111,7 +111,7 @@ public class WFSystemResource {
return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.save(wfsystemMapping.toDomain(wfsystemdto)));
}
@ApiOperation(value = "SaveBatch", tags = {"SaveBatch" }, notes = "SaveBatch")
@ApiOperation(value = "SaveBatch", tags = {"WFSystem" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.saveBatch(wfsystemMapping.toDomain(wfsystemdtos));
......@@ -133,8 +133,8 @@ public class WFSystemResource {
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
@ApiOperation(value = "createBatch", tags = {"createBatch" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/createbatch")
@ApiOperation(value = "createBatch", tags = {"WFSystem" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.createBatch(wfsystemMapping.toDomain(wfsystemdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java
浏览文件 @ 384c2438
......@@ -63,8 +63,8 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(wfuserService.remove(wfuser_id));
}
@ApiOperation(value = "RemoveBatch", tags = {"RemoveBatch" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/removebatch")
@ApiOperation(value = "RemoveBatch", tags = {"WFUser" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfuserService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -88,7 +88,7 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(wfuserService.save(wfuserMapping.toDomain(wfuserdto)));
}
@ApiOperation(value = "SaveBatch", tags = {"SaveBatch" }, notes = "SaveBatch")
@ApiOperation(value = "SaveBatch", tags = {"WFUser" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.saveBatch(wfuserMapping.toDomain(wfuserdtos));
......@@ -111,8 +111,8 @@ public class WFUserResource {
}
@PreAuthorize("hasPermission(#wfuser_id,'Update',{this.getEntity(),'Sql'})")
@ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/updatebatch")
@ApiOperation(value = "UpdateBatch", tags = {"WFUser" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.updateBatch(wfuserMapping.toDomain(wfuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -145,8 +145,8 @@ public class WFUserResource {
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
@ApiOperation(value = "createBatch", tags = {"createBatch" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/createbatch")
@ApiOperation(value = "createBatch", tags = {"WFUser" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.createBatch(wfuserMapping.toDomain(wfuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
......
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/swagger/SwaggerConfiguration.java 0 → 100644
浏览文件 @ 384c2438
package cn.ibizlab.swagger;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Configuration
//@EnableSwagger2
public class SwaggerConfiguration {
@Bean
public Docket docket() {
return new Docket(DocumentationType.SWAGGER_2)
.groupName("DEFAULT")
.pathMapping("/")
.apiInfo(
new ApiInfoBuilder()
.title("DEFAULT")
.build()
)
.select()
.apis(RequestHandlerSelectors.basePackage("cn.ibizlab"))
//.paths(or(regex("/rest/.*")))
.paths(PathSelectors.any())
.build()
;
}
@Bean
public Docket apiDocket() {
return new Docket(DocumentationType.SWAGGER_2)
.groupName("microservice")
.pathMapping("/")
.apiInfo(
new ApiInfoBuilder()
.title("microservice")
.version("1")
.build()
)
.select()
.apis(RequestHandlerSelectors.basePackage("cn.ibizlab.api"))
//.paths(or(regex("/rest/api/.*")))
.paths(PathSelectors.any())
.build()
;
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或