From b494f66c503032d4f0401f4e1211c9e8ed7ca602 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 26 Feb 2021 12:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=96=87=E6=9C=AC=20=E8=AE=A9=E6=8F=90=E7=A4=BA=E6=9B=B4?= =?UTF-8?q?=E5=8A=A0=E5=8F=8B=E5=A5=BD=20=E6=A0=B9=E6=8D=AEscuxiatian?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84=E6=96=B9=E6=A1=88=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86workflow=E5=89=8D=E7=AB=AF=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/cmd/information/system/api.go | 2 +- server/cmd/information/system/menu.go | 2 +- web/src/components/gva-wfd/behavior/dragPanelItemAddNode.js | 1 + web/src/components/gva-wfd/components/Wfd.vue | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/cmd/information/system/api.go b/server/cmd/information/system/api.go index 27c430dc..32e46ec6 100644 --- a/server/cmd/information/system/api.go +++ b/server/cmd/information/system/api.go @@ -42,7 +42,7 @@ var apis = []model.SysApi{ {global.GVA_MODEL{ID: 27, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/casbin/updateCasbin", "更改角色api权限", "casbin", "POST"}, {global.GVA_MODEL{ID: 28, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/casbin/getPolicyPathByAuthorityId", "获取权限列表", "casbin", "POST"}, {global.GVA_MODEL{ID: 29, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/fileUploadAndDownload/deleteFile", "删除文件", "fileUploadAndDownload", "POST"}, - {global.GVA_MODEL{ID: 30, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/jwt/jsonInBlacklist", "jwt加入黑名单", "jwt", "POST"}, + {global.GVA_MODEL{ID: 30, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/jwt/jsonInBlacklist", "jwt加入黑名单(退出)", "jwt", "POST"}, {global.GVA_MODEL{ID: 31, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/authority/setDataAuthority", "设置角色资源权限", "authority", "POST"}, {global.GVA_MODEL{ID: 32, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/system/getSystemConfig", "获取配置文件内容", "system", "POST"}, {global.GVA_MODEL{ID: 33, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/system/setSystemConfig", "设置配置文件内容", "system", "POST"}, diff --git a/server/cmd/information/system/menu.go b/server/cmd/information/system/menu.go index 5a8023f4..91728a9c 100644 --- a/server/cmd/information/system/menu.go +++ b/server/cmd/information/system/menu.go @@ -24,7 +24,7 @@ var menus = []model.SysBaseMenu{ {GVA_MODEL: global.GVA_MODEL{ID: 8, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: true, ParentId: "0", Path: "person", Name: "person", Component: "view/person/person.vue", Sort: 4, Meta: model.Meta{Title: "个人信息", Icon: "message-solid"}}, {GVA_MODEL: global.GVA_MODEL{ID: 9, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "example", Name: "example", Component: "view/example/index.vue", Sort: 6, Meta: model.Meta{Title: "示例文件", Icon: "s-management"}}, {GVA_MODEL: global.GVA_MODEL{ID: 10, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "excel", Name: "excel", Component: "view/example/excel/excel.vue", Sort: 4, Meta: model.Meta{Title: "excel导入导出", Icon: "s-marketing"}}, - {GVA_MODEL: global.GVA_MODEL{ID: 11, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "upload", Name: "upload", Component: "view/example/upload/upload.vue", Sort: 5, Meta: model.Meta{Title: "上传下载", Icon: "upload"}}, + {GVA_MODEL: global.GVA_MODEL{ID: 11, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "upload", Name: "upload", Component: "view/example/upload/upload.vue", Sort: 5, Meta: model.Meta{Title: "媒体库（上传下载）", Icon: "upload"}}, {GVA_MODEL: global.GVA_MODEL{ID: 12, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "breakpoint", Name: "breakpoint", Component: "view/example/breakpoint/breakpoint.vue", Sort: 6, Meta: model.Meta{Title: "断点续传", Icon: "upload"}}, {GVA_MODEL: global.GVA_MODEL{ID: 13, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "customer", Name: "customer", Component: "view/example/customer/customer.vue", Sort: 7, Meta: model.Meta{Title: "客户列表（资源示例）", Icon: "s-custom"}}, {GVA_MODEL: global.GVA_MODEL{ID: 14, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "systemTools", Name: "systemTools", Component: "view/systemTools/index.vue", Sort: 5, Meta: model.Meta{Title: "系统工具", Icon: "s-cooperation"}}, diff --git a/web/src/components/gva-wfd/behavior/dragPanelItemAddNode.js b/web/src/components/gva-wfd/behavior/dragPanelItemAddNode.js index 4d7e2a55..25135218 100644 --- a/web/src/components/gva-wfd/behavior/dragPanelItemAddNode.js +++ b/web/src/components/gva-wfd/behavior/dragPanelItemAddNode.js @@ -121,6 +121,7 @@ export default function(G6){ //type、shape属性同时存在即兼容之前版本的数据，又兼容g6的升级 addModel.type = getShapeName(clazz); addModel.shape = getShapeName(clazz); + addModel.hideIcon = false; const timestamp = new Date().getTime(); const id = clazz + timestamp; const x = p.x; diff --git a/web/src/components/gva-wfd/components/Wfd.vue b/web/src/components/gva-wfd/components/Wfd.vue index 47a76980..48e86eca 100644 --- a/web/src/components/gva-wfd/components/Wfd.vue +++ b/web/src/components/gva-wfd/components/Wfd.vue @@ -150,6 +150,10 @@ this.selectedModel = this.processModel; } }); + this.graph.on('aftercommandexecute',(command)=>{ + if (command.name !== 'undo' && command.name !== 'redo') return; + // 更新selectedModel + }); const page = this.$refs['canvas']; const graph = this.graph; const height = this.height-1;