admin/lx-admin-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复代码缩进，类型名称错误

Browse Source
This commit is contained in:
LiuHao 2024-04-15 10:22:44 +08:00
parent 9da3f1f2d7
commit 64fb2899c9
3 changed files with 70 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/workflow/definitionConfig/index.ts
View File

@ -2,10 +2,9 @@ import request from '@/utils/request';
import { AxiosPromise } from 'axios'; import { AxiosPromise } from 'axios';
import { DefinitionConfigVO, DefinitionConfigForm } from '@/api/workflow/definitionConfig/types'; import { DefinitionConfigVO, DefinitionConfigForm } from '@/api/workflow/definitionConfig/types';
/** /**
* 查询表单配置详细 * 查询表单配置详细
* @param id * @param definitionId
*/ */
export const getByDefId = (definitionId: string | number): AxiosPromise<DefinitionConfigVO> => { export const getByDefId = (definitionId: string | number): AxiosPromise<DefinitionConfigVO> => {
return request({ return request({
@ -40,9 +39,9 @@ export const deldefinitionConfig = (id: string | number | Array<string | number>
/** /**
* 查询流程定义配置排除当前查询的流程定义 * 查询流程定义配置排除当前查询的流程定义
* @param tableName * @param tableName
* @param tableName * @param definitionId
*/ */
export const getByTableNameNotDefId = (tableName: string,definitionId: string ) => { export const getByTableNameNotDefId = (tableName: string, definitionId: string | number) => {
return request({ return request({
url: `/workflow/definitionConfig/getByTableNameNotDefId/${tableName}/${definitionId}`, url: `/workflow/definitionConfig/getByTableNameNotDefId/${tableName}/${definitionId}`,
method: 'get' method: 'get'

8
src/api/workflow/definitionConfig/types.ts
View File

@ -35,7 +35,6 @@ export interface DefinitionConfigVO {
* 表单管理 * 表单管理
*/ */
wfFormManageVo: FormManageVO; wfFormManageVo: FormManageVO;
} }
export interface DefinitionConfigForm extends BaseEntity { export interface DefinitionConfigForm extends BaseEntity {
@ -73,12 +72,9 @@ export interface DefinitionConfigForm extends BaseEntity {
* 表单管理 * 表单管理
*/ */
wfFormManageVo: FormManageVO; wfFormManageVo: FormManageVO;
} }
export interface DefinitionConfigQuery extends PageQuery { export interface DefinitionConfigQuery extends PageQuery {
/** /**
* 表名 * 表名
*/ */
@ -103,8 +99,4 @@ export interface DefinitionConfigQuery extends PageQuery {
* 表单管理 * 表单管理
*/ */
wfFormManageVo: FormManageVO; wfFormManageVo: FormManageVO;
} }

111
src/views/workflow/processDefinition/index.vue
View File

@ -38,23 +38,20 @@
</el-card> </el-card>
</div> </div>
</transition> </transition>
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
<el-button type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
</el-card>
</div>
</transition>
<el-card shadow="hover"> <el-card shadow="hover">
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> </el-col> <el-col :span="1.5">
<el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row> </el-row>
</template> </template>
<el-table border v-loading="loading" :data="processDefinitionList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="processDefinitionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column> <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
<el-table-column align="center" prop="name" label="流程定义名称" :show-overflow-tooltip="true"></el-table-column> <el-table-column align="center" prop="name" label="流程定义名称" :show-overflow-tooltip="true"></el-table-column>
@ -101,7 +98,9 @@
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="text" size="small" icon="Document" @click="getProcessDefinitionHitoryList(scope.row.id, scope.row.key)">历史版本</el-button> <el-button link type="primary" size="small" icon="Document" @click="getProcessDefinitionHitoryList(scope.row.id, scope.row.key)">
历史版本
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
@ -112,7 +111,7 @@
<el-button link type="primary" size="small" icon="Sort" @click="handleConvertToModel(scope.row)"> 转换模型 </el-button> <el-button link type="primary" size="small" icon="Sort" @click="handleConvertToModel(scope.row)"> 转换模型 </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="text" size="small" icon="Tickets" @click="handleDefinitionConfigOpen(scope.row)">绑定业务</el-button> <el-button link type="primary" size="small" icon="Tickets" @click="handleDefinitionConfigOpen(scope.row)">绑定业务</el-button>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
@ -222,16 +221,22 @@
</el-dialog> </el-dialog>
<!-- 表单配置 --> <!-- 表单配置 -->
<el-dialog v-model="definitionConfigDialog.visible" :title="definitionConfigDialog.title" width="650px" append-to-body :close-on-click-modal="false"> <el-dialog
v-model="definitionConfigDialog.visible"
:title="definitionConfigDialog.title"
width="650px"
append-to-body
:close-on-click-modal="false"
>
<el-form :model="definitionConfigForm" label-width="auto"> <el-form :model="definitionConfigForm" label-width="auto">
<el-form-item label="流程KEY"> <el-form-item label="流程KEY">
<el-input v-model="definitionConfigForm.processKey" disabled/> <el-input v-model="definitionConfigForm.processKey" disabled />
</el-form-item> </el-form-item>
<el-form-item label="表名" prop="formId"> <el-form-item label="表名" prop="formId">
<el-input v-model="definitionConfigForm.tableName" placeholder="示例:test_leave"/> <el-input v-model="definitionConfigForm.tableName" placeholder="示例:test_leave" />
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="definitionConfigForm.remark" type="textarea" resize="none"/> <el-input v-model="definitionConfigForm.remark" type="textarea" resize="none" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -256,12 +261,12 @@ import {
deployProcessFile, deployProcessFile,
getListByKey getListByKey
} from '@/api/workflow/processDefinition'; } from '@/api/workflow/processDefinition';
import { getByTableNameNotDefId,getByDefId,saveOrUpdate } from '@/api/workflow/definitionConfig'; import { getByTableNameNotDefId, getByDefId, saveOrUpdate } from '@/api/workflow/definitionConfig';
import ProcessPreview from './components/processPreview.vue'; import ProcessPreview from './components/processPreview.vue';
import { listCategory } from '@/api/workflow/category'; import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types'; import { CategoryVO } from '@/api/workflow/category/types';
import { ProcessDefinitionQuery, ProcessDefinitionVO } from '@/api/workflow/processDefinition/types'; import { ProcessDefinitionQuery, ProcessDefinitionVO } from '@/api/workflow/processDefinition/types';
import { definitionConfigForm } from '@/api/workflow/definitionConfig/types'; import { DefinitionConfigForm } from '@/api/workflow/definitionConfig/types';
import { UploadRequestOptions, ElMessage, ElMessageBox } from 'element-plus'; import { UploadRequestOptions, ElMessage, ElMessageBox } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -269,7 +274,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const previewRef = ref<InstanceType<typeof ProcessPreview>>(); const previewRef = ref<InstanceType<typeof ProcessPreview>>();
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>(); const categoryTreeRef = ref<ElTreeInstance>();
const definitionConfigForm = ref<definitionConfigForm>({}); const definitionConfigForm = ref<DefinitionConfigForm>();
type CategoryOption = { type CategoryOption = {
categoryCode: string; categoryCode: string;
@ -418,11 +423,11 @@ const clickPreviewXML = async (id: string) => {
} }
}; };
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (row: ProcessDefinitionVO) => { const handleDelete = async (row?: ProcessDefinitionVO) => {
const id = row.id || ids.value; const id = row?.id || ids.value;
const deployIds = row.deploymentId || deploymentIds.value; const deployIds = row?.deploymentId || deploymentIds.value;
const defKeys = row.key || keys.value; const defKeys = row?.key || keys.value;
await proxy?.$modal.confirm('是否确认删除流程定义KEY为【' + keys.value + '】的数据项？'); await proxy?.$modal.confirm('是否确认删除流程定义KEY为【' + defKeys + '】的数据项？');
loading.value = true; loading.value = true;
await deleteProcessDefinition(deployIds, id).finally(() => (loading.value = false)); await deleteProcessDefinition(deployIds, id).finally(() => (loading.value = false));
await getList(); await getList();
@ -480,46 +485,44 @@ const handerDeployProcessFile = (data: UploadRequestOptions): XMLHttpRequest =>
}; };
//打开流程定义配置 //打开流程定义配置
const handleDefinitionConfigOpen = async (row: ProcessDefinitionVO) => { const handleDefinitionConfigOpen = async (row: ProcessDefinitionVO) => {
definitionConfigDialog.visible = true definitionConfigDialog.visible = true;
definitionConfigForm.value.processKey = row.key definitionConfigForm.value.processKey = row.key;
definitionConfigForm.value.definitionId = row.id definitionConfigForm.value.definitionId = row.id;
definitionConfigForm.value.version = row.version definitionConfigForm.value.version = row.version;
const resp = await getByDefId(row.id) const resp = await getByDefId(row.id);
if(resp.data){ if (resp.data) {
definitionConfigForm.value = resp.data definitionConfigForm.value = resp.data;
}else{ } else {
definitionConfigForm.value.tableName = undefined definitionConfigForm.value.tableName = undefined;
definitionConfigForm.value.remark = undefined definitionConfigForm.value.remark = undefined;
} }
} };
//保存表单 //保存表单
const handlerSaveForm = async () => { const handlerSaveForm = async () => {
getByTableNameNotDefId(definitionConfigForm.value.tableName,definitionConfigForm.value.definitionId).then(res => { getByTableNameNotDefId(definitionConfigForm.value.tableName, definitionConfigForm.value.definitionId).then((res) => {
if(res.data && res.data.length > 0){ if (res.data && res.data.length > 0) {
ElMessageBox.confirm('表名已被【'+res.data[0].processKey+'】版本v'+res.data[0].version+'.0绑定确认后将会删除绑定的流程KEY!','提示',{ ElMessageBox.confirm('表名已被【' + res.data[0].processKey + '】版本v' + res.data[0].version + '.0绑定确认后将会删除绑定的流程KEY!', '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
} }).then(() => {
).then(() => { saveOrUpdate(definitionConfigForm.value).then((resp) => {
saveOrUpdate(definitionConfigForm.value).then(resp=>{ if (resp.code === 200) {
if(resp.code === 200){
proxy?.$modal.msgSuccess('操作成功'); proxy?.$modal.msgSuccess('操作成功');
definitionConfigDialog.visible = false definitionConfigDialog.visible = false;
getList(); getList();
} }
}) });
}) });
}else{ } else {
saveOrUpdate(definitionConfigForm.value).then(resp=>{ saveOrUpdate(definitionConfigForm.value).then((resp) => {
if(resp.code === 200){ if (resp.code === 200) {
proxy?.$modal.msgSuccess('操作成功'); proxy?.$modal.msgSuccess('操作成功');
definitionConfigDialog.visible = false definitionConfigDialog.visible = false;
getList(); getList();
} }
}) });
} }
}) });
};
}
</script> </script>