mirror of
https://gitee.com/JavaLionLi/plus-ui.git
synced 2026-09-15 00:25:07 +08:00
Pre Merge pull request !228 from AprilWind/dev
This commit is contained in:
commit
55b13dbf3b
@ -5,7 +5,22 @@ export interface SpelVO {
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* 组件名称
|
||||
* 表达式类型(1默认办理人变量策略 2SpEL办理人变量策略)
|
||||
*/
|
||||
spelType: string;
|
||||
|
||||
/**
|
||||
* 所属分组
|
||||
*/
|
||||
spelGroup: string;
|
||||
|
||||
/**
|
||||
* 表达式名称(业务描述)
|
||||
*/
|
||||
spelName: string;
|
||||
|
||||
/**
|
||||
* 组件名称(类名)
|
||||
*/
|
||||
componentName: string;
|
||||
|
||||
@ -15,12 +30,12 @@ export interface SpelVO {
|
||||
methodName: string;
|
||||
|
||||
/**
|
||||
* 参数
|
||||
* 方法参数(名称)
|
||||
*/
|
||||
methodParams: string;
|
||||
|
||||
/**
|
||||
* 预览spel值
|
||||
* SpEL表达式(预览)
|
||||
*/
|
||||
viewSpel: string;
|
||||
|
||||
@ -29,10 +44,15 @@ export interface SpelVO {
|
||||
*/
|
||||
status: string;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
orderNum: number;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
remark?: string;
|
||||
remark: string;
|
||||
|
||||
}
|
||||
|
||||
@ -43,7 +63,22 @@ export interface SpelForm extends BaseEntity {
|
||||
id?: string | number;
|
||||
|
||||
/**
|
||||
* 组件名称
|
||||
* 表达式类型(1默认办理人变量策略 2SpEL办理人变量策略)
|
||||
*/
|
||||
spelType?: string;
|
||||
|
||||
/**
|
||||
* 所属分组
|
||||
*/
|
||||
spelGroup?: string;
|
||||
|
||||
/**
|
||||
* 表达式名称(业务描述)
|
||||
*/
|
||||
spelName?: string;
|
||||
|
||||
/**
|
||||
* 组件名称(类名)
|
||||
*/
|
||||
componentName?: string;
|
||||
|
||||
@ -53,12 +88,12 @@ export interface SpelForm extends BaseEntity {
|
||||
methodName?: string;
|
||||
|
||||
/**
|
||||
* 参数
|
||||
* 方法参数(名称)
|
||||
*/
|
||||
methodParams?: string;
|
||||
|
||||
/**
|
||||
* 预览spel值
|
||||
* SpEL表达式(预览)
|
||||
*/
|
||||
viewSpel?: string;
|
||||
|
||||
@ -67,6 +102,11 @@ export interface SpelForm extends BaseEntity {
|
||||
*/
|
||||
status?: string;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
orderNum?: number;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ -77,24 +117,19 @@ export interface SpelForm extends BaseEntity {
|
||||
export interface SpelQuery extends PageQuery {
|
||||
|
||||
/**
|
||||
* 组件名称
|
||||
* 表达式类型(1默认办理人变量策略 2SpEL办理人变量策略)
|
||||
*/
|
||||
componentName?: string;
|
||||
spelType?: string;
|
||||
|
||||
/**
|
||||
* 方法名
|
||||
* 所属分组
|
||||
*/
|
||||
methodName?: string;
|
||||
spelGroup?: string;
|
||||
|
||||
/**
|
||||
* 参数
|
||||
* 表达式名称(业务描述)
|
||||
*/
|
||||
methodParams?: string;
|
||||
|
||||
/**
|
||||
* 预览spel值
|
||||
*/
|
||||
viewSpel?: string;
|
||||
spelName?: string;
|
||||
|
||||
/**
|
||||
* 状态(0正常 1停用)
|
||||
|
||||
@ -4,11 +4,23 @@
|
||||
<div v-show="showSearch" class="mb-[10px]">
|
||||
<el-card shadow="hover">
|
||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
||||
<el-form-item label="组件名称" prop="componentName">
|
||||
<el-input v-model="queryParams.componentName" placeholder="请输入组件名称" clearable @keyup.enter="handleQuery" />
|
||||
<el-form-item label="名称" prop="spelName">
|
||||
<el-input v-model="queryParams.spelName" placeholder="请输入表达式名称" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="方法名" prop="methodName">
|
||||
<el-input v-model="queryParams.methodName" placeholder="请输入方法名" clearable @keyup.enter="handleQuery" />
|
||||
<el-form-item label="类型" prop="spelType">
|
||||
<el-select v-model="queryParams.spelType" placeholder="请选择表达式类型" clearable >
|
||||
<el-option v-for="dict in wf_spel_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="分组" prop="spelGroup">
|
||||
<el-select v-model="queryParams.spelGroup" placeholder="请选择所属分组" clearable >
|
||||
<el-option v-for="dict in wf_spel_group" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable >
|
||||
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@ -40,38 +52,26 @@
|
||||
|
||||
<el-table v-loading="loading" border :data="spelList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" type="index" width="60" align="center">
|
||||
<el-table-column label="主键id" align="center" prop="id" v-if="true" />
|
||||
<el-table-column label="表达式类型" align="center" prop="spelType">
|
||||
<template #default="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||
<dict-tag :options="wf_spel_type" :value="scope.row.spelType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组件名称" align="center">
|
||||
<el-table-column label="所属分组" align="center" prop="spelGroup">
|
||||
<template #default="scope">
|
||||
{{ scope.row.componentName || '-' }}
|
||||
<dict-tag :options="wf_spel_group" :value="scope.row.spelGroup"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="方法名称" align="center">
|
||||
<template #default="scope">
|
||||
{{ scope.row.methodName || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="参数名称" align="center">
|
||||
<template #default="scope">
|
||||
{{ scope.row.methodParams || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="SPEL表达式" align="center" prop="viewSpel" />
|
||||
<el-table-column label="表达式名称" align="center" prop="spelName" />
|
||||
<el-table-column label="SpEL表达式" align="center" prop="viewSpel" />
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template #default="scope">
|
||||
<el-tag v-if="scope.row.status === '0'">正常</el-tag>
|
||||
<el-tag v-else>停用</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center">
|
||||
<template #default="scope">
|
||||
{{ scope.row.remark || '-' }}
|
||||
<dict-tag :options="sys_normal_disable" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="显示顺序" align="center" prop="orderNum" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-tooltip content="修改" placement="top">
|
||||
@ -86,11 +86,32 @@
|
||||
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
</el-card>
|
||||
<!-- 添加或修改流程spel表达式定义对话框 -->
|
||||
<!-- 添加或修改流程表达式对话框 -->
|
||||
<el-dialog :title="dialog.title" v-model="dialog.visible" width="550px" append-to-body>
|
||||
<el-form ref="spelFormRef" :model="form" :rules="rules" label-width="100px">
|
||||
<!-- 组件名称 -->
|
||||
<el-form-item label="组件名称" prop="componentName">
|
||||
<el-form-item label="名称" prop="spelName">
|
||||
<el-input v-model="form.spelName" placeholder="请输入表达式名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属分组" prop="spelGroup">
|
||||
<el-select v-model="form.spelGroup" placeholder="请选择所属分组">
|
||||
<el-option
|
||||
v-for="dict in wf_spel_group"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型" prop="spelType">
|
||||
<el-radio-group v-model="form.spelType">
|
||||
<el-radio
|
||||
v-for="dict in wf_spel_type"
|
||||
:key="dict.value"
|
||||
:value="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="组件名称" prop="componentName" v-if="form.spelType !== '1'">
|
||||
<el-input v-model="form.componentName" placeholder="请输入组件名称" @input="updateViewSpel" />
|
||||
<template #label>
|
||||
<span>
|
||||
@ -101,7 +122,7 @@
|
||||
</span>
|
||||
</template>
|
||||
</el-form-item>
|
||||
<el-form-item label="方法名称" prop="methodName">
|
||||
<el-form-item label="方法名称" prop="methodName" v-if="form.spelType !== '1'">
|
||||
<el-input v-model="form.methodName" placeholder="请输入方法名称" @input="updateViewSpel" />
|
||||
<template #label>
|
||||
<span>
|
||||
@ -125,20 +146,25 @@
|
||||
</el-form-item>
|
||||
|
||||
<!-- 改为只读文本展示 -->
|
||||
<el-form-item label="SPEL表达式">
|
||||
<el-form-item label="SpEL表达式(预览)">
|
||||
<span class="preview-box">
|
||||
{{ form.viewSpel || '例如:#{@组件名.方法名(#方法参数)} 或 ${方法参数}' }}
|
||||
</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">
|
||||
{{ dict.label }}
|
||||
</el-radio>
|
||||
<el-radio
|
||||
v-for="dict in sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:value="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="orderNum">
|
||||
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@ -156,7 +182,7 @@ import { listSpel, getSpel, delSpel, addSpel, updateSpel } from '@/api/workflow/
|
||||
import { SpelVO, SpelQuery, SpelForm } from '@/api/workflow/spel/types';
|
||||
|
||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||
const { sys_show_hide, sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_show_hide', 'sys_normal_disable'));
|
||||
const { sys_normal_disable, wf_spel_group, wf_spel_type } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'wf_spel_group', 'wf_spel_type'));
|
||||
|
||||
const spelList = ref<SpelVO[]>([]);
|
||||
const buttonLoading = ref(false);
|
||||
@ -177,27 +203,42 @@ const dialog = reactive<DialogOption>({
|
||||
|
||||
const initFormData: SpelForm = {
|
||||
id: undefined,
|
||||
spelType: "2",
|
||||
spelGroup: "system",
|
||||
spelName: undefined,
|
||||
componentName: undefined,
|
||||
methodName: undefined,
|
||||
methodParams: undefined,
|
||||
viewSpel: undefined,
|
||||
status: '0',
|
||||
remark: undefined,
|
||||
status: "0",
|
||||
orderNum: 100,
|
||||
remark: undefined
|
||||
}
|
||||
const data = reactive<PageData<SpelForm, SpelQuery>>({
|
||||
form: {...initFormData},
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
componentName: undefined,
|
||||
methodName: undefined,
|
||||
methodParams: undefined,
|
||||
viewSpel: undefined,
|
||||
status: '0',
|
||||
spelType: undefined,
|
||||
spelGroup: undefined,
|
||||
spelName: undefined,
|
||||
status: undefined,
|
||||
params: {
|
||||
}
|
||||
},
|
||||
rules: {
|
||||
spelType: [
|
||||
{ required: true, message: "表达式类型不能为空", trigger: "change" }
|
||||
],
|
||||
spelGroup: [
|
||||
{ required: true, message: "所属分组不能为空", trigger: "change" }
|
||||
],
|
||||
spelName: [
|
||||
{ required: true, message: "表达式名称不能为空", trigger: "blur" }
|
||||
],
|
||||
viewSpel: [
|
||||
{ required: true, message: "SpEL表达式不能为空", trigger: "blur" }
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: "状态不能为空", trigger: "change" }
|
||||
],
|
||||
@ -206,7 +247,7 @@ const data = reactive<PageData<SpelForm, SpelQuery>>({
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
||||
/** 查询流程spel表达式定义列表 */
|
||||
/** 查询流程表达式列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true;
|
||||
const res = await listSpel(queryParams.value);
|
||||
@ -250,7 +291,7 @@ const handleSelectionChange = (selection: SpelVO[]) => {
|
||||
const handleAdd = () => {
|
||||
reset();
|
||||
dialog.visible = true;
|
||||
dialog.title = "添加流程spel表达式定义";
|
||||
dialog.title = "添加流程表达式";
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
@ -260,7 +301,7 @@ const handleUpdate = async (row?: SpelVO) => {
|
||||
const res = await getSpel(_id);
|
||||
Object.assign(form.value, res.data);
|
||||
dialog.visible = true;
|
||||
dialog.title = "修改流程spel表达式定义";
|
||||
dialog.title = "修改流程表达式";
|
||||
}
|
||||
|
||||
/** 提交按钮 */
|
||||
@ -283,7 +324,7 @@ const submitForm = () => {
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (row?: SpelVO) => {
|
||||
const _ids = row?.id || ids.value;
|
||||
await proxy?.$modal.confirm('是否确认删除流程spel表达式定义编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
|
||||
await proxy?.$modal.confirm('是否确认删除流程表达式编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
|
||||
await delSpel(_ids);
|
||||
proxy?.$modal.msgSuccess("删除成功");
|
||||
await getList();
|
||||
@ -291,7 +332,7 @@ const handleDelete = async (row?: SpelVO) => {
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = () => {
|
||||
proxy?.download('system/spel/export', {
|
||||
proxy?.download('workflow/spel/export', {
|
||||
...queryParams.value
|
||||
}, `spel_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user