Pre Merge pull request !166 from dhb52/warm-flw-future

This commit is contained in:
dhb52 2024-12-11 09:07:48 +00:00 committed by Gitee
commit 15594c6c4b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 1 additions and 17 deletions

View File

@ -141,8 +141,6 @@
</el-card>
</el-col>
</el-row>
<!-- 预览图片或xml -->
<process-preview ref="previewRef" />
<!-- 部署文件 -->
<el-dialog v-if="uploadDialog.visible" v-model="uploadDialog.visible" :title="uploadDialog.title" width="30%">
@ -298,7 +296,6 @@
<script lang="ts" setup name="processDefinition">
import { listDefinition, definitionXml, deleteDefinition, active, importDef, getHisListByKey, publish, add, copy } from '@/api/workflow/definition';
import { getByTableNameNotDefId, getByDefId, saveOrUpdate } from '@/api/workflow/definitionConfig';
import ProcessPreview from './components/processPreview.vue';
import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types';
import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types';
@ -307,7 +304,6 @@ import { UploadRequestOptions } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const previewRef = ref<InstanceType<typeof ProcessPreview>>();
const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>();
const definitionConfigForm = ref<DefinitionConfigForm>({});
@ -451,18 +447,6 @@ const getProcessDefinitionHitoryList = async (id: string, key: string) => {
loading.value = false;
};
type PreviewType = 'xml' | 'bpmn';
//
const clickPreview = async (id: string, type: PreviewType) => {
loading.value = true;
const resp = await definitionXml(id);
if (previewRef.value) {
const xmlStr = resp.data.xmlStr;
loading.value = false;
previewRef.value.openDialog(xmlStr, type);
}
};
/** 删除按钮操作 */
const handleDelete = async (row?: FlowDefinitionVo) => {
const id = row?.id || ids.value;

View File

@ -102,7 +102,7 @@
</template>
<script lang="ts" setup>
import { pageByCurrent, deleteByInstanceIds, cancelProcessApply } from 'src/api/workflow/instance';
import { pageByCurrent, deleteByInstanceIds, cancelProcessApply } from '@/api/workflow/instance';
import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types';
import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';