diff --git a/.env.development b/.env.development index c7c1206..5d0e5a7 100644 --- a/.env.development +++ b/.env.development @@ -10,7 +10,7 @@ VITE_PUBLIC_PATH = / # 如果接口地址匹配到,则会转发到http://localhost:3000,防止本地出现跨域问题 # 可以有多个,注意多个不能换行,否则代理将会失效 #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]] -VITE_PROXY=[["/api/magic-api/", "http://127.0.0.1:8097","/magic-api/"], ["/api","http://10.10.2.102:9500"]] +VITE_PROXY=[["/api/workflow","http://10.0.0.2:8093/workflow/"],["/api/magic-api","http://10.0.0.2:8097/magic-api/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api","http://10.10.2.102:9500"]] diff --git a/src/utils/storage.ts b/src/utils/storage.ts index 4278aff..c9434f8 100644 --- a/src/utils/storage.ts +++ b/src/utils/storage.ts @@ -65,7 +65,7 @@ class StorageData { static fromJSON(json: string): StorageData { const data = JSON.parse(json); - return new StorageData(data.data,data.type,parseInt(data.timeout)); + return new StorageData(data.data,data.type,data.timeout); } } diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index 8d07535..5d87d4b 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -240,15 +240,15 @@ const UserProperties = { buttonGroup: '', index: 6 }, - // { - // buttonType: ButtonType.DEFAULT, //按钮类型 - // buttonName: t('结束'), //按钮名称 - // buttonCode: ApproveCode.FINISH, //按钮编码 - // approveType: ApproveType.FINISH, // - // checked: true, //选中 - // buttonGroup: '更多', - // index: 7 - // }, + { + buttonType: ButtonType.DEFAULT, //按钮类型 + buttonName: t('结束'), //按钮名称 + buttonCode: ApproveCode.FINISH, //按钮编码 + approveType: ApproveType.FINISH, // + checked: true, //选中 + buttonGroup: '更多', + index: 7 + }, { buttonType: ButtonType.DEFAULT, //按钮类型 buttonName: t('查看流程图'), //按钮名称