From fd01b5a61f1a92db90c00e7bb1b4162a2b61bfa3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 04 十二月 2024 11:42:07 +0800
Subject: [PATCH] update 优化 白名单支持对通配符路径匹配
---
src/views/workflow/processDefinition/index.vue | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 8f1096c..6c686bf 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -25,10 +25,10 @@
<el-card shadow="hover">
<el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
<el-form-item label="娴佺▼瀹氫箟鍚嶇О" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="娴佺▼瀹氫箟KEY" prop="key">
- <el-input v-model="queryParams.key" placeholder="璇疯緭鍏ユ祦绋嬪畾涔塊EY" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.key" placeholder="璇疯緭鍏ユ祦绋嬪畾涔塊EY" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
@@ -47,7 +47,7 @@
<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:show-search="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
@@ -61,12 +61,12 @@
</el-table-column>
<el-table-column align="center" prop="resourceName" label="娴佺▼XML" width="100" :show-overflow-tooltip="true">
<template #default="scope">
- <el-link type="primary" @click="clickPreviewXML(scope.row.id)">{{ scope.row.resourceName }}</el-link>
+ <el-link type="primary" @click="clickPreview(scope.row.id, 'xml')">{{ scope.row.resourceName }}</el-link>
</template>
</el-table-column>
<el-table-column align="center" prop="diagramResourceName" label="娴佺▼鍥剧墖" width="100" :show-overflow-tooltip="true">
<template #default="scope">
- <el-link type="primary" @click="clickPreviewImg(scope.row.id)">{{ scope.row.diagramResourceName }}</el-link>
+ <el-link type="primary" @click="clickPreview(scope.row.id, 'bpmn')">{{ scope.row.diagramResourceName }}</el-link>
</template>
</el-table-column>
<el-table-column align="center" prop="suspensionState" label="鐘舵��" width="80">
@@ -274,7 +274,7 @@
const previewRef = ref<InstanceType<typeof ProcessPreview>>();
const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>();
-const definitionConfigForm = ref<DefinitionConfigForm>();
+const definitionConfigForm = ref<DefinitionConfigForm>({});
type CategoryOption = {
categoryCode: string;
@@ -293,7 +293,6 @@
const uploadDialogLoading = ref(false);
const processDefinitionList = ref<ProcessDefinitionVO[]>([]);
const processDefinitionHistoryList = ref<ProcessDefinitionVO[]>([]);
-const url = ref<string[]>([]);
const categoryOptions = ref<CategoryOption[]>([]);
const categoryName = ref('');
/** 閮ㄧ讲鏂囦欢鍒嗙被閫夋嫨 */
@@ -400,28 +399,18 @@
loading.value = false;
};
-//棰勮鍥剧墖
-const clickPreviewImg = async (id: string) => {
- loading.value = true;
- const resp = await definitionImage(id);
- if (previewRef.value) {
- url.value = [];
- url.value.push('data:image/png;base64,' + resp.data);
- loading.value = false;
- previewRef.value.openDialog(url.value, 'png');
- }
-};
-//棰勮xml
-const clickPreviewXML = async (id: string) => {
+type PreviewType = 'xml' | 'bpmn';
+//棰勮 鍏叡鏂规硶
+const clickPreview = async (id: string, type: PreviewType) => {
loading.value = true;
const resp = await definitionXml(id);
if (previewRef.value) {
- url.value = [];
- url.value = resp.data.xml;
+ const xmlStr = resp.data.xmlStr;
loading.value = false;
- previewRef.value.openDialog(url.value, 'xml');
+ previewRef.value.openDialog(xmlStr, type);
}
};
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: ProcessDefinitionVO) => {
const id = row?.id || ids.value;
--
Gitblit v1.9.3