diff --git a/flowable-engine-web/package.json b/flowable-engine-web/package.json
index 94e2d13..206e7d3 100644
--- a/flowable-engine-web/package.json
+++ b/flowable-engine-web/package.json
@@ -10,7 +10,6 @@
"dependencies": {
"axios": "^0.20.0",
"clipboard": "^2.0.6",
- "codemirror": "^6.0.0",
"core-js": "^3.6.5",
"element-ui": "^2.15.8",
"less": "^3.12.2",
@@ -21,6 +20,7 @@
"signature_pad": "^3.0.0-beta.4",
"trim-canvas": "^0.1.2",
"vue": "^2.6.11",
+ "vue-codemirror": "^4.0.6",
"vue-esign": "^1.1.4",
"vue-router": "^3.4.3",
"vuedraggable": "^2.24.1",
@@ -36,7 +36,6 @@
"babel-preset-env": "^1.7.0",
"style-resources-loader": "^1.3.2",
"vue-cli-plugin-style-resources-loader": "^0.1.4",
- "vue-codemirror": "^6.0.0",
"vue-template-compiler": "^2.6.11"
},
"eslintConfig": {
diff --git a/flowable-engine-web/src/api/org.js b/flowable-engine-web/src/api/org.js
index 660e418..f862b25 100644
--- a/flowable-engine-web/src/api/org.js
+++ b/flowable-engine-web/src/api/org.js
@@ -1,15 +1,5 @@
import request from '@/api/request.js'
-
-// 查询组织架构树
-export function getOrgTree(param) {
- return request({
- url: 'oa/org/tree',
- method: 'get',
- params: param
- })
-}
-
// 查询系统角色
export function getRole() {
return request({
@@ -17,15 +7,6 @@ export function getRole() {
method: 'get'
})
}
-
-// 搜索人员
-export function getUserByName(param) {
- return request({
- url: 'oa/org/tree/user/search',
- method: 'get',
- params: param
- })
-}
//获取采取树形控件的部门option
export function getDepartmentTree() {
return request({
@@ -43,5 +24,5 @@ export function getUserTree(type,chooseId){
}
export default {
- getOrgTree, getUserByName, getRole,getDepartmentTree,getUserTree
+ getRole,getDepartmentTree,getUserTree
}
diff --git a/flowable-engine-web/src/api/query.js b/flowable-engine-web/src/api/query.js
deleted file mode 100644
index 2f9f0e9..0000000
--- a/flowable-engine-web/src/api/query.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import request from '@/api/request.js'
-
-
-// 查询万能查询列表
-export function listQuery(query) {
- return request({
- url: '/custom-query/uni/query',
- method: 'get',
- params: query
- })
-}
-
-// 查询万能查询详细
-export function getQuery(id) {
- return request({
- url: '/custom-query/uni/query/' + id,
- method: 'get'
- })
-}
-
-// 新增万能查询
-export function addQuery(data) {
- return request({
- url: '/custom-query/uni/query',
- method: 'post',
- data: data
- })
-}
-
-// 修改万能查询
-export function updateQuery(data) {
- return request({
- url: '/custom-query/uni/query',
- method: 'put',
- data: data
- })
-}
-
-// 删除万能查询
-export function delQuery(id) {
- return request({
- url: '/custom-query/uni/query/' + id,
- method: 'delete'
- })
-}
-
-// 导出万能查询
-export function exportQuery(query) {
- return request({
- url: '/custom-query/uni/query/export',
- method: 'get',
- params: query
- })
-}
-
-// 获取条件
-export function getQueryInfo(id) {
- return request({
- url: '/query/'+id,
- method: 'get',
- })
-}
-// 修改条件
-export function editQueryInfo(data) {
- return request({
- url: '/query',
- method: 'put',
- data: data
- })
-}
diff --git a/flowable-engine-web/src/components/common/CodeEdit.vue b/flowable-engine-web/src/components/common/CodeEdit.vue
new file mode 100644
index 0000000..69b578a
--- /dev/null
+++ b/flowable-engine-web/src/components/common/CodeEdit.vue
@@ -0,0 +1,96 @@
+
+