make some changes

apache · Feb 23, 2024 · 8480ad4 · 8480ad4
1 parent 2697af8
commit 8480ad4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/inlong-dashboard/src/ui/components/HighSelect/index.tsx b/inlong-dashboard/src/ui/components/HighSelect/index.tsx
@@ -46,7 +46,6 @@ export interface HighSelectProps extends Omit<SelectProps<any>, 'options'> {
         requestParams?: unknown;
         requestAuto?: boolean;
         requestTrigger?: ('onOpen' | 'onSearch')[];
-        filterOption?: boolean;
       };
   asyncValueLabel?: string;
   useInput?: boolean;
@@ -169,11 +168,6 @@ const HighSelect: React.FC<HighSelectProps> = ({
       onSearch={options?.requestTrigger?.includes('onSearch') ? onSearch : rest.onSearch}
       onDropdownVisibleChange={onDropdownVisibleChange}
       onChange={onSelectChange}
-      filterOption={
-        options?.filterOption === true
-          ? (input, option) => (option?.label ?? '').toString().includes(input)
-          : false
-      }
       value={
         useInput && diyState
           ? '__DIYState'

diff --git a/inlong-dashboard/src/ui/pages/GroupDetail/Audit/config.tsx b/inlong-dashboard/src/ui/pages/GroupDetail/Audit/config.tsx
@@ -22,6 +22,7 @@ import { Button } from 'antd';
 import dayjs from 'dayjs';
 import i18n from '@/i18n';
 import { sinks } from '@/plugins/sinks';
+import request from '@/core/utils/request';
 
 export const timeStaticsDimList = [
   {
@@ -213,12 +214,14 @@ export const getFormContent = (inlongGroupId, initialValues, onSearch, onDataStr
       mode: 'multiple',
       maxTagCount: 3,
       allowClear: true,
+      showSearch: true,
       dropdownMatchSelectWidth: false,
       options: {
         requestAuto: true,
-        requestService: {
-          url: '/audit/getAuditBases',
-          method: 'GET',
+        requestTrigger: ['onOpen', 'onSearch'],
+        requestService: async keyword => {
+          const req = await request('/audit/getAuditBases');
+          return keyword === undefined ? req : req.filter(audit => audit.name.includes(keyword));
         },
         requestParams: {
           formatResult: result =>

diff --git a/inlong-dashboard/src/ui/pages/ModuleAudit/IdModule/config.tsx b/inlong-dashboard/src/ui/pages/ModuleAudit/IdModule/config.tsx
@@ -19,6 +19,7 @@
 
 import dayjs from 'dayjs';
 import i18n from '@/i18n';
+import request from '@/core/utils/request';
 
 export const timeStaticsDimList = [
   {
@@ -137,10 +138,10 @@ export const getFormContent = initialValues => [
       dropdownMatchSelectWidth: false,
       options: {
         requestAuto: true,
-        filterOption: true,
-        requestService: {
-          url: '/audit/getAuditBases',
-          method: 'GET',
+        requestTrigger: ['onOpen', 'onSearch'],
+        requestService: async keyword => {
+          const req = await request('/audit/getAuditBases');
+          return keyword === undefined ? req : req.filter(audit => audit.name.includes(keyword));
         },
         requestParams: {
           formatResult: result =>
@@ -162,10 +163,10 @@ export const getFormContent = initialValues => [
       dropdownMatchSelectWidth: false,
       options: {
         requestAuto: true,
-        filterOption: true,
-        requestService: {
-          url: '/audit/getAuditBases',
-          method: 'GET',
+        requestTrigger: ['onOpen', 'onSearch'],
+        requestService: async keyword => {
+          const req = await request('/audit/getAuditBases');
+          return keyword === undefined ? req : req.filter(audit => audit.name.includes(keyword));
         },
         requestParams: {
           formatResult: result =>

diff --git a/inlong-dashboard/src/ui/pages/ModuleAudit/IpModule/config.tsx b/inlong-dashboard/src/ui/pages/ModuleAudit/IpModule/config.tsx
@@ -19,6 +19,7 @@
 
 import dayjs from 'dayjs';
 import i18n from '@/i18n';
+import request from '@/core/utils/request';
 
 export const toChartData = (source, sourceDataMap) => {
   const xAxisData = Object.keys(sourceDataMap);
@@ -91,10 +92,10 @@ export const getFormContent = (initialValues, onSearch) => [
       dropdownMatchSelectWidth: false,
       options: {
         requestAuto: true,
-        filterOption: true,
-        requestService: {
-          url: '/audit/getAuditBases',
-          method: 'GET',
+        requestTrigger: ['onOpen', 'onSearch'],
+        requestService: async keyword => {
+          const req = await request('/audit/getAuditBases');
+          return keyword === undefined ? req : req.filter(audit => audit.name.includes(keyword));
         },
         requestParams: {
           formatResult: result =>
@@ -116,10 +117,10 @@ export const getFormContent = (initialValues, onSearch) => [
       dropdownMatchSelectWidth: false,
       options: {
         requestAuto: true,
-        filterOption: true,
-        requestService: {
-          url: '/audit/getAuditBases',
-          method: 'GET',
+        requestTrigger: ['onOpen', 'onSearch'],
+        requestService: async keyword => {
+          const req = await request('/audit/getAuditBases');
+          return keyword === undefined ? req : req.filter(audit => audit.name.includes(keyword));
         },
         requestParams: {
           formatResult: result =>