From 8f4a3efd8114529f806c5021e1feb3329b281130 Mon Sep 17 00:00:00 2001 From: asp_ly Date: Fri, 17 Jan 2025 22:12:50 +0800 Subject: [PATCH] 1 --- .../List/components/DeploymentConfigModal.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx b/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx index d145648c..efde3931 100644 --- a/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx +++ b/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx @@ -91,13 +91,12 @@ const DeploymentConfigModal: React.FC = ({ const useAsyncDataSource = ( url: string, options?: { - params?: Record; mapping?: FieldMapping; } ) => (field: Field) => { - const {params, mapping = {label: 'name', value: 'id'}} = options || {}; + const {mapping = {label: 'name', value: 'id'}} = options || {}; field.loading = true; - request.get(url, {params}) + request.get(url) .then(action.bound?.((response) => { field.dataSource = response.map((item: any) => ({ label: item[mapping.label], @@ -180,7 +179,7 @@ const DeploymentConfigModal: React.FC = ({ placeholder: '请选择三方系统', allowClear: true }, - 'x-reactions': ["{{useAsyncDataSource('/api/v1/external-system/list', { params: { type: 'JENKINS' }, mapping: { label: 'name', value: 'id' } })}}"], + 'x-reactions': ["{{useAsyncDataSource('/api/v1/external-system/list?type=JENKINS', { mapping: { label: 'name', value: 'id' } })}}"], }, viewId: { type: 'string', @@ -208,7 +207,7 @@ const DeploymentConfigModal: React.FC = ({ state: { value: undefined }, - run: '{{function runEffect(){if($deps[0]){useAsyncDataSource("/api/v1/jenkins-view/list", { params: { externalSystemId: $deps[0] }, mapping: { label: "viewName", value: "id" } })($self)}else{$self.dataSource=[];}};runEffect()}}' + run: '{{function runEffect(){if($deps[0]){useAsyncDataSource(`/api/v1/jenkins-view/list?externalSystemId=${$deps[0]}`, { mapping: { label: "viewName", value: "id" } })($self)}else{$self.dataSource=[];}};runEffect()}}' } }, "description": "{{$self.dataSource && $self.value ? ($self.dataSource.find(item => item.value === $self.value)?.extra?.description) : undefined}}" @@ -239,7 +238,7 @@ const DeploymentConfigModal: React.FC = ({ state: { value: undefined }, - run: '{{function runEffect(){if($deps[0] && $deps[1]){useAsyncDataSource("/api/v1/jenkins-job/list", { params: { externalSystemId: $deps[0], viewId: $deps[1] }, mapping: { label: "jobName", value: "id" } })($self)}else{$self.dataSource=[];}};runEffect()}}' + run: '{{function runEffect(){if($deps[0] && $deps[1]){useAsyncDataSource(`/api/v1/jenkins-job/list?externalSystemId=${$deps[0]}&viewId=${$deps[1]}`, { mapping: { label: "jobName", value: "id" } })($self)}else{$self.dataSource=[];}};runEffect()}}' } }, "description": "{{$self.dataSource && $self.value ? ($self.dataSource.find(item => item.value === $self.value)?.extra?.description) : undefined}}"