midway-fatcms 0.0.1-beta.22 → 0.0.1-beta.25

package/src/models/bizmodels.ts

@@ -1,88 +1,120 @@
-import { IRequestCfgModel, IVisitor } from '../libs/crud-pro/interfaces';
-
-/**
- * 实体表公共字段
- */
-export interface IEntityCommonInfo {
-  id?: number;
-  created_by?: string;
-  modified_by?: string;
-  created_at?: string;
-  modified_at?: string;
-  status?: number;
-}
-
-export interface ITableBaseInfo {
-  databaseName: string;
-  tableName: string;
-}
-
-export interface IStdCrudCfgObj {
-  tableBaseInfo: ITableBaseInfo;
-  authSetting: any;
-  actionColumns?: any[];
-  queryFormFields?: any[];
-  tableColumns?: any[];
-  tableFields?: any[];
-  toolbarList?: any[];
-}
-
-export interface ICrudStdAppInfo {
-  stdCrudCfgObj?: IStdCrudCfgObj;
-  actionsMap?: any;
-  status: number;
-}
-
-export interface ICrudStdAppInfoForSettingKey extends ICrudStdAppInfo {
-  settingKeyActionCfg?: any;
-  authConfig?: string[];
-  authType?: string;
-}
-
-export enum AccessType {
-  owner = 'owner', // 只有上传人自己才有权限能查看
-  login = 'login', // 只有登录用户才能查看
-  open = 'open', // 所有人都能查看
-}
-
-export enum UploadCategoryType {
-  file = 'file', // 普通文件
-  assets = 'assets', // 前端资源文件
-}
-
-export class PermFunc {
-  public funcCode: string;
-  public funcName: string;
-  constructor(funcCode: string, funcName: string) {
-    this.funcName = funcName;
-    this.funcCode = funcCode;
-  }
-}
-
-export class PermRole {
-  public roleCode: string;
-  public roleName: string;
-  constructor(roleCode: string, roleName: string) {
-    this.roleName = roleName;
-    this.roleCode = roleCode;
-  }
-}
-
-export const CTX_VISITOR_ID = 'visitor.accountId';
-export const CTX_VISITOR_AVATAR = 'visitor.avatar';
-export const CTX_VISITOR_NICKNAME = 'visitor.nickName';
-export const CTX_VISITOR_ACCOUNT_TYPE = 'visitor.accountType';
-export const CTX_WORKBENCH_CODE = 'visitor.workbenchCode';
-
-export interface IRequestCfgModel2 extends IRequestCfgModel {
-  enableStandardUpdateCfg?: boolean | string[]; // 默认为true
-  enableStandardUpdateCfgCondition?: boolean | string[]; // 默认为false
-}
-
-export interface IVisitorExt extends IVisitor {
-  workbenchCode: string;
-  avatar: string;
-  accountType: string;
-}
-
-export const FILE_GET_TYPES = ['thumbnail', 'preview', 'download'];
+import { IRequestCfgModel, IVisitor } from '../libs/crud-pro/interfaces';
+
+/**
+ * 实体表公共字段
+ */
+export interface IEntityCommonInfo {
+  id?: number;
+  created_by?: string;
+  modified_by?: string;
+  created_at?: string;
+  modified_at?: string;
+  status?: number;
+}
+
+export interface ITableBaseInfo {
+  databaseName: string;
+  tableName: string;
+}
+
+export interface IStdCrudCfgObj {
+  tableBaseInfo: ITableBaseInfo;
+  authSetting: any;
+  actionColumns?: any[];
+  queryFormFields?: any[];
+  tableColumns?: any[];
+  tableFields?: any[];
+  toolbarList?: any[];
+}
+
+export interface ICrudStdAppInfo {
+  stdCrudCfgObj?: IStdCrudCfgObj;
+  actionsMap?: any;
+  status: number;
+}
+
+export interface ICrudStdAppInfoForSettingKey extends ICrudStdAppInfo {
+  settingKeyActionCfg?: any;
+  authConfig?: string[];
+  authType?: string;
+}
+
+export enum AccessType {
+  owner = 'owner', // 只有上传人自己才有权限能查看
+  login = 'login', // 只有登录用户才能查看
+  open = 'open', // 所有人都能查看
+}
+
+export enum UploadCategoryType {
+  file = 'file', // 普通文件
+  assets = 'assets', // 前端资源文件
+}
+
+export class PermFunc {
+  public funcCode: string;
+  public funcName: string;
+  constructor(funcCode: string, funcName: string) {
+    this.funcName = funcName;
+    this.funcCode = funcCode;
+  }
+}
+
+export class PermRole {
+  public roleCode: string;
+  public roleName: string;
+  constructor(roleCode: string, roleName: string) {
+    this.roleName = roleName;
+    this.roleCode = roleCode;
+  }
+}
+
+export const CTX_VISITOR_ID = 'visitor.accountId';
+export const CTX_VISITOR_AVATAR = 'visitor.avatar';
+export const CTX_VISITOR_NICKNAME = 'visitor.nickName';
+export const CTX_VISITOR_ACCOUNT_TYPE = 'visitor.accountType';
+export const CTX_WORKBENCH_CODE = 'visitor.workbenchCode';
+
+export interface IRequestCfgModel2 extends IRequestCfgModel {
+  enableStandardUpdateCfg?: boolean | string[]; // 默认为true
+  enableStandardUpdateCfgCondition?: boolean | string[]; // 默认为false
+}
+
+export interface IVisitorExt extends IVisitor {
+  workbenchCode: string;
+  avatar: string;
+  accountType: string;
+}
+
+export const FILE_GET_TYPES = ['thumbnail', 'preview', 'download'];
+
+
+/**
+ * fat-design中的TablePro组件的查询参数
+ */
+export interface ITableProQueryParams {
+  condition: any;
+  pageNo: number;
+  pageSize: number;
+  orderBy: string | any;
+}
+
+
+export enum StdCrudExportInputParamsAppType {
+  STD_CRUD = 'STD_CRUD',
+  INNER_HTTP = 'INNER_HTTP',
+}
+
+/**
+ * fat-design中的TablePro组件的查询参数
+ */
+export interface IStdCrudExportInputParams {
+  appType: StdCrudExportInputParamsAppType; // 公共
+  appCode?: string; // STD_CRUD导出需要。
+  innerHttpUrl?: string; // INNER_HTTP导出需要。
+  columns?: any[]; // INNER_HTTP导出需要。
+  lastQueryParams: ITableProQueryParams; // 公共
+  selectedRowKeys: string[] | number []; // 公共
+  headers: any; // 公共
+  primaryKey: any; // 公共
+  pageSize: number; // 公共
+}

package/src/models/contextLogger.ts

@@ -1,132 +1,132 @@
-import { ILogger } from '@midwayjs/core';
-import * as koa from '@midwayjs/koa';
-import { Context } from '@midwayjs/koa';
-import * as moment from 'moment';
-
-import { isEnableDebug } from '../libs/utils/fatcms-request';
-
-interface ILoggerContext extends ILogger {
-  log(msg: any, ...args: any[]): void;
-}
-
-const consoleLogger: ILoggerContext = {
-  info: (msg: any, ...args: any[]) => {
-    console.info(msg, ...args);
-  },
-  debug: (msg: any, ...args: any[]) => {
-    console.debug(msg, ...args);
-  },
-  error: (msg: any, ...args: any[]) => {
-    console.error(msg, ...args);
-  },
-  warn: (msg: any, ...args: any[]) => {
-    console.warn(msg, ...args);
-  },
-  log: (msg: any, ...args: any[]) => {
-    console.log(msg, ...args);
-  },
-};
-
-function getCallerInfo() {
-  // 创建一个新的 Error 对象
-  const error = new Error();
-  // 获取调用栈信息
-  const stack = error.stack.split('\n');
-  // 跳过前几行
-  const callerLine = stack[4];
-  // 提取文件名和行号
-  const match = callerLine.match(/at\s+(.*)\s+\((.*):(\d+):(\d+)\)/);
-  if (match) {
-    return {
-      functionName: match[1],
-      fileName: match[2],
-      lineNumber: parseInt(match[3]),
-      columnNumber: parseInt(match[4]),
-    };
-  }
-  return null;
-}
-
-/**
- * 每个Context请求，都会创建一个新的ContextLogger对象
- */
-class ContextLogger implements ILoggerContext {
-  private readonly ctx: Context;
-  private readonly app: koa.Application;
-  private readonly logList: any = [];
-
-  constructor(ctx: Context) {
-    this.app = ctx.app;
-    this.ctx = ctx;
-    this.logList = [];
-  }
-
-  getLogList() {
-    return this.logList;
-  }
-
-  debug(msg: any, ...args: any[]): void {
-    this.getLogger().debug(msg, ...args);
-    this.appendLogList('debug', msg, ...args);
-  }
-
-  error(msg: any, ...args: any[]): void {
-    this.getLogger().error(msg, ...args);
-    this.appendLogList('error', msg, ...args);
-  }
-
-  info(msg: any, ...args: any[]): void {
-    this.getLogger().info(msg, ...args);
-    this.appendLogList('info', msg, ...args);
-  }
-
-  warn(msg: any, ...args: any[]): void {
-    this.getLogger().warn(msg, ...args);
-    this.appendLogList('warn', msg, ...args);
-  }
-
-  log(msg: any, ...args: any[]): void {
-    this.getLogger().info(msg, ...args);
-    this.appendLogList('info', msg, ...args);
-  }
-
-  private appendLogList(level: string, msg: string, ...args: any[]) {
-    const ctx = this.ctx;
-    if (!isEnableDebug(ctx)) {
-      return;
-    }
-    const time = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
-    const caller = getCallerInfo();
-    this.logList.push({ level, msg, args, caller, time });
-  }
-
-  private getLogger(): ILogger {
-    const logger = this.app.getLogger('logger');
-    if (logger) {
-      return logger;
-    }
-    return consoleLogger;
-  }
-
-  public getPrefixContextLogger(prefix: string): ILoggerContext {
-    return {
-      info: (msg: any, ...args: any[]) => {
-        this.info(prefix, msg, ...args);
-      },
-      debug: (msg: any, ...args: any[]) => {
-        this.debug(prefix, msg, ...args);
-      },
-      error: (msg: any, ...args: any[]) => {
-        this.error(prefix, msg, ...args);
-      },
-      warn: (msg: any, ...args: any[]) => {
-        this.warn(prefix, msg, ...args);
-      },
-      log: (msg: any, ...args: any[]) => {
-        this.log(prefix, msg, ...args);
-      },
-    };
-  }
-}
-
-export { ContextLogger, consoleLogger, ILoggerContext };
+import { ILogger } from '@midwayjs/core';
+import * as koa from '@midwayjs/koa';
+import { Context } from '@midwayjs/koa';
+import * as moment from 'moment';
+
+import { isEnableDebug } from '../libs/utils/fatcms-request';
+
+interface ILoggerContext extends ILogger {
+  log(msg: any, ...args: any[]): void;
+}
+
+const consoleLogger: ILoggerContext = {
+  info: (msg: any, ...args: any[]) => {
+    console.info(msg, ...args);
+  },
+  debug: (msg: any, ...args: any[]) => {
+    console.debug(msg, ...args);
+  },
+  error: (msg: any, ...args: any[]) => {
+    console.error(msg, ...args);
+  },
+  warn: (msg: any, ...args: any[]) => {
+    console.warn(msg, ...args);
+  },
+  log: (msg: any, ...args: any[]) => {
+    console.log(msg, ...args);
+  },
+};
+
+function getCallerInfo() {
+  // 创建一个新的 Error 对象
+  const error = new Error();
+  // 获取调用栈信息
+  const stack = error.stack.split('\n');
+  // 跳过前几行
+  const callerLine = stack[4];
+  // 提取文件名和行号
+  const match = callerLine.match(/at\s+(.*)\s+\((.*):(\d+):(\d+)\)/);
+  if (match) {
+    return {
+      functionName: match[1],
+      fileName: match[2],
+      lineNumber: parseInt(match[3]),
+      columnNumber: parseInt(match[4]),
+    };
+  }
+  return null;
+}
+
+/**
+ * 每个Context请求，都会创建一个新的ContextLogger对象
+ */
+class ContextLogger implements ILoggerContext {
+  private readonly ctx: Context;
+  private readonly app: koa.Application;
+  private readonly logList: any = [];
+
+  constructor(ctx: Context) {
+    this.app = ctx.app;
+    this.ctx = ctx;
+    this.logList = [];
+  }
+
+  getLogList() {
+    return this.logList;
+  }
+
+  debug(msg: any, ...args: any[]): void {
+    this.getLogger().debug(msg, ...args);
+    this.appendLogList('debug', msg, ...args);
+  }
+
+  error(msg: any, ...args: any[]): void {
+    this.getLogger().error(msg, ...args);
+    this.appendLogList('error', msg, ...args);
+  }
+
+  info(msg: any, ...args: any[]): void {
+    this.getLogger().info(msg, ...args);
+    this.appendLogList('info', msg, ...args);
+  }
+
+  warn(msg: any, ...args: any[]): void {
+    this.getLogger().warn(msg, ...args);
+    this.appendLogList('warn', msg, ...args);
+  }
+
+  log(msg: any, ...args: any[]): void {
+    this.getLogger().info(msg, ...args);
+    this.appendLogList('info', msg, ...args);
+  }
+
+  private appendLogList(level: string, msg: string, ...args: any[]) {
+    const ctx = this.ctx;
+    if (!isEnableDebug(ctx)) {
+      return;
+    }
+    const time = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
+    const caller = getCallerInfo();
+    this.logList.push({ level, msg, args, caller, time });
+  }
+
+  private getLogger(): ILogger {
+    const logger = this.app.getLogger('logger');
+    if (logger) {
+      return logger;
+    }
+    return consoleLogger;
+  }
+
+  public getPrefixContextLogger(prefix: string): ILoggerContext {
+    return {
+      info: (msg: any, ...args: any[]) => {
+        this.info(prefix, msg, ...args);
+      },
+      debug: (msg: any, ...args: any[]) => {
+        this.debug(prefix, msg, ...args);
+      },
+      error: (msg: any, ...args: any[]) => {
+        this.error(prefix, msg, ...args);
+      },
+      warn: (msg: any, ...args: any[]) => {
+        this.warn(prefix, msg, ...args);
+      },
+      log: (msg: any, ...args: any[]) => {
+        this.log(prefix, msg, ...args);
+      },
+    };
+  }
+}
+
+export { ContextLogger, consoleLogger, ILoggerContext };

package/src/models/devops.ts

@@ -1,17 +1,17 @@
-// 状态；0 未启用， 1 已启用',
-export enum CommonStatusEnum {
-  DISABLED = 0,
-  ENABLED = 1,
-}
-
-/**
- * 业务异常
- */
-export class BizException {
-  public message: string;
-  public code: string;
-  constructor(message?: string, code?: string) {
-    this.message = message;
-    this.code = code || 'BizException';
-  }
-}
+// 状态；0 未启用， 1 已启用',
+export enum CommonStatusEnum {
+  DISABLED = 0,
+  ENABLED = 1,
+}
+
+/**
+ * 业务异常
+ */
+export class BizException {
+  public message: string;
+  public code: string;
+  constructor(message?: string, code?: string) {
+    this.message = message;
+    this.code = code || 'BizException';
+  }
+}