diff --git a/frontend/packages/common/src/const/policy/type.ts b/frontend/packages/common/src/const/policy/type.ts index 084d5f90..26e80bb7 100644 --- a/frontend/packages/common/src/const/policy/type.ts +++ b/frontend/packages/common/src/const/policy/type.ts @@ -105,6 +105,7 @@ export type FilterFormType = { onFilterFormChange: (form: FilterFormType) => void; setFormCanSubmit:(canSubmit:boolean)=>void serviceId?:string + teamId?:string } export type FilterFormHandle = { @@ -119,6 +120,7 @@ export type FilterFormType = { option:unknown onShowValueChange?:(value:string)=>void serviceId?:string + teamId?:string } export type RemoteTitleType = { diff --git a/frontend/packages/core/src/pages/policy/FilterForm.tsx b/frontend/packages/core/src/pages/policy/FilterForm.tsx index 4b6f881f..0e8b16a8 100644 --- a/frontend/packages/core/src/pages/policy/FilterForm.tsx +++ b/frontend/packages/core/src/pages/policy/FilterForm.tsx @@ -9,7 +9,7 @@ import { BasicResponse, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE } from '@common/ import { v4 as uuidv4 } from 'uuid' const RemoteFormItem: React.FC = (props) =>{ - const {value, onChange, disabled,option, onShowValueChange,serviceId} = props + const {value, onChange, disabled,option, onShowValueChange,serviceId, teamId} = props const [remoteList, setRemoteList] = useState([]) const [remoteTableColumns, setRemoteTableColumns] = useState([]) const [loading, setLoading] = useState(false) @@ -28,7 +28,7 @@ const RemoteFormItem: React.FC = (props) =>{ titles:Array, total:number value:string - }>>(`strategy/${serviceId === undefined ? '' : 'service/'}filter-remote/${option?.name}`,{method:'GET', eoParams:{keyword:searchWord}}).then(response=>{ + }>>(`strategy/${serviceId === undefined ? '' : 'service/'}filter-remote/${option?.name}`,{method:'GET', eoParams:{keyword:searchWord,...(serviceId ? {team:teamId, service:serviceId} : {})}}).then(response=>{ const {code,data, msg} = response if(code === STATUS_CODE.SUCCESS){ setRemoteList(data.list as unknown[]) @@ -156,7 +156,7 @@ const FilterForm = forwardRef(({ selectedOptionNameSet, disabled, setFormCanSubmit, - serviceId},ref)=> { + serviceId,teamId},ref)=> { const [form] = Form.useForm(); const [filterType, setFilterType] = useState<'remote'|'static'|'pattern'>(); const [curOption, setCurOption] = useState() @@ -236,7 +236,7 @@ const FilterForm = forwardRef(({ - {filterType === 'remote' && } + {filterType === 'remote' && } {filterType === 'pattern' && form.getFieldValue('name') !== 'ip' && ( = ({ const formRef = useRef(null); const [formCanSubmit,setFormCanSubmit] = useState(false) const [selectedOptionNameSet, setSelectedOptionNameSet] = useState>(new Set()); - const {serviceId} = useParams() + const {serviceId,teamId} = useParams() const openDrawer = (type: string, data?: FilterFormField) => { switch (type) { case 'addFilter': @@ -68,7 +68,7 @@ const FilterTable: React.FC = ({ }, [value, onChange]); const getFilterOptions = ()=>{ - fetchData>(`strategy/${serviceId === undefined ? 'global' : 'service'}/filter-options`,{method:'GET'}).then(response=>{ + fetchData>(`strategy/${serviceId === undefined ? 'global' : 'service'}/filter-options`,{method:'GET', eoParams:{...(serviceId ? {team:teamId, service:serviceId} : {})}}).then(response=>{ const {code,data,msg} = response if(code === STATUS_CODE.SUCCESS){ setFilterOptions(data.options) @@ -139,6 +139,7 @@ const FilterTable: React.FC = ({ disabled={disabled} setFormCanSubmit={setFormCanSubmit} serviceId={serviceId} + teamId={teamId} />