From d0c2c7488c49fb91515c118c48f5e961b1494ddd Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Wed, 18 Jun 2025 15:15:52 +0800 Subject: [PATCH] 1.完善主表多页签标题的多语言翻译 --- src/components/Common/CommonGroupBill.js | 36 ++++++++++++++++++++++++++++++------ src/components/Common/CommonNewListBill.js | 36 ++++++++++++++++++++++++++++++------ src/components/Common/CommonNewTabBill.js | 6 +++++- 3 files changed, 65 insertions(+), 13 deletions(-) diff --git a/src/components/Common/CommonGroupBill.js b/src/components/Common/CommonGroupBill.js index 93bd19d..59a3c5b 100644 --- a/src/components/Common/CommonGroupBill.js +++ b/src/components/Common/CommonGroupBill.js @@ -2065,7 +2065,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2103,7 +2107,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2139,7 +2147,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2175,7 +2187,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2211,7 +2227,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2247,7 +2267,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
diff --git a/src/components/Common/CommonNewListBill.js b/src/components/Common/CommonNewListBill.js index 8ad929b..c673b89 100644 --- a/src/components/Common/CommonNewListBill.js +++ b/src/components/Common/CommonNewListBill.js @@ -2345,7 +2345,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2385,7 +2389,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2469,7 +2477,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2547,7 +2559,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2586,7 +2602,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
@@ -2625,7 +2645,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
diff --git a/src/components/Common/CommonNewTabBill.js b/src/components/Common/CommonNewTabBill.js index 4915f2a..a8e11d8 100644 --- a/src/components/Common/CommonNewTabBill.js +++ b/src/components/Common/CommonNewTabBill.js @@ -2386,7 +2386,11 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = item.replace(/\d+/g,''); + let tabName = item.replace(/\d+/g,''); + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName =tableConfigArr[0].showName; + } return (
-- libgit2 0.22.2