fix(@vben/web-antd): resolve typecheck issues blocking pre-commit
- fix map Select handler value typing - remove unused AI template refs and normalize v-for indexes - clean stale BPMN form field editor code - type BPMN listener helpers and modal grid rows - preserve node-name input focus with function refs - add CRM receivable list fields and query param typespull/365/head
parent
53053524f6
commit
56435b45f8
|
|
@ -12,6 +12,7 @@ export namespace CrmReceivableApi {
|
||||||
customerId?: number;
|
customerId?: number;
|
||||||
customerName?: string;
|
customerName?: string;
|
||||||
contractId?: number;
|
contractId?: number;
|
||||||
|
contractNo?: string;
|
||||||
contract?: Contract;
|
contract?: Contract;
|
||||||
auditStatus: number;
|
auditStatus: number;
|
||||||
processInstanceId: number;
|
processInstanceId: number;
|
||||||
|
|
@ -34,6 +35,11 @@ export namespace CrmReceivableApi {
|
||||||
no: string;
|
no: string;
|
||||||
totalPrice: number;
|
totalPrice: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ReceivablePageParam extends PageParam {
|
||||||
|
contractId?: number;
|
||||||
|
customerId?: number;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 查询回款列表 */
|
/** 查询回款列表 */
|
||||||
|
|
@ -45,7 +51,9 @@ export function getReceivablePage(params: PageParam) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 查询回款列表,基于指定客户 */
|
/** 查询回款列表,基于指定客户 */
|
||||||
export function getReceivablePageByCustomer(params: PageParam) {
|
export function getReceivablePageByCustomer(
|
||||||
|
params: CrmReceivableApi.ReceivablePageParam,
|
||||||
|
) {
|
||||||
return requestClient.get<PageResult<CrmReceivableApi.Receivable>>(
|
return requestClient.get<PageResult<CrmReceivableApi.Receivable>>(
|
||||||
'/crm/receivable/page-by-customer',
|
'/crm/receivable/page-by-customer',
|
||||||
{ params },
|
{ params },
|
||||||
|
|
|
||||||
|
|
@ -136,9 +136,13 @@ function autoSearch(queryValue: string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 处理地址选择 */
|
/** 处理地址选择 */
|
||||||
function handleAddressSelect(value: string) {
|
function handleAddressSelect(value: unknown) {
|
||||||
if (value) {
|
const selectedValue =
|
||||||
regeoCode(value);
|
typeof value === 'object' && value !== null && 'value' in value
|
||||||
|
? (value as { value?: number | string }).value
|
||||||
|
: value;
|
||||||
|
if (selectedValue !== undefined && selectedValue !== null) {
|
||||||
|
regeoCode(String(selectedValue));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,6 @@ const document = ref<null | {
|
||||||
}[];
|
}[];
|
||||||
title: string;
|
title: string;
|
||||||
}>(null); // 知识库文档列表
|
}>(null); // 知识库文档列表
|
||||||
const dialogVisible = ref(false); // 知识引用详情弹窗
|
|
||||||
const documentRef = ref<HTMLElement>(); // 知识引用详情弹窗 Ref
|
|
||||||
|
|
||||||
/** 按照 document 聚合 segments */
|
/** 按照 document 聚合 segments */
|
||||||
const documentList = computed(() => {
|
const documentList = computed(() => {
|
||||||
|
|
@ -49,7 +47,6 @@ const documentList = computed(() => {
|
||||||
/** 点击 document 处理 */
|
/** 点击 document 处理 */
|
||||||
function handleClick(doc: any) {
|
function handleClick(doc: any) {
|
||||||
document.value = doc;
|
document.value = doc;
|
||||||
dialogVisible.value = true;
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
@ -79,7 +76,7 @@ function handleClick(doc: any) {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Tooltip placement="topLeft" trigger="click">
|
<Tooltip placement="topLeft" trigger="click">
|
||||||
<div ref="documentRef"></div>
|
<div></div>
|
||||||
<template #title>
|
<template #title>
|
||||||
<div class="mb-3 text-base font-bold">{{ document?.title }}</div>
|
<div class="mb-3 text-base font-bold">{{ document?.title }}</div>
|
||||||
<div class="max-h-[60vh] overflow-y-auto">
|
<div class="max-h-[60vh] overflow-y-auto">
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,6 @@ const props = defineProps({
|
||||||
});
|
});
|
||||||
const emits = defineEmits(['onBtnClick', 'onMjBtnClick']);
|
const emits = defineEmits(['onBtnClick', 'onMjBtnClick']);
|
||||||
|
|
||||||
const cardImageRef = ref<any>(); // 卡片 image ref
|
|
||||||
|
|
||||||
/** 处理点击事件 */
|
/** 处理点击事件 */
|
||||||
async function handleButtonClick(type: string, detail: AiImageApi.Image) {
|
async function handleButtonClick(type: string, detail: AiImageApi.Image) {
|
||||||
emits('onBtnClick', type, detail);
|
emits('onBtnClick', type, detail);
|
||||||
|
|
@ -110,7 +108,7 @@ onMounted(async () => {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 图片展示区域 -->
|
<!-- 图片展示区域 -->
|
||||||
<div class="mt-5 h-72 flex-1 overflow-hidden" ref="cardImageRef">
|
<div class="mt-5 h-72 flex-1 overflow-hidden">
|
||||||
<Image class="w-full rounded-lg" :src="detail?.picUrl" />
|
<Image class="w-full rounded-lg" :src="detail?.picUrl" />
|
||||||
<div v-if="detail?.status === AiImageStatusEnum.FAIL">
|
<div v-if="detail?.status === AiImageStatusEnum.FAIL">
|
||||||
{{ detail?.errorMessage }}
|
{{ detail?.errorMessage }}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@ const queryParams = reactive({
|
||||||
}); // 图片分页相关的参数
|
}); // 图片分页相关的参数
|
||||||
const pageTotal = ref<number>(0); // page size
|
const pageTotal = ref<number>(0); // page size
|
||||||
const imageList = ref<AiImageApi.Image[]>([]); // image 列表
|
const imageList = ref<AiImageApi.Image[]>([]); // image 列表
|
||||||
const imageListRef = ref<any>(); // ref
|
|
||||||
|
|
||||||
const inProgressImageMap = ref<{}>({}); // 监听的 image 映射,一般是生成中(需要轮询),key 为 image 编号,value 为 image
|
const inProgressImageMap = ref<{}>({}); // 监听的 image 映射,一般是生成中(需要轮询),key 为 image 编号,value 为 image
|
||||||
const inProgressTimer = ref<any>(); // 生成中的 image 定时器,轮询生成进展
|
const inProgressTimer = ref<any>(); // 生成中的 image 定时器,轮询生成进展
|
||||||
|
|
@ -190,7 +189,6 @@ onUnmounted(async () => {
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="flex flex-1 flex-wrap content-start overflow-y-auto p-3 pb-28 pt-5"
|
class="flex flex-1 flex-wrap content-start overflow-y-auto p-3 pb-28 pt-5"
|
||||||
ref="imageListRef"
|
|
||||||
>
|
>
|
||||||
<ImageCard
|
<ImageCard
|
||||||
v-for="image in imageList"
|
v-for="image in imageList"
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,8 @@ const currentFile = ref<any>(null); // 当前选中的文件
|
||||||
const submitLoading = ref(false); // 提交按钮加载状态
|
const submitLoading = ref(false); // 提交按钮加载状态
|
||||||
|
|
||||||
/** 选择文件 */
|
/** 选择文件 */
|
||||||
async function selectFile(index: number) {
|
async function selectFile(index: number | string) {
|
||||||
currentFile.value = modelData.value.list[index];
|
currentFile.value = modelData.value.list[Number(index)];
|
||||||
await splitContentFile(currentFile.value);
|
await splitContentFile(currentFile.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -256,7 +256,8 @@ onMounted(async () => {
|
||||||
class="mb-2.5"
|
class="mb-2.5"
|
||||||
>
|
>
|
||||||
<div class="mb-1 text-sm text-gray-500">
|
<div class="mb-1 text-sm text-gray-500">
|
||||||
分片-{{ index + 1 }} · {{ segment.contentLength || 0 }} 字符数 ·
|
分片-{{ Number(index) + 1 }} ·
|
||||||
|
{{ segment.contentLength || 0 }} 字符数 ·
|
||||||
{{ segment.tokens || 0 }} Token
|
{{ segment.tokens || 0 }} Token
|
||||||
</div>
|
</div>
|
||||||
<div class="rounded-md bg-card p-2">
|
<div class="rounded-md bg-card p-2">
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,6 @@ const props = defineProps({
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits(['update:modelValue']);
|
const emit = defineEmits(['update:modelValue']);
|
||||||
const formRef = ref(); // 表单引用
|
|
||||||
const uploadRef = ref(); // 上传组件引用
|
|
||||||
const parent = inject('parent', null); // 获取父组件实例
|
const parent = inject('parent', null); // 获取父组件实例
|
||||||
const { uploadUrl, httpRequest } = useUpload(); // 使用上传组件的钩子
|
const { uploadUrl, httpRequest } = useUpload(); // 使用上传组件的钩子
|
||||||
const fileList = ref<UploadProps['fileList']>([]); // 文件列表
|
const fileList = ref<UploadProps['fileList']>([]); // 文件列表
|
||||||
|
|
@ -148,10 +146,10 @@ async function customRequest(info: UploadRequestOption) {
|
||||||
*
|
*
|
||||||
* @param index 要移除的文件索引
|
* @param index 要移除的文件索引
|
||||||
*/
|
*/
|
||||||
function removeFile(index: number) {
|
function removeFile(index: number | string) {
|
||||||
// 从列表中移除文件
|
// 从列表中移除文件
|
||||||
const newList = [...props.modelValue.list];
|
const newList = [...props.modelValue.list];
|
||||||
newList.splice(index, 1);
|
newList.splice(Number(index), 1);
|
||||||
// 更新表单数据
|
// 更新表单数据
|
||||||
emit('update:modelValue', {
|
emit('update:modelValue', {
|
||||||
...props.modelValue,
|
...props.modelValue,
|
||||||
|
|
@ -186,14 +184,13 @@ onMounted(() => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<Form ref="formRef" :model="modelData" label-width="0" class="mt-5">
|
<Form :model="modelData" label-width="0" class="mt-5">
|
||||||
<Form.Item class="mb-5">
|
<Form.Item class="mb-5">
|
||||||
<div class="w-full">
|
<div class="w-full">
|
||||||
<div
|
<div
|
||||||
class="w-full rounded-md border-2 border-dashed border-gray-200 p-5 text-center hover:border-blue-500"
|
class="w-full rounded-md border-2 border-dashed border-gray-200 p-5 text-center hover:border-blue-500"
|
||||||
>
|
>
|
||||||
<UploadDragger
|
<UploadDragger
|
||||||
ref="uploadRef"
|
|
||||||
class="upload-demo"
|
class="upload-demo"
|
||||||
:action="uploadUrl"
|
:action="uploadUrl"
|
||||||
v-model:file-list="fileList"
|
v-model:file-list="fileList"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
<!-- eslint-disable no-unused-vars -->
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { computed, inject, nextTick, onMounted, ref, toRaw, watch } from 'vue';
|
import { computed, inject, nextTick, onMounted, ref, toRaw, watch } from 'vue';
|
||||||
|
|
||||||
|
|
@ -24,26 +23,7 @@ const prefix = inject('prefix');
|
||||||
|
|
||||||
const formKey = ref<number | string | undefined>(undefined);
|
const formKey = ref<number | string | undefined>(undefined);
|
||||||
const businessKey = ref('');
|
const businessKey = ref('');
|
||||||
const optionModelTitle = ref('');
|
|
||||||
const fieldList = ref<any[]>([]);
|
const fieldList = ref<any[]>([]);
|
||||||
const formFieldForm = ref<any>({});
|
|
||||||
const fieldType = ref({
|
|
||||||
long: '长整型',
|
|
||||||
string: '字符串',
|
|
||||||
boolean: '布尔类',
|
|
||||||
date: '日期类',
|
|
||||||
enum: '枚举类',
|
|
||||||
custom: '自定义类型',
|
|
||||||
});
|
|
||||||
const formFieldIndex = ref(-1); // 编辑中的字段, -1 为新增
|
|
||||||
const formFieldOptionIndex = ref(-1); // 编辑中的字段配置项, -1 为新增
|
|
||||||
const fieldModelVisible = ref(false);
|
|
||||||
const fieldOptionModelVisible = ref(false);
|
|
||||||
const fieldOptionForm = ref<any>({}); // 当前激活的字段配置项数据
|
|
||||||
const fieldOptionType = ref(''); // 当前激活的字段配置项弹窗 类型
|
|
||||||
const fieldEnumList = ref<any[]>([]); // 枚举值列表
|
|
||||||
const fieldConstraintsList = ref<any[]>([]); // 约束条件列表
|
|
||||||
const fieldPropertiesList = ref<any[]>([]); // 绑定属性列表
|
|
||||||
const bpmnELement = ref();
|
const bpmnELement = ref();
|
||||||
const elExtensionElements = ref();
|
const elExtensionElements = ref();
|
||||||
const formData = ref();
|
const formData = ref();
|
||||||
|
|
@ -94,173 +74,6 @@ const _updateElementBusinessKey = () => {
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
// 根据类型调整字段type
|
|
||||||
const _changeFieldTypeType = (type: any) => {
|
|
||||||
formFieldForm.value.type = type === 'custom' ? '' : type;
|
|
||||||
};
|
|
||||||
|
|
||||||
// 打开字段详情侧边栏
|
|
||||||
const _openFieldForm = (field: any, index: any) => {
|
|
||||||
formFieldIndex.value = index;
|
|
||||||
if (index === -1) {
|
|
||||||
formFieldForm.value = {};
|
|
||||||
// 初始化枚举值列表
|
|
||||||
fieldEnumList.value = [];
|
|
||||||
// 初始化约束条件列表
|
|
||||||
fieldConstraintsList.value = [];
|
|
||||||
// 初始化自定义属性列表
|
|
||||||
fieldPropertiesList.value = [];
|
|
||||||
} else {
|
|
||||||
const FieldObject = formData.value.fields[index];
|
|
||||||
formFieldForm.value = cloneDeep(field);
|
|
||||||
// 设置自定义类型
|
|
||||||
// this.$set(this.formFieldForm, "typeType", !this.fieldType[field.type] ? "custom" : field.type);
|
|
||||||
formFieldForm.value.typeType = fieldType.value[
|
|
||||||
field.type as keyof typeof fieldType.value
|
|
||||||
]
|
|
||||||
? field.type
|
|
||||||
: 'custom';
|
|
||||||
// 初始化枚举值列表
|
|
||||||
field.type === 'enum' &&
|
|
||||||
(fieldEnumList.value = cloneDeep(FieldObject?.values || []));
|
|
||||||
// 初始化约束条件列表
|
|
||||||
fieldConstraintsList.value = cloneDeep(
|
|
||||||
FieldObject?.validation?.constraints || [],
|
|
||||||
);
|
|
||||||
// 初始化自定义属性列表
|
|
||||||
fieldPropertiesList.value = cloneDeep(
|
|
||||||
FieldObject?.properties?.values || [],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
fieldModelVisible.value = true;
|
|
||||||
};
|
|
||||||
// 打开字段 某个 配置项 弹窗
|
|
||||||
const _openFieldOptionForm = (option: any, index: any, type: any) => {
|
|
||||||
fieldOptionModelVisible.value = true;
|
|
||||||
fieldOptionType.value = type;
|
|
||||||
formFieldOptionIndex.value = index;
|
|
||||||
if (type === 'property') {
|
|
||||||
fieldOptionForm.value = option ? cloneDeep(option) : {};
|
|
||||||
return (optionModelTitle.value = '属性配置');
|
|
||||||
}
|
|
||||||
if (type === 'enum') {
|
|
||||||
fieldOptionForm.value = option ? cloneDeep(option) : {};
|
|
||||||
return (optionModelTitle.value = '枚举值配置');
|
|
||||||
}
|
|
||||||
fieldOptionForm.value = option ? cloneDeep(option) : {};
|
|
||||||
return (optionModelTitle.value = '约束条件配置');
|
|
||||||
};
|
|
||||||
|
|
||||||
// 保存字段 某个 配置项
|
|
||||||
const _saveFieldOption = () => {
|
|
||||||
if (formFieldOptionIndex.value === -1) {
|
|
||||||
if (fieldOptionType.value === 'property') {
|
|
||||||
fieldPropertiesList.value.push(fieldOptionForm.value);
|
|
||||||
}
|
|
||||||
if (fieldOptionType.value === 'constraint') {
|
|
||||||
fieldConstraintsList.value.push(fieldOptionForm.value);
|
|
||||||
}
|
|
||||||
if (fieldOptionType.value === 'enum') {
|
|
||||||
fieldEnumList.value.push(fieldOptionForm.value);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
fieldOptionType.value === 'property' &&
|
|
||||||
fieldPropertiesList.value.splice(
|
|
||||||
formFieldOptionIndex.value,
|
|
||||||
1,
|
|
||||||
fieldOptionForm.value,
|
|
||||||
);
|
|
||||||
fieldOptionType.value === 'constraint' &&
|
|
||||||
fieldConstraintsList.value.splice(
|
|
||||||
formFieldOptionIndex.value,
|
|
||||||
1,
|
|
||||||
fieldOptionForm.value,
|
|
||||||
);
|
|
||||||
fieldOptionType.value === 'enum' &&
|
|
||||||
fieldEnumList.value.splice(
|
|
||||||
formFieldOptionIndex.value,
|
|
||||||
1,
|
|
||||||
fieldOptionForm.value,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
fieldOptionModelVisible.value = false;
|
|
||||||
fieldOptionForm.value = {};
|
|
||||||
};
|
|
||||||
// 保存字段配置
|
|
||||||
const _saveField = () => {
|
|
||||||
const { id, type, label, defaultValue, datePattern } = formFieldForm.value;
|
|
||||||
const Field = bpmnInstances().moddle.create(`${prefix}:FormField`, {
|
|
||||||
id,
|
|
||||||
type,
|
|
||||||
label,
|
|
||||||
});
|
|
||||||
defaultValue && (Field.defaultValue = defaultValue);
|
|
||||||
datePattern && (Field.datePattern = datePattern);
|
|
||||||
// 构建属性
|
|
||||||
if (fieldPropertiesList.value && fieldPropertiesList.value.length > 0) {
|
|
||||||
const fieldPropertyList = fieldPropertiesList.value.map((fp: any) => {
|
|
||||||
return bpmnInstances().moddle.create(`${prefix}:Property`, {
|
|
||||||
id: fp.id,
|
|
||||||
value: fp.value,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
Field.properties = bpmnInstances().moddle.create(`${prefix}:Properties`, {
|
|
||||||
values: fieldPropertyList,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// 构建校验规则
|
|
||||||
if (fieldConstraintsList.value && fieldConstraintsList.value.length > 0) {
|
|
||||||
const fieldConstraintList = fieldConstraintsList.value.map((fc: any) => {
|
|
||||||
return bpmnInstances().moddle.create(`${prefix}:Constraint`, {
|
|
||||||
name: fc.name,
|
|
||||||
config: fc.config,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
Field.validation = bpmnInstances().moddle.create(`${prefix}:Validation`, {
|
|
||||||
constraints: fieldConstraintList,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// 构建枚举值
|
|
||||||
if (fieldEnumList.value && fieldEnumList.value.length > 0) {
|
|
||||||
Field.values = fieldEnumList.value.map((fe: any) => {
|
|
||||||
return bpmnInstances().moddle.create(`${prefix}:Value`, {
|
|
||||||
name: fe.name,
|
|
||||||
id: fe.id,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// 更新数组 与 表单配置实例
|
|
||||||
if (formFieldIndex.value === -1) {
|
|
||||||
fieldList.value.push(formFieldForm.value);
|
|
||||||
formData.value.fields.push(Field);
|
|
||||||
} else {
|
|
||||||
fieldList.value.splice(formFieldIndex.value, 1, formFieldForm.value);
|
|
||||||
formData.value.fields.splice(formFieldIndex.value, 1, Field);
|
|
||||||
}
|
|
||||||
updateElementExtensions();
|
|
||||||
fieldModelVisible.value = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
// 移除某个 字段的 配置项
|
|
||||||
const _removeFieldOptionItem = (_option: any, index: any, type: any) => {
|
|
||||||
// console.log(option, 'option')
|
|
||||||
if (type === 'property') {
|
|
||||||
fieldPropertiesList.value.splice(index, 1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (type === 'enum') {
|
|
||||||
fieldEnumList.value.splice(index, 1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
fieldConstraintsList.value.splice(index, 1);
|
|
||||||
};
|
|
||||||
// 移除 字段
|
|
||||||
const _removeField = (field: any, index: any) => {
|
|
||||||
console.warn(field, 'field');
|
|
||||||
fieldList.value.splice(index, 1);
|
|
||||||
formData.value.fields.splice(index, 1);
|
|
||||||
updateElementExtensions();
|
|
||||||
};
|
|
||||||
|
|
||||||
const updateElementExtensions = () => {
|
const updateElementExtensions = () => {
|
||||||
// 更新回扩展元素
|
// 更新回扩展元素
|
||||||
|
|
@ -329,211 +142,5 @@ watch(
|
||||||
</Select>
|
</Select>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
</Form>
|
</Form>
|
||||||
|
|
||||||
<!--字段列表-->
|
|
||||||
<!-- <div class="element-property list-property">-->
|
|
||||||
<!-- <Divider><Icon icon="ep:coin" /> 表单字段</Divider>-->
|
|
||||||
<!-- <Table :data-source="fieldList" :scroll="{ y: 240 }" bordered>-->
|
|
||||||
<!-- <TableColumn title="序号" type="index" width="50px" />-->
|
|
||||||
<!-- <TableColumn title="字段名称" dataIndex="label" width="80px" :ellipsis="true" />-->
|
|
||||||
<!-- <TableColumn-->
|
|
||||||
<!-- title="字段类型"-->
|
|
||||||
<!-- dataIndex="type"-->
|
|
||||||
<!-- width="80px"-->
|
|
||||||
<!-- :customRender="({ text }) => fieldType[text] || text"-->
|
|
||||||
<!-- :ellipsis="true"-->
|
|
||||||
<!-- />-->
|
|
||||||
<!-- <TableColumn-->
|
|
||||||
<!-- title="默认值"-->
|
|
||||||
<!-- dataIndex="defaultValue"-->
|
|
||||||
<!-- width="80px"-->
|
|
||||||
<!-- :ellipsis="true"-->
|
|
||||||
<!-- />-->
|
|
||||||
<!-- <TableColumn title="操作" width="90px">-->
|
|
||||||
<!-- <template #default="scope">-->
|
|
||||||
<!-- <Button type="link" @click="openFieldForm(scope, scope.$index)">-->
|
|
||||||
<!-- 编辑-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- <Divider type="vertical" />-->
|
|
||||||
<!-- <Button-->
|
|
||||||
<!-- type="link"-->
|
|
||||||
<!-- danger-->
|
|
||||||
<!-- @click="removeField(scope, scope.$index)"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- 移除-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </TableColumn>-->
|
|
||||||
<!-- </Table>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <div class="element-drawer__button">-->
|
|
||||||
<!-- <Button type="primary" @click="openFieldForm(null, -1)">添加字段</Button>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
|
|
||||||
<!--字段配置侧边栏-->
|
|
||||||
<!-- <Drawer-->
|
|
||||||
<!-- v-model:open="fieldModelVisible"-->
|
|
||||||
<!-- title="字段配置"-->
|
|
||||||
<!-- :width="`${width}px`"-->
|
|
||||||
<!-- destroyOnClose-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- <Form :model="formFieldForm" :label-col="{ style: { width: '90px' } }">-->
|
|
||||||
<!-- <FormItem label="字段ID">-->
|
|
||||||
<!-- <Input v-model:value="formFieldForm.id" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="类型">-->
|
|
||||||
<!-- <Select-->
|
|
||||||
<!-- v-model:value="formFieldForm.typeType"-->
|
|
||||||
<!-- placeholder="请选择字段类型"-->
|
|
||||||
<!-- allowClear-->
|
|
||||||
<!-- @change="changeFieldTypeType"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- <SelectOption v-for="(value, key) of fieldType" :key="key" :value="key">{{ value }}</SelectOption>-->
|
|
||||||
<!-- </Select>-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="类型名称" v-if="formFieldForm.typeType === 'custom'">-->
|
|
||||||
<!-- <Input v-model:value="formFieldForm.type" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="名称">-->
|
|
||||||
<!-- <Input v-model:value="formFieldForm.label" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="时间格式" v-if="formFieldForm.typeType === 'date'">-->
|
|
||||||
<!-- <Input v-model:value="formFieldForm.datePattern" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="默认值">-->
|
|
||||||
<!-- <Input v-model:value="formFieldForm.defaultValue" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- </Form>-->
|
|
||||||
|
|
||||||
<!-- <!– 枚举值设置 –>-->
|
|
||||||
<!-- <template v-if="formFieldForm.type === 'enum'">-->
|
|
||||||
<!-- <Divider key="enum-divider" />-->
|
|
||||||
<!-- <p class="listener-filed__title" key="enum-title">-->
|
|
||||||
<!-- <span><Icon icon="ep:menu" />枚举值列表:</span>-->
|
|
||||||
<!-- <Button type="primary" @click="openFieldOptionForm(null, -1, 'enum')"-->
|
|
||||||
<!-- >添加枚举值</Button-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- </p>-->
|
|
||||||
<!-- <Table :data-source="fieldEnumList" key="enum-table" :scroll="{ y: 240 }" bordered>-->
|
|
||||||
<!-- <TableColumn title="序号" width="50px" type="index" />-->
|
|
||||||
<!-- <TableColumn title="枚举值编号" dataIndex="id" width="100px" :ellipsis="true" />-->
|
|
||||||
<!-- <TableColumn title="枚举值名称" dataIndex="name" width="100px" :ellipsis="true" />-->
|
|
||||||
<!-- <TableColumn title="操作" width="90px">-->
|
|
||||||
<!-- <template #default="scope">-->
|
|
||||||
<!-- <Button-->
|
|
||||||
<!-- type="link"-->
|
|
||||||
<!-- @click="openFieldOptionForm(scope, scope.$index, 'enum')"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- 编辑-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- <Divider type="vertical" />-->
|
|
||||||
<!-- <Button-->
|
|
||||||
<!-- type="link"-->
|
|
||||||
<!-- danger-->
|
|
||||||
<!-- @click="removeFieldOptionItem(scope, scope.$index, 'enum')"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- 移除-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </TableColumn>-->
|
|
||||||
<!-- </Table>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
|
|
||||||
<!-- <!– 校验规则 –>-->
|
|
||||||
<!-- <Divider key="validation-divider" />-->
|
|
||||||
<!-- <p class="listener-filed__title" key="validation-title">-->
|
|
||||||
<!-- <span><Icon icon="ep:menu" />约束条件列表:</span>-->
|
|
||||||
<!-- <Button type="primary" @click="openFieldOptionForm(null, -1, 'constraint')"-->
|
|
||||||
<!-- >添加约束</Button-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- </p>-->
|
|
||||||
<!-- <Table :data-source="fieldConstraintsList" key="validation-table" :scroll="{ y: 240 }" bordered>-->
|
|
||||||
<!-- <TableColumn title="序号" width="50px" type="index" />-->
|
|
||||||
<!-- <TableColumn title="约束名称" dataIndex="name" width="100px" :ellipsis="true" />-->
|
|
||||||
<!-- <TableColumn title="约束配置" dataIndex="config" width="100px" :ellipsis="true" />-->
|
|
||||||
<!-- <TableColumn title="操作" width="90px">-->
|
|
||||||
<!-- <template #default="scope">-->
|
|
||||||
<!-- <Button-->
|
|
||||||
<!-- type="link"-->
|
|
||||||
<!-- @click="openFieldOptionForm(scope, scope.$index, 'constraint')"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- 编辑-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- <Divider type="vertical" />-->
|
|
||||||
<!-- <Button-->
|
|
||||||
<!-- type="link"-->
|
|
||||||
<!-- danger-->
|
|
||||||
<!-- @click="removeFieldOptionItem(scope, scope.$index, 'constraint')"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- 移除-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </TableColumn>-->
|
|
||||||
<!-- </Table>-->
|
|
||||||
|
|
||||||
<!-- <!– 表单属性 –>-->
|
|
||||||
<!-- <Divider key="property-divider" />-->
|
|
||||||
<!-- <p class="listener-filed__title" key="property-title">-->
|
|
||||||
<!-- <span><Icon icon="ep:menu" />字段属性列表:</span>-->
|
|
||||||
<!-- <Button type="primary" @click="openFieldOptionForm(null, -1, 'property')"-->
|
|
||||||
<!-- >添加属性</Button-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- </p>-->
|
|
||||||
<!-- <Table :data-source="fieldPropertiesList" key="property-table" :scroll="{ y: 240 }" bordered>-->
|
|
||||||
<!-- <TableColumn title="序号" width="50px" type="index" />-->
|
|
||||||
<!-- <TableColumn title="属性编号" dataIndex="id" width="100px" :ellipsis="true" />-->
|
|
||||||
<!-- <TableColumn title="属性值" dataIndex="value" width="100px" :ellipsis="true" />-->
|
|
||||||
<!-- <TableColumn title="操作" width="90px">-->
|
|
||||||
<!-- <template #default="scope">-->
|
|
||||||
<!-- <Button-->
|
|
||||||
<!-- type="link"-->
|
|
||||||
<!-- @click="openFieldOptionForm(scope, scope.$index, 'property')"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- 编辑-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- <Divider type="vertical" />-->
|
|
||||||
<!-- <Button-->
|
|
||||||
<!-- type="link"-->
|
|
||||||
<!-- danger-->
|
|
||||||
<!-- @click="removeFieldOptionItem(scope, scope.$index, 'property')"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- 移除-->
|
|
||||||
<!-- </Button>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </TableColumn>-->
|
|
||||||
<!-- </Table>-->
|
|
||||||
|
|
||||||
<!-- <!– 底部按钮 –>-->
|
|
||||||
<!-- <div class="element-drawer__button">-->
|
|
||||||
<!-- <Button>取 消</Button>-->
|
|
||||||
<!-- <Button type="primary" @click="saveField">保 存</Button>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- </Drawer>-->
|
|
||||||
|
|
||||||
<!-- <Modal-->
|
|
||||||
<!-- v-model:open="fieldOptionModelVisible"-->
|
|
||||||
<!-- :title="optionModelTitle"-->
|
|
||||||
<!-- width="600px"-->
|
|
||||||
<!-- destroyOnClose-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- <Form :model="fieldOptionForm" :label-col="{ style: { width: '96px' } }">-->
|
|
||||||
<!-- <FormItem label="编号/ID" v-if="fieldOptionType !== 'constraint'" key="option-id">-->
|
|
||||||
<!-- <Input v-model:value="fieldOptionForm.id" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="名称" v-if="fieldOptionType !== 'property'" key="option-name">-->
|
|
||||||
<!-- <Input v-model:value="fieldOptionForm.name" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="配置" v-if="fieldOptionType === 'constraint'" key="option-config">-->
|
|
||||||
<!-- <Input v-model:value="fieldOptionForm.config" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- <FormItem label="值" v-if="fieldOptionType === 'property'" key="option-value">-->
|
|
||||||
<!-- <Input v-model:value="fieldOptionForm.value" allowClear />-->
|
|
||||||
<!-- </FormItem>-->
|
|
||||||
<!-- </Form>-->
|
|
||||||
<!-- <template #footer>-->
|
|
||||||
<!-- <Button @click="fieldOptionModelVisible = false">取 消</Button>-->
|
|
||||||
<!-- <Button type="primary" @click="saveFieldOption">确 定</Button>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </Modal>-->
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ const props = defineProps({
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
const prefix = inject('prefix');
|
const prefix = inject<string>('prefix', 'flowable'); // 增加默认值flowable
|
||||||
const elementListenersList = ref<any[]>([]); // 监听器列表
|
const elementListenersList = ref<any[]>([]); // 监听器列表
|
||||||
const listenerForm = ref<any>({}); // 监听器详情表单
|
const listenerForm = ref<any>({}); // 监听器详情表单
|
||||||
const fieldsListOfListener = ref<any[]>([]);
|
const fieldsListOfListener = ref<any[]>([]);
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ interface Props {
|
||||||
type?: string;
|
type?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const prefix = inject<string>('prefix');
|
const prefix = inject<string>('prefix', 'flowable');
|
||||||
|
|
||||||
const elementListenersList = ref<any[]>([]);
|
const elementListenersList = ref<any[]>([]);
|
||||||
const listenerEventTypeObject = ref(eventType);
|
const listenerEventTypeObject = ref(eventType);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
||||||
|
|
||||||
import { inject, nextTick, ref, watch } from 'vue';
|
import { inject, nextTick, ref, watch } from 'vue';
|
||||||
|
|
||||||
import { confirm, useVbenModal } from '@vben/common-ui';
|
import { confirm, useVbenModal } from '@vben/common-ui';
|
||||||
|
|
@ -151,7 +153,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
},
|
} as VxeTableGridOptions<{ name: string; value: string }>,
|
||||||
});
|
});
|
||||||
|
|
||||||
const [FieldModal, fieldModalApi] = useVbenModal({
|
const [FieldModal, fieldModalApi] = useVbenModal({
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,35 @@
|
||||||
const bpmnInstances = () => (window as any)?.bpmnInstances;
|
const bpmnInstances = () => (window as any)?.bpmnInstances;
|
||||||
|
|
||||||
|
interface ListenerFieldOptions {
|
||||||
|
expression?: string;
|
||||||
|
fieldType: string;
|
||||||
|
name: string;
|
||||||
|
string?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ListenerOptions {
|
||||||
|
class?: string;
|
||||||
|
delegateExpression?: string;
|
||||||
|
event?: string;
|
||||||
|
eventDefinitionType?: string;
|
||||||
|
eventTimeDefinitions?: string;
|
||||||
|
expression?: string;
|
||||||
|
fields?: ListenerFieldOptions[];
|
||||||
|
id?: string;
|
||||||
|
listenerType?: string;
|
||||||
|
resource?: string;
|
||||||
|
scriptFormat?: string;
|
||||||
|
scriptType?: string;
|
||||||
|
value?: string;
|
||||||
|
}
|
||||||
|
|
||||||
// 创建监听器实例
|
// 创建监听器实例
|
||||||
export function createListenerObject(options, isTask, prefix) {
|
export function createListenerObject(
|
||||||
const listenerObj = Object.create(null);
|
options: ListenerOptions,
|
||||||
|
isTask: boolean,
|
||||||
|
prefix: string,
|
||||||
|
) {
|
||||||
|
const listenerObj: Record<string, any> = Object.create(null);
|
||||||
listenerObj.event = options.event;
|
listenerObj.event = options.event;
|
||||||
isTask && (listenerObj.id = options.id); // 任务监听器特有的 id 字段
|
isTask && (listenerObj.id = options.id); // 任务监听器特有的 id 字段
|
||||||
switch (options.listenerType) {
|
switch (options.listenerType) {
|
||||||
|
|
@ -52,7 +80,10 @@ export function createListenerObject(options, isTask, prefix) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建 监听器的注入字段 实例
|
// 创建 监听器的注入字段 实例
|
||||||
export function createFieldObject(option, prefix) {
|
export function createFieldObject(
|
||||||
|
option: ListenerFieldOptions,
|
||||||
|
prefix: string,
|
||||||
|
) {
|
||||||
const { name, fieldType, string, expression } = option;
|
const { name, fieldType, string, expression } = option;
|
||||||
const fieldConfig =
|
const fieldConfig =
|
||||||
fieldType === 'string' ? { name, string } : { name, expression };
|
fieldType === 'string' ? { name, string } : { name, expression };
|
||||||
|
|
@ -60,7 +91,7 @@ export function createFieldObject(option, prefix) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建脚本实例
|
// 创建脚本实例
|
||||||
export function createScriptObject(options, prefix) {
|
export function createScriptObject(options: ListenerOptions, prefix: string) {
|
||||||
const { scriptType, scriptFormat, value, resource } = options;
|
const { scriptType, scriptFormat, value, resource } = options;
|
||||||
const scriptConfig =
|
const scriptConfig =
|
||||||
scriptType === 'inlineScript'
|
scriptType === 'inlineScript'
|
||||||
|
|
@ -70,7 +101,7 @@ export function createScriptObject(options, prefix) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新元素扩展属性
|
// 更新元素扩展属性
|
||||||
export function updateElementExtensions(element, extensionList) {
|
export function updateElementExtensions(element: any, extensionList: any[]) {
|
||||||
const extensions = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
|
const extensions = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
|
||||||
values: extensionList,
|
values: extensionList,
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,9 @@ const currentNode = useWatchNode(props);
|
||||||
/** 节点名称配置 */
|
/** 节点名称配置 */
|
||||||
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
||||||
useNodeName(BpmNodeTypeEnum.CHILD_PROCESS_NODE);
|
useNodeName(BpmNodeTypeEnum.CHILD_PROCESS_NODE);
|
||||||
|
function setInputRef(el: unknown) {
|
||||||
|
inputRef.value = el as HTMLInputElement | null;
|
||||||
|
}
|
||||||
// 激活的 Tab 标签页
|
// 激活的 Tab 标签页
|
||||||
const activeTabName = ref('child');
|
const activeTabName = ref('child');
|
||||||
// 子流程表单配置
|
// 子流程表单配置
|
||||||
|
|
@ -391,7 +394,7 @@ onMounted(async () => {
|
||||||
<div class="config-header">
|
<div class="config-header">
|
||||||
<Input
|
<Input
|
||||||
v-if="showInput"
|
v-if="showInput"
|
||||||
ref="inputRef"
|
:ref="setInputRef"
|
||||||
type="text"
|
type="text"
|
||||||
class="focus:border-blue-500 focus:shadow-[0_0_0_2px_rgba(24,144,255,0.2)] focus:outline-none"
|
class="focus:border-blue-500 focus:shadow-[0_0_0_2px_rgba(24,144,255,0.2)] focus:outline-none"
|
||||||
@blur="changeNodeName()"
|
@blur="changeNodeName()"
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,9 @@ const currentNode = useWatchNode(props);
|
||||||
// 节点名称
|
// 节点名称
|
||||||
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
||||||
useNodeName(BpmNodeTypeEnum.COPY_TASK_NODE);
|
useNodeName(BpmNodeTypeEnum.COPY_TASK_NODE);
|
||||||
|
function setInputRef(el: unknown) {
|
||||||
|
inputRef.value = el as HTMLInputElement | null;
|
||||||
|
}
|
||||||
|
|
||||||
// 激活的 Tab 标签页
|
// 激活的 Tab 标签页
|
||||||
const activeTabName = ref('user');
|
const activeTabName = ref('user');
|
||||||
|
|
@ -211,7 +214,7 @@ defineExpose({ showCopyTaskNodeConfig }); // 暴露方法给父组件
|
||||||
<div class="config-header">
|
<div class="config-header">
|
||||||
<Input
|
<Input
|
||||||
v-if="showInput"
|
v-if="showInput"
|
||||||
ref="inputRef"
|
:ref="setInputRef"
|
||||||
type="text"
|
type="text"
|
||||||
class="focus:border-blue-500 focus:shadow-[0_0_0_2px_rgba(24,144,255,0.2)] focus:outline-none"
|
class="focus:border-blue-500 focus:shadow-[0_0_0_2px_rgba(24,144,255,0.2)] focus:outline-none"
|
||||||
@blur="changeNodeName()"
|
@blur="changeNodeName()"
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,9 @@ const currentNode = useWatchNode(props);
|
||||||
// 节点名称
|
// 节点名称
|
||||||
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
||||||
useNodeName(BpmNodeTypeEnum.DELAY_TIMER_NODE);
|
useNodeName(BpmNodeTypeEnum.DELAY_TIMER_NODE);
|
||||||
|
function setInputRef(el: unknown) {
|
||||||
|
inputRef.value = el as HTMLInputElement | null;
|
||||||
|
}
|
||||||
// 抄送人表单配置
|
// 抄送人表单配置
|
||||||
const formRef = ref(); // 表单 Ref
|
const formRef = ref(); // 表单 Ref
|
||||||
|
|
||||||
|
|
@ -156,7 +159,7 @@ defineExpose({ openDrawer }); // 暴露方法给父组件
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<Input
|
<Input
|
||||||
v-if="showInput"
|
v-if="showInput"
|
||||||
ref="inputRef"
|
:ref="setInputRef"
|
||||||
type="text"
|
type="text"
|
||||||
class="mr-2 w-48"
|
class="mr-2 w-48"
|
||||||
@blur="changeNodeName()"
|
@blur="changeNodeName()"
|
||||||
|
|
|
||||||
|
|
@ -97,21 +97,21 @@ function changeConditionType() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function deleteConditionGroup(conditions: any, index: number) {
|
function deleteConditionGroup(conditions: any, index: number | string) {
|
||||||
conditions.splice(index, 1);
|
conditions.splice(Number(index), 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
function deleteConditionRule(condition: any, index: number) {
|
function deleteConditionRule(condition: any, index: number | string) {
|
||||||
condition.rules.splice(index, 1);
|
condition.rules.splice(Number(index), 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addConditionRule(condition: any, index: number) {
|
function addConditionRule(condition: any, index: number | string) {
|
||||||
const rule = {
|
const rule = {
|
||||||
opCode: '==',
|
opCode: '==',
|
||||||
leftSide: undefined,
|
leftSide: undefined,
|
||||||
rightSide: '',
|
rightSide: '',
|
||||||
};
|
};
|
||||||
condition.rules.splice(index + 1, 0, rule);
|
condition.rules.splice(Number(index) + 1, 0, rule);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addConditionGroup(conditions: any) {
|
function addConditionGroup(conditions: any) {
|
||||||
|
|
|
||||||
|
|
@ -59,9 +59,9 @@ function addHttpResponseSetting(responseSetting: Record<string, string>[]) {
|
||||||
/** 删除 HTTP 请求返回值设置项 */
|
/** 删除 HTTP 请求返回值设置项 */
|
||||||
function deleteHttpResponseSetting(
|
function deleteHttpResponseSetting(
|
||||||
responseSetting: Record<string, string>[],
|
responseSetting: Record<string, string>[],
|
||||||
index: number,
|
index: number | string,
|
||||||
) {
|
) {
|
||||||
responseSetting.splice(index, 1);
|
responseSetting.splice(Number(index), 1);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,9 @@ const currentNode = useWatchNode(props);
|
||||||
/** 节点名称 */
|
/** 节点名称 */
|
||||||
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
||||||
useNodeName(BpmNodeTypeEnum.ROUTER_BRANCH_NODE);
|
useNodeName(BpmNodeTypeEnum.ROUTER_BRANCH_NODE);
|
||||||
|
function setInputRef(el: unknown) {
|
||||||
|
inputRef.value = el as HTMLInputElement | null;
|
||||||
|
}
|
||||||
const routerGroups = ref<RouterSetting[]>([]);
|
const routerGroups = ref<RouterSetting[]>([]);
|
||||||
const nodeOptions = ref<any[]>([]);
|
const nodeOptions = ref<any[]>([]);
|
||||||
const conditionRef = ref<any[]>([]);
|
const conditionRef = ref<any[]>([]);
|
||||||
|
|
@ -203,7 +206,7 @@ defineExpose({ openDrawer }); // 暴露方法给父组件
|
||||||
<template #title>
|
<template #title>
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<Input
|
<Input
|
||||||
ref="inputRef"
|
:ref="setInputRef"
|
||||||
v-if="showInput"
|
v-if="showInput"
|
||||||
type="text"
|
type="text"
|
||||||
class="mr-2 w-48"
|
class="mr-2 w-48"
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,9 @@ const currentNode = useWatchNode(props);
|
||||||
// 节点名称
|
// 节点名称
|
||||||
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
const { nodeName, showInput, clickIcon, changeNodeName, inputRef } =
|
||||||
useNodeName(BpmNodeTypeEnum.START_USER_NODE);
|
useNodeName(BpmNodeTypeEnum.START_USER_NODE);
|
||||||
|
function setInputRef(el: unknown) {
|
||||||
|
inputRef.value = el as HTMLInputElement | null;
|
||||||
|
}
|
||||||
// 激活的 Tab 标签页
|
// 激活的 Tab 标签页
|
||||||
const activeTabName = ref('user');
|
const activeTabName = ref('user');
|
||||||
|
|
||||||
|
|
@ -144,7 +147,7 @@ defineExpose({ showStartUserNodeConfig });
|
||||||
<template #title>
|
<template #title>
|
||||||
<div class="config-header">
|
<div class="config-header">
|
||||||
<Input
|
<Input
|
||||||
ref="inputRef"
|
:ref="setInputRef"
|
||||||
v-if="showInput"
|
v-if="showInput"
|
||||||
type="text"
|
type="text"
|
||||||
class="focus:border-blue-500 focus:shadow-[0_0_0_2px_rgba(24,144,255,0.2)] focus:outline-none"
|
class="focus:border-blue-500 focus:shadow-[0_0_0_2px_rgba(24,144,255,0.2)] focus:outline-none"
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,9 @@ const { showInput, changeNodeName, clickTitle, inputRef } = useNodeName2(
|
||||||
currentNode,
|
currentNode,
|
||||||
BpmNodeTypeEnum.TRIGGER_NODE,
|
BpmNodeTypeEnum.TRIGGER_NODE,
|
||||||
);
|
);
|
||||||
|
function setInputRef(el: unknown) {
|
||||||
|
inputRef.value = el as HTMLInputElement | null;
|
||||||
|
}
|
||||||
|
|
||||||
const nodeSetting = ref();
|
const nodeSetting = ref();
|
||||||
// 打开节点配置
|
// 打开节点配置
|
||||||
|
|
@ -68,7 +71,7 @@ function deleteNode() {
|
||||||
<span class="iconfont icon-trigger"></span>
|
<span class="iconfont icon-trigger"></span>
|
||||||
</div>
|
</div>
|
||||||
<Input
|
<Input
|
||||||
ref="inputRef"
|
:ref="setInputRef"
|
||||||
v-if="!readonly && showInput"
|
v-if="!readonly && showInput"
|
||||||
type="text"
|
type="text"
|
||||||
class="editable-title-input"
|
class="editable-title-input"
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ const [Grid] = useVbenVxeGrid({
|
||||||
toolbarConfig: {
|
toolbarConfig: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
},
|
} as VxeTableGridOptions<BpmProcessExpressionApi.ProcessExpression>,
|
||||||
});
|
});
|
||||||
|
|
||||||
// 配置 Modal
|
// 配置 Modal
|
||||||
|
|
@ -88,7 +88,7 @@ function useGridFormSchema(): VbenFormSchema[] {
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
function useGridColumns(): VxeTableGridOptions['columns'] {
|
function useGridColumns(): VxeTableGridOptions<BpmProcessExpressionApi.ProcessExpression>['columns'] {
|
||||||
return [
|
return [
|
||||||
{ field: 'name', title: '名字', minWidth: 160 },
|
{ field: 'name', title: '名字', minWidth: 160 },
|
||||||
{ field: 'expression', title: '表达式', minWidth: 260 },
|
{ field: 'expression', title: '表达式', minWidth: 260 },
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,6 @@ const tempStartUserSelectAssignees = ref<Record<string, string[]>>({});
|
||||||
const bpmnXML = ref<string | undefined>(undefined);
|
const bpmnXML = ref<string | undefined>(undefined);
|
||||||
const simpleJson = ref<string | undefined>(undefined);
|
const simpleJson = ref<string | undefined>(undefined);
|
||||||
|
|
||||||
const timelineRef = ref<any>();
|
|
||||||
const activeTab = ref('form');
|
const activeTab = ref('form');
|
||||||
const activityNodes = ref<BpmProcessInstanceApi.ApprovalNodeInfo[]>([]);
|
const activityNodes = ref<BpmProcessInstanceApi.ApprovalNodeInfo[]>([]);
|
||||||
const processInstanceStartLoading = ref(false);
|
const processInstanceStartLoading = ref(false);
|
||||||
|
|
@ -303,7 +302,6 @@ defineExpose({ initProcessInfo });
|
||||||
</Col>
|
</Col>
|
||||||
<Col :xs="24" :sm="24" :md="6" :lg="6" :xl="6">
|
<Col :xs="24" :sm="24" :md="6" :lg="6" :xl="6">
|
||||||
<ProcessInstanceTimeline
|
<ProcessInstanceTimeline
|
||||||
ref="timelineRef"
|
|
||||||
:activity-nodes="activityNodes"
|
:activity-nodes="activityNodes"
|
||||||
:show-status-icon="false"
|
:show-status-icon="false"
|
||||||
@select-user-confirm="selectUserConfirm"
|
@select-user-confirm="selectUserConfirm"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import type { VxeGridPropTypes } from '#/adapter/vxe-table';
|
import type {
|
||||||
|
VxeGridPropTypes,
|
||||||
|
VxeTableGridOptions,
|
||||||
|
} from '#/adapter/vxe-table';
|
||||||
import type { BpmProcessListenerApi } from '#/api/bpm/processListener';
|
import type { BpmProcessListenerApi } from '#/api/bpm/processListener';
|
||||||
|
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
|
|
@ -47,7 +50,7 @@ const [Grid] = useVbenVxeGrid({
|
||||||
toolbarConfig: {
|
toolbarConfig: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
},
|
} as VxeTableGridOptions<BpmProcessListenerApi.ProcessListener>,
|
||||||
});
|
});
|
||||||
|
|
||||||
// 配置 Modal
|
// 配置 Modal
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue