diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue index d67f4c6..4bf1430 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue @@ -394,7 +394,14 @@ const changeData = (index: number, key: string) => { for (let i = 0; i < that.propInfo[key].dataInfo.length; i++) { for (let j = 0; j < mapping.length; j++) { if (that.propInfo[key].dataInfo[i].locale === mapping[j].locale) { - that.propInfo[key].dataInfo[i].label = mapping[j].value + + let str = that.propInfo[key].dataInfo[0].ratio; + if (str === null || str === undefined || str === -1) { + str = '' + } + const value = `${mapping[j].value}`.replaceAll('${r}', str) + console.log("value",value) + that.propInfo[key].dataInfo[i].label = value break; } } diff --git a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue index d67f4c6..4bf1430 100644 --- a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue +++ b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue @@ -394,7 +394,14 @@ const changeData = (index: number, key: string) => { for (let i = 0; i < that.propInfo[key].dataInfo.length; i++) { for (let j = 0; j < mapping.length; j++) { if (that.propInfo[key].dataInfo[i].locale === mapping[j].locale) { - that.propInfo[key].dataInfo[i].label = mapping[j].value + + let str = that.propInfo[key].dataInfo[0].ratio; + if (str === null || str === undefined || str === -1) { + str = '' + } + const value = `${mapping[j].value}`.replaceAll('${r}', str) + console.log("value",value) + that.propInfo[key].dataInfo[i].label = value break; } }