fix: 修改bug

This commit is contained in:
100011797 2023-07-12 15:43:34 +08:00
parent a15b036639
commit 84c743ac23
3 changed files with 34 additions and 28 deletions

View File

@ -123,7 +123,7 @@
placeholder="请选择功能"
v-model:value="modelRef.message.functionId"
show-search
@change="funcChange"
@change="(e) => funcChange(e)"
>
<j-select-option
v-for="i in metadata?.functions || []"
@ -216,12 +216,33 @@ const onPropertyChange = (val: string, flag?: boolean) => {
};
const onTypeChange = () => {
modelRef.message = {
properties: undefined,
functionId: undefined,
inputs: [],
value: undefined,
};
// ,
// modelRef.message = {
// properties: undefined,
// functionId: undefined,
// inputs: [],
// value: undefined,
// };
};
const funcChange = (val: string, _inputs?: any[]) => {
if (val) {
const arr =
props.metadata?.functions.find((item: any) => item.id === val)
?.inputs || [];
const list = arr.map((item: any) => {
const _item = _inputs?.find(i => i.id === item.id)
return {
id: item.id,
name: item.name,
value: undefined,
valueType: item?.valueType?.type,
..._item,
required: item?.expands?.required
};
});
modelRef.message.inputs = list;
}
};
watch(
@ -232,6 +253,9 @@ watch(
if (newVal?.message?.properties) {
onPropertyChange(newVal?.message?.properties, true);
}
if (newVal?.message?.functionId) {
funcChange(newVal?.message?.functionId, newVal?.message?.inputs);
}
}
},
{
@ -239,24 +263,6 @@ watch(
},
);
const funcChange = (val: string) => {
if (val) {
const arr =
props.metadata?.functions.find((item: any) => item.id === val)
?.inputs || [];
const list = arr.map((item: any) => {
return {
id: item.id,
name: item.name,
value: undefined,
valueType: item?.valueType?.type,
required: item?.expands?.required
};
});
modelRef.message.inputs = list;
}
};
const saveBtn = () =>
new Promise((resolve) => {
formRef.value

View File

@ -72,7 +72,7 @@ const queryChartsAggList = async () => {
{
property: prop.data.id,
alias: prop.data.id,
agg: agg.value,
agg: _type.value ? agg.value : 'COUNT',
},
],
query: {

View File

@ -302,8 +302,8 @@ const handleSubmit = () => {
};
}
const res = formData.value.id
? await ChannelApi.update(formData.value.id, extraFormData)
: await ChannelApi.save(extraFormData);
? await ChannelApi.update(formData.value.id, extraFormData).finally(() => {loading.value = false;})
: await ChannelApi.save(extraFormData).finally(() => {loading.value = false;});
if (res.success) {
onlyMessage('操作成功');
_vis.value = false;