From 018328673f993cd3a38c306ab5bdb0c7a719477d Mon Sep 17 00:00:00 2001 From: xxm Date: Mon, 13 Mar 2023 23:36:23 +0800 Subject: [PATCH] =?UTF-8?q?perf=20SQL=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E8=AE=BE=E8=AE=A1=E7=A7=BB=E6=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 - src/components/Bpmn/ProcessViewer.vue | 55 +++--- src/components/Bpmn/common/customTranslate.js | 7 +- src/components/Bpmn/processViewerUtils.js | 18 +- src/components/FlowChart/index.ts | 4 - src/components/FlowChart/src/FlowChart.vue | 158 ----------------- .../FlowChart/src/FlowChartToolbar.vue | 159 ------------------ .../FlowChart/src/adpterForTurbo.ts | 75 --------- src/components/FlowChart/src/config.ts | 96 ----------- src/components/FlowChart/src/enum.ts | 11 -- src/components/FlowChart/src/types.ts | 14 -- .../FlowChart/src/useFlowContext.ts | 17 -- .../modules/bpm/instance/Instance.api.ts | 2 +- src/views/modules/bpm/model/BpmModelList.vue | 6 +- src/views/modules/bpm/model/BpmModeler.vue | 110 ++++++++++++ .../bpm/model/{ => node}/BpmModelNodeCode.ts | 0 .../bpm/model/{ => node}/BpmModelNodeEdit.vue | 2 +- .../bpm/model/{ => node}/BpmModelNodeList.vue | 4 +- .../bpm/model/{ => node}/ModelNode.api.ts | 0 .../modules/develop/query/QuerySql.api.ts | 82 +++++++++ .../modules/develop/query/QuerySqlEdit.vue | 133 +++++++++++++++ .../modules/develop/query/QuerySqlList.vue | 121 +++++++++++++ yarn.lock | 38 ----- 23 files changed, 494 insertions(+), 620 deletions(-) delete mode 100644 src/components/FlowChart/index.ts delete mode 100644 src/components/FlowChart/src/FlowChart.vue delete mode 100644 src/components/FlowChart/src/FlowChartToolbar.vue delete mode 100644 src/components/FlowChart/src/adpterForTurbo.ts delete mode 100644 src/components/FlowChart/src/config.ts delete mode 100644 src/components/FlowChart/src/enum.ts delete mode 100644 src/components/FlowChart/src/types.ts delete mode 100644 src/components/FlowChart/src/useFlowContext.ts create mode 100644 src/views/modules/bpm/model/BpmModeler.vue rename src/views/modules/bpm/model/{ => node}/BpmModelNodeCode.ts (100%) rename src/views/modules/bpm/model/{ => node}/BpmModelNodeEdit.vue (99%) rename src/views/modules/bpm/model/{ => node}/BpmModelNodeList.vue (97%) rename src/views/modules/bpm/model/{ => node}/ModelNode.api.ts (100%) create mode 100644 src/views/modules/develop/query/QuerySql.api.ts create mode 100644 src/views/modules/develop/query/QuerySqlEdit.vue create mode 100644 src/views/modules/develop/query/QuerySqlList.vue diff --git a/package.json b/package.json index 55a8eb7a..e0c9beb9 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,6 @@ "@ant-design/colors": "^6.0.0", "@ant-design/icons-vue": "^6.1.0", "@iconify/iconify": "^2.2.1", - "@logicflow/core": "^1.1.13", - "@logicflow/extension": "^1.1.13", "@vue/runtime-core": "^3.2.33", "@vue/shared": "^3.2.33", "@vueuse/core": "^8.3.0", diff --git a/src/components/Bpmn/ProcessViewer.vue b/src/components/Bpmn/ProcessViewer.vue index 79bea680..a20528c1 100644 --- a/src/components/Bpmn/ProcessViewer.vue +++ b/src/components/Bpmn/ProcessViewer.vue @@ -3,18 +3,18 @@
- - - -

开始时间: {{ o.startTime }}

-

状态：{{ stateNameConvert(o.state) }}

-

处理结果：{{ dictConvert('BpmTaskResult', o.result) }}

-

处理人: {{ o.userName }}

-

结束时间: {{ o.endTime ? o.endTime : '' }}

-

审批意见：{{ o.reason ? o.reason : '' }}

- - - + + + + + + + + + + + + - -
- - - - - - diff --git a/src/components/FlowChart/src/FlowChartToolbar.vue b/src/components/FlowChart/src/FlowChartToolbar.vue deleted file mode 100644 index 01c37b04..00000000 --- a/src/components/FlowChart/src/FlowChartToolbar.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - diff --git a/src/components/FlowChart/src/adpterForTurbo.ts b/src/components/FlowChart/src/adpterForTurbo.ts deleted file mode 100644 index 51040797..00000000 --- a/src/components/FlowChart/src/adpterForTurbo.ts +++ /dev/null @@ -1,75 +0,0 @@ -const TurboType = { - SEQUENCE_FLOW: 1, - START_EVENT: 2, - END_EVENT: 3, - USER_TASK: 4, - SERVICE_TASK: 5, - EXCLUSIVE_GATEWAY: 6, -} - -function convertFlowElementToEdge(element) { - const { incoming, outgoing, properties, key } = element - const { text, startPoint, endPoint, pointsList, logicFlowType } = properties - const edge = { - id: key, - type: logicFlowType, - sourceNodeId: incoming[0], - targetNodeId: outgoing[0], - text, - startPoint, - endPoint, - pointsList, - properties: {}, - } - const excludeProperties = ['startPoint', 'endPoint', 'pointsList', 'text', 'logicFlowType'] - Object.keys(element.properties).forEach((property) => { - if (excludeProperties.indexOf(property) === -1) { - edge.properties[property] = element.properties[property] - } - }) - return edge -} - -function convertFlowElementToNode(element) { - const { properties, key } = element - const { x, y, text, logicFlowType } = properties - const node = { - id: key, - type: logicFlowType, - x, - y, - text, - properties: {}, - } - const excludeProperties = ['x', 'y', 'text', 'logicFlowType'] - Object.keys(element.properties).forEach((property) => { - if (excludeProperties.indexOf(property) === -1) { - node.properties[property] = element.properties[property] - } - }) - return node -} - -export function toLogicFlowData(data) { - const lfData: { - // TODO type - nodes: any[] - edges: any[] - } = { - nodes: [], - edges: [], - } - const list = data.flowElementList - list && - list.length > 0 && - list.forEach((element) => { - if (element.type === TurboType.SEQUENCE_FLOW) { - const edge = convertFlowElementToEdge(element) - lfData.edges.push(edge) - } else { - const node = convertFlowElementToNode(element) - lfData.nodes.push(node) - } - }) - return lfData -} diff --git a/src/components/FlowChart/src/config.ts b/src/components/FlowChart/src/config.ts deleted file mode 100644 index 1467cfc5..00000000 --- a/src/components/FlowChart/src/config.ts +++ /dev/null @@ -1,96 +0,0 @@ -export const nodeList = [ - { - text: '开始', - type: 'start', - class: 'node-start', - }, - { - text: '矩形', - type: 'rect', - class: 'node-rect', - }, - { - type: 'user', - text: '用户', - class: 'node-user', - }, - { - type: 'push', - text: '推送', - class: 'node-push', - }, - { - type: 'download', - text: '位置', - class: 'node-download', - }, - { - type: 'end', - text: '结束', - class: 'node-end', - }, -] - -export const BpmnNode = [ - { - type: 'bpmn:startEvent', - text: '开始', - class: 'bpmn-start', - }, - { - type: 'bpmn:endEvent', - text: '结束', - class: 'bpmn-end', - }, - { - type: 'bpmn:exclusiveGateway', - text: '网关', - class: 'bpmn-exclusiveGateway', - }, - { - type: 'bpmn:userTask', - text: '用户', - class: 'bpmn-user', - }, -] - -export function configDefaultDndPanel(lf) { - return [ - { - text: '选区', - icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAAH6ji2bAAAABGdBTUEAALGPC/xhBQAAAOVJREFUOBGtVMENwzAIjKP++2026ETdpv10iy7WFbqFyyW6GBywLCv5gI+Dw2Bluj1znuSjhb99Gkn6QILDY2imo60p8nsnc9bEo3+QJ+AKHfMdZHnl78wyTnyHZD53Zzx73MRSgYvnqgCUHj6gwdck7Zsp1VOrz0Uz8NbKunzAW+Gu4fYW28bUYutYlzSa7B84Fh7d1kjLwhcSdYAYrdkMQVpsBr5XgDGuXwQfQr0y9zwLda+DUYXLaGKdd2ZTtvbolaO87pdo24hP7ov16N0zArH1ur3iwJpXxm+v7oAJNR4JEP8DoAuSFEkYH7cAAAAASUVORK5CYII=', - callback: () => { - lf.updateEditConfig({ - stopMoveGraph: true, - }) - }, - }, - { - type: 'circle', - text: '开始', - icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAAH6ji2bAAAABGdBTUEAALGPC/xhBQAAAnBJREFUOBGdVL1rU1EcPfdGBddmaZLiEhdx1MHZQXApraCzQ7GKLgoRBxMfcRELuihWKcXFRcEWF8HBf0DdDCKYRZpnl7p0svLe9Zzbd29eQhTbC8nv+9zf130AT63jvooOGS8Vf9Nt5zxba7sXQwODfkWpkbjTQfCGUd9gIp3uuPP8bZ946g56dYQvnBg+b1HB8VIQmMFrazKcKSvFW2dQTxJnJdQ77urmXWOMBCmXM2Rke4S7UAW+/8ywwFoewmBps2tu7mbTdp8VMOkIRAkKfrVawalJTtIliclFbaOBqa0M2xImHeVIfd/nKAfVq/LGnPss5Kh00VEdSzfwnBXPUpmykNss4lUI9C1ga+8PNrBD5YeqRY2Zz8PhjooIbfJXjowvQJBqkmEkVnktWhwu2SM7SMx7Cj0N9IC0oQXRo8xwAGzQms+xrB/nNSUWVveI48ayrFGyC2+E2C+aWrZHXvOuz+CiV6iycWe1Rd1Q6+QUG07nb5SbPrL4426d+9E1axKjY3AoRrlEeSQo2Eu0T6BWAAr6COhTcWjRaYfKG5csnvytvUr/WY4rrPMB53Uo7jZRjXaG6/CFfNMaXEu75nG47X+oepU7PKJvvzGDY1YLSKHJrK7vFUwXKkaxwhCW3u+sDFMVrIju54RYYbFKpALZAo7sB6wcKyyrd+aBMryMT2gPyD6GsQoRFkGHr14TthZni9ck0z+Pnmee460mHXbRAypKNy3nuMdrWgVKj8YVV8E7PSzp1BZ9SJnJAsXdryw/h5ctboUVi4AFiCd+lQaYMw5z3LGTBKjLQOeUF35k89f58Vv/tGh+l+PE/wG0rgfIUbZK5AAAAABJRU5ErkJggg==', - }, - { - type: 'rect', - text: '用户任务', - icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAEFVwZaAAAABGdBTUEAALGPC/xhBQAAAqlJREFUOBF9VM9rE0EUfrMJNUKLihGbpLGtaCOIR8VjQMGDePCgCCIiCNqzCAp2MyYUCXhUtF5E0D+g1t48qAd7CCLqQUQKEWkStcEfVGlLdp/fm3aW2QQdyLzf33zz5m2IsAZ9XhDpyaaIZkTS4ASzK41TFao88GuJ3hsr2pAbipHxuSYyKRugagICGANkfFnNh3HeE2N0b3nN2cgnpcictw5veJIzxmDamSlxxQZicq/mflxhbaH8BLRbuRwNtZp0JAhoplVRUdzmCe/vO27wFuuA3S5qXruGdboy5/PRGFsbFGKo/haRtQHIrM83bVeTrOgNhZReWaYGnE4aUQgTJNvijJFF4jQ8BxJE5xfKatZWmZcTQ+BVgh7s8SgPlCkcec4mGTmieTP4xd7PcpIEg1TX6gdeLW8rTVMVLVvb7ctXoH0Cydl2QOPJBG21STE5OsnbweVYzAnD3A7PVILuY0yiiyDwSm2g441r6rMSgp6iK42yqroI2QoXeJVeA+YeZSa47gZdXaZWQKTrG93rukk/l2Al6Kzh5AZEl7dDQy+JjgFahQjRopSxPbrbvK7GRe9ePWBo1wcU7sYrFZtavXALwGw/7Dnc50urrHJuTPSoO2IMV3gUQGNg87IbSOIY9BpiT9HV7FCZ94nPXb3MSnwHn/FFFE1vG6DTby+r31KAkUktB3Qf6ikUPWxW1BkXSPQeMHHiW0+HAd2GelJsZz1OJegCxqzl+CLVHa/IibuHeJ1HAKzhuDR+ymNaRFM+4jU6UWKXorRmbyqkq/D76FffevwdCp+jN3UAN/C9JRVTDuOxC/oh+EdMnqIOrlYteKSfadVRGLJFJPSB/ti/6K8f0CNymg/iH2gO/f0DwE0yjAFO6l8JaR5j0VPwPwfaYHqOqrCI319WzwhwzNW/aQAAAABJRU5ErkJggg==', - cls: 'important-node', - }, - { - type: 'rect', - text: '系统任务', - icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAEFVwZaAAAABGdBTUEAALGPC/xhBQAAAqlJREFUOBF9VM9rE0EUfrMJNUKLihGbpLGtaCOIR8VjQMGDePCgCCIiCNqzCAp2MyYUCXhUtF5E0D+g1t48qAd7CCLqQUQKEWkStcEfVGlLdp/fm3aW2QQdyLzf33zz5m2IsAZ9XhDpyaaIZkTS4ASzK41TFao88GuJ3hsr2pAbipHxuSYyKRugagICGANkfFnNh3HeE2N0b3nN2cgnpcictw5veJIzxmDamSlxxQZicq/mflxhbaH8BLRbuRwNtZp0JAhoplVRUdzmCe/vO27wFuuA3S5qXruGdboy5/PRGFsbFGKo/haRtQHIrM83bVeTrOgNhZReWaYGnE4aUQgTJNvijJFF4jQ8BxJE5xfKatZWmZcTQ+BVgh7s8SgPlCkcec4mGTmieTP4xd7PcpIEg1TX6gdeLW8rTVMVLVvb7ctXoH0Cydl2QOPJBG21STE5OsnbweVYzAnD3A7PVILuY0yiiyDwSm2g441r6rMSgp6iK42yqroI2QoXeJVeA+YeZSa47gZdXaZWQKTrG93rukk/l2Al6Kzh5AZEl7dDQy+JjgFahQjRopSxPbrbvK7GRe9ePWBo1wcU7sYrFZtavXALwGw/7Dnc50urrHJuTPSoO2IMV3gUQGNg87IbSOIY9BpiT9HV7FCZ94nPXb3MSnwHn/FFFE1vG6DTby+r31KAkUktB3Qf6ikUPWxW1BkXSPQeMHHiW0+HAd2GelJsZz1OJegCxqzl+CLVHa/IibuHeJ1HAKzhuDR+ymNaRFM+4jU6UWKXorRmbyqkq/D76FffevwdCp+jN3UAN/C9JRVTDuOxC/oh+EdMnqIOrlYteKSfadVRGLJFJPSB/ti/6K8f0CNymg/iH2gO/f0DwE0yjAFO6l8JaR5j0VPwPwfaYHqOqrCI319WzwhwzNW/aQAAAABJRU5ErkJggg==', - cls: 'import_icon', - }, - { - type: 'diamond', - text: '条件判断', - icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAVCAYAAAHeEJUAAAAABGdBTUEAALGPC/xhBQAAAvVJREFUOBGNVEFrE0EU/mY3bQoiFlOkaUJrQUQoWMGePLX24EH0IIoHKQiCV0G8iE1covgLiqA/QTzVm1JPogc9tIJYFaQtlhQxqYjSpunu+L7JvmUTU3AgmTfvffPNN++9WSA1DO182f6xwILzD5btfAoQmwL5KJEwiQyVbSVZ0IgRyV6PTpIJ81E5ZvqfHQR0HUOBHW4L5Et2kQ6Zf7iAOhTFAA8s0pEP7AXO1uAA52SbqGk6h/6J45LaLhO64ByfcUzM39V7ZiAdS2yCePPEIQYvTUHqM/n7dgQNfBKWPjpF4ISk8q3J4nB11qw6X8l+FsF3EhlkEMfrjIer3wJTLwS2aCNcj4DbGxXTw00JmAuO+Ni6bBxVUCvS5d9aa04+so4pHW5jLTywuXAL7jJ+D06sl82Sgl2JuVBQn498zkc2bGKxULHjCnSMadBKYDYYHAtsby1EQ5lNGrQd4Y3v4Zo0XdGEmDno46yCM9Tk+RiJmUYHS/aXHPNTcjxcbTFna000PFJHIVZ5lFRqRpJWk9/+QtlOUYJj9HG5pVFEU7zqIYDVsw2s+AJaD8wTd2umgSCCyUxgGsS1Y6TBwXQQTFuZaHcd8gAGioE90hlsY+wMcs30RduYtxanjMGal8H5dMW67dmT1JFtYUEe8LiQLRsPZ6IIc7A4J5tqco3T0pnv/4u0kyzrYUq7gASuEyI8VXKvB9Odytv6jS/PNaZBln0nioJG/AVQRZvApOdhjj3Jt8QC8Im09SafwdBdvIpztpxWxpeKCC+EsFdS8DCyuCn2munFpL7ctHKp+Xc5cMybeIyMAN33SPL3ZR9QV1XVwLyzHm6Iv0/yeUuUb7PPlZC4D4HZkeu6dpF4v9j9MreGtMbxMMRLIcjJic9yHi7WQ3yVKzZVWUr5UrViJvn1FfUlwe/KYVfYyWRLSGNu16hR01U9IacajXPei0wx/5BqgInvJN+MMNtNme7ReU9SBbgntovn0kKHpFg7UogZvaZiOue/q1SBo9ktHzQAAAAASUVORK5CYII=', - }, - { - type: 'circle', - text: '结束', - icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAAH6ji2bAAAABGdBTUEAALGPC/xhBQAAA1BJREFUOBFtVE1IVUEYPXOf+tq40Y3vPcmFIdSjIorWoRG0ERWUgnb5FwVhYQSl72oUoZAboxKNFtWiwKRN0M+jpfSzqJAQclHo001tKkjl3emc8V69igP3znzfnO/M9zcDcKT67azmjYWTwl9Vn7Vumeqzj1DVb6cleQY4oAVnIOPb+mKAGxQmKI5CWNJ2aLPatxWa3aB9K7/fB+/Z0jUF6TmMlFLQqrkECWQzOZxYGjTlOl8eeKaIY5yHnFn486xBustDjWT6dG7pmjHOJd+33t0iitTPkK6tEvjxq4h2MozQ6WFSX/LkDUGfFwfhEZj1Auz/U4pyAi5Sznd7uKzznXeVHlI/Aywmk6j7fsUsEuCGADrWARXXwjxWQsUbIupDHJI7kF5dRktg0eN81IbiZXiTESic50iwS+t1oJgL83jAiBupLDCQqwziaWSoAFSeIR3P5Xv5az00wyIn35QRYTwdSYbz8pH8fxUUAtxnFvYmEmgI0wYXUXcCCSpeEVpXlsRhBnCEATxWylL9+EKCAYhe1NGstUa6356kS9NVvt3DU2fd+Wtbm/+lSbylJqsqkSm9CRhvoJVlvKPvF1RKY/FcPn5j4UfIMLn8D4UYb54BNsilTDXKnF4CfTobA0FpoW/LSp306wkXM+XaOJhZaFkcNM82ASNAWMrhrUbRfmyeI1FvRBTpN06WKxa9BK0o2E4Pd3zfBBEwPsv9sQBnmLVbLEIZ/Xe9LYwJu/Er17W6HYVBc7vmuk0xUQ+pqxdom5Fnp55SiytXLPYoMXNM4u4SNSCFWnrVIzKG3EGyMXo6n/BQOe+bX3FClY4PwydVhthOZ9NnS+ntiLh0fxtlUJHAuGaFoVmttpVMeum0p3WEXbcll94l1wM/gZ0Ccczop77VvN2I7TlsZCsuXf1WHvWEhjO8DPtyOVg2/mvK9QqboEth+7pD6NUQC1HN/TwvydGBARi9MZSzLE4b8Ru3XhX2PBxf8E1er2A6516o0w4sIA+lwURhAON82Kwe2iDAC1Watq4XHaGQ7skLcFOtI5lDxuM2gZe6WFIotPAhbaeYlU4to5cuarF1QrcZ/lwrLaCJl66JBocYZnrNlvm2+MBCTmUymPrYZVbjdlr/BxlMjmNmNI3SAAAAAElFTkSuQmCC', - }, - ] -} diff --git a/src/components/FlowChart/src/enum.ts b/src/components/FlowChart/src/enum.ts deleted file mode 100644 index 8ea134ca..00000000 --- a/src/components/FlowChart/src/enum.ts +++ /dev/null @@ -1,11 +0,0 @@ -export enum ToolbarTypeEnum { - ZOOM_IN = 'zoomIn', - ZOOM_OUT = 'zoomOut', - RESET_ZOOM = 'resetZoom', - - UNDO = 'undo', - REDO = 'redo', - - SNAPSHOT = 'snapshot', - VIEW_DATA = 'viewData', -} diff --git a/src/components/FlowChart/src/types.ts b/src/components/FlowChart/src/types.ts deleted file mode 100644 index 5e42aedb..00000000 --- a/src/components/FlowChart/src/types.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NodeConfig } from '@logicflow/core' -import { ToolbarTypeEnum } from './enum' - -export interface NodeItem extends NodeConfig { - icon: string -} - -export interface ToolbarConfig { - type?: string | ToolbarTypeEnum - tooltip?: string | boolean - icon?: string - disabled?: boolean - separate?: boolean -} diff --git a/src/components/FlowChart/src/useFlowContext.ts b/src/components/FlowChart/src/useFlowContext.ts deleted file mode 100644 index da348e5c..00000000 --- a/src/components/FlowChart/src/useFlowContext.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type LogicFlow from '@logicflow/core' - -import { provide, inject } from 'vue' - -const key = Symbol('flow-chart') - -type Instance = { - logicFlow: LogicFlow -} - -export function createFlowChartContext(instance: Instance) { - provide(key, instance) -} - -export function useFlowChartContext(): Instance { - return inject(key) as Instance -} diff --git a/src/views/modules/bpm/instance/Instance.api.ts b/src/views/modules/bpm/instance/Instance.api.ts index 8e05346a..59dd6066 100644 --- a/src/views/modules/bpm/instance/Instance.api.ts +++ b/src/views/modules/bpm/instance/Instance.api.ts @@ -1,7 +1,7 @@ import { defHttp } from '/@/utils/http/axios' import { BaseEntity } from '/#/web' import { PageResult, Result } from '/#/axios' -import { BpmModelNode } from '/@/views/modules/bpm/model/ModelNode.api' +import { BpmModelNode } from '/@/views/modules/bpm/model/node/ModelNode.api' /** * 分页 diff --git a/src/views/modules/bpm/model/BpmModelList.vue b/src/views/modules/bpm/model/BpmModelList.vue index 80728bc6..547a33d8 100644 --- a/src/views/modules/bpm/model/BpmModelList.vue +++ b/src/views/modules/bpm/model/BpmModelList.vue @@ -81,6 +81,7 @@ + @@ -93,11 +94,12 @@ import { copy, del, page, publish, verifyModel } from '/@/views/modules/bpm/model/Model.api' import BQuery from '/@/components/Bootx/Query/BQuery.vue' import { useDict } from '/@/hooks/bootx/useDict' - import { PUBLISHED, UNPUBLISHED } from './BpmModelNodeCode' + import { PUBLISHED, UNPUBLISHED } from './node/BpmModelNodeCode' import { useMessage } from '/@/hooks/web/useMessage' import { FormEditType } from '/@/enums/formTypeEnum' import BpmModelEdit from './BpmModelEdit.vue' - import BpmModelNodeList from './BpmModelNodeList.vue' + import BpmModelNodeList from './node/BpmModelNodeList.vue' + import BpmModeler from './BpmModeler.vue' const { handleTableChange, resetQueryParams, pageQueryResHandel, pagination, pages, model, loading } = useTablePage(queryPage) const { dictConvert } = useDict() diff --git a/src/views/modules/bpm/model/BpmModeler.vue b/src/views/modules/bpm/model/BpmModeler.vue new file mode 100644 index 00000000..1c7d2277 --- /dev/null +++ b/src/views/modules/bpm/model/BpmModeler.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/views/modules/bpm/model/BpmModelNodeCode.ts b/src/views/modules/bpm/model/node/BpmModelNodeCode.ts similarity index 100% rename from src/views/modules/bpm/model/BpmModelNodeCode.ts rename to src/views/modules/bpm/model/node/BpmModelNodeCode.ts diff --git a/src/views/modules/bpm/model/BpmModelNodeEdit.vue b/src/views/modules/bpm/model/node/BpmModelNodeEdit.vue similarity index 99% rename from src/views/modules/bpm/model/BpmModelNodeEdit.vue rename to src/views/modules/bpm/model/node/BpmModelNodeEdit.vue index d5e40279..53f96b59 100644 --- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue +++ b/src/views/modules/bpm/model/node/BpmModelNodeEdit.vue @@ -117,7 +117,7 @@ USER_GROUP, USER, ROLE, - } from '/@/views/modules/bpm/model/BpmModelNodeCode' + } from '/@/views/modules/bpm/model/node/BpmModelNodeCode' import BUserSelectModal from '/@/components/Bootx/UserSelectModal/BUserSelectModal.vue' import BRoleSelectModal from '/@/components/Bootx/RoleSelectModal/BRoleSelectModal.vue' import { UserInfo } from '/@/views/modules/system/user/User.api' diff --git a/src/views/modules/bpm/model/BpmModelNodeList.vue b/src/views/modules/bpm/model/node/BpmModelNodeList.vue similarity index 97% rename from src/views/modules/bpm/model/BpmModelNodeList.vue rename to src/views/modules/bpm/model/node/BpmModelNodeList.vue index 4b08da0c..6033f9c9 100644 --- a/src/views/modules/bpm/model/BpmModelNodeList.vue +++ b/src/views/modules/bpm/model/node/BpmModelNodeList.vue @@ -51,8 +51,8 @@ import { useMessage } from '/@/hooks/web/useMessage' import { useDict } from '/@/hooks/bootx/useDict' import { $ref } from 'vue/macros' - import { BpmModel } from './Model.api' - import { PUBLISHED } from '/@/views/modules/bpm/model/BpmModelNodeCode' + import { BpmModel } from '../Model.api' + import { PUBLISHED } from '/@/views/modules/bpm/model/node/BpmModelNodeCode' import { BpmModelNode, del, listByModelId, sync } from './ModelNode.api' import BpmModelNodeEdit from './BpmModelNodeEdit.vue' import { FormEditType } from '/@/enums/formTypeEnum' diff --git a/src/views/modules/bpm/model/ModelNode.api.ts b/src/views/modules/bpm/model/node/ModelNode.api.ts similarity index 100% rename from src/views/modules/bpm/model/ModelNode.api.ts rename to src/views/modules/bpm/model/node/ModelNode.api.ts diff --git a/src/views/modules/develop/query/QuerySql.api.ts b/src/views/modules/develop/query/QuerySql.api.ts new file mode 100644 index 00000000..4d60613f --- /dev/null +++ b/src/views/modules/develop/query/QuerySql.api.ts @@ -0,0 +1,82 @@ +import { defHttp } from '/@/utils/http/axios' +import { PageResult, Result } from '/#/axios' +import { BaseEntity } from '/#/web' + +/** + * 分页 + */ +export function page(params) { + return defHttp.get>>({ + url: '/query/sql/page', + params, + }) +} + +/** + * 查询全部 + */ +export function findAll() { + return defHttp.get>({ + url: '/query/sql/findAll', + }) +} + +/** + * 获取单条 + */ +export function get(id) { + return defHttp.get>({ + url: '/query/sql/findById', + params: { id }, + }) +} + +/** + * 添加 + */ +export function add(obj: QuerySql) { + return defHttp.post({ + url: '/query/sql/add', + data: obj, + }) +} + +/** + * 更新 + */ +export function update(obj: QuerySql) { + return defHttp.post({ + url: '/query/sql/update', + data: obj, + }) +} + +/** + * 删除 + */ +export function del(id) { + return defHttp.delete({ + url: '/query/sql/delete', + params: { id }, + }) +} + +/** + * SQL查询语句 + */ +export interface QuerySql extends BaseEntity { + // 数据源ID + databaseId?: string + // 名称 + name?: string + // sql语句 + sql?: string + // 是否集合 + isList?: boolean + // SQL查询参数 + params?: string + // SQL查询结果字段 + fields?: string + // 备注 + remark?: string +} diff --git a/src/views/modules/develop/query/QuerySqlEdit.vue b/src/views/modules/develop/query/QuerySqlEdit.vue new file mode 100644 index 00000000..485c59c8 --- /dev/null +++ b/src/views/modules/develop/query/QuerySqlEdit.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/views/modules/develop/query/QuerySqlList.vue b/src/views/modules/develop/query/QuerySqlList.vue new file mode 100644 index 00000000..83244aef --- /dev/null +++ b/src/views/modules/develop/query/QuerySqlList.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/yarn.lock b/yarn.lock index e4699c4c..76a7918a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1324,24 +1324,6 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@logicflow/core@^1.1.13", "@logicflow/core@^1.1.21": - version "1.1.21" - resolved "https://registry.npmmirror.com/@logicflow/core/-/core-1.1.21.tgz#80f3651a9559e7bf90631814f5cd3fe61e543e7a" - integrity sha512-LfFnHV009HhozPSWyFlLwsIsEXniFtjJKHGxQVxzRDwKqsgBOUBwyCTbDgejTIc4fw0zaINYhG5YRFSPGsDzWQ== - dependencies: - "@types/mousetrap" "^1.6.4" - mousetrap "^1.6.5" - preact "^10.4.8" - -"@logicflow/extension@^1.1.13": - version "1.1.21" - resolved "https://registry.npmmirror.com/@logicflow/extension/-/extension-1.1.21.tgz#efa91c2fe6712568270e222ff7b73859caf09d45" - integrity sha512-jUrChV89BC7QsyejGt3tIWX9/EGI/Rh+LFsht0OZDafgabk4D99D3J8Glg1UC/unh9dOUNDoD3Hs3xaO8gDBzg== - dependencies: - "@logicflow/core" "^1.1.21" - ids "^1.0.0" - preact "^10.4.8" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1750,11 +1732,6 @@ resolved "https://registry.npmmirror.com/@types/mockjs/-/mockjs-1.0.6.tgz#dafdd5de65156f7aa63eab4e29fa3d532cd95609" integrity sha512-Yu5YlqbYZyqsd6LjO4e8ONJDN9pTSnciHDcRP4teNOh/au2b8helFhgRx+3w8xsTFEnwr9jtfTVJbAx+eYmlHA== -"@types/mousetrap@^1.6.4": - version "1.6.9" - resolved "https://registry.npmmirror.com/@types/mousetrap/-/mousetrap-1.6.9.tgz#f1ef9adbd1eac3466f21b6988b1c82c633a45340" - integrity sha512-HUAiN65VsRXyFCTicolwb5+I7FM6f72zjMWr+ajGk+YTvzBgXqa2A5U7d+rtsouAkunJ5U4Sb5lNJjo9w+nmXg== - "@types/node@*", "@types/node@>=12": version "18.0.3" resolved "https://registry.npmmirror.com/@types/node/-/node-18.0.3.tgz#463fc47f13ec0688a33aec75d078a0541a447199" @@ -3107,11 +3084,6 @@ chardet@^0.7.0: resolved "https://registry.npmmirror.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -china-area-data@^5.0.1: - version "5.0.1" - resolved "https://registry.npmmirror.com/china-area-data/-/china-area-data-5.0.1.tgz#7943b83a0619f033bb5893da80cb46e52e44be66" - integrity sha512-BQDPpiv5Nn+018ekcJK2oSD9PAD+E1bvXB0wgabc//dFVS/KvRqCgg0QOEUt3vBkx9XzB5a9BmkJCEZDBxVjVw== - "chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2: version "3.5.3" resolved "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" @@ -7126,11 +7098,6 @@ modify-values@^1.0.0: resolved "https://registry.npmmirror.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== -mousetrap@^1.6.5: - version "1.6.5" - resolved "https://registry.npmmirror.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" - integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA== - mozjpeg@^7.0.0: version "7.1.1" resolved "https://registry.npmmirror.com/mozjpeg/-/mozjpeg-7.1.1.tgz#dfb61953536e66fcabd4ae795e7a312d42a51f18" @@ -7943,11 +7910,6 @@ posthtml@^0.9.2: posthtml-parser "^0.2.0" posthtml-render "^1.0.5" -preact@^10.4.8: - version "10.9.0" - resolved "https://registry.npmmirror.com/preact/-/preact-10.9.0.tgz#69b282b26926b66481c9ae3450cf68610fee29ff" - integrity sha512-jO6/OvCRL+OT8gst/+Q2ir7dMybZAX8ioP02Zmzh3BkQMHLyqZSujvxbUriXvHi8qmhcHKC2Gwbog6Kt+YTh+Q== - preact@^10.5.13: version "10.11.3" resolved "https://registry.npmmirror.com/preact/-/preact-10.11.3.tgz#8a7e4ba19d3992c488b0785afcc0f8aa13c78d19"