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 @@ + + + + + diff --git a/flowable-engine-web/src/components/common/RolePicker.vue b/flowable-engine-web/src/components/common/RolePicker.vue index 402aec3..74d3098 100644 --- a/flowable-engine-web/src/components/common/RolePicker.vue +++ b/flowable-engine-web/src/components/common/RolePicker.vue @@ -76,7 +76,6 @@ export default { }; }, created() { - this.getRole(); }, methods: { //获取角色信息 @@ -89,6 +88,7 @@ export default { }, //用于弹出角色选择器 showRolePicker() { + this.getRole(); this.visible = true; }, //选中角色 diff --git a/flowable-engine-web/src/router/index.js b/flowable-engine-web/src/router/index.js index 7170001..b6941b8 100644 --- a/flowable-engine-web/src/router/index.js +++ b/flowable-engine-web/src/router/index.js @@ -33,12 +33,6 @@ const router = new Router({ component: () => import("@/views/admin/FormsPanel.vue"), meta: {title: '表单列表', viewport: viewport} }, - { - path: "/query", - name: "query", - component: () => import("@/views/query/index.vue"), - meta: {title: '自定义查询', viewport: viewport} - }, { path: "/admin/design", name: "design", diff --git a/flowable-engine-web/src/views/Index.vue b/flowable-engine-web/src/views/Index.vue index 721c789..67b990d 100644 --- a/flowable-engine-web/src/views/Index.vue +++ b/flowable-engine-web/src/views/Index.vue @@ -2,17 +2,13 @@

欢迎进入Spring Security 配套 Workflow工作流模块

-
- - 登录 -
- - - - - - +
+ 选择本次登录者 +
+ {{ loginUser.name }} +
+
@@ -34,39 +30,21 @@
- - - - - - +
diff --git a/flowable-engine-web/src/views/query/index.vue b/flowable-engine-web/src/views/query/index.vue deleted file mode 100644 index a043720..0000000 --- a/flowable-engine-web/src/views/query/index.vue +++ /dev/null @@ -1,352 +0,0 @@ - - -