调整会员筛选

package.json~8b7995037b9e0cb70aeb8e1c870cc139e78bde6c

-{
-  "name": "god-template",
-  "scripts": {
-    "api": "god-ytt",
-    "start:analyze": "ANALYZE=1 umi dev",
-    "start:dev": "umi dev",
-    "scripts:build": "node scripts/run",
-    "start": "yarn api && yarn scripts:build && umi dev",
-    "build": "yarn api && yarn scripts:build && umi build",
-    "build:analyze": "ANALYZE=1 umi build",
-    "postinstall": "umi generate tmp",
-    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@ant-design/icons": "^4.2.1",
-    "@ant-design/pro-layout": "^5.0.12",
-    "@formily/antd": "^1.2.11",
-    "@formily/antd-components": "^1.2.11",
-    "@umijs/hooks": "^1.9.3",
-    "@umijs/preset-react": "1.x",
-    "@umijs/test": "^3.2.0",
-    "braft-editor": "^2.3.9",
-    "classnames": "^2.2.6",
-    "core-js": "^3.6.5",
-    "god": "0.1.17",
-    "lint-staged": "^10.0.7",
-    "mobx": "^5.15.4",
-    "mobx-react": "^6.2.2",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "umi": "^3.2.0",
-    "yorkie": "^2.0.0"
-  },
-  "devDependencies": {
-    "axios": "^0.19.2",
-    "god-yapi2ts": "^1.6.0",
-    "gulp": "^4.0.2",
-    "json2ts": "^0.0.7",
-    "ora": "^4.0.4"
-  }
-}

src/pages/member/components/auditList.tsx

@@ -30,7 +30,8 @@ const auditList: React.FC<PageProps> = props => {
       ? 'auditPr2'
       : 'auditPrComfirm';
   const ref = useRef<any>({});
-  const [searchForm, setSearchForm] = useState<any>({});
+  const [searchItems, setSearchItems] = useState<any>({});
+  const [filteredInfo, setFilteredInfo] = useState<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]);
   const [selectedList, setSelectList] = useState<any>([]);
 
@@ -84,11 +85,11 @@ const auditList: React.FC<PageProps> = props => {
     },
     {
       title: '会员状态',
-      dataIndex: 'statusName',
+      dataIndex: 'memberStatus',
       align: 'center',
       key: 'memberStatus',
       filters: [],
-      filteredValue: searchForm.innerStatus || ['0'],
+      filteredValue: filteredInfo.name || ['0'],
       filterMultiple: false,
       render: (text: any, record: any) => (
         <span
@@ -104,9 +105,9 @@ const auditList: React.FC<PageProps> = props => {
       title: '外部状态',
       dataIndex: 'outerStatusName',
       align: 'center',
-      key: 'outerStatus',
+      key: 'outerStatusName',
       filters: [],
-      filteredValue: searchForm.innerStatus || ['0'],
+      filteredValue: filteredInfo.name || ['0'],
       filterMultiple: false,
       render: (text: any, record: any) => (
         <span style={{ color: '#FF991F' }}>{text}</span>
@@ -116,9 +117,9 @@ const auditList: React.FC<PageProps> = props => {
       title: '内部状态',
       dataIndex: 'innerStatusName',
       align: 'center',
-      key: 'innerStatus',
+      key: 'innerStatusName',
       filters: [],
-      filteredValue: searchForm.innerStatus || ['0'],
+      filteredValue: filteredInfo.name || ['0'],
       filterMultiple: false,
       render: (text: any, record: any) => (
         <Badge color={'#6C9CEB'} text={text} />
@@ -194,20 +195,37 @@ const auditList: React.FC<PageProps> = props => {
   };
 
   // 初始化高级筛选选项
-  const fetchSelectOptions = async () => {
+  const fetchSearchItems = async () => {
     const { data } = await PublicApi.getMemberValidateCommitPageitems();
+    defaultColumns.find(target => {
+      switch (target.key) {
+        case 'memberStatus':
+          target.filters = fetchFilterOptions(data.memberStatus);
+          break;
+        case 'outerStatusName':
+          target.filters = fetchFilterOptions(data.outerStatus);
+          break;
+        case 'innerStatusName':
+          target.filters = fetchFilterOptions(data.innerStatus);
+          break;
+      }
+    });
     return {
-      memberType: fetchFilterOptions(data.memberTypes),
-      roleId: fetchFilterOptions(data.memberRoles),
-      level: fetchFilterOptions(data.memberLevels),
-      source: fetchFilterOptions(data.memberSource),
+      memberType: fetchSelectOptions(data.memberTypes),
+      roleId: fetchSelectOptions(data.memberRoles),
+      level: fetchSelectOptions(data.memberLevels),
+      source: fetchSelectOptions(data.memberSource),
     };
   };
 
-  const fetchFilterOptions = data => {
+  const fetchSelectOptions = data => {
     return data.map(v => ({ label: v.text, value: v.id }));
   };
 
+  const fetchFilterOptions = data => {
+    return data?.map(v => ({ text: v.text, value: v.id }));
+  };
+
   const handleBatch = () => {
     let batchFn;
     switch (pageType) {
@@ -286,7 +304,7 @@ const auditList: React.FC<PageProps> = props => {
               );
               useAsyncInitSelect(
                 ['memberType', 'roleId', 'level', 'source'],
-                fetchSelectOptions,
+                fetchSearchItems,
               );
             }}
             schema={auditSchema}

src/utils/request.ts

@@ -31,7 +31,7 @@ const errorMessage = {
   504: "网关超时。"
 };
 
-const errorHandler = (error: ResponseError):IRequestError => {
+const errorHandler = (error: ResponseError): IRequestError => {
   const { response } = error
   // http状态码非200的错误处理
   const messageText = errorMessage[response.status]
@@ -47,7 +47,7 @@ const errorHandler = (error: ResponseError):IRequestError => {
 
 const defaultHeaders = {
   'Content-Type': 'Application/json',
-  'token': 'd319db57b93759a3787a239c3d9c91b1'
+  'token': '99dbcd04b7253c8920f319f4103ec5c1'
 }
 
 /**
@@ -62,7 +62,7 @@ const baseRequest = extend({
 });
 
 // 请求拦截器
-baseRequest.interceptors.request.use((url: string, options: RequestOptionsInit):{ url: string, options: RequestOptionsInit } => {
+baseRequest.interceptors.request.use((url: string, options: RequestOptionsInit): { url: string, options: RequestOptionsInit } => {
   return {
     // 前缀如果已经带上api, 跳过自动补前缀
     // url: url.startsWith('/api') ? url : basePrefix + url,
@@ -86,7 +86,7 @@ baseRequest.use(async (ctx: Context, next: () => void) => {
  */
 class ApiRequest {
 
-  createRequest <T>(url: string, options: IApiRequest = { ctlType: 'none' }): Promise<IRequestSuccess<T>> {
+  createRequest<T>(url: string, options: IApiRequest = { ctlType: 'none' }): Promise<IRequestSuccess<T>> {
     return new Promise((resolve, reject) => {
       baseRequest<IRequestSuccess<T>>(url, options).then(res => {
         if (res.code === 1000) {