提交 070bc6c0 authored 作者: kxjia's avatar kxjia

修改 找不到id问题

上级 05bcf8a9
...@@ -68,24 +68,24 @@ export function expList(query) { ...@@ -68,24 +68,24 @@ export function expList(query) {
// 读取xml文件 // 读取xml文件
export function readXml(deployId) { export function readXml(deployId) {
return defHttp.get({ return defHttp.get({
url: '/flowable/definition/readXml/' + deployId, url: '/flowable/definition/readXml',
method: 'get' params: {deployId:deployId}
}) })
} }
// 读取image文件 // 读取image文件
export function readImage(deployId) { export function readImage(deployId) {
return defHttp.get({ return defHttp.get({
url: '/flowable/definition/readImage/' + deployId, url: '/flowable/definition/readImage',
method: 'get' params: {deployId:deployId}
}) })
} }
// 获取流程执行节点 // 获取流程执行节点
export function getFlowViewer(procInsId, executionId) { export function getFlowViewer(procInsId, executionId) {
return defHttp.get({ return defHttp.get({
url: '/flowable/task/flowViewer/' + procInsId + '/' + executionId, url: '/flowable/task/flowViewer',
method: 'get' params: {procInsId:procInsId,executionId:executionId}
}) })
} }
...@@ -166,7 +166,7 @@ export function delDeployment(deployId,handleSuccess) { ...@@ -166,7 +166,7 @@ export function delDeployment(deployId,handleSuccess) {
onOk: () => { onOk: () => {
return defHttp.delete( return defHttp.delete(
{ {
url: `/flowable/definition/delete?deployId=${encodeURIComponent(deployId)}` url: `/flowable/definition/delete?deployId=${encodeURIComponent(deployId)}`,
}, },
).then(() => { ).then(() => {
handleSuccess(); handleSuccess();
...@@ -186,8 +186,9 @@ export function selectTableNameList() { ...@@ -186,8 +186,9 @@ export function selectTableNameList() {
// 部署流程实例 // 部署流程实例
export function definitionStartByDeployId(deployId, data) { export function definitionStartByDeployId(deployId, data) {
data["deployId"] = deployId
return defHttp.post({ return defHttp.post({
url: '/flowable/definition/startByDeployId/' + deployId, url: '/flowable/definition/startByDeployId',
data: data data: data
}) })
} }
......
...@@ -13,7 +13,8 @@ export function listExpression(query) { ...@@ -13,7 +13,8 @@ export function listExpression(query) {
// 查询流程达式详细 // 查询流程达式详细
export function getExpression(id) { export function getExpression(id) {
return defHttp.get({ return defHttp.get({
url: '/flowable/expression/' + id, url: '/flowable/expression',
params: {id:id}
}) })
} }
......
...@@ -21,14 +21,16 @@ export function flowRecord(query) { ...@@ -21,14 +21,16 @@ export function flowRecord(query) {
// 部署流程实例 // 部署流程实例
export function deployStart(deployId) { export function deployStart(deployId) {
return defHttp.get({ return defHttp.get({
url: '/flowable/process/startFlow/' + deployId, url: '/flowable/process/startFlow',
params: {deployId:deployId}
}) })
} }
// 查询流程定义详细 // 查询流程定义详细
export function getDeployment(id) { export function getDeployment(id) {
return defHttp.get({ return defHttp.get({
url: '/system/deployment/' + id url: '/system/deployment',
params: {id:id}
}) })
} }
......
...@@ -13,7 +13,8 @@ export function listListener(query) { ...@@ -13,7 +13,8 @@ export function listListener(query) {
// 查询流程监听详细 // 查询流程监听详细
export function getListener(id) { export function getListener(id) {
return defHttp.get({ return defHttp.get({
url: '/flowable/listener/' + id, url: '/flowable/listener',
params: {id:id}
}) })
} }
......
...@@ -58,14 +58,16 @@ export function returnList(data) { ...@@ -58,14 +58,16 @@ export function returnList(data) {
// 部署流程实例 // 部署流程实例
export function deployStart(deployId) { export function deployStart(deployId) {
return defHttp.get({ return defHttp.get({
url: '/flowable/process/startFlow/' + deployId, url: '/flowable/process/startFlow',
params: {deployId:deployId}
}) })
} }
// 查询流程定义详细 // 查询流程定义详细
export function getDeployment(id) { export function getDeployment(id) {
return defHttp.get({ return defHttp.get({
url: '/system/deployment/' + id, url: '/system/deployment',
params: {id:id}
}) })
} }
...@@ -88,7 +90,8 @@ export function updateDeployment(data) { ...@@ -88,7 +90,8 @@ export function updateDeployment(data) {
// 删除流程定义 // 删除流程定义
export function delDeployment(id) { export function delDeployment(id) {
return defHttp.delete({ return defHttp.delete({
url: '/system/deployment/' + id, url: '/system/deployment',
params: {id:id}
}) })
} }
......
...@@ -68,14 +68,16 @@ export function getNextFlowNodeByStart(data) { ...@@ -68,14 +68,16 @@ export function getNextFlowNodeByStart(data) {
// 部署流程实例 // 部署流程实例
export function deployStart(deployId) { export function deployStart(deployId) {
return defHttp.get({ return defHttp.get({
url: '/flowable/process/startFlow/' + deployId, url: '/flowable/process/startFlow',
params: {deployId:deployId}
}) })
} }
// 查询流程定义详细 // 查询流程定义详细
export function getDeployment(id) { export function getDeployment(id) {
return defHttp.get({ return defHttp.get({
url: '/system/deployment/' + id, url: '/system/deployment',
params: {id:id}
}) })
} }
...@@ -98,7 +100,8 @@ export function updateDeployment(data) { ...@@ -98,7 +100,8 @@ export function updateDeployment(data) {
// 删除流程定义 // 删除流程定义
export function delDeployment(id) { export function delDeployment(id) {
return defHttp.delete({ return defHttp.delete({
url: '/system/deployment/' + id, url: '/system/deployment',
params: {id:id}
}) })
} }
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<div style="background-color: black;"> <div style="background-color: black;">
<pre><code class="xml" v-html="highlightedXml"></code></pre> <pre><code class="xml" v-html="highlightedXml"></code></pre>
</div> </div>
</a-scrollbar> </a-scrollbar>
</a-drawer> </a-drawer>
</div> </div>
...@@ -34,15 +33,15 @@ import { readXml, saveXml } from "/@/components/Process/api/definition" ...@@ -34,15 +33,15 @@ import { readXml, saveXml } from "/@/components/Process/api/definition"
import BpmnModel from '/@/components/Process/index.vue' import BpmnModel from '/@/components/Process/index.vue'
import * as vkbeautify from 'vkbeautify' import * as vkbeautify from 'vkbeautify'
import hljs from 'highlight.js' import hljs from 'highlight.js'
import { useRouter,useRoute } from 'vue-router' import { useRouter, useRoute } from 'vue-router'
const router = useRouter();
const route = useRoute();
// 使用一个存在的样式文件
import "highlight.js/styles/atom-one-dark.css" import "highlight.js/styles/atom-one-dark.css"
const router = useRouter()
const route = useRoute()
// 定义类型 // 定义类型
interface ProcessData { interface ProcessData {
process: { process: {
...@@ -66,17 +65,16 @@ const xmlData = ref<string>('') ...@@ -66,17 +65,16 @@ const xmlData = ref<string>('')
// 计算属性,用于高亮显示的XML // 计算属性,用于高亮显示的XML
const highlightedXml = computed(() => { const highlightedXml = computed(() => {
if (!xmlData.value) return ''; if (!xmlData.value) return ''
return hljs.highlight(xmlData.value, { language: 'xml' }).value; return hljs.highlight(xmlData.value, { language: 'xml' }).value
}); })
// 获取XML数据 // 获取XML数据
const getXmlData = async (deployId: string) => { const getXmlData = async (deployId: string) => {
try { try {
xml.value = await readXml(deployId) xml.value = await readXml(deployId)
} catch (error) { } catch (error) {
console.error('Failed to fetch XML data:', error) console.error('Failed:', error)
} }
} }
...@@ -90,24 +88,35 @@ const save = async (data: ProcessData) => { ...@@ -90,24 +88,35 @@ const save = async (data: ProcessData) => {
try { try {
const res = await saveXml(params) const res = await saveXml(params)
await handleSuccess(); await handleSuccess()
} catch (error) { } catch (error) {
console.error('Failed to save XML:', error) console.error('Failed to save XML:', error)
} }
} }
const handleSuccess = async () => { const handleSuccess = async () => {
router.push({ path: '/flowable/definition/index' })
//closeSameRoute("/flowable/definition/AddFlow")
router.push({ path: '/flowable/definition/index'});
} }
// 展示XML // 展示XML
const showXML = (xmlContent: string) => { const showXML = (xmlContent: string) => {
xmlTitle.value = 'XML查看' xmlTitle.value = 'XML查看'
xmlOpen.value = true xmlOpen.value = true
xmlData.value = vkBeautify.xml(xmlContent)
// 修改2: 使用正确的大小写和调用方式
try {
// 第一种方式: 使用 default 导出(如果库是这种方式)
if (vkbeautify && typeof vkbeautify === 'object' && vkbeautify.xml) {
xmlData.value = vkbeautify.xml(xmlContent)
} else {
// 如果 vkbeautify 本身就是函数
xmlData.value = vkbeautify(xmlContent)
}
} catch (error) {
console.error('Failed to format XML:', error)
// 如果格式化失败,使用原始XML内容
xmlData.value = xmlContent
}
} }
onMounted(() => { onMounted(() => {
...@@ -155,7 +164,7 @@ onMounted(() => { ...@@ -155,7 +164,7 @@ onMounted(() => {
pre { pre {
margin: 0; margin: 0;
padding: 16px; padding: 16px;
//background-color: #282c34; // background-color: #282c34;
border-radius: 4px; border-radius: 4px;
code { code {
......
...@@ -238,7 +238,6 @@ function handleConfigForm(row: RowVO) { ...@@ -238,7 +238,6 @@ function handleConfigForm(row: RowVO) {
function handleDesign(row: RowVO) { function handleDesign(row: RowVO) {
if (isOperationInProgress('design', row.id)) return; if (isOperationInProgress('design', row.id)) return;
setOperationState('design', row.id, true); setOperationState('design', row.id, true);
try { try {
const url = "/flowable/definition/AddFlow"; const url = "/flowable/definition/AddFlow";
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论