fix: merge

src/components/FIndicators/index.tsx

@@ -120,10 +120,10 @@ const FIndicators = (props: Props) => {
         <>
           <Input
             value={value?.value ? value?.value[0] : ''}
-            onChange={(val) => {
+            onChange={(e) => {
               onChange({
                 ...value,
-                value: [val, value?.value && value?.value[1]],
+                value: [e.target.value, value?.value && value?.value[1]],
               });
             }}
           />
@@ -132,10 +132,10 @@ const FIndicators = (props: Props) => {
               ~
               <Input
                 value={value?.value ? value?.value[1] : ''}
-                onChange={(val) => {
+                onChange={(e) => {
                   onChange({
                     ...value,
-                    value: [value?.value && value?.value[0], val],
+                    value: [value?.value && value?.value[0], e.target.value],
                   });
                 }}
               />

src/components/SearchComponent/index.tsx

@@ -606,12 +606,12 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
     _terms.terms1 = filterTerms(_terms.terms1);
     _terms.terms2 = filterTerms(_terms.terms2);
     const _temp = formatValue(_terms);
+    uiParamRef.current = ui2Server(value);
     if (
       (_terms.terms1 && _terms.terms1.length > 1) ||
       (_terms.terms2 && _terms.terms2.length > 1)
     ) {
       // 展开高级搜索
-      uiParamRef.current = ui2Server(value);
       setExpand(false);
       handleForm(true);
     }

src/pages/device/Instance/index.tsx

@@ -329,10 +329,19 @@ const Instance = () => {
       hideInTable: true,
       request: () =>
         service.getProviders().then((resp: any) => {
-          return (resp?.result || []).map((item: any) => ({
-            label: item.name,
-            value: `accessProvider is ${item.id}`,
-          }));
+          return (resp?.result || [])
+            .filter((i: any) =>
+              [
+                'mqtt-server-gateway',
+                'http-server-gateway',
+                'mqtt-client-gateway',
+                'tcp-server-gateway',
+              ].includes(i.id),
+            )
+            .map((item: any) => ({
+              label: item.name,
+              value: `accessProvider is ${item.id}`,
+            }));
         }),
     },
     {