diff --git a/package.json b/package.json index d57618dbb1ae9add60d5c27345cf4e4bebb784eb..404f581421ee208de6d3abee00f10b3fe1e19ea4 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@wangeditor/plugin-md": "^1.0.0", "ant-design-vue": "^1.7.8", "axios": "^0.27.2", - "bpmn-js": "^7.5.0", + "bpmn-js": "^8.9.0", "core-js": "^3.24.0", "cron-parser": "^4.5.0", "echarts": "^5.3.3", diff --git a/src/api/develop/dynamicDataSource.js b/src/api/develop/dynamicDataSource.js index 3a3e0087dd8ea7546545bde2202281f5c572dfd1..8ecd9b638be102b86935b8f3ae9fba18f1a5afea 100644 --- a/src/api/develop/dynamicDataSource.js +++ b/src/api/develop/dynamicDataSource.js @@ -64,3 +64,120 @@ export function del (id) { method: 'DELETE' }) } + +/** + * 测试连接 + */ +export const testConnection = (obj) => { + return axios({ + url: '/dynamic/source/testConnection', + data: obj, + method: 'POST' + }) +} + +/** + * 测试连接 + */ +export const testConnectionById = (id) => { + return axios({ + url: '/dynamic/source/testConnectionById', + params: { id }, + method: 'GET' + }) +} + +/** + * 根据id进行添加到连接池中 + */ +export const addDynamicDataSourceById = (id) => { + return axios({ + url: '/dynamic/source/addDynamicDataSourceById', + params: { id }, + method: 'POST' + }) +} + +/** + * 判断编码是否被使用 + */ +export const existsByCode = (code) => { + return axios({ + url: '/dynamic/source/existsByCode', + params: { code }, + method: 'GET' + }) +} + +/** + * 判断编码是否被使用 + */ +export const existsByCodeNotId = (code, id) => { + return axios({ + url: '/dynamic/source/existsByCodeNotId', + params: { code, id }, + method: 'GET' + }) +} +/** + * 判断是否已经添加到连接池中 + */ +export const existsByDataSourceKey = (code) => { + return axios({ + url: '/dynamic/source/existsByDataSourceKey', + params: { code }, + method: 'GET' + }) +} + +/** + * 查询当前数据源列表 + */ +export const findAllDataSource = () => { + return axios({ + url: '/dynamic/source/findAllDataSource', + method: 'GET' + }) +} + +/** + * 从数据源列表中删除指定数据源 + */ +export const removeDataSourceByKey = (key) => { + return axios({ + url: '/dynamic/source/removeDataSourceByKey', + params: { key }, + method: 'DELETE' + }) +} + +/** + * 数据类型列表 + */ +export const databaseTypes = [ + { value: 'mysql', label: 'MySQL' }, + { value: 'oracle', label: 'Oracle' }, + { value: 'mssql', label: 'SQLServer' }, +] + +/** + * 数据类型关联信息列表 + */ +export // 数据列表 +const databaseTypeMap = { + mysql: { + dbDriver: 'com.mysql.cj.jdbc.Driver', + dbUrl: + 'jdbc:mysql://127.0.0.1:3306/bootx?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai', + }, + oracle: { + dbDriver: 'oracle.jdbc.OracleDriver', + dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:BOOTX', + }, + mssql: { + dbDriver: 'com.microsoft.sqlserver.jdbc.SQLServerDriver', + dbUrl: 'jdbc:mysql://127.0.0.1:3306/bootx?characterEncoding=UTF-8&useUnicode=true&useSSL=false', + }, +} + + diff --git a/src/assets/css/components.less b/src/assets/css/components.less index dd003d1b8da6037240f76d1994caf284f9403257..f4a5c6dfe016475db15460376a754faadd1ce26a 100644 --- a/src/assets/css/components.less +++ b/src/assets/css/components.less @@ -53,7 +53,7 @@ } /* wangEditor end */ -/* vxe end */ +/* vxe start */ // vxe模态框样式 .vxe-modal--wrapper{ // 层级与保持antdv一致 diff --git a/src/components/Bpmn/BpmData.js b/src/components/Bpmn/BpmData.js index 6900fa0c637fda5af88ef9613209bc83859fb1e2..e634b32e85860833a6c9c4b0cba3679147952646 100644 --- a/src/components/Bpmn/BpmData.js +++ b/src/components/Bpmn/BpmData.js @@ -2,12 +2,12 @@ * 存储流程设计相关参数 */ export default class BpmData { - constructor() { + constructor () { this.controls = [] // 设计器控件 this.init() } - init() { + init () { this.controls = [ { action: 'hand-tool', @@ -78,7 +78,7 @@ export default class BpmData { } // 获取控件配置信息 - getControl(action) { + getControl (action) { const result = this.controls.filter(item => item.action === action) return result[0] || {} } diff --git a/src/components/Bpmn/WorkflowBpmnModeler.vue b/src/components/Bpmn/WorkflowBpmnModeler.vue index 47aee63e222a3696fa7b7c5c733ea405b06fc243..90166479d62a33f9b037e27c9863e59eb3b113aa 100644 --- a/src/components/Bpmn/WorkflowBpmnModeler.vue +++ b/src/components/Bpmn/WorkflowBpmnModeler.vue @@ -75,7 +75,7 @@
- +
@@ -83,8 +83,9 @@ @@ -135,7 +136,6 @@ -
diff --git a/src/mixins/FormMixin.js b/src/mixins/FormMixin.js index e8553b4369f386afb528f5eb8b8ce9687091868d..65ac7873c7386d96f09a1b4815791f727c65d3d2 100644 --- a/src/mixins/FormMixin.js +++ b/src/mixins/FormMixin.js @@ -3,7 +3,6 @@ import { getDictItemsAsync, getDictItemsByNumber, getDictItemsByNumberAsync } from '@/components/Bootx/Dict/DictUtils' -import { findByParamKey } from '@/api/system/param' export const FormMixin = { data () { diff --git a/src/views/modules/bpm/model/BpmModelList.vue b/src/views/modules/bpm/model/BpmModelList.vue index 1c8d0a64b11b04238199f6e4d73a128f12310983..fd78b6e7eb74b6f8b66db9631c8a56df16d4d69f 100644 --- a/src/views/modules/bpm/model/BpmModelList.vue +++ b/src/views/modules/bpm/model/BpmModelList.vue @@ -103,7 +103,7 @@ import { TableMixin } from '@/mixins/TableMixin' import { copy, del, page, publish, verifyModel } from '@/api/bpm/model' import BpmModelEdit from './BpmModelEdit' import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode' -import BpmModelNodeList from './BpmModelNodeList' +import BpmModelNodeList from './node/BpmModelNodeList.vue' import BpmModeler from './BpmModeler' export default { diff --git a/src/views/modules/bpm/model/BpmModeler.vue b/src/views/modules/bpm/model/BpmModeler.vue index 4423ec6c77103368c409a955a784dce3ed9e97ca..d2ee3ec3086d4607bb4308aa788ccca67cb9027f 100644 --- a/src/views/modules/bpm/model/BpmModeler.vue +++ b/src/views/modules/bpm/model/BpmModeler.vue @@ -6,7 +6,6 @@ :esc-closable="false" :show-footer="false" :show-header="isView" - @close="handleCancel" > { - this.confirmLoading = true await uploadBpmn(this.bpmModel.id, data.xml) - this.confirmLoading = false - this.$emit('ok') + this.$message.success('保存成功') this.visible = false } }) }, cancel () { - if (this.isEdit){ + if (this.isEdit) { this.$confirm({ title: '警告', content: '关闭后后将不对编辑的内容进行保存', diff --git a/src/views/modules/bpm/model/BpmModelNodeCode.js b/src/views/modules/bpm/model/node/BpmModelNodeCode.js similarity index 100% rename from src/views/modules/bpm/model/BpmModelNodeCode.js rename to src/views/modules/bpm/model/node/BpmModelNodeCode.js 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 19882e594ce58b8c6bbedb0784604aa6a29e7d70..29621034123afcaf56f6343a5887dc6a27d51e6d 100644 --- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue +++ b/src/views/modules/bpm/model/node/BpmModelNodeEdit.vue @@ -160,8 +160,8 @@ + + diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue index 564242ab30ff7a12e348339efd0908e4caf51187..4b8e9949e812088d50a4b1dbec0ad8e4d0e1f0ee 100644 --- a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue +++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue @@ -1,12 +1,11 @@