Merge

longyn · longyn · commit e8955a51f25c · 2020-12-02T09:59:43.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -53,7 +53,7 @@ Temporary Items
 /db/
 /dist/
 /build/
-**/__pycache__/
+__pycache__/
 /tyadmin_api_cli.egg-info/
 **/node_modules
 **/.umi/
diff --git a/demos/tyadmin_demo_finish/tyadmin/src/.umi/plugin-request/request.ts b/demos/tyadmin_demo_finish/tyadmin/src/.umi/plugin-request/request.ts
@@ -0,0 +1,274 @@
+// @ts-nocheck
+/**
+ * Base on https://github.com/umijs//Users/mtianyan/tyRepos/tyadmin_api_cli/demos/tyadmin_demo_init/tyadmin/node_modules/umi-request
+ */
+import {
+  extend,
+  Context,
+  RequestOptionsInit,
+  OnionMiddleware,
+  RequestOptionsWithoutResponse,
+  RequestMethod,
+  RequestOptionsWithResponse,
+  RequestResponse,
+  RequestInterceptor,
+  ResponseInterceptor,
+} from '/Users/mtianyan/tyRepos/tyadmin_api_cli/demos/tyadmin_demo_init/tyadmin/node_modules/umi-request';
+// @ts-ignore
+
+import { ApplyPluginsType } from 'umi';
+import { history, plugin } from '../core/umiExports';
+            
+import { message, notification } from 'antd';
+import useUmiRequest, { UseRequestProvider } from '/Users/mtianyan/tyRepos/tyadmin_api_cli/demos/tyadmin_demo_init/tyadmin/node_modules/@ahooksjs/use-request';
+import {
+  BaseOptions,
+  BasePaginatedOptions,
+  BaseResult,
+  CombineService,
+  LoadMoreFormatReturn,
+  LoadMoreOptions,
+  LoadMoreOptionsWithFormat,
+  LoadMoreParams,
+  LoadMoreResult,
+  OptionsWithFormat,
+  PaginatedFormatReturn,
+  PaginatedOptionsWithFormat,
+  PaginatedParams,
+  PaginatedResult,
+} from '/Users/mtianyan/tyRepos/tyadmin_api_cli/demos/tyadmin_demo_init/tyadmin/node_modules/@ahooksjs/use-request/lib/types';
+
+type ResultWithData<T = any> = { data: T; [key: string]: any };
+
+function useRequest<
+  R = any,
+  P extends any[] = any,
+  U = any,
+  UU extends U = any
+>(
+  service: CombineService<R, P>,
+  options: OptionsWithFormat<R, P, U, UU>,
+): BaseResult<U, P>;
+function useRequest<R extends ResultWithData = any, P extends any[] = any>(
+  service: CombineService<R, P>,
+  options?: BaseOptions<R['data'], P>,
+): BaseResult<R['data'], P>;
+function useRequest<R extends LoadMoreFormatReturn = any, RR = any>(
+  service: CombineService<RR, LoadMoreParams<R>>,
+  options: LoadMoreOptionsWithFormat<R, RR>,
+): LoadMoreResult<R>;
+function useRequest<
+  R extends ResultWithData<LoadMoreFormatReturn> = any,
+  RR extends R = any
+>(
+  service: CombineService<R, LoadMoreParams<R['data']>>,
+  options: LoadMoreOptions<RR['data']>,
+): LoadMoreResult<R['data']>;
+
+function useRequest<R = any, Item = any, U extends Item = any>(
+  service: CombineService<R, PaginatedParams>,
+  options: PaginatedOptionsWithFormat<R, Item, U>,
+): PaginatedResult<Item>;
+function useRequest<Item = any, U extends Item = any>(
+  service: CombineService<
+    ResultWithData<PaginatedFormatReturn<Item>>,
+    PaginatedParams
+  >,
+  options: BasePaginatedOptions<U>,
+): PaginatedResult<Item>;
+function useRequest(service: any, options: any = {}) {
+  return useUmiRequest(service, {
+    formatResult: result => result?.data,
+    requestMethod: (requestOptions: any) => {
+      if (typeof requestOptions === 'string') {
+        return request(requestOptions);
+      }
+      if (typeof requestOptions === 'object') {
+        const { url, ...rest } = requestOptions;
+        return request(url, rest);
+      }
+      throw new Error('request options error');
+    },
+    ...options,
+  });
+}
+
+export interface RequestConfig extends RequestOptionsInit {
+  errorConfig?: {
+    errorPage?: string;
+    adaptor?: (resData: any, ctx: Context) => ErrorInfoStructure;
+  };
+  middlewares?: OnionMiddleware[];
+  requestInterceptors?: RequestInterceptor[];
+  responseInterceptors?: ResponseInterceptor[];
+}
+
+export enum ErrorShowType {
+  SILENT = 0,
+  WARN_MESSAGE = 1,
+  ERROR_MESSAGE = 2,
+  NOTIFICATION = 4,
+  REDIRECT = 9,
+}
+
+interface ErrorInfoStructure {
+  success: boolean;
+  data?: any;
+  errorCode?: string;
+  errorMessage?: string;
+  showType?: ErrorShowType;
+  traceId?: string;
+  host?: string;
+  [key: string]: any;
+}
+
+interface RequestError extends Error {
+  data?: any;
+  info?: ErrorInfoStructure;
+  request?: Context['req'];
+  response?: Context['res'];
+}
+
+const DEFAULT_ERROR_PAGE = '/exception';
+
+let requestMethodInstance: RequestMethod;
+const getRequestMethod = () => {
+  if (requestMethodInstance) {
+    // request method 已经示例化
+    return requestMethodInstance;
+  }
+
+  // runtime 配置可能应为依赖顺序的问题在模块初始化的时候无法获取，所以需要封装一层在异步调用后初始化相关方法
+  // 当用户的 app.ts 中依赖了该文件的情况下就该模块的初始化时间就会被提前，无法获取到运行时配置
+  const requestConfig: RequestConfig = plugin.applyPlugins({
+    key: 'request',
+    type: ApplyPluginsType.modify,
+    initialValue: {},
+  });
+
+  const errorAdaptor =
+    requestConfig.errorConfig?.adaptor || (resData => resData);
+
+  requestMethodInstance = extend({
+    errorHandler: (error: RequestError) => {
+      // @ts-ignore
+      if (error?.request?.options?.skipErrorHandler) {
+        throw error;
+      }
+      let errorInfo: ErrorInfoStructure | undefined;
+      if (error.name === 'ResponseError' && error.data && error.request) {
+        const ctx: Context = {
+          req: error.request,
+          res: error.response,
+        };
+        errorInfo = errorAdaptor(error.data, ctx);
+        error.message = errorInfo?.errorMessage || error.message;
+        error.data = error.data;
+        error.info = errorInfo;
+      }
+      errorInfo = error.info;
+
+      if (errorInfo) {
+        const errorMessage = errorInfo?.errorMessage;
+        const errorCode = errorInfo?.errorCode;
+        const errorPage =
+          requestConfig.errorConfig?.errorPage || DEFAULT_ERROR_PAGE;
+
+        switch (errorInfo?.showType) {
+          case ErrorShowType.SILENT:
+            // do nothing
+            break;
+          case ErrorShowType.WARN_MESSAGE:
+            message.warn(errorMessage);
+            break;
+          case ErrorShowType.ERROR_MESSAGE:
+            message.error(errorMessage);
+            break;
+          case ErrorShowType.NOTIFICATION:
+            notification.open({
+              message: errorMessage,
+            });
+            break;
+          case ErrorShowType.REDIRECT:
+            // @ts-ignore
+            history.push({
+              pathname: errorPage,
+              query: { errorCode, errorMessage },
+            });
+            // redirect to error page
+            break;
+          default:
+            message.error(errorMessage);
+            break;
+        }
+      } else {
+        message.error(error.message || 'Request error, please retry.');
+      }
+      throw error;
+    },
+    ...requestConfig,
+  });
+
+  // 中间件统一错误处理
+  // 后端返回格式 { success: boolean, data: any }
+  // 按照项目具体情况修改该部分逻辑
+  requestMethodInstance.use(async (ctx, next) => {
+    await next();
+    const { req, res } = ctx;
+    // @ts-ignore
+    if (req.options?.skipErrorHandler) {
+      return;
+    }
+    const { options } = req;
+    const { getResponse } = options;
+    const resData = getResponse ? res.data : res;
+    const errorInfo = errorAdaptor(resData, ctx);
+    if (errorInfo.success === false) {
+      // 抛出错误到 errorHandler 中处理
+      const error: RequestError = new Error(errorInfo.errorMessage);
+      error.name = 'BizError';
+      error.data = resData;
+      error.info = errorInfo;
+      throw error;
+    }
+  });
+
+  // Add user custom middlewares
+  const customMiddlewares = requestConfig.middlewares || [];
+  customMiddlewares.forEach(mw => {
+    requestMethodInstance.use(mw);
+  });
+
+  // Add user custom interceptors
+  const requestInterceptors = requestConfig.requestInterceptors || [];
+  const responseInterceptors = requestConfig.responseInterceptors || [];
+  requestInterceptors.map(ri => {
+    requestMethodInstance.interceptors.request.use(ri);
+  });
+  responseInterceptors.map(ri => {
+    requestMethodInstance.interceptors.response.use(ri);
+  });
+
+  return requestMethodInstance;
+};
+
+interface RequestMethodInUmi<R = false> {
+  <T = any>(
+    url: string,
+    options: RequestOptionsWithResponse & { skipErrorHandler?: boolean },
+  ): Promise<RequestResponse<T>>;
+  <T = any>(
+    url: string,
+    options: RequestOptionsWithoutResponse & { skipErrorHandler?: boolean },
+  ): Promise<T>;
+  <T = any>(
+    url: string,
+    options?: RequestOptionsInit & { skipErrorHandler?: boolean },
+  ): R extends true ? Promise<RequestResponse<T>>: Promise<T>;
+}
+const request: RequestMethodInUmi = (url: any, options: any) => {
+  const requestMethod = getRequestMethod();
+  return requestMethod(url, options);
+};
+
+export { request, useRequest, UseRequestProvider };
diff --git a/tyadmin_api_cli/antd_page_templates/base/index.jsx b/tyadmin_api_cli/antd_page_templates/base/index.jsx
@@ -100,6 +100,7 @@ const TableList = () => {
 
    >>FOREIGNKEY_PLACE<<
 
+    >>FOREIGNKEY_PLACE<<
 
    >>MANY_TO_MANY_PLACE<<
   return (
diff --git a/tyadmin_api_cli/deal_antd_pages.py b/tyadmin_api_cli/deal_antd_pages.py
@@ -232,15 +232,19 @@ def gen_antd_pages(project_name_settings, user_label_list, focus_model=None, tem
             cur_path = f'{target_path}/{model_name}List'
             if not os.path.exists(cur_path):
                 os.makedirs(cur_path)
+
             cur_path_co = f'{target_path}/{model_name}List/components'
             if not os.path.exists(cur_path_co):
                 os.makedirs(cur_path_co)
             with open(f'{target_path}/{model_name}List/index.jsx', 'w', encoding='utf-8') as fw:
                 fw.write(new_content)
+
             with open(f'{target_path}/{model_name}List/service.js', 'w', encoding='utf-8') as fw:
                 fw.write(new_services)
+
             with open(f'{target_path}/{model_name}List/components/CreateForm.jsx', 'w', encoding='utf-8') as fw:
                 fw.write(create_form)
+
             with open(f'{target_path}/{model_name}List/components/UpdateForm.jsx', 'w', encoding='utf-8') as fw:
                 fw.write(update_form)
             if app_name == user._meta.app_label:
diff --git a/tyadmin_api_cli/init_filter_serial_url_view.py b/tyadmin_api_cli/init_filter_serial_url_view.py
@@ -9,16 +9,22 @@
 def gen_all(project_name_settings, models_list):
     gen_url(project_name_settings, models_list)
     print("*" * 20, f"已自动生成urls -> auto_url.py", "*" * 20)
+
     gen_view(project_name_settings, models_list)
     print("*" * 20, "已自动生成views -> auto_views.py", "*" * 20)
+
     gen_serializer(project_name_settings, models_list)
     print("*" * 20, "已自动生成serializers -> auto_serializers.py", "*" * 20)
+
     gen_filter(project_name_settings, models_list)
     print("*" * 20, "已自动生成filters -> auto_filters.py", "*" * 20)
+
     gen_antd_pages(project_name_settings, models_list)
     print("*" * 20, "已自动生成antd pages -> pages/AutoGenPage", "*" * 20)
+
     gen_route(project_name_settings, models_list)
     print("*" * 20, "已自动生成antd router -> auto_menu.json", "*" * 20)
+
     print("#"*20, "大功告成! 请开始你的表演->注册tyadmin_api->注册url->启动项目", "#"*20)
 
 if __name__ == '__main__':
diff --git a/tyadmin_api_cli/tyadmin_api_init/models.py b/tyadmin_api_cli/tyadmin_api_init/models.py
@@ -1,4 +1,3 @@
-
 from django.db import models
 from django.utils import timezone
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`from django.db import models`
`3`	`2`	`from django.utils import timezone`
`4`	`3`