update

zhoubichuan · Nov 12, 2023 · f4d5f46 · f4d5f46
1 parent 5114022
commit f4d5f46
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/src/pages/list/list/index.tsx b/src/pages/list/list/index.tsx
@@ -169,16 +169,7 @@ const TableList: React.FC = () => {
   };
   const handleOnSearch = async () => {
     const { data } = await requestList({ current: 1, pageSize: 1000 });
-    const targetArr = [],
-      obj = {};
-    for (let i = 0; i < data.length; i++) {
-      const { typeName = '' } = data[i];
-      if (!obj[typeName]) {
-        obj[typeName] = true;
-        targetArr.push({ label: typeName, value: typeName });
-      }
-    }
-    setOptions(targetArr);
+    setOptions(data);
   };
   useEffect(() => {
     getTemplateData(params.id);
@@ -224,11 +215,17 @@ const TableList: React.FC = () => {
         ...item.table,
         renderFormItem: () => {
           if (item.search && item.search.type === 'select') {
-            // if(item.search.data){
-            //   return <ProFormSelect name={item.dataIndex} options={item.search.data} />;
-            // }else{
-            return <ProFormSelect name={item.dataIndex} options={options} />;
-            // }
+            return (
+              <ProFormSelect
+                name={item.dataIndex}
+                options={[...new Set(options.map((o: any) => o[item.dataIndex]))].map(
+                  (name: string) => ({
+                    label: name,
+                    value: name,
+                  }),
+                )}
+              />
+            );
           } else {
             return <ProFormText name={item.dataIndex} />;
           }