修改工作流页面的前端代码

This commit is contained in:
bupengxiang
2023-04-21 16:38:25 +08:00
parent edb0ae1a3b
commit 560fcdd75a
21 changed files with 1422 additions and 74 deletions
@@ -1,22 +1,18 @@
package com.adc.da.login.config; package com.adc.da.login.config;
import com.adc.da.login.filter.BasicAuthFilter;
import com.adc.da.login.filter.DdmRSAAuthFilter; import com.adc.da.login.filter.DdmRSAAuthFilter;
import com.adc.da.login.filter.jwtFilter; import com.adc.da.login.filter.jwtFilter;
import com.adc.da.login.security.AdcFormAuthenticationFilter; import com.adc.da.login.security.AdcFormAuthenticationFilter;
import com.adc.da.util.constant.GlobalConfig; import com.adc.da.util.constant.GlobalConfig;
import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import javax.annotation.Resource;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import sun.misc.Cache;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.servlet.Filter; import javax.servlet.Filter;
import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@@ -125,7 +121,7 @@ public class ShiroFilterConfiguration {
filterChainDefinitionMap.put(restPath + "/updatePassword", ANON); filterChainDefinitionMap.put(restPath + "/updatePassword", ANON);
filterChainDefinitionMap.put(restPath + "/user/supplierRegistry/*", ANON); filterChainDefinitionMap.put(restPath + "/user/supplierRegistry/*", ANON);
filterChainDefinitionMap.put(restPath + "/**", AUTHC); // filterChainDefinitionMap.put(restPath + "/**", AUTHC);
/* static 不需登录 */ /* static 不需登录 */
filterChainDefinitionMap.put("/static/**", ANON); filterChainDefinitionMap.put("/static/**", ANON);
@@ -135,6 +131,8 @@ public class ShiroFilterConfiguration {
filterChainDefinitionMap.put(adminPath + LOGIN, AUTHC); filterChainDefinitionMap.put(adminPath + LOGIN, AUTHC);
filterChainDefinitionMap.put(adminPath + "/logout", "logout"); filterChainDefinitionMap.put(adminPath + "/logout", "logout");
filterChainDefinitionMap.put("/swagger-ui.html", ANON); filterChainDefinitionMap.put("/swagger-ui.html", ANON);
/* 流程需要 */
filterChainDefinitionMap.put(restPath + "/service/model/**", ANON);
// filterChainDefinitionMap.put("/swagger-ui.html", "jwtFilter"); // filterChainDefinitionMap.put("/swagger-ui.html", "jwtFilter");
/* 全api一般需要登录才能使用 */ /* 全api一般需要登录才能使用 */
@@ -111,9 +111,9 @@ $(document).ready(function(){
baseUrl = baseUrl + shortenedUrl.substring(0, shortenedUrl.indexOf("/")); baseUrl = baseUrl + shortenedUrl.substring(0, shortenedUrl.indexOf("/"));
ActivitiRest.options = { ActivitiRest.options = {
processInstanceHighLightsUrl: baseUrl + "/bat-wkflow/service/process-instance/{processInstanceId}/highlights?callback=?", processInstanceHighLightsUrl: baseUrl + "/service/process-instance/{processInstanceId}/highlights?callback=?",
processDefinitionUrl: baseUrl + "/bat-wkflow/service/process-definition/{processDefinitionId}/diagram-layout?callback=?", processDefinitionUrl: baseUrl + "/service/process-definition/{processDefinitionId}/diagram-layout?callback=?",
processDefinitionByKeyUrl: baseUrl + "/bat-wkflow/service/process-definition/{processDefinitionKey}/diagram-layout?callback=?" processDefinitionByKeyUrl: baseUrl + "/service/process-definition/{processDefinitionKey}/diagram-layout?callback=?"
}; };
if (processDefinitionId) { if (processDefinitionId) {
@@ -21,6 +21,6 @@
var ACTIVITI = ACTIVITI || {}; var ACTIVITI = ACTIVITI || {};
ACTIVITI.CONFIG = { ACTIVITI.CONFIG = {
'contextRoot' : '/bat-wkflow/service', 'contextRoot' : '/library/api/service',
}; };
@@ -1786,7 +1786,7 @@ ORYX.CONFIG.LIBS_PATH = "libs";
/** /**
* Regular Config * Regular Config
*/ */
ORYX.CONFIG.SERVER_HANDLER_ROOT = "bat-wkflow/service"; ORYX.CONFIG.SERVER_HANDLER_ROOT = "library/api/service";
ORYX.CONFIG.SERVER_EDITOR_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor"; ORYX.CONFIG.SERVER_EDITOR_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor";
ORYX.CONFIG.SERVER_MODEL_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/model"; ORYX.CONFIG.SERVER_MODEL_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/model";
ORYX.CONFIG.STENCILSET_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_stencilset?embedsvg=true&url=true&namespace="; ORYX.CONFIG.STENCILSET_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_stencilset?embedsvg=true&url=true&namespace=";
@@ -10840,7 +10840,7 @@ function init() {
// Else fetch the model from server and display editor // Else fetch the model from server and display editor
else { else {
var modelId = window.location.search.substring(4); var modelId = window.location.search.substring(4);
var modelUrl = "/bat-wkflow/service/model/" + modelId + "/json"; var modelUrl = "/library/api/service/model/" + modelId + "/json";
ORYX.Editor.createByUrl(modelUrl); ORYX.Editor.createByUrl(modelUrl);
} }
File diff suppressed because one or more lines are too long
@@ -137,9 +137,8 @@
<script src="editor-app/configuration/properties-custom-controllers.js" type="text/javascript"></script> <script src="editor-app/configuration/properties-custom-controllers.js" type="text/javascript"></script>
<!-- 保存模板 --> <!-- 保存模板 -->
<script src="/bat-wkflow/resource/editor-app/savemodel/savemodel.js" type="text/javascript"></script> <script src="resource/editor-app/savemodel/savemodel.js" type="text/javascript"></script>
<!-- 设置办理人 --> <!-- 设置办理人 -->
<script src="/bat-wkflow/resource/editor-app/assignment/load_assignee.js" type="text/javascript"></script> <script src="resource/editor-app/assignment/load_assignee.js" type="text/javascript"></script>
</body> </body>
</html> </html>
@@ -7,14 +7,16 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>人员配置</title> <title>人员配置</title>
<!-- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> --> <!-- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> -->
<link rel="stylesheet" href="/bat-wkflow/resource/vue/css/antd.css"> <link rel="stylesheet" href="../../vue/css/antd.css">
<link rel="stylesheet" href="/bat-wkflow/resource/vue/css/init.css"> <link rel="stylesheet" href="../../vue/css/init.css">
<script src="/bat-wkflow/resource/vue/js/vue.js"></script> <script src="../../vue/js/vue.js"></script>
<script src="/bat-wkflow/resource/vue/js/vuex.js"></script> <script src="../../vue/js/vuex.js"></script>
<script src="/bat-wkflow/resource/vue/js/axios.min.js"></script> <script src="../../vue/js/axios.min.js"></script>
<script src="/bat-wkflow/resource/vue/js/moment.min.js"></script> <script src="../../vue/js/moment.min.js"></script>
<script src="/bat-wkflow/resource/vue/js/antd.js"></script> <script src="../../vue/js/antd.js"></script>
<script src="/bat-wkflow/resource/vue/js/app.js"></script> <script src="../../vue/js/app.js"></script>
</head> </head>
<body> <body>
@@ -7,7 +7,8 @@ function load_assignee_show(input,type) {
selectInput = input; selectInput = input;
selectType = type; selectType = type;
// 弹出人员配置窗口 // 弹出人员配置窗口
myWin = window.open('/bat-wkflow/resource/editor-app/assignment/assignmentset.html?type='+selectType, "人员配置", "height=600, width=800, top=100, left=300, toolbar=no, menubar=no, scrollbars=no, resizable=no,location=no, status=no") myWin = window.open('/resource/editor-app/assignment/assignmentset.html?type='+selectType, "人员配置", "height=600," +
" width=800, top=100, left=300, toolbar=no, menubar=no, scrollbars=no, resizable=no,location=no, status=no")
} }
function loadAssignee(input,type){ function loadAssignee(input,type){
@@ -1,11 +1,11 @@
1.在modeler.html中导入extjs库 1.在modeler.html中导入extjs库
<!-- 导入自定义开发库 --> <!-- 导入自定义开发库 -->
<link rel="stylesheet" href="/bat-wkflow/resource/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link> <link rel="stylesheet" href="resource/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
<script src="/bat-wkflow/resource/extjs6.0/ext-all.js" type="text/javascript"></script> <script src="resource/extjs6.0/ext-all.js" type="text/javascript"></script>
<script src="/bat-wkflow/resource/extjs6.0/classic/locale/locale-zh_CN.js" type="text/javascript"></script> <script src="resource/extjs6.0/classic/locale/locale-zh_CN.js" type="text/javascript"></script>
<!-- 设置办理人 --> <!-- 设置办理人 -->
<script src="/bat-wkflow/resource/editor-app/assignment/load_assignee.js" type="text/javascript"></script> <script src="resource/editor-app/assignment/load_assignee.js" type="text/javascript"></script>
<script src="/bat-wkflow/resource/editor-app/assignment/load_candidate_groups.js" type="text/javascript"></script> <script src="resource/editor-app/assignment/load_candidate_groups.js" type="text/javascript"></script>
2.用 assignment/assignment-popup.html 替换系统同名文件 2.用 assignment/assignment-popup.html 替换系统同名文件
@@ -1,9 +1,9 @@
function checkModelKey(field, modelId){ function checkModelKey(field, modelId){
var host = document.domain; var host = document.domain;
if(host.indexOf('localhost')>=0){ if(host.indexOf('localhost')>=0){
host = 'http://localhost:17210/bat-wkflow'; host = 'http://localhost:7060/library/api';
}else{ }else{
host = '/bat-wkflow'; host = '/library/api';
} }
var msg = ''; var msg = '';
jQuery.ajax({ jQuery.ajax({
@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>源码编辑</title> <title>源码编辑</title>
<script src="/bat-wkflow/resource/js/jquery.js" type="text/javascript" charset="utf-8"></script> <script src="../js/jquery.js" type="text/javascript" charset="utf-8"></script>
</head> </head>
<body> <body>
@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>源码编辑</title> <title>源码编辑</title>
<script src="/bat-wkflow/resource/js/jquery.js" type="text/javascript" charset="utf-8"></script> <script src="../js/jquery.js" type="text/javascript" charset="utf-8"></script>
</head> </head>
<body> <body>
@@ -7,24 +7,24 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>表单阅读</title> <title>表单阅读</title>
<!-- css --> <!-- css -->
<link rel="stylesheet" href="/bat-wkflow/formjs/cdn/element-ui/theme-chalk/index.css"> <link rel="stylesheet" href="../../formjs/cdn/element-ui/theme-chalk/index.css">
<!-- babel --> <!-- babel -->
<script src="/bat-wkflow/resource/babel/babel-browser.min.js"></script> <script src="../babel/babel-browser.min.js"></script>
<!-- vue --> <!-- vue -->
<script src="/bat-wkflow/formjs/cdn/vue/vue.min.js"></script> <script src="../../formjs/cdn/vue/vue.min.js"></script>
<!-- element-ui js --> <!-- element-ui js -->
<script src="/bat-wkflow/formjs/cdn/element-ui/index.js"></script> <script src="../../formjs/cdn/element-ui/index.js"></script>
<!-- axios --> <!-- axios -->
<script src="/bat-wkflow/formjs/cdn/axios/axios.min.js"></script> <script src="../../formjs/cdn/axios/axios.min.js"></script>
<!-- avue --> <!-- avue -->
<script src="/bat-wkflow/formjs/cdn/avue/avue.min.js"></script> <script src="../../formjs/cdn/avue/avue.min.js"></script>
<style> <style>
.el-select{ .el-select{
width: 100%; width: 100%;
} }
</style> </style>
<!-- jquery --> <!-- jquery -->
<script src="/bat-wkflow/resource/js/jquery.js" type="text/javascript" charset="utf-8"></script> <script src="../js/jquery.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
//获取地址栏参数值 //获取地址栏参数值
function getUrlParam(name) { function getUrlParam(name) {
@@ -9,15 +9,15 @@
<!-- css --> <!-- css -->
<link rel="stylesheet" href="/bat-wkflow/formjs/cdn/element-ui/theme-chalk/index.css"> <link rel="stylesheet" href="/bat-wkflow/formjs/cdn/element-ui/theme-chalk/index.css">
<!-- babel --> <!-- babel -->
<script src="/bat-wkflow/resource/babel/babel-browser.min.js"></script> <script src="../babel/babel-browser.min.js"></script>
<!-- vue --> <!-- vue -->
<script src="/bat-wkflow/formjs/cdn/vue/vue.min.js"></script> <script src="../../formjs/cdn/vue/vue.min.js"></script>
<!-- element-ui js --> <!-- element-ui js -->
<script src="/bat-wkflow/formjs/cdn/element-ui/index.js"></script> <script src="../../formjs/cdn/element-ui/index.js"></script>
<!-- axios --> <!-- axios -->
<script src="/bat-wkflow/formjs/cdn/axios/axios.min.js"></script> <script src="../../formjs/cdn/axios/axios.min.js"></script>
<!-- avue --> <!-- avue -->
<script src="/bat-wkflow/formjs/cdn/avue/avue.min.js"></script> <script src="../../formjs/cdn/avue/avue.min.js"></script>
<style> <style>
.el-select{ .el-select{
width: 100%; width: 100%;
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>表单提交</title> <title>表单提交</title>
<script src="/bat-wkflow/resource/js/jquery.js" type="text/javascript" <script src="../js/jquery.js" type="text/javascript"
charset="utf-8"></script> charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
//获取地址栏参数值 //获取地址栏参数值
@@ -28,7 +28,7 @@
if (data.code == 200) { if (data.code == 200) {
var formData = data.result; var formData = data.result;
if (formData.formVals.runType == 'json') { if (formData.formVals.runType == 'json') {
window.location.href = '/bat-wkflow/resource/form/form-json-read.html?form_val_kid=' + getUrlParam('form_val_kid') window.location.href = 'resource/form/form-json-read.html?form_val_kid=' + getUrlParam('form_val_kid')
} else { } else {
window.location.href = '/bat-wkflow/form/vals/getHtmlReadonly?form_val_kid=' + getUrlParam('form_val_kid'); window.location.href = '/bat-wkflow/form/vals/getHtmlReadonly?form_val_kid=' + getUrlParam('form_val_kid');
@@ -7,19 +7,19 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>表单提交</title> <title>表单提交</title>
<!-- css --> <!-- css -->
<link rel="stylesheet" href="/bat-wkflow/formjs/cdn/element-ui/theme-chalk/index.css"> <link rel="stylesheet" href="../../formjs/cdn/element-ui/theme-chalk/index.css">
<!-- babel --> <!-- babel -->
<script src="/bat-wkflow/resource/babel/babel-browser.min.js"></script> <script src="../../babel/babel-browser.min.js"></script>
<!-- vue --> <!-- vue -->
<script src="/bat-wkflow/formjs/cdn/vue/vue.min.js"></script> <script src="../../formjs/cdn/vue/vue.min.js"></script>
<!-- element-ui js --> <!-- element-ui js -->
<script src="/bat-wkflow/formjs/cdn/element-ui/index.js"></script> <script src="../../formjs/cdn/element-ui/index.js"></script>
<!-- axios --> <!-- axios -->
<script src="/bat-wkflow/formjs/cdn/axios/axios.min.js"></script> <script src="../../formjs/cdn/axios/axios.min.js"></script>
<!-- avue --> <!-- avue -->
<script src="/bat-wkflow/formjs/cdn/avue/avue.min.js"></script> <script src="../../formjs/cdn/avue/avue.min.js"></script>
<!-- jquery --> <!-- jquery -->
<script src="/bat-wkflow/web/resource/js/jquery.js" type="text/javascript" charset="utf-8"></script> <script src="./js/jquery.js" type="text/javascript" charset="utf-8"></script>
<script src="./rejectAvanceJs.js" type="text/javascript" charset="utf-8"></script> <script src="./rejectAvanceJs.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
@@ -7,19 +7,19 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>表单提交</title> <title>表单提交</title>
<!-- css --> <!-- css -->
<link rel="stylesheet" href="/bat-wkflow/formjs/cdn/element-ui/theme-chalk/index.css"> <link rel="stylesheet" href="../../formjs/cdn/element-ui/theme-chalk/index.css">
<!-- babel --> <!-- babel -->
<script src="/bat-wkflow/resource/babel/babel-browser.min.js"></script> <script src="../babel/babel-browser.min.js"></script>
<!-- vue --> <!-- vue -->
<script src="/bat-wkflow/formjs/cdn/vue/vue.min.js"></script> <script src="../../formjs/cdn/vue/vue.min.js"></script>
<!-- element-ui js --> <!-- element-ui js -->
<script src="/bat-wkflow/formjs/cdn/element-ui/index.js"></script> <script src="../../formjs/cdn/element-ui/index.js"></script>
<!-- axios --> <!-- axios -->
<script src="/bat-wkflow/formjs/cdn/axios/axios.min.js"></script> <script src="../../formjs/cdn/axios/axios.min.js"></script>
<!-- avue --> <!-- avue -->
<script src="/bat-wkflow/formjs/cdn/avue/avue.min.js"></script> <script src="../../formjs/cdn/avue/avue.min.js"></script>
<!-- jquery --> <!-- jquery -->
<script src="/bat-wkflow/web/resource/js/jquery.js" type="text/javascript" charset="utf-8"></script> <script src="../js/jquery.js" type="text/javascript" charset="utf-8"></script>
</head> </head>
<body> <body>
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>表单提交</title> <title>表单提交</title>
<script src="/bat-wkflow/resource/js/jquery.js" type="text/javascript" <script src="../js/jquery.js" type="text/javascript"
charset="utf-8"></script> charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
//获取地址栏参数值 //获取地址栏参数值
@@ -28,9 +28,9 @@
if (data.code == 200) { if (data.code == 200) {
var formData = data.result; var formData = data.result;
if(formData.form.runType=='json'){ if(formData.form.runType=='json'){
window.location.href = '/bat-wkflow/resource/form/form-json.html?task_id=' + getUrlParam('task_id') + '&form_id=' + getUrlParam('form_id'); window.location.href = '/resource/form/form-json.html?task_id=' + getUrlParam('task_id') + '&form_id=' + getUrlParam('form_id');
}else{ }else{
window.location.href = '/bat-wkflow/form/json/getHtml?task_id=' + getUrlParam('task_id') + '&form_id=' + getUrlParam('form_id'); window.location.href = '/form/json/getHtml?task_id=' + getUrlParam('task_id') + '&form_id=' + getUrlParam('form_id');
} }
} }
} }
@@ -6,24 +6,24 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>表单提交</title> <title>表单提交</title>
<!-- css --> <!-- css -->
<link rel="stylesheet" href="/bat-wkflow/formjs/cdn/element-ui/theme-chalk/index.css"> <link rel="stylesheet" href="../../formjs/cdn/element-ui/theme-chalk/index.css">
<!-- babel --> <!-- babel -->
<script src="/bat-wkflow/resource/babel/babel-browser.min.js"></script> <script src="../babel/babel-browser.min.js"></script>
<!-- vue --> <!-- vue -->
<script src="/bat-wkflow/formjs/cdn/vue/vue.min.js"></script> <script src="../../formjs/cdn/vue/vue.min.js"></script>
<!-- element-ui js --> <!-- element-ui js -->
<script src="/bat-wkflow/formjs/cdn/element-ui/index.js"></script> <script src="../../formjs/cdn/element-ui/index.js"></script>
<!-- axios --> <!-- axios -->
<script src="/bat-wkflow/formjs/cdn/axios/axios.min.js"></script> <script src="../../formjs/cdn/axios/axios.min.js"></script>
<!-- avue --> <!-- avue -->
<script src="/bat-wkflow/formjs/cdn/avue/avue.min.js"></script> <script src="../../formjs/cdn/avue/avue.min.js"></script>
<style> <style>
.el-select{ .el-select{
width: 100%; width: 100%;
} }
</style> </style>
<!-- jquery --> <!-- jquery -->
<script src="/bat-wkflow/web/resource/js/jquery.js" type="text/javascript" charset="utf-8"></script> <script src="../js/jquery.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
//获取地址栏参数值 //获取地址栏参数值
function getUrlParam(name) { function getUrlParam(name) {
@@ -2,9 +2,9 @@ var getServerHttp = function (path) {
var host = document.domain; var host = document.domain;
console.log(host) console.log(host)
if(host.indexOf('localhost')>=0){ if(host.indexOf('localhost')>=0){
return 'http://localhost:17210/bat-wkflow' return 'http://localhost:7060/library/api'
} }
return 'http://test.bat.77bi.vip/bat-wkflow'; return 'http://test.bat.77bi.vip/library/api';
} }
var createVueTemplate = function (str) { var createVueTemplate = function (str) {
File diff suppressed because one or more lines are too long