Skip to content

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

ibiz4j 发布系统代码

上级 55546b6a
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 3305 行增加 和 3277 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ eddfeaf7
[ [
{ {
"srfkey": "WFSystemList",
"emptytext": "未定义",
"codelisttype":"dynamic",
"appdataentity":"WFSystem",
"appdedataset":"FetchDefault",
"items": []
},
{
"srfkey": "YesNo", "srfkey": "YesNo",
"emptytext": "未定义", "emptytext": "未定义",
"codelisttype":"static", "codelisttype":"static",
...@@ -8,6 +16,7 @@ ...@@ -8,6 +16,7 @@
"id": "1", "id": "1",
"label": "是", "label": "是",
"text": "是", "text": "是",
"class":"",
"data":"", "data":"",
"codename":"Item_1", "codename":"Item_1",
"value": "1", "value": "1",
...@@ -18,6 +27,7 @@ ...@@ -18,6 +27,7 @@
"id": "0", "id": "0",
"label": "否", "label": "否",
"text": "否", "text": "否",
"class":"",
"data":"", "data":"",
"codename":"Item_0", "codename":"Item_0",
"value": "0", "value": "0",
...@@ -25,13 +35,5 @@ ...@@ -25,13 +35,5 @@
"disabled": false "disabled": false
} }
] ]
},
{
"srfkey": "WFSystemList",
"emptytext": "未定义",
"codelisttype":"dynamic",
"appdataentity":"WFSystem",
"appdedataset":"FetchDefault",
"items": []
} }
] ]
\ No newline at end of file
app_web/public/assets/json/view-config.json
浏览文件 @ eddfeaf7
{ {
"wfindexview": {
"title": "workflow",
"caption": "ibizlab",
"viewtype": "APPINDEXVIEW",
"viewmodule": "workflow",
"viewname": "WFIndexView",
"viewtag": "096fd4090f21e0fa0f4a303ed9041bff"
},
"wfmembergridview": { "wfmembergridview": {
"title": "成员表格视图", "title": "成员表格视图",
"caption": "成员", "caption": "成员",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFMemberGridView", "viewname": "WFMemberGridView",
"viewtag": "2543a3f227c806c6433bf9710717de93" "viewtag": "135872676ba63d430b2f20bd20364286"
}, },
"wfindexview": { "wfgrouppickupgridview": {
"title": "workflow", "title": "角色/用户组选择表格视图",
"caption": "ibizlab", "caption": "角色/用户组",
"viewtype": "APPINDEXVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFIndexView", "viewname": "WFGroupPickupGridView",
"viewtag": "380EA9D7-5F04-46C1-9E82-2877EE29336A" "viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
}, },
"wfusermpickupview": { "wfprocessdefinitioneditview": {
"title": "用户数据多项选择视图", "title": "流程定义查看",
"caption": "用户", "caption": "流程定义查看",
"viewtype": "DEMPICKUPVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFUserMPickupView", "viewname": "WFProcessDefinitionEditView",
"viewtag": "3b32fb97ab849d5f36e8a283c85b5098" "viewtag": "3fcd491c13d05ab7dcce8d2c920d0aec"
},
"wfremodeleditview": {
"title": "流程模型编辑视图",
"caption": "流程模型",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFREModelEditView",
"viewtag": "5856bfb8b576cc2ee743801b23e58299"
}, },
"wfuserpickupview": { "wfuserpickupview": {
"title": "用户数据选择视图", "title": "用户数据选择视图",
...@@ -29,15 +45,7 @@ ...@@ -29,15 +45,7 @@
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFUserPickupView", "viewname": "WFUserPickupView",
"viewtag": "5592ca3571d551675c5306a0a9f1352e" "viewtag": "61c5bff70bcf56e1dc0bb0900df9c98c"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupMPickupView",
"viewtag": "5db49698557288612b9247b259ffbcd7"
}, },
"wftaskgridview": { "wftaskgridview": {
"title": "我的待办", "title": "我的待办",
...@@ -45,47 +53,7 @@ ...@@ -45,47 +53,7 @@
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFTaskGridView", "viewname": "WFTaskGridView",
"viewtag": "67f605f39e4d0d7cfa524ea97bc29ced" "viewtag": "66f4bcca719e75fa9645380cc81bc3e2"
},
"wfusereditview": {
"title": "用户编辑视图",
"caption": "用户",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFUserEditView",
"viewtag": "77dd35badedcc0f6b98e83ee1ff82bda"
},
"wftaskeditview": {
"title": "工作流任务编辑视图",
"caption": "工作流任务",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFTaskEditView",
"viewtag": "84f38898137b7bd1f9f135ac74b4b850"
},
"wfprocessdefinitioneditview": {
"title": "流程定义查看",
"caption": "流程定义查看",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFProcessDefinitionEditView",
"viewtag": "9aad4530afb58f5c348a5b21d9c7ae72"
},
"wfprocessdefinitiongridview": {
"title": "流程定义",
"caption": "流程定义",
"viewtype": "DEGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFProcessDefinitionGridView",
"viewtag": "a06aed382ebc28e6521b4398880388cd"
},
"wfuserpickupgridview": {
"title": "用户选择表格视图",
"caption": "用户",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFUserPickupGridView",
"viewtag": "a9dfca1bcb877df49bfed9a2bd177d14"
}, },
"wfmembereditview": { "wfmembereditview": {
"title": "成员编辑视图", "title": "成员编辑视图",
...@@ -93,15 +61,23 @@ ...@@ -93,15 +61,23 @@
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFMemberEditView", "viewname": "WFMemberEditView",
"viewtag": "ac7cba0b131aa74021747169735a4f90" "viewtag": "6e1b35989dd6470b5c890369ab87b545"
}, },
"wfgroupeditview": { "wfusermpickupview": {
"title": "角色/用户组编辑视图", "title": "用户数据多项选择视图",
"caption": "用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFUserMPickupView",
"viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组", "caption": "角色/用户组",
"viewtype": "DEEDITVIEW", "viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupEditView", "viewname": "WFGroupMPickupView",
"viewtag": "aeb28973b7182f671fa50aa5d87e9346" "viewtag": "90a777962337daaf4cffd846eecb1f0f"
}, },
"wfgrouppickupview": { "wfgrouppickupview": {
"title": "角色/用户组数据选择视图", "title": "角色/用户组数据选择视图",
...@@ -109,23 +85,31 @@ ...@@ -109,23 +85,31 @@
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupPickupView", "viewname": "WFGroupPickupView",
"viewtag": "bfd32eedd618add6408b75a98f40f809" "viewtag": "b05c9353d499f973106e6ed4dde58074"
}, },
"wfremodeleditview": { "wfgroupeditview": {
"title": "流程模型编辑视图", "title": "角色/用户组编辑视图",
"caption": "流程模型", "caption": "角色/用户组",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFREModelEditView", "viewname": "WFGroupEditView",
"viewtag": "c0e7fb60c35f15d4f23800acae7afbd1" "viewtag": "b23a721ca159ac2490b768d795e85d17"
}, },
"wfgrouppickupgridview": { "wfprocessdefinitiongridview": {
"title": "角色/用户组选择表格视图", "title": "流程定义",
"caption": "角色/用户组", "caption": "流程定义",
"viewtype": "DEGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFProcessDefinitionGridView",
"viewtag": "bfa86be8c02420f87d5cf4ff9a768948"
},
"wfuserpickupgridview": {
"title": "用户选择表格视图",
"caption": "用户",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupPickupGridView", "viewname": "WFUserPickupGridView",
"viewtag": "c539c8d177b0401b79fa0808de6f13dd" "viewtag": "c9c73c8d2e61bd29a304622f3d39b522"
}, },
"wfusergridview": { "wfusergridview": {
"title": "用户表格视图", "title": "用户表格视图",
...@@ -133,7 +117,15 @@ ...@@ -133,7 +117,15 @@
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFUserGridView", "viewname": "WFUserGridView",
"viewtag": "ec44dccb75670532aa3e9bfae73c4259" "viewtag": "cf0fdabd8378e07ca72ac167b1406756"
},
"wftaskeditview": {
"title": "工作流任务编辑视图",
"caption": "工作流任务",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFTaskEditView",
"viewtag": "e3020680a441ab58a29db6fe2434f08b"
}, },
"wfgroupgridview": { "wfgroupgridview": {
"title": "角色/用户组表格视图", "title": "角色/用户组表格视图",
...@@ -141,6 +133,14 @@ ...@@ -141,6 +133,14 @@
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupGridView", "viewname": "WFGroupGridView",
"viewtag": "f11ad9a3b9260fb68a2a2e870419bffa" "viewtag": "f498dfb24e88df7c70a5c09ecb587647"
},
"wfusereditview": {
"title": "用户编辑视图",
"caption": "用户",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFUserEditView",
"viewtag": "ffd6ce24e0a1aa780920b48721e502a7"
} }
} }
app_web/public/environments/environment.js 0 → 100644
浏览文件 @ eddfeaf7
window.Environment = {
// 应用基础路径
BaseUrl: '',
// 是否为开发模式
devMode: true,
// 是否为pc端应用
isAppMode:true,
// 是否开启权限认证
enablePermissionValid:false,
// 打开目标工具，可选参数：sln、mos
debugOpenMode:'mos',
// 配置平台地址
StudioUrl: "http://172.16.170.145/mos/",
// 中心标识
SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
// 系统标识
SysId: "B428B5BE-EA90-4101-A493-BA7085D89F0A",
// 前端应用标识
AppId: "6e0b7357169ef4eba84e1347ed94bd84",
}
\ No newline at end of file
app_web/src/authservice/auth-service-register.ts
浏览文件 @ eddfeaf7
...@@ -39,13 +39,13 @@ export class AuthServiceRegister { ...@@ -39,13 +39,13 @@ export class AuthServiceRegister {
* @memberof AuthServiceRegister * @memberof AuthServiceRegister
*/ */
protected init(): void { protected init(): void {
this.allAuthService.set('wfremodel', () => import('@/authservice/wfremodel/wfremodel-auth-service')); this.allAuthService.set('wftask', () => import('@/authservice/wftask/wftask-auth-service'));
this.allAuthService.set('wfmember', () => import('@/authservice/wfmember/wfmember-auth-service')); this.allAuthService.set('wfmember', () => import('@/authservice/wfmember/wfmember-auth-service'));
this.allAuthService.set('wfgroup', () => import('@/authservice/wfgroup/wfgroup-auth-service'));
this.allAuthService.set('wfuser', () => import('@/authservice/wfuser/wfuser-auth-service')); this.allAuthService.set('wfuser', () => import('@/authservice/wfuser/wfuser-auth-service'));
this.allAuthService.set('wftask', () => import('@/authservice/wftask/wftask-auth-service')); this.allAuthService.set('wfgroup', () => import('@/authservice/wfgroup/wfgroup-auth-service'));
this.allAuthService.set('wfprocessdefinition', () => import('@/authservice/wfprocess-definition/wfprocess-definition-auth-service')); this.allAuthService.set('wfremodel', () => import('@/authservice/wfremodel/wfremodel-auth-service'));
this.allAuthService.set('wfsystem', () => import('@/authservice/wfsystem/wfsystem-auth-service')); this.allAuthService.set('wfsystem', () => import('@/authservice/wfsystem/wfsystem-auth-service'));
this.allAuthService.set('wfprocessdefinition', () => import('@/authservice/wfprocess-definition/wfprocess-definition-auth-service'));
} }
/** /**
......
app_web/src/components/app-actionbar/app-actionbar.vue
浏览文件 @ eddfeaf7
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<script lang="ts"> <script lang="ts">
import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator"; import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator";
import { Subject,Subscription } from "rxjs"; import { Subject,Subscription } from "rxjs";
import { Environment } from '@/environments/environment';
@Component({}) @Component({})
export default class AppActionBar extends Vue { export default class AppActionBar extends Vue {
...@@ -99,37 +100,39 @@ export default class AppActionBar extends Vue { ...@@ -99,37 +100,39 @@ export default class AppActionBar extends Vue {
* @memberof AppActionBar * @memberof AppActionBar
*/ */
public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){ public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
for (const key in ActionModel) { if(Environment.enablePermissionValid){
if (!ActionModel.hasOwnProperty(key)) { for (const key in ActionModel) {
return; if (!ActionModel.hasOwnProperty(key)) {
} return;
const _item = ActionModel[key]; }
if(_item && _item['dataaccaction'] && UIService){ const _item = ActionModel[key];
let dataActionResult:any; if(_item && _item['dataaccaction'] && UIService){
if(Object.is(_item['actiontarget'],"NONE")){ let dataActionResult:any;
dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']); if(Object.is(_item['actiontarget'],"NONE")){
}else{ dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
if(data && Object.keys(data).length >0){ }else{
dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']]; if(data && Object.keys(data).length >0){
} dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
} }
// 无权限:0;有权限:1 }
if(dataActionResult === 0){ // 无权限:0;有权限:1
// 禁用:1;隐藏:2;隐藏且默认隐藏:6 if(dataActionResult === 0){
if(_item.noprivdisplaymode === 1){ // 禁用:1;隐藏:2;隐藏且默认隐藏:6
_item.disabled = true; if(_item.noprivdisplaymode === 1){
} _item.disabled = true;
if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){ }
_item.visabled = false; if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
}else{ _item.visabled = false;
_item.visabled = true; }else{
} _item.visabled = true;
} }
if(dataActionResult === 1){ }
_item.visabled = true; if(dataActionResult === 1){
_item.disabled = false; _item.visabled = true;
} _item.disabled = false;
} }
}
}
} }
} }
......
app_web/src/components/app-embed-picker/app-embed-picker.vue
浏览文件 @ eddfeaf7
...@@ -222,7 +222,12 @@ export default class AppEmbedPicker extends Vue { ...@@ -222,7 +222,12 @@ export default class AppEmbedPicker extends Vue {
if(Object.is(newFormData[this.refreshitems], oldDormData[this.refreshitems])) { if(Object.is(newFormData[this.refreshitems], oldDormData[this.refreshitems])) {
return; return;
} }
this.setValue([{srfmajortext: null, srfkey: null}]); if (this.valueItem) {
this.$emit('formitemvaluechange', { name: this.valueItem, value: null });
}
if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: null });
}
} }
/** /**
...@@ -231,6 +236,7 @@ export default class AppEmbedPicker extends Vue { ...@@ -231,6 +236,7 @@ export default class AppEmbedPicker extends Vue {
* @memberof AppEmbedPicker * @memberof AppEmbedPicker
*/ */
public created() { public created() {
this.setViewParam();
if(this.formState) { if(this.formState) {
this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => { this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
if (Object.is('load', action)) { if (Object.is('load', action)) {
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ eddfeaf7
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<script lang="ts"> <script lang="ts">
import { Vue, Component, Prop, Watch } from 'vue-property-decorator'; import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
import { Environment } from '@/environments/environment';
@Component({}) @Component({})
export default class AppFormGroup extends Vue { export default class AppFormGroup extends Vue {
...@@ -157,36 +158,38 @@ export default class AppFormGroup extends Vue { ...@@ -157,36 +158,38 @@ export default class AppFormGroup extends Vue {
* @memberof AppFormGroup * @memberof AppFormGroup
*/ */
public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){ public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
for (const key in ActionModel) { if(Environment.enablePermissionValid){
if (!ActionModel.hasOwnProperty(key)) { for (const key in ActionModel) {
return; if (!ActionModel.hasOwnProperty(key)) {
} return;
const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService){
let dataActionResult:any;
if(Object.is(_item['actiontarget'],"NONE")){
dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
}else{
if(data && Object.keys(data).length >0){
dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
}
} }
// 无权限:0;有权限:1 const _item = ActionModel[key];
if(dataActionResult === 0){ if(_item && _item['dataaccaction'] && UIService){
// 禁用:1;隐藏:2;隐藏且默认隐藏:6 let dataActionResult:any;
if(_item.noprivdisplaymode === 1){ if(Object.is(_item['actiontarget'],"NONE")){
_item.disabled = true; dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
}
if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
_item.visabled = false;
}else{ }else{
if(data && Object.keys(data).length >0){
dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
}
}
// 无权限:0;有权限:1
if(dataActionResult === 0){
// 禁用:1;隐藏:2;隐藏且默认隐藏:6
if(_item.noprivdisplaymode === 1){
_item.disabled = true;
}
if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
_item.visabled = false;
}else{
_item.visabled = true;
}
}
if(dataActionResult === 1){
_item.visabled = true; _item.visabled = true;
_item.disabled = false;
} }
} }
if(dataActionResult === 1){
_item.visabled = true;
_item.disabled = false;
}
} }
} }
} }
......
app_web/src/components/app-message-popover/app-message-popover.less
浏览文件 @ eddfeaf7
...@@ -19,10 +19,12 @@ ...@@ -19,10 +19,12 @@
padding-top: 2px; padding-top: 2px;
padding-right: 2px; padding-right: 2px;
color: #aaa; color: #aaa;
cursor: pointer;
} }
.Row { .Row {
height: 70px; min-height: 70px;
height: auto;
border-bottom: 1px solid lightgray; border-bottom: 1px solid lightgray;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -34,20 +36,24 @@ ...@@ -34,20 +36,24 @@
.column2 { .column2 {
border: 0px red solid; border: 0px red solid;
.process-definition-name { .process-definition-name {
font-size: 14px; font-size: 14px;
padding-top: 5px;
}
.description {
margin-top: 6px;
margin-bottom: 6px;
max-width: 95%;
}
.createtime {
padding-bottom: 5px;
} }
.el-row { .el-row {
display: flex; display: flex;
.el-col { .el-col {
flex-grow: 1; flex-grow: 1;
div {
margin-bottom: 5px;
}
div:first-child { div:first-child {
font-weight: 500; font-weight: 500;
overflow: hidden; overflow: hidden;
......
app_web/src/components/app-message-popover/app-message-popover.vue
浏览文件 @ eddfeaf7
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<el-row :draggable="false"> <el-row :draggable="false">
<el-col :span="16" :draggable="false"> <el-col :span="16" :draggable="false">
<div class="process-definition-name" :draggable="false"><strong>{{myTask.processDefinitionName}}</strong></div> <div class="process-definition-name" :draggable="false"><strong>{{myTask.processDefinitionName}}</strong></div>
<div :draggable="false">{{myTask.description}}</div> <div class="description" :draggable="false">{{myTask.description}}</div>
<div :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div> <div class="createtime" :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div>
</el-col> </el-col>
<el-col :span="5" :draggable="false" style='display: flex; align-items: center'> <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
<el-tag :type="myTask.name.indexOf('驳回')!=-1?'danger':(myTask.name.indexOf('成功')!=-1?'success':(myTask.name.indexOf('取消')!=-1?'info':'-'))" <el-tag :type="myTask.name.indexOf('驳回')!=-1?'danger':(myTask.name.indexOf('成功')!=-1?'success':(myTask.name.indexOf('取消')!=-1?'info':'-'))"
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<el-row :draggable="false"> <el-row :draggable="false">
<el-col :span="16" :draggable="false"> <el-col :span="16" :draggable="false">
<div class="process-definition-name" :draggable="false"><strong>{{myMsg.processDefinitionName}}</strong></div> <div class="process-definition-name" :draggable="false"><strong>{{myMsg.processDefinitionName}}</strong></div>
<div :draggable="false">{{myMsg.description}}</div> <div class="description" :draggable="false">{{myMsg.description}}</div>
<div :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div> <div class="createtime" :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div>
</el-col> </el-col>
<el-col :span="5" :draggable="false" style='display: flex; align-items: center'> <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
<el-tag :type="myMsg.name.indexOf('驳回')!=-1?'danger':(myMsg.name.indexOf('成功')!=-1?'success':(myMsg.name.indexOf('取消')!=-1?'info':'-'))" <el-tag :type="myMsg.name.indexOf('驳回')!=-1?'danger':(myMsg.name.indexOf('成功')!=-1?'success':(myMsg.name.indexOf('取消')!=-1?'info':'-'))"
......
app_web/src/components/app-transfer/app-transfer.less
浏览文件 @ eddfeaf7
...@@ -5,11 +5,21 @@ ...@@ -5,11 +5,21 @@
display: none; display: none;
} }
.el-transfer{ .el-transfer{
max-height: 200px;
min-width: 100% !important; min-width: 100% !important;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.el-transfer-panel{ .el-transfer-panel{
min-width: 25%; min-width: 25%;
.el-transfer-panel__body{
max-height: 160px;
.el-checkbox-group{
max-height: 160px;
.el-checkbox+.el-checkbox {
margin-left: 0px;
}
}
}
} }
.el-transfer__buttons{ .el-transfer__buttons{
align-self: center; align-self: center;
......
app_web/src/components/app-wf-approval/app-wf-approval.vue
浏览文件 @ eddfeaf7
...@@ -5,30 +5,35 @@ ...@@ -5,30 +5,35 @@
<span>{{data.startUserName}}{{$t('components.appWFApproval.commit')}}</span> <span>{{data.startUserName}}{{$t('components.appWFApproval.commit')}}</span>
</div> </div>
<div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0"> <div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0">
<div class="approval-content-item" v-for="(usertask,index) in data.usertasks" :key="index"> <template v-for="(usertask,index) in data.usertasks" >
<div class="approval-content-item-left"> <template v-if="usertask.identitylinks.length >0">
{{usertask.userTaskName}} <div class="approval-content-item" :key="index">
</div> <div class="approval-content-item-left">
<div class="approval-content-item-right"> {{usertask.userTaskName}}
<div class="approval-content-item-wait" v-if="usertask.identitylinks.length >0"> </div>
{{$t('components.appWFApproval.wait')}}<span v-for="(identitylink,inx) in usertask.identitylinks" :key="inx">{{identitylink.displayname}}<span v-if="inx >0">、</span></span>{{$t('components.appWFApproval.handle')}} <div class="approval-content-item-right">
</div> <div class="approval-content-item-wait" v-if="usertask.identitylinks.length >0">
<div class="approval-content-item-info" v-if="usertask.comments.length >0"> {{$t('components.appWFApproval.wait')}}<span v-for="(identitylink,inx) in usertask.identitylinks" :key="inx">{{identitylink.displayname}}<span v-if="inx >0">、</span></span>{{$t('components.appWFApproval.handle')}}
<div v-for="(comment,commentInx) in usertask.comments" :key="commentInx">
<div class="approval-content-item-info-item approval-content-item-info-top">
{{`【${comment.type}】${comment.fullMessage}`}}
</div> </div>
<div class="approval-content-item-info-item approval-content-item-info-bottom"> <div class="approval-content-item-info" v-if="usertask.comments.length >0">
<span class="info-bottom-name">{{comment.authorName}}</span> <div v-for="(comment,commentInx) in usertask.comments" :key="commentInx">
<span>{{comment.time}}</span> <div class="approval-content-item-info-item approval-content-item-info-top">
{{`【${comment.type}】${comment.fullMessage}`}}
</div>
<div class="approval-content-item-info-item approval-content-item-info-bottom">
<span class="info-bottom-name">{{comment.authorName}}</span>
<span>{{comment.time}}</span>
</div>
</div>
</div>
<div class="approval-content-item-memo" v-if="usertask.userTaskId === viewparams.userTaskId">
<el-input type="textarea" v-model="initmemo" :rows="2" @blur="handleBlur" :placeholder="$t('components.appWFApproval.placeholder')"></el-input>
</div> </div>
</div> </div>
</div> </div>
<div class="approval-content-item-memo" v-if="usertask.userTaskId === viewparams.userTaskId"> </template>
<el-input type="textarea" v-model="initmemo" :rows="2" @blur="handleBlur" :placeholder="$t('components.appWFApproval.placeholder')"></el-input> </template>
</div>
</div>
</div>
</div> </div>
<div class="app-wf-approval-bottom"> <div class="app-wf-approval-bottom">
<span v-if="data.endTime">{{data.endTime}}{{$t('components.appWFApproval.end')}}</span> <span v-if="data.endTime">{{data.endTime}}{{$t('components.appWFApproval.end')}}</span>
......
app_web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue
浏览文件 @ eddfeaf7
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:filterable="filterable" :filterable="filterable"
@on-open-change="onClick" @on-open-change="onClick"
:placeholder="$t('components.dropDownListDynamic.placeholder')"> :placeholder="$t('components.dropDownListDynamic.placeholder')">
<i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option> <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
</i-select> </i-select>
</template> </template>
......
app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue
浏览文件 @ eddfeaf7
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
:filterable="filterable" :filterable="filterable"
@on-open-change="onClick" @on-open-change="onClick"
:placeholder="$t('components.dropDownListMpicker.placeholder')"> :placeholder="$t('components.dropDownListMpicker.placeholder')">
<i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text"> <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value.toString()" :label="item.text">
<Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true"> <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
{{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}} {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
</Checkbox> </Checkbox>
......
app_web/src/components/dropdown-list/dropdown-list.vue
浏览文件 @ eddfeaf7
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:filterable="filterable" :filterable="filterable"
@on-open-change="onClick" @on-open-change="onClick"
:placeholder="$t('components.dropDownList.placeholder')"> :placeholder="$t('components.dropDownList.placeholder')">
<i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option> <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
</i-select> </i-select>
<ibiz-select-tree v-if="hasChildren" class="tree-dropdown-list" :disabled="disabled" :NodesData="items" v-model="currentVal" :multiple="false"></ibiz-select-tree> <ibiz-select-tree v-if="hasChildren" class="tree-dropdown-list" :disabled="disabled" :NodesData="items" v-model="currentVal" :multiple="false"></ibiz-select-tree>
</div> </div>
......
app_web/src/engine/view/view-engine.ts
浏览文件 @ eddfeaf7
import { Environment } from '@/environments/environment';
/** /**
* *
* *
...@@ -184,37 +186,39 @@ export default class ViewEngine { ...@@ -184,37 +186,39 @@ export default class ViewEngine {
* @memberof ViewEngine * @memberof ViewEngine
*/ */
public calcToolbarItemAuthState(data:any){ public calcToolbarItemAuthState(data:any){
const _this: any = this; if(Environment.enablePermissionValid){
for (const key in _this.view.toolBarModels) { const _this: any = this;
if (!_this.view.toolBarModels.hasOwnProperty(key)) { for (const key in _this.view.toolBarModels) {
return; if (!_this.view.toolBarModels.hasOwnProperty(key)) {
} return;
const _item = _this.view.toolBarModels[key];
if(_item && _item['dataaccaction'] && _this.view.appUIService){
let dataActionResult:any;
if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
}else{
if(data && Object.keys(data).length >0){
dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];
}
} }
// 无权限:0;有权限:1 const _item = _this.view.toolBarModels[key];
if(dataActionResult === 0){ if(_item && _item['dataaccaction'] && _this.view.appUIService){
// 禁用:1;隐藏:2;隐藏且默认隐藏:6 let dataActionResult:any;
if(_item.noprivdisplaymode === 1){ if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
_this.view.toolBarModels[key].disabled = true; dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
}
if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
_this.view.toolBarModels[key].visabled = false;
}else{ }else{
if(data && Object.keys(data).length >0){
dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];
}
}
// 无权限:0;有权限:1
if(dataActionResult === 0){
// 禁用:1;隐藏:2;隐藏且默认隐藏:6
if(_item.noprivdisplaymode === 1){
_this.view.toolBarModels[key].disabled = true;
}
if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
_this.view.toolBarModels[key].visabled = false;
}else{
_this.view.toolBarModels[key].visabled = true;
}
}
if(dataActionResult === 1){
_this.view.toolBarModels[key].visabled = true; _this.view.toolBarModels[key].visabled = true;
_this.view.toolBarModels[key].disabled = false;
} }
} }
if(dataActionResult === 1){
_this.view.toolBarModels[key].visabled = true;
_this.view.toolBarModels[key].disabled = false;
}
} }
} }
} }
......
app_web/src/environments/environment.ts
浏览文件 @ eddfeaf7
...@@ -25,8 +25,10 @@ export const Environment = { ...@@ -25,8 +25,10 @@ export const Environment = {
enablePermissionValid:false, enablePermissionValid:false,
// 项目模板地址 // 项目模板地址
ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7", ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
// 打开目标工具，可选参数：sln、mos
debugOpenMode:'mos',
// 配置平台地址 // 配置平台地址
StudioUrl: "http://172.16.170.145/slnstudio/", StudioUrl: "http://172.16.170.145/mos/",
// 中心标识 // 中心标识
SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C", SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
// 系统标识 // 系统标识
...@@ -34,9 +36,13 @@ export const Environment = { ...@@ -34,9 +36,13 @@ export const Environment = {
// 前端应用标识 // 前端应用标识
AppId: "6e0b7357169ef4eba84e1347ed94bd84", AppId: "6e0b7357169ef4eba84e1347ed94bd84",
// 项目发布文件地址 // 项目发布文件地址
PublishProjectUrl: 'http://oauth2:ymrzrgzh97axsgq_TjR3@labcs.ibizee.cn/ibiz4jteam/ibzwf.git', PublishProjectUrl: 'http://oauth2:cTux_e7Aoz1PrasP5dDq@demo.ibizlab.cn/ibiz4jteam/ibzwf.git',
// ibiz开放平台地址 // ibiz开放平台地址
ibizlabtUrl: 'https://www.ibizlab.cn', ibizlabtUrl: 'https://www.ibizlab.cn',
// ibiz论坛地址 // ibiz论坛地址
ibizbbstUrl: 'https://bbs.ibizlab.cn', ibizbbstUrl: 'https://bbs.ibizlab.cn',
}; };
\ No newline at end of file // 挂载外部配置文件
if ((window as any).Environment) {
Object.assign(Environment, (window as any).Environment);
}
\ No newline at end of file
app_web/src/locale/lang/en-US.ts
浏览文件 @ eddfeaf7
import wfremodel_en_US from '@locale/lanres/entities/wfremodel/wfremodel_en_US'; import wftask_en_US from '@locale/lanres/entities/wftask/wftask_en_US';
import wfmember_en_US from '@locale/lanres/entities/wfmember/wfmember_en_US'; import wfmember_en_US from '@locale/lanres/entities/wfmember/wfmember_en_US';
import wfgroup_en_US from '@locale/lanres/entities/wfgroup/wfgroup_en_US';
import wfuser_en_US from '@locale/lanres/entities/wfuser/wfuser_en_US'; import wfuser_en_US from '@locale/lanres/entities/wfuser/wfuser_en_US';
import wftask_en_US from '@locale/lanres/entities/wftask/wftask_en_US'; import wfgroup_en_US from '@locale/lanres/entities/wfgroup/wfgroup_en_US';
import wfprocessdefinition_en_US from '@locale/lanres/entities/wfprocess-definition/wfprocess-definition_en_US'; import wfremodel_en_US from '@locale/lanres/entities/wfremodel/wfremodel_en_US';
import wfsystem_en_US from '@locale/lanres/entities/wfsystem/wfsystem_en_US'; import wfsystem_en_US from '@locale/lanres/entities/wfsystem/wfsystem_en_US';
import wfprocessdefinition_en_US from '@locale/lanres/entities/wfprocess-definition/wfprocess-definition_en_US';
import components_en_US from '@locale/lanres/components/components_en_US'; import components_en_US from '@locale/lanres/components/components_en_US';
import codelist_en_US from '@locale/lanres/codelist/codelist_en_US'; import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US'; import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
...@@ -223,13 +223,13 @@ export default { ...@@ -223,13 +223,13 @@ export default {
}, },
}, },
entities: { entities: {
wfremodel: wfremodel_en_US, wftask: wftask_en_US,
wfmember: wfmember_en_US, wfmember: wfmember_en_US,
wfgroup: wfgroup_en_US,
wfuser: wfuser_en_US, wfuser: wfuser_en_US,
wftask: wftask_en_US, wfgroup: wfgroup_en_US,
wfprocessdefinition: wfprocessdefinition_en_US, wfremodel: wfremodel_en_US,
wfsystem: wfsystem_en_US, wfsystem: wfsystem_en_US,
wfprocessdefinition: wfprocessdefinition_en_US,
}, },
components: components_en_US, components: components_en_US,
codelist: codelist_en_US, codelist: codelist_en_US,
......
app_web/src/locale/lang/zh-CN.ts
浏览文件 @ eddfeaf7
import wfremodel_zh_CN from '@locale/lanres/entities/wfremodel/wfremodel_zh_CN'; import wftask_zh_CN from '@locale/lanres/entities/wftask/wftask_zh_CN';
import wfmember_zh_CN from '@locale/lanres/entities/wfmember/wfmember_zh_CN'; import wfmember_zh_CN from '@locale/lanres/entities/wfmember/wfmember_zh_CN';
import wfgroup_zh_CN from '@locale/lanres/entities/wfgroup/wfgroup_zh_CN';
import wfuser_zh_CN from '@locale/lanres/entities/wfuser/wfuser_zh_CN'; import wfuser_zh_CN from '@locale/lanres/entities/wfuser/wfuser_zh_CN';
import wftask_zh_CN from '@locale/lanres/entities/wftask/wftask_zh_CN'; import wfgroup_zh_CN from '@locale/lanres/entities/wfgroup/wfgroup_zh_CN';
import wfprocessdefinition_zh_CN from '@locale/lanres/entities/wfprocess-definition/wfprocess-definition_zh_CN'; import wfremodel_zh_CN from '@locale/lanres/entities/wfremodel/wfremodel_zh_CN';
import wfsystem_zh_CN from '@locale/lanres/entities/wfsystem/wfsystem_zh_CN'; import wfsystem_zh_CN from '@locale/lanres/entities/wfsystem/wfsystem_zh_CN';
import wfprocessdefinition_zh_CN from '@locale/lanres/entities/wfprocess-definition/wfprocess-definition_zh_CN';
import components_zh_CN from '@locale/lanres/components/components_zh_CN'; import components_zh_CN from '@locale/lanres/components/components_zh_CN';
import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN'; import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN'; import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
...@@ -222,13 +222,13 @@ export default { ...@@ -222,13 +222,13 @@ export default {
}, },
}, },
entities: { entities: {
wfremodel: wfremodel_zh_CN, wftask: wftask_zh_CN,
wfmember: wfmember_zh_CN, wfmember: wfmember_zh_CN,
wfgroup: wfgroup_zh_CN,
wfuser: wfuser_zh_CN, wfuser: wfuser_zh_CN,
wftask: wftask_zh_CN, wfgroup: wfgroup_zh_CN,
wfprocessdefinition: wfprocessdefinition_zh_CN, wfremodel: wfremodel_zh_CN,
wfsystem: wfsystem_zh_CN, wfsystem: wfsystem_zh_CN,
wfprocessdefinition: wfprocessdefinition_zh_CN,
}, },
components: components_zh_CN, components: components_zh_CN,
codelist: codelist_zh_CN, codelist: codelist_zh_CN,
......
app_web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ eddfeaf7
export default { export default {
WFSystemList: {
"empty": "",
},
YesNo: { YesNo: {
"1": "是", "1": "是",
"0": "否", "0": "否",
"empty": "" "empty": ""
}, },
WFSystemList: {
"empty": "",
},
}; };
\ No newline at end of file
app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ eddfeaf7
export default { export default {
WFSystemList: {
"empty": "",
},
YesNo: { YesNo: {
"1": "是", "1": "是",
"0": "否", "0": "否",
"empty": "", "empty": "",
}, },
WFSystemList: {
"empty": "",
},
}; };
\ No newline at end of file
app_web/src/locale/lanres/entities/wfgroup/wfgroup_en_US.ts
浏览文件 @ eddfeaf7
...@@ -6,21 +6,21 @@ export default { ...@@ -6,21 +6,21 @@ export default {
groupscope: "范围", groupscope: "范围",
}, },
views: { views: {
mpickupview: { pickupgridview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组数据多项选择视图", title: "角色/用户组选择表格视图",
}, },
editview: { mpickupview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组编辑视图", title: "角色/用户组数据多项选择视图",
}, },
pickupview: { pickupview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组数据选择视图", title: "角色/用户组数据选择视图",
}, },
pickupgridview: { editview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组选择表格视图", title: "角色/用户组编辑视图",
}, },
gridview: { gridview: {
caption: "角色/用户组", caption: "角色/用户组",
......
app_web/src/locale/lanres/entities/wfgroup/wfgroup_zh_CN.ts
浏览文件 @ eddfeaf7
...@@ -5,21 +5,21 @@ export default { ...@@ -5,21 +5,21 @@ export default {
groupscope: "范围", groupscope: "范围",
}, },
views: { views: {
mpickupview: { pickupgridview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组数据多项选择视图", title: "角色/用户组选择表格视图",
}, },
editview: { mpickupview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组编辑视图", title: "角色/用户组数据多项选择视图",
}, },
pickupview: { pickupview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组数据选择视图", title: "角色/用户组数据选择视图",
}, },
pickupgridview: { editview: {
caption: "角色/用户组", caption: "角色/用户组",
title: "角色/用户组选择表格视图", title: "角色/用户组编辑视图",
}, },
gridview: { gridview: {
caption: "角色/用户组", caption: "角色/用户组",
......
app_web/src/locale/lanres/entities/wfuser/wfuser_en_US.ts
浏览文件 @ eddfeaf7
...@@ -13,17 +13,13 @@ export default { ...@@ -13,17 +13,13 @@ export default {
orgname: "单位名称", orgname: "单位名称",
}, },
views: { views: {
mpickupview: {
caption: "用户",
title: "用户数据多项选择视图",
},
pickupview: { pickupview: {
caption: "用户", caption: "用户",
title: "用户数据选择视图", title: "用户数据选择视图",
}, },
editview: { mpickupview: {
caption: "用户", caption: "用户",
title: "用户编辑视图", title: "用户数据多项选择视图",
}, },
pickupgridview: { pickupgridview: {
caption: "用户", caption: "用户",
...@@ -33,6 +29,10 @@ export default { ...@@ -33,6 +29,10 @@ export default {
caption: "用户", caption: "用户",
title: "用户表格视图", title: "用户表格视图",
}, },
editview: {
caption: "用户",
title: "用户编辑视图",
},
}, },
main_form: { main_form: {
details: { details: {
...@@ -71,6 +71,64 @@ export default { ...@@ -71,6 +71,64 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "Export Data Model",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
tbitem18: {
caption: "Help",
tip: "Help",
},
},
editviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "Save", caption: "Save",
...@@ -137,62 +195,4 @@ export default { ...@@ -137,62 +195,4 @@ export default {
tip: "Help", tip: "Help",
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "Export Data Model",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
tbitem18: {
caption: "Help",
tip: "Help",
},
},
}; };
\ No newline at end of file
app_web/src/locale/lanres/entities/wfuser/wfuser_zh_CN.ts
浏览文件 @ eddfeaf7
...@@ -12,17 +12,13 @@ export default { ...@@ -12,17 +12,13 @@ export default {
orgname: "单位名称", orgname: "单位名称",
}, },
views: { views: {
mpickupview: {
caption: "用户",
title: "用户数据多项选择视图",
},
pickupview: { pickupview: {
caption: "用户", caption: "用户",
title: "用户数据选择视图", title: "用户数据选择视图",
}, },
editview: { mpickupview: {
caption: "用户", caption: "用户",
title: "用户编辑视图", title: "用户数据多项选择视图",
}, },
pickupgridview: { pickupgridview: {
caption: "用户", caption: "用户",
...@@ -32,6 +28,10 @@ export default { ...@@ -32,6 +28,10 @@ export default {
caption: "用户", caption: "用户",
title: "用户表格视图", title: "用户表格视图",
}, },
editview: {
caption: "用户",
title: "用户编辑视图",
},
}, },
main_form: { main_form: {
details: { details: {
...@@ -70,6 +70,64 @@ export default { ...@@ -70,6 +70,64 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "导出数据模型",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
tbitem18: {
caption: "帮助",
tip: "帮助",
},
},
editviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "保存", caption: "保存",
...@@ -136,62 +194,4 @@ export default { ...@@ -136,62 +194,4 @@ export default {
tip: "帮助", tip: "帮助",
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "导出数据模型",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
tbitem18: {
caption: "帮助",
tip: "帮助",
},
},
}; };
\ No newline at end of file
app_web/src/mock/app/wfindex-view-appmenu/wfindex-view-appmenu.ts
浏览文件 @ eddfeaf7
...@@ -11,7 +11,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => { ...@@ -11,7 +11,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
name: 'appmenu', name: 'appmenu',
items: [ items: [
{ {
id: 'DE6BF5A8-9640-47AF-9AE7-7C73C5FCC8BF', id: 'f7995aae13c2a12ed1bca0f098371b7f',
name: 'menuitem1', name: 'menuitem1',
text: '流程定义', text: '流程定义',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -29,7 +29,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => { ...@@ -29,7 +29,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
resourcetag: '', resourcetag: '',
}, },
{ {
id: 'F6C65EF1-F523-466D-9C63-7FA2F87BA90B', id: '2738fed9d24a10a28095fb04fd468883',
name: 'menuitem3', name: 'menuitem3',
text: '发布新流程', text: '发布新流程',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -47,7 +47,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => { ...@@ -47,7 +47,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
resourcetag: '', resourcetag: '',
}, },
{ {
id: 'A2004B9C-B0CE-4180-8C76-6FD90059F17B', id: '27b0edb66e9777d3d6271163680881e8',
name: 'menuitem2', name: 'menuitem2',
text: '用户组', text: '用户组',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -65,7 +65,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => { ...@@ -65,7 +65,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
resourcetag: '', resourcetag: '',
}, },
{ {
id: '0F72A458-D47D-4305-AF77-4D643124741D', id: '4e8e7629980b4670ef786b281bf0feae',
name: 'menuitem4', name: 'menuitem4',
text: '我的待办', text: '我的待办',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -79,7 +79,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => { ...@@ -79,7 +79,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-list-alt', iconcls: 'fa fa-list-alt',
icon: '', icon: '',
textcls: '', textcls: '',
appfunctag: '_2', appfunctag: 'Auto4',
resourcetag: '', resourcetag: '',
}, },
], ],
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ eddfeaf7
...@@ -8,6 +8,14 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -8,6 +8,14 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
return [status, [ return [status, [
{ {
"srfkey": "WFSystemList",
"emptytext": "未定义",
"codelisttype":"dynamic",
"appdataentity":"WFSystem",
"appdedataset":"FetchDefault",
"items": []
},
{
srfkey: "YesNo", srfkey: "YesNo",
emptytext: "未定义", emptytext: "未定义",
"codelisttype":"static", "codelisttype":"static",
...@@ -16,6 +24,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -16,6 +24,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
id: "1", id: "1",
label: "是", label: "是",
text: "是", text: "是",
"class":"",
"data":"", "data":"",
"codename":"Item_1", "codename":"Item_1",
value: "1", value: "1",
...@@ -26,6 +35,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -26,6 +35,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
id: "0", id: "0",
label: "否", label: "否",
text: "否", text: "否",
"class":"",
"data":"", "data":"",
"codename":"Item_0", "codename":"Item_0",
value: "0", value: "0",
...@@ -33,14 +43,6 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -33,14 +43,6 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
disabled: false, disabled: false,
}, },
] ]
},
{
"srfkey": "WFSystemList",
"emptytext": "未定义",
"codelisttype":"dynamic",
"appdataentity":"WFSystem",
"appdedataset":"FetchDefault",
"items": []
} }
]]; ]];
}); });
......
app_web/src/mock/index.ts
浏览文件 @ eddfeaf7
...@@ -7,10 +7,10 @@ import './login/login'; ...@@ -7,10 +7,10 @@ import './login/login';
import './upload/upload'; import './upload/upload';
// 实体级接口对象 // 实体级接口对象
import './entity/wfremodels/wfremodels'; import './entity/wftasks/wftasks';
import './entity/wfmembers/wfmembers'; import './entity/wfmembers/wfmembers';
import './entity/wfgroups/wfgroups';
import './entity/wfusers/wfusers'; import './entity/wfusers/wfusers';
import './entity/wftasks/wftasks'; import './entity/wfgroups/wfgroups';
import './entity/wfprocess-definitions/wfprocess-definitions'; import './entity/wfremodels/wfremodels';
import './entity/wfsystems/wfsystems'; import './entity/wfsystems/wfsystems';
import './entity/wfprocess-definitions/wfprocess-definitions';
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ eddfeaf7
...@@ -7,29 +7,45 @@ import Mock from 'mockjs' ...@@ -7,29 +7,45 @@ import Mock from 'mockjs'
mock.onGet('./assets/json/view-config.json').reply((config: any) => { mock.onGet('./assets/json/view-config.json').reply((config: any) => {
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
return [status,{ return [status,{
"wfmembergridview": { "wfindexview": {
"title": "workflow",
"caption": "ibizlab",
"viewtype": "APPINDEXVIEW",
"viewmodule": "workflow",
"viewname": "WFIndexView",
"viewtag": "096fd4090f21e0fa0f4a303ed9041bff"
},
"wfmembergridview": {
"title": "成员表格视图", "title": "成员表格视图",
"caption": "成员", "caption": "成员",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFMemberGridView", "viewname": "WFMemberGridView",
"viewtag": "2543a3f227c806c6433bf9710717de93" "viewtag": "135872676ba63d430b2f20bd20364286"
}, },
"wfindexview": { "wfgrouppickupgridview": {
"title": "workflow", "title": "角色/用户组选择表格视图",
"caption": "ibizlab", "caption": "角色/用户组",
"viewtype": "APPINDEXVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFIndexView", "viewname": "WFGroupPickupGridView",
"viewtag": "380EA9D7-5F04-46C1-9E82-2877EE29336A" "viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
}, },
"wfusermpickupview": { "wfprocessdefinitioneditview": {
"title": "用户数据多项选择视图", "title": "流程定义查看",
"caption": "用户", "caption": "流程定义查看",
"viewtype": "DEMPICKUPVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFUserMPickupView", "viewname": "WFProcessDefinitionEditView",
"viewtag": "3b32fb97ab849d5f36e8a283c85b5098" "viewtag": "3fcd491c13d05ab7dcce8d2c920d0aec"
},
"wfremodeleditview": {
"title": "流程模型编辑视图",
"caption": "流程模型",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFREModelEditView",
"viewtag": "5856bfb8b576cc2ee743801b23e58299"
}, },
"wfuserpickupview": { "wfuserpickupview": {
"title": "用户数据选择视图", "title": "用户数据选择视图",
...@@ -37,15 +53,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -37,15 +53,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFUserPickupView", "viewname": "WFUserPickupView",
"viewtag": "5592ca3571d551675c5306a0a9f1352e" "viewtag": "61c5bff70bcf56e1dc0bb0900df9c98c"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFGroupMPickupView",
"viewtag": "5db49698557288612b9247b259ffbcd7"
}, },
"wftaskgridview": { "wftaskgridview": {
"title": "我的待办", "title": "我的待办",
...@@ -53,47 +61,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -53,47 +61,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFTaskGridView", "viewname": "WFTaskGridView",
"viewtag": "67f605f39e4d0d7cfa524ea97bc29ced" "viewtag": "66f4bcca719e75fa9645380cc81bc3e2"
},
"wfusereditview": {
"title": "用户编辑视图",
"caption": "用户",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFUserEditView",
"viewtag": "77dd35badedcc0f6b98e83ee1ff82bda"
},
"wftaskeditview": {
"title": "工作流任务编辑视图",
"caption": "工作流任务",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFTaskEditView",
"viewtag": "84f38898137b7bd1f9f135ac74b4b850"
},
"wfprocessdefinitioneditview": {
"title": "流程定义查看",
"caption": "流程定义查看",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFProcessDefinitionEditView",
"viewtag": "9aad4530afb58f5c348a5b21d9c7ae72"
},
"wfprocessdefinitiongridview": {
"title": "流程定义",
"caption": "流程定义",
"viewtype": "DEGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFProcessDefinitionGridView",
"viewtag": "a06aed382ebc28e6521b4398880388cd"
},
"wfuserpickupgridview": {
"title": "用户选择表格视图",
"caption": "用户",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFUserPickupGridView",
"viewtag": "a9dfca1bcb877df49bfed9a2bd177d14"
}, },
"wfmembereditview": { "wfmembereditview": {
"title": "成员编辑视图", "title": "成员编辑视图",
...@@ -101,15 +69,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -101,15 +69,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFMemberEditView", "viewname": "WFMemberEditView",
"viewtag": "ac7cba0b131aa74021747169735a4f90" "viewtag": "6e1b35989dd6470b5c890369ab87b545"
}, },
"wfgroupeditview": { "wfusermpickupview": {
"title": "角色/用户组编辑视图", "title": "用户数据多项选择视图",
"caption": "用户",
"viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow",
"viewname": "WFUserMPickupView",
"viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
},
"wfgroupmpickupview": {
"title": "角色/用户组数据多项选择视图",
"caption": "角色/用户组", "caption": "角色/用户组",
"viewtype": "DEEDITVIEW", "viewtype": "DEMPICKUPVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupEditView", "viewname": "WFGroupMPickupView",
"viewtag": "aeb28973b7182f671fa50aa5d87e9346" "viewtag": "90a777962337daaf4cffd846eecb1f0f"
}, },
"wfgrouppickupview": { "wfgrouppickupview": {
"title": "角色/用户组数据选择视图", "title": "角色/用户组数据选择视图",
...@@ -117,23 +93,31 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -117,23 +93,31 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupPickupView", "viewname": "WFGroupPickupView",
"viewtag": "bfd32eedd618add6408b75a98f40f809" "viewtag": "b05c9353d499f973106e6ed4dde58074"
}, },
"wfremodeleditview": { "wfgroupeditview": {
"title": "流程模型编辑视图", "title": "角色/用户组编辑视图",
"caption": "流程模型", "caption": "角色/用户组",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFREModelEditView", "viewname": "WFGroupEditView",
"viewtag": "c0e7fb60c35f15d4f23800acae7afbd1" "viewtag": "b23a721ca159ac2490b768d795e85d17"
}, },
"wfgrouppickupgridview": { "wfprocessdefinitiongridview": {
"title": "角色/用户组选择表格视图", "title": "流程定义",
"caption": "角色/用户组", "caption": "流程定义",
"viewtype": "DEGRIDVIEW",
"viewmodule": "workflow",
"viewname": "WFProcessDefinitionGridView",
"viewtag": "bfa86be8c02420f87d5cf4ff9a768948"
},
"wfuserpickupgridview": {
"title": "用户选择表格视图",
"caption": "用户",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupPickupGridView", "viewname": "WFUserPickupGridView",
"viewtag": "c539c8d177b0401b79fa0808de6f13dd" "viewtag": "c9c73c8d2e61bd29a304622f3d39b522"
}, },
"wfusergridview": { "wfusergridview": {
"title": "用户表格视图", "title": "用户表格视图",
...@@ -141,7 +125,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -141,7 +125,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFUserGridView", "viewname": "WFUserGridView",
"viewtag": "ec44dccb75670532aa3e9bfae73c4259" "viewtag": "cf0fdabd8378e07ca72ac167b1406756"
},
"wftaskeditview": {
"title": "工作流任务编辑视图",
"caption": "工作流任务",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFTaskEditView",
"viewtag": "e3020680a441ab58a29db6fe2434f08b"
}, },
"wfgroupgridview": { "wfgroupgridview": {
"title": "角色/用户组表格视图", "title": "角色/用户组表格视图",
...@@ -149,7 +141,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -149,7 +141,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "workflow", "viewmodule": "workflow",
"viewname": "WFGroupGridView", "viewname": "WFGroupGridView",
"viewtag": "f11ad9a3b9260fb68a2a2e870419bffa" "viewtag": "f498dfb24e88df7c70a5c09ecb587647"
},
"wfusereditview": {
"title": "用户编辑视图",
"caption": "用户",
"viewtype": "DEEDITVIEW",
"viewmodule": "workflow",
"viewname": "WFUserEditView",
"viewtag": "ffd6ce24e0a1aa780920b48721e502a7"
} }
}]; }];
}); });
\ No newline at end of file
app_web/src/model/form-detail/form-button.ts
浏览文件 @ eddfeaf7
...@@ -11,7 +11,7 @@ export class FormButtonModel extends FormDetailModel { ...@@ -11,7 +11,7 @@ export class FormButtonModel extends FormDetailModel {
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.disabled = opts.disabled; this.$disabled = opts.disabled;
this.uiaction = opts.uiaction; this.uiaction = opts.uiaction;
} }
...@@ -21,7 +21,7 @@ export class FormButtonModel extends FormDetailModel { ...@@ -21,7 +21,7 @@ export class FormButtonModel extends FormDetailModel {
* @type {boolean} * @type {boolean}
* @memberof FormButtonModel * @memberof FormButtonModel
*/ */
public disabled:boolean = false; private $disabled:boolean = false;
/** /**
* 按钮对应的界面行为 * 按钮对应的界面行为
...@@ -31,4 +31,26 @@ export class FormButtonModel extends FormDetailModel { ...@@ -31,4 +31,26 @@ export class FormButtonModel extends FormDetailModel {
*/ */
public uiaction:any; public uiaction:any;
/**
* 是否启用
*
* @type {boolean}
* @memberof FormButtonModel
*/
public get disabled(): boolean {
return this.$disabled;
}
/**
* 设置是否启用
*
* @memberof FormButtonModel
*/
public set disabled(val: boolean) {
if(this.isPower) {
this.$disabled = val;
}
}
} }
\ No newline at end of file
app_web/src/model/form-detail/form-detail.ts
浏览文件 @ eddfeaf7
...@@ -6,6 +6,14 @@ ...@@ -6,6 +6,14 @@
*/ */
export class FormDetailModel { export class FormDetailModel {
/**
* 是否有权限
*
* @type {boolean}
* @memberof FormDetailModel
*/
public isPower: boolean = true;
/** /**
* 成员标题 * 成员标题
* *
...@@ -44,7 +52,7 @@ export class FormDetailModel { ...@@ -44,7 +52,7 @@ export class FormDetailModel {
* @type {boolean} * @type {boolean}
* @memberof FormDetailModel * @memberof FormDetailModel
*/ */
public visible: boolean = true; public $visible: boolean = true;
/** /**
* 成员是否显示(旧) * 成员是否显示(旧)
...@@ -83,12 +91,33 @@ export class FormDetailModel { ...@@ -83,12 +91,33 @@ export class FormDetailModel {
this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : ''; this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : '';
this.form = opts.form ? opts.form : {}; this.form = opts.form ? opts.form : {};
this.name = !Object.is(opts.name, '') ? opts.name : ''; this.name = !Object.is(opts.name, '') ? opts.name : '';
this.visible = opts.visible ? true : false; this.$visible = opts.visible ? true : false;
this.oldVisible = opts.visible ? true : false; this.oldVisible = opts.visible ? true : false;
this.isShowCaption = opts.isShowCaption ? true : false; this.isShowCaption = opts.isShowCaption ? true : false;
this.isControlledContent = opts.isControlledContent ? true : false; this.isControlledContent = opts.isControlledContent ? true : false;
} }
/**
* 设置成员是否隐藏
*
* @memberof FormDetailModel
*/
public set visible(val: boolean) {
if(this.isPower) {
this.$visible = val;
}
}
/**
* 获取成员是否隐藏
*
* @memberof FormDetailModel
*/
public get visible() {
return this.$visible;
}
/** /**
* 设置显示与隐藏 * 设置显示与隐藏
* *
...@@ -96,7 +125,9 @@ export class FormDetailModel { ...@@ -96,7 +125,9 @@ export class FormDetailModel {
* @memberof FormDetailModel * @memberof FormDetailModel
*/ */
public setVisible(state: boolean): void { public setVisible(state: boolean): void {
this.visible = state; if(this.isPower) {
this.visible = state;
}
} }
/** /**
......
app_web/src/pages/workflow/wfgroup-edit-view/wfgroup-edit-view.less
浏览文件 @ eddfeaf7
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
.wfgroup-edit-view{ .wfgroup-edit-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view.less
浏览文件 @ eddfeaf7
.wfgroup-grid-view{ .wfgroup-grid-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view-base.vue
浏览文件 @ eddfeaf7
...@@ -5,20 +5,20 @@ ...@@ -5,20 +5,20 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
</div> </div>
<div v-if="isShowButton" class="translate-buttons"> <div v-if="isShowButton" class="translate-buttons">
<div class="buttons"> <div class="buttons">
...@@ -158,7 +158,7 @@ export default class WFGroupMPickupViewBase extends Vue { ...@@ -158,7 +158,7 @@ export default class WFGroupMPickupViewBase extends Vue {
* @type {string} * @type {string}
* @memberof WFGroupMPickupViewBase * @memberof WFGroupMPickupViewBase
*/ */
public viewtag: string = '5db49698557288612b9247b259ffbcd7'; public viewtag: string = '90a777962337daaf4cffd846eecb1f0f';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view-base.vue
浏览文件 @ eddfeaf7
...@@ -3,43 +3,43 @@ ...@@ -3,43 +3,43 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupgridview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupgridview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :bordered="false">
<div class='content-container pickup-grid-view'> <div class='content-container pickup-grid-view'>
<view_searchform <view_searchform
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:showBusyIndicator="true" :showBusyIndicator="true"
v-show="isExpandSearchForm" v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft" loaddraftAction="FilterGetDraft"
loadAction="FilterGet" loadAction="FilterGet"
name="searchform" name="searchform"
ref='searchform' ref='searchform'
@save="searchform_save($event)" @save="searchform_save($event)"
@search="searchform_search($event)" @search="searchform_search($event)"
@load="searchform_load($event)" @load="searchform_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_searchform> </view_searchform>
<view_grid <view_grid
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:showBusyIndicator="true" :showBusyIndicator="true"
updateAction="" updateAction=""
removeAction="Remove" removeAction="Remove"
loaddraftAction="" loaddraftAction=""
loadAction="" loadAction=""
createAction="" createAction=""
fetchAction="FetchDefault" fetchAction="FetchDefault"
name="grid" name="grid"
ref='grid' ref='grid'
@selectionchange="grid_selectionchange($event)" @selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)" @beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)" @rowdblclick="grid_rowdblclick($event)"
@load="grid_load($event)" @load="grid_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_grid> </view_grid>
</div> </div>
</card> </card>
</div> </div>
...@@ -140,7 +140,7 @@ export default class WFGroupPickupGridViewBase extends Vue { ...@@ -140,7 +140,7 @@ export default class WFGroupPickupGridViewBase extends Vue {
* @type {string} * @type {string}
* @memberof WFGroupPickupGridViewBase * @memberof WFGroupPickupGridViewBase
*/ */
public viewtag: string = 'c539c8d177b0401b79fa0808de6f13dd'; public viewtag: string = '17ccd6d8d2bb7cf30158253da129ec1b';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view-base.vue
浏览文件 @ eddfeaf7
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }">
<i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
...@@ -125,7 +125,7 @@ export default class WFGroupPickupViewBase extends Vue { ...@@ -125,7 +125,7 @@ export default class WFGroupPickupViewBase extends Vue {
* @type {string} * @type {string}
* @memberof WFGroupPickupViewBase * @memberof WFGroupPickupViewBase
*/ */
public viewtag: string = 'bfd32eedd618add6408b75a98f40f809'; public viewtag: string = 'b05c9353d499f973106e6ed4dde58074';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/workflow/wfindex-view/page-register.ts
浏览文件 @ eddfeaf7
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('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-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('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'));
Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
Vue.component('wfgroup-pickup-view', () => import('@pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view.vue')); Vue.component('wfgroup-pickup-view', () => import('@pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view.vue'));
Vue.component('wfremodel-edit-view', () => import('@pages/workflow/wfremodel-edit-view/wfremodel-edit-view.vue'));
Vue.component('wfgroup-pickup-grid-view', () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'));
Vue.component('wftask-grid-view', () => import('@pages/workflow/wftask-grid-view/wftask-grid-view.vue')); Vue.component('wftask-grid-view', () => import('@pages/workflow/wftask-grid-view/wftask-grid-view.vue'));
Vue.component('wfgroup-edit-view', () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'));
Vue.component('wftask-edit-view', () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue')); Vue.component('wftask-edit-view', () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue'));
Vue.component('wfremodel-edit-view', () => import('@pages/workflow/wfremodel-edit-view/wfremodel-edit-view.vue')); Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue')); Vue.component('wfgroup-edit-view', () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'));
Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-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-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-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('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
Vue.component('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.vue'));
} }
}; };
\ No newline at end of file
app_web/src/pages/workflow/wfindex-view/wfindex-view-base.vue
浏览文件 @ eddfeaf7
...@@ -130,7 +130,7 @@ export default class WFIndexViewBase extends Vue { ...@@ -130,7 +130,7 @@ export default class WFIndexViewBase extends Vue {
* @type {string} * @type {string}
* @memberof WFIndexViewBase * @memberof WFIndexViewBase
*/ */
public viewtag: string = '380EA9D7-5F04-46C1-9E82-2877EE29336A'; public viewtag: string = '096fd4090f21e0fa0f4a303ed9041bff';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/workflow/wfmember-edit-view/wfmember-edit-view.less
浏览文件 @ eddfeaf7
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
.wfmember-edit-view{ .wfmember-edit-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view.less
浏览文件 @ eddfeaf7
.wfmember-grid-view{ .wfmember-grid-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.less
浏览文件 @ eddfeaf7
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
.wfprocess-definition-edit-view{ .wfprocess-definition-edit-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.less
浏览文件 @ eddfeaf7
.wfprocess-definition-grid-view{ .wfprocess-definition-grid-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfremodel-edit-view/wfremodel-edit-view-base.vue
浏览文件 @ eddfeaf7
...@@ -5,44 +5,44 @@ ...@@ -5,44 +5,44 @@
<div slot='title' class="header-container"> <div slot='title' class="header-container">
<span class='caption-info'>{{$t(model.srfCaption)}}</span> <span class='caption-info'>{{$t(model.srfCaption)}}</span>
<div class='toolbar-container'> <div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1.visabled" :disabled="toolBarModels.tbitem1.disabled" class='' @click="toolbar_click({ tag: 'tbitem1' }, $event)"> <i-button v-show="toolBarModels.tbitem1.visabled" :disabled="toolBarModels.tbitem1.disabled" class='' @click="toolbar_click({ tag: 'tbitem1' }, $event)">
<i class='fa fa-save'></i> <i class='fa fa-save'></i>
<span class='caption'>{{$t('entities.wfremodel.editviewtoolbar_toolbar.tbitem1.caption')}}</span> <span class='caption'>{{$t('entities.wfremodel.editviewtoolbar_toolbar.tbitem1.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.wfremodel.editviewtoolbar_toolbar.tbitem1.tip')}}</div> <div slot='content'>{{$t('entities.wfremodel.editviewtoolbar_toolbar.tbitem1.tip')}}</div>
</tooltip> </tooltip>
</div> </div>
</div> </div>
<div class="content-container"> <div class="content-container">
<div class='view-top-messages'> <div class='view-top-messages'>
</div> </div>
<view_form <view_form
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
:autosave="false" :autosave="false"
:viewtag="viewtag" :viewtag="viewtag"
:showBusyIndicator="true" :showBusyIndicator="true"
updateAction="Update" updateAction="Update"
removeAction="Remove" removeAction="Remove"
loaddraftAction="GetDraft" loaddraftAction="GetDraft"
loadAction="Get" loadAction="Get"
createAction="Create" createAction="Create"
WFSubmitAction="" WFSubmitAction=""
WFStartAction="" WFStartAction=""
style='' style=''
name="form" name="form"
ref='form' ref='form'
@save="form_save($event)" @save="form_save($event)"
@remove="form_remove($event)" @remove="form_remove($event)"
@load="form_load($event)" @load="form_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_form> </view_form>
<div class='view-bottom-messages'> <div class='view-bottom-messages'>
</div> </div>
</div> </div>
</card> </card>
</div> </div>
...@@ -143,7 +143,7 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -143,7 +143,7 @@ export default class WFREModelEditViewBase extends Vue {
* @type {string} * @type {string}
* @memberof WFREModelEditViewBase * @memberof WFREModelEditViewBase
*/ */
public viewtag: string = 'c0e7fb60c35f15d4f23800acae7afbd1'; public viewtag: string = '5856bfb8b576cc2ee743801b23e58299';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/workflow/wfremodel-edit-view/wfremodel-edit-view.less
浏览文件 @ eddfeaf7
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
.wfremodel-edit-view{ .wfremodel-edit-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wftask-edit-view/wftask-edit-view.less
浏览文件 @ eddfeaf7
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
.wftask-edit-view{ .wftask-edit-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wftask-grid-view/wftask-grid-view.less
浏览文件 @ eddfeaf7
.wftask-grid-view{ .wftask-grid-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfuser-edit-view/wfuser-edit-view.less
浏览文件 @ eddfeaf7
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
.wfuser-edit-view{ .wfuser-edit-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-view.less
浏览文件 @ eddfeaf7
.wfuser-grid-view{ .wfuser-grid-view{
position: relative; position: relative;
} }
.toolbar-container { .toolbar-container {
button { button {
margin: 6px 0px 4px 4px; margin: 6px 0px 4px 4px;
.caption { .caption {
margin-left: 4px; margin-left: 4px;
} }
} }
.seperator { .seperator {
color: #dcdee2; color: #dcdee2;
margin: 0 0px 0 4px; margin: 0 0px 0 4px;
} }
} }
// this is less // this is less
app_web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view-base.vue
浏览文件 @ eddfeaf7
...@@ -5,20 +5,20 @@ ...@@ -5,20 +5,20 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
</div> </div>
<div v-if="isShowButton" class="translate-buttons"> <div v-if="isShowButton" class="translate-buttons">
<div class="buttons"> <div class="buttons">
...@@ -158,7 +158,7 @@ export default class WFUserMPickupViewBase extends Vue { ...@@ -158,7 +158,7 @@ export default class WFUserMPickupViewBase extends Vue {
* @type {string} * @type {string}
* @memberof WFUserMPickupViewBase * @memberof WFUserMPickupViewBase
*/ */
public viewtag: string = '3b32fb97ab849d5f36e8a283c85b5098'; public viewtag: string = '84e5a5b589b434dfdc60a3d0ad087d37';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/workflow/wfuser-pickup-view/wfuser-pickup-view-base.vue
浏览文件 @ eddfeaf7
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfuserpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfuserpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
name="pickupviewpanel" name="pickupviewpanel"
ref='pickupviewpanel' ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)" @selectionchange="pickupviewpanel_selectionchange($event)"
@activated="pickupviewpanel_activated($event)" @activated="pickupviewpanel_activated($event)"
@load="pickupviewpanel_load($event)" @load="pickupviewpanel_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_pickupviewpanel> </view_pickupviewpanel>
<card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer"> <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
<row :style="{ textAlign: 'right' }"> <row :style="{ textAlign: 'right' }">
<i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button> <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
...@@ -125,7 +125,7 @@ export default class WFUserPickupViewBase extends Vue { ...@@ -125,7 +125,7 @@ export default class WFUserPickupViewBase extends Vue {
* @type {string} * @type {string}
* @memberof WFUserPickupViewBase * @memberof WFUserPickupViewBase
*/ */
public viewtag: string = '5592ca3571d551675c5306a0a9f1352e'; public viewtag: string = '61c5bff70bcf56e1dc0bb0900df9c98c';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/service/entity-service-register.ts
浏览文件 @ eddfeaf7
...@@ -39,13 +39,13 @@ export class EntityServiceRegister { ...@@ -39,13 +39,13 @@ export class EntityServiceRegister {
* @memberof EntityServiceRegister * @memberof EntityServiceRegister
*/ */
protected init(): void { protected init(): void {
this.allEntityService.set('wfremodel', () => import('@/service/wfremodel/wfremodel-service')); this.allEntityService.set('wftask', () => import('@/service/wftask/wftask-service'));
this.allEntityService.set('wfmember', () => import('@/service/wfmember/wfmember-service')); this.allEntityService.set('wfmember', () => import('@/service/wfmember/wfmember-service'));
this.allEntityService.set('wfgroup', () => import('@/service/wfgroup/wfgroup-service'));
this.allEntityService.set('wfuser', () => import('@/service/wfuser/wfuser-service')); this.allEntityService.set('wfuser', () => import('@/service/wfuser/wfuser-service'));
this.allEntityService.set('wftask', () => import('@/service/wftask/wftask-service')); this.allEntityService.set('wfgroup', () => import('@/service/wfgroup/wfgroup-service'));
this.allEntityService.set('wfprocessdefinition', () => import('@/service/wfprocess-definition/wfprocess-definition-service')); this.allEntityService.set('wfremodel', () => import('@/service/wfremodel/wfremodel-service'));
this.allEntityService.set('wfsystem', () => import('@/service/wfsystem/wfsystem-service')); this.allEntityService.set('wfsystem', () => import('@/service/wfsystem/wfsystem-service'));
this.allEntityService.set('wfprocessdefinition', () => import('@/service/wfprocess-definition/wfprocess-definition-service'));
} }
/** /**
......
app_web/src/styles/default.less
浏览文件 @ eddfeaf7
此差异已折叠。
app_web/src/template.html
浏览文件 @ eddfeaf7
此差异已折叠。
config.xml
浏览文件 @ eddfeaf7
此差异已折叠。
ibzwf-app/ibzwf-app-web/pom.xml
浏览文件 @ eddfeaf7
此差异已折叠。
ibzwf-dependencies/pom.xml
浏览文件 @ eddfeaf7
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或