From fc510c6aecd1eb1a5801893932499911685ba455 Mon Sep 17 00:00:00 2001 From: Mouriya Date: Fri, 13 Sep 2024 05:32:56 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=82=92=E9=81=B8=E6=8A=9E=E3=81=99=E3=82=8B=E3=81=A8=E3=80=81?= =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=83=E3=82=AF=E3=83=AA=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E4=B8=80=E9=83=A8=E3=81=AE?= =?UTF-8?q?=E7=B5=90=E6=9E=9C=E3=81=8C=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82?= =?UTF-8?q?=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/FieldSelect.vue | 31 ++++++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/FieldSelect.vue b/frontend/src/components/FieldSelect.vue index 6b77015..4238926 100644 --- a/frontend/src/components/FieldSelect.vue +++ b/frontend/src/components/FieldSelect.vue @@ -37,6 +37,10 @@ export default { updateSelectFields: { type: Function }, + blackListLabel: { + type:Array, + default:()=>[] + } }, setup(props) { const isLoaded = ref(false); @@ -62,16 +66,25 @@ export default { app: props.appId } }); - let fields = res.data.properties; - Object.keys(fields).forEach((key,index) => { - const fld = fields[key]; - if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){ - rows.push({id:index, name: fld.label || fld.code, ...fld }); - }else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){ - rows.push({id:index, name: fld.label || fld.code, ...fld }); + let fields = Object.values(res.data.properties); + for (const index in fields) { + const fld = fields[index] + if(props.blackListLabel.length > 0){ + if(!props.blackListLabel.find(blackListItem => blackListItem === fld.label)){ + if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){ + rows.push({id:index, name: fld.label || fld.code, ...fld }); + }else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){ + rows.push({id:index, name: fld.label || fld.code, ...fld }); + } + } + } else { + if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){ + rows.push({id:index, name: fld.label || fld.code, ...fld }); + }else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){ + rows.push({id:index, name: fld.label || fld.code, ...fld }); + } } - - }); + } isLoaded.value = true; });