From 0154fb7d7c4714757ef00775f95998f856e398c1 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Mon, 24 Apr 2023 11:05:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/scene.ts | 20 ++++++----------- .../Scene/Save/components/Terms/Branches.vue | 21 +++++++----------- .../Save/components/Terms/ParamsItem.vue | 20 +++++++++-------- .../Scene/Save/components/Terms/TermsItem.vue | 13 +++++------ .../Scene/Save/components/Terms/WhenItem.vue | 22 +++++++------------ 5 files changed, 39 insertions(+), 57 deletions(-) diff --git a/src/store/scene.ts b/src/store/scene.ts index 0a3e4733..4696874c 100644 --- a/src/store/scene.ts +++ b/src/store/scene.ts @@ -32,20 +32,14 @@ export const defaultBranches = [ { terms: [ { - terms: [ - { - column: undefined, - value: { - source: 'fixed', - value: undefined - }, - termType: undefined, - key: 'params_1', - type: 'and', - }, - ], + column: undefined, + value: { + source: 'fixed', + value: undefined + }, + termType: undefined, + key: 'params_1', type: 'and', - key: 'terms_1_terms_1', }, ], type: 'and', diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue b/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue index 08342d36..97fe3d6f 100644 --- a/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue +++ b/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue @@ -106,6 +106,7 @@ const showWhen = computed(() => { }) const whenData = computed(() => { + console.log(props.data.when) return props.data.when }) @@ -141,19 +142,13 @@ const addWhen = () => { type: 'and', terms: [ { - terms: [ - { - column: undefined, - value: { - source: 'fixed', - value: undefined - }, - termType: undefined, - key: `params_${randomString()}`, - type: 'and', - } - ], - key: `terms_2_${randomString()}`, + column: undefined, + value: { + source: 'fixed', + value: undefined + }, + termType: undefined, + key: `params_${randomString()}`, type: 'and', } ], diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue index e51f639a..e7955fed 100644 --- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue +++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue @@ -284,8 +284,8 @@ const columnSelect = (option: any) => { handOptionByColumn(option) emit('update:value', { ...paramsValue }) formItemContext.onFieldChange() - formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.name][0] = option.name - formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.name][1] = paramsValue.termType + formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][0] = option.name + formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][1] = paramsValue.termType } const termsTypeSelect = (e: { key: string, name: string }) => { @@ -310,11 +310,12 @@ const termsTypeSelect = (e: { key: string, name: string }) => { } emit('update:value', { ...paramsValue }) formItemContext.onFieldChange() - formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.name][1] = e.name + formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][1] = e.name } const valueSelect = (v: any, label: string, labelObj: Record, option: any) => { + console.log(paramsValue.value?.source) if (paramsValue.value?.source === 'metric') { paramsValue.metric = option?.id } @@ -325,14 +326,15 @@ const valueSelect = (v: any, label: string, labelObj: Record, optio delete newValues.metric } + console.log(newValues) emit('update:value', { ...newValues }) formItemContext.onFieldChange() - formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.name][2] = labelObj + formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][2] = labelObj } const typeSelect = (e: any) => { emit('update:value', { ...paramsValue }) - formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.name][3] = e.label + formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][3] = e.label } const termAdd = () => { @@ -346,17 +348,17 @@ const termAdd = () => { type: 'and', key: `params_${new Date().getTime()}` } - formModel.value.branches?.[props.branchName]?.when?.[props.whenName]?.terms?.[props.termsName]?.terms?.push(terms) + formModel.value.branches?.[props.branchName]?.when?.[props.whenName]?.terms?.push(terms) formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName].push(['', '', '', '并且']) } const onDelete = () => { - formModel.value.branches?.[props.branchName]?.when?.[props.whenName]?.terms?.[props.termsName]?.terms?.splice(props.name, 1) - formModel.value.options!.when[props.branchName].terms[props.whenName].terms.splice(props.name, 1) + formModel.value.branches?.[props.branchName]?.when?.[props.whenName]?.terms?.splice(props.termsName, 1) + formModel.value.options!.when[props.branchName].terms[props.whenName].terms.splice(props.termsName, 1) } nextTick(() => { - Object.assign(paramsValue, pick(props.value, ['column', 'options', 'termType', 'terms', 'type', 'value'])) + Object.assign(paramsValue, pick(props.value, ['column', 'options', 'termType', 'terms', 'type', 'value', 'metric'])) }) diff --git a/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue index eb61b193..193991ae 100644 --- a/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue +++ b/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue @@ -15,17 +15,14 @@ { type: 'and', terms: [ { - terms: [ - { - column: undefined, - value: { - source: 'manual', - value: undefined - }, - termType: undefined, - key: `params_${randomString()}`, - type: 'and', - } - ], - key: `terms_2_${randomString()}`, + column: undefined, + value: { + source: 'manual', + value: undefined + }, + termType: undefined, + key: `params_${randomString()}`, type: 'and', } ],