midway-fatcms 0.0.1-beta.6 → 0.0.1-beta.60

package/src/service/base/BaseService.ts

@@ -1,74 +1,95 @@
-import { Inject, Provide, App } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { RedisService } from '@midwayjs/redis';
-import { OSSService, OSSServiceFactory } from '@midwayjs/oss';
-import * as koa from '@midwayjs/koa';
-import { consoleLogger, ContextLogger, ILoggerContext } from '../../models/contextLogger';
-import { isEnableDebug, isLocalEnv } from '../../libs/utils/fatcms-request';
-
-
-@Provide()
-export class BaseService {
-  @Inject()
-  protected ctx: Context;
-
-  @App()
-  protected app: koa.Application;
-
-  @Inject()
-  protected redisService: RedisService;
-
-  @Inject()
-  protected ossServiceFactory: OSSServiceFactory;
-
-
-  /**
-   * 用户自己上传的文件，使用私有的bucket。
-   * @protected
-   */
-  protected getPrivateOSSService(): OSSService {
-    return this.ossServiceFactory.get<OSSService>('privateBucket');
-  }
-
-  /**
-   * 公共读的bucket，如js文件等使用它
-   * @protected
-   */
-  protected getPublicOSSService(): OSSService {
-    return this.ossServiceFactory.get<OSSService>('publicBucket');
-  }
-
-
-  protected getContextLogger(): ILoggerContext {
-    return this.ctx.contextLogger || consoleLogger;
-  }
-
-  protected getPrefixContextLogger(prefix: string) {
-    const s = this.ctx.contextLogger as ContextLogger;
-    return s.getPrefixContextLogger(prefix);
-  }
-
-  protected logInfo(msg: string, ...args: any) {
-    this.getContextLogger().info(msg, ...args);
-  }
-
-  protected logError(msg: string, ...args: any) {
-    this.getContextLogger().error(msg, ...args);
-  }
-
-  protected logWarn(msg: string, ...args: any) {
-    this.getContextLogger().warn(msg, ...args);
-  }
-
-  protected logDebug(msg: string, ...args: any) {
-    this.getContextLogger().debug(msg, ...args);
-  }
-
-  protected isLocalEnv(): boolean {
-    return isLocalEnv(this.ctx);
-  }
-
-  protected isEnableDebug(): boolean {
-    return isEnableDebug(this.ctx);
-  }
-}
+import { Inject, Provide, App } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { RedisService } from '@midwayjs/redis';
+import { OSSService, OSSServiceFactory } from '@midwayjs/oss';
+import * as koa from '@midwayjs/koa';
+import { consoleLogger, ContextLogger, ILoggerContext } from '@/models/contextLogger';
+import { isEnableDebug, isLocalEnv } from '@/libs/utils/fatcms-request';
+
+@Provide()
+export class BaseService {
+  @Inject()
+  protected ctx: Context;
+
+  @App()
+  protected app: koa.Application;
+
+  @Inject()
+  protected redisService: RedisService;
+
+  @Inject()
+  protected ossServiceFactory: OSSServiceFactory;
+
+  /**
+   * 请求级别的内存缓存
+   * @param key
+   * @returns
+   */
+  protected getFromCtxCache(key: string): any {
+    if (!this.ctx.ctxCacheMap) {
+      this.ctx.ctxCacheMap = {};
+    }
+    return this.ctx.ctxCacheMap[key];
+  }
+
+  /**
+   * 请求级别的内存缓存
+   * @param key
+   * @param obj
+   */
+  protected setToCtxCache(key: string, obj: any): void {
+    if (!this.ctx.ctxCacheMap) {
+      this.ctx.ctxCacheMap = {};
+    }
+    this.ctx.ctxCacheMap[key] = obj;
+  }
+
+  /**
+   * 用户自己上传的文件，使用私有的bucket。
+   * @protected
+   */
+  protected getPrivateOSSService(): OSSService {
+    return this.ossServiceFactory.get<OSSService>('privateBucket');
+  }
+
+  /**
+   * 公共读的bucket，如js文件等使用它
+   * @protected
+   */
+  protected getPublicOSSService(): OSSService {
+    return this.ossServiceFactory.get<OSSService>('publicBucket');
+  }
+
+  protected getContextLogger(): ILoggerContext {
+    return this.ctx.contextLogger || consoleLogger;
+  }
+
+  protected getPrefixContextLogger(prefix: string) {
+    const s = this.ctx.contextLogger as ContextLogger;
+    return s.getPrefixContextLogger(prefix);
+  }
+
+  protected logInfo(msg: string, ...args: any) {
+    this.getContextLogger().info(msg, ...args);
+  }
+
+  protected logError(msg: string, ...args: any) {
+    this.getContextLogger().error(msg, ...args);
+  }
+
+  protected logWarn(msg: string, ...args: any) {
+    this.getContextLogger().warn(msg, ...args);
+  }
+
+  protected logDebug(msg: string, ...args: any) {
+    this.getContextLogger().debug(msg, ...args);
+  }
+
+  protected isLocalEnv(): boolean {
+    return isLocalEnv(this.ctx);
+  }
+
+  protected isEnableDebug(): boolean {
+    return isEnableDebug(this.ctx);
+  }
+}

package/src/service/base/RedisCacheService.ts

@@ -1,38 +1,42 @@
-import { Inject, Provide, App } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { RedisService } from '@midwayjs/redis';
-import { OSSServiceFactory } from '@midwayjs/oss';
-import * as koa from '@midwayjs/koa';
-import {parseJsonObject} from "../../libs/utils/functions";
-
-
-@Provide()
-export class RedisCacheService {
-  @Inject()
-  protected ctx: Context;
-
-  @App()
-  protected app: koa.Application;
-
-  @Inject()
-  protected redisService: RedisService;
-
-  @Inject()
-  protected ossServiceFactory: OSSServiceFactory;
-
-
-  async getJsonObject(key: string): Promise<any>  {
-    const str = await this.redisService.get(key);
-    return parseJsonObject(str)
-  }
-
-  async setJsonObject(key: string, obj: any, expireSecond: number): Promise<any> {
-    const str = JSON.stringify(obj);
-    return this.redisService.set(key, str, 'EX', expireSecond);
-  }
-
-  async removeItem(key: string): Promise<any>  {
-    return await this.redisService.del(key);
-  }
-
-}
+import { Inject, Provide, App } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { RedisService } from '@midwayjs/redis';
+import { OSSServiceFactory } from '@midwayjs/oss';
+import * as koa from '@midwayjs/koa';
+import { parseJsonObject } from '../../libs/utils/functions';
+
+@Provide()
+export class RedisCacheService {
+  @Inject()
+  protected ctx: Context;
+
+  @App()
+  protected app: koa.Application;
+
+  @Inject()
+  protected redisService: RedisService;
+
+  @Inject()
+  protected ossServiceFactory: OSSServiceFactory;
+
+  async getJsonObject(key: string): Promise<any> {
+    const str = await this.redisService.get(key);
+    return parseJsonObject(str);
+  }
+
+  /**
+   * 设置缓存对象
+   * @param key
+   * @param obj
+   * @param expireSecond 过期时间，单位秒
+   * @returns
+   */
+  async setJsonObject(key: string, obj: any, expireSecond: number): Promise<any> {
+    const str = JSON.stringify(obj);
+    return this.redisService.set(key, str, 'EX', expireSecond);
+  }
+
+  async removeItem(key: string): Promise<any> {
+    return await this.redisService.del(key);
+  }
+}

package/src/service/crudstd/CrudStdActionService.ts

@@ -1,27 +1,27 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import * as _ from 'lodash';
-import { CurdMixService } from '../curd/CurdMixService';
-import { IRequestModel } from '../../libs/crud-pro/interfaces';
-import { ICrudStdAppInfo } from '../../models/bizmodels';
-import { BaseService } from '../base/BaseService';
-
-interface IHandleStdActionByReq {
-  actionsMap: any;
-  appInfo: ICrudStdAppInfo;
-  params: IRequestModel;
-  actionCfg: any;
-}
-
-@Provide()
-export class CrudStdActionService extends BaseService {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  protected curdMixService: CurdMixService;
-
-  public async handleStdActionByReq({ appInfo, params, actionCfg }: IHandleStdActionByReq) {
-    return null;
-  }
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import * as _ from 'lodash';
+import { CurdMixService } from '../curd/CurdMixService';
+import { IRequestModel } from '../../libs/crud-pro/interfaces';
+import { ICrudStdAppInfo } from '../../models/bizmodels';
+import { BaseService } from '../base/BaseService';
+
+interface IHandleStdActionByReq {
+  actionsMap: any;
+  appInfo: ICrudStdAppInfo;
+  params: IRequestModel;
+  actionCfg: any;
+}
+
+@Provide()
+export class CrudStdActionService extends BaseService {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  protected curdMixService: CurdMixService;
+
+  public async handleStdActionByReq({ appInfo, params, actionCfg }: IHandleStdActionByReq) {
+    return null;
+  }
+}

package/src/service/crudstd/CrudStdConstant.ts

@@ -1,62 +1,62 @@
-/**
- * 工具栏的动作。一般都是批量操作
- */
-const toolbarOptions = {
-  ToolbarCreateFormPro: 'ToolbarCreateFormPro', // 新建
-  ToolbarBatchEditFormPro: 'ToolbarBatchEditFormPro', // 批量编辑
-  ToolbarBatchDelete: 'ToolbarBatchDelete', //批量删除
-  ToolbarBatchCreate: 'ToolbarBatchCreate', // 批量新建
-  ToolbarSpecializedScene: 'ToolbarSpecializedScene',
-  ToolbarOpenURL: 'ToolbarOpenURL',
-};
-
-/**
- * 操作列的可选项
- * @type {{}}
- */
-const actionColumnOptions = {
-  ActionDialogEditFormPro: 'ActionDialogEditFormPro',
-  ActionDialogDelete: 'ActionDialogDelete',
-  ActionLinkTo: 'ActionLinkTo', // 跳转链接(自动拼参数)
-  ActionLinkToCustom: 'ActionLinkToCustom', // 跳转链接(完全自定义)
-  ActionDialogEditJSON: 'ActionDialogEditJSON',
-  ActionDialogEditHTML: 'ActionDialogEditHTML',
-  ActionDialogEditText: 'ActionDialogEditText',
-  ActionDialogEditRichText: 'ActionDialogEditRichText',
-  ActionDialogEditExcel: 'ActionDialogEditExcel',
-  ActionDrawerRelationCrud: 'ActionDrawerRelationCrud', // 关联对象CRUD
-  ActionSpecializedScene: 'ActionSpecializedScene',
-};
-
-/**
- * 表格列展示字段
- * @type {{}}
- */
-const tableColumnRenders = {
-  RenderString: 'RenderString',
-  RenderDictEnumText: 'RenderDictEnumText',
-  RenderDictEnumStatus: 'RenderDictEnumStatus',
-  RenderEntityStatus: 'RenderEntityStatus',
-  RenderDateTime: 'RenderDateTime',
-  RenderDate: 'RenderDate',
-  RenderImage: 'RenderImage',
-  RenderLink: 'RenderLink',
-  RenderHTML: 'RenderHTML',
-  RenderJSON: 'RenderJSON',
-  RenderDialogText: 'RenderDialogText',
-  RenderDialogHTML: 'RenderDialogHTML',
-  RenderDialogJSON: 'RenderDialogJSON',
-  RenderUserInfo: 'RenderUserInfo',
-};
-
-/**
- * 字段关联数据类型
- * @type {{}}
- */
-const fieldLinkToTypes = {
-  linkToDict: 'linkToDict',
-  linkToSysCfgEnum: 'linkToSysCfgEnum',
-  linkToCustom: 'linkToCustom',
-};
-
-export { toolbarOptions, actionColumnOptions, tableColumnRenders, fieldLinkToTypes };
+/**
+ * 工具栏的动作。一般都是批量操作
+ */
+const toolbarOptions = {
+  ToolbarCreateFormPro: 'ToolbarCreateFormPro', // 新建
+  ToolbarBatchEditFormPro: 'ToolbarBatchEditFormPro', // 批量编辑
+  ToolbarBatchDelete: 'ToolbarBatchDelete', //批量删除
+  ToolbarBatchCreate: 'ToolbarBatchCreate', // 批量新建
+  ToolbarSpecializedScene: 'ToolbarSpecializedScene',
+  ToolbarOpenURL: 'ToolbarOpenURL',
+};
+
+/**
+ * 操作列的可选项
+ * @type {{}}
+ */
+const actionColumnOptions = {
+  ActionDialogEditFormPro: 'ActionDialogEditFormPro',
+  ActionDialogDelete: 'ActionDialogDelete',
+  ActionLinkTo: 'ActionLinkTo', // 跳转链接(自动拼参数)
+  ActionLinkToCustom: 'ActionLinkToCustom', // 跳转链接(完全自定义)
+  ActionDialogEditJSON: 'ActionDialogEditJSON',
+  ActionDialogEditHTML: 'ActionDialogEditHTML',
+  ActionDialogEditText: 'ActionDialogEditText',
+  ActionDialogEditRichText: 'ActionDialogEditRichText',
+  ActionDialogEditExcel: 'ActionDialogEditExcel',
+  ActionDrawerRelationCrud: 'ActionDrawerRelationCrud', // 关联对象CRUD
+  ActionSpecializedScene: 'ActionSpecializedScene',
+};
+
+/**
+ * 表格列展示字段
+ * @type {{}}
+ */
+const tableColumnRenders = {
+  RenderString: 'RenderString',
+  RenderDictEnumText: 'RenderDictEnumText',
+  RenderDictEnumStatus: 'RenderDictEnumStatus',
+  RenderEntityStatus: 'RenderEntityStatus',
+  RenderDateTime: 'RenderDateTime',
+  RenderDate: 'RenderDate',
+  RenderImage: 'RenderImage',
+  RenderLink: 'RenderLink',
+  RenderHTML: 'RenderHTML',
+  RenderJSON: 'RenderJSON',
+  RenderDialogText: 'RenderDialogText',
+  RenderDialogHTML: 'RenderDialogHTML',
+  RenderDialogJSON: 'RenderDialogJSON',
+  RenderUserInfo: 'RenderUserInfo',
+};
+
+/**
+ * 字段关联数据类型
+ * @type {{}}
+ */
+const fieldLinkToTypes = {
+  linkToDict: 'linkToDict',
+  linkToSysCfgEnum: 'linkToSysCfgEnum',
+  linkToCustom: 'linkToCustom',
+};
+
+export { toolbarOptions, actionColumnOptions, tableColumnRenders, fieldLinkToTypes };

package/src/service/crudstd/CrudStdRelationService.ts

@@ -1,78 +1,118 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import * as _ from 'lodash';
-import { CurdMixService } from '../curd/CurdMixService';
-import { IRequestCfgModel } from '../../libs/crud-pro/interfaces';
-import { ICrudStdAppInfoForSettingKey } from '../../models/bizmodels';
-import { BaseService } from '../base/BaseService';
-import { tableColumnRenders, fieldLinkToTypes } from './CrudStdConstant';
-import { RelatedType } from '../curd/CurdMixUtils';
-
-@Provide()
-export class CrudStdRelationService extends BaseService {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  protected curdMixService: CurdMixService;
-
-  async addCfgModelColumnsRelation(cfgModel: IRequestCfgModel, appInfo: ICrudStdAppInfoForSettingKey) {
-    const tableColumns = appInfo?.stdCrudCfgObj?.tableColumns;
-    const tableFields = appInfo?.stdCrudCfgObj?.tableFields || [];
-
-    if (!Array.isArray(tableColumns)) {
-      return;
-    }
-
-    const columnsRelation = [];
-    cfgModel.columnsRelation = columnsRelation;
-    for (let i = 0; i < tableColumns.length; i++) {
-      const tableColumn = tableColumns[i];
-      const dataIndex = _.get(tableColumn, 'dataIndex');
-      const componentName = _.get(tableColumn, 'component.componentName');
-
-      // 关联用户信息
-      if (componentName === tableColumnRenders.RenderUserInfo) {
-        columnsRelation.push({
-          relatedType: RelatedType.accountBasic,
-          sourceColumn: dataIndex,
-          targetColumns: [], // 使用默认
-        });
-      }
-
-      // 关联枚举文案/状态标签颜色
-      if (componentName === tableColumnRenders.RenderDictEnumText || componentName === tableColumnRenders.RenderDictEnumStatus) {
-        const fieldCfg = tableFields.find(f => {
-          return f.fieldIndex === dataIndex;
-        });
-
-        if (fieldCfg && fieldCfg.linkToType === fieldLinkToTypes.linkToCustom) {
-          columnsRelation.push({
-            relatedType: RelatedType.linkToCustom,
-            relatedCode: fieldCfg.linkToCustom,
-            sourceColumn: dataIndex,
-            targetColumns: [], // 使用默认
-          });
-        }
-
-        if (fieldCfg && fieldCfg.linkToType === fieldLinkToTypes.linkToSysCfgEnum) {
-          columnsRelation.push({
-            relatedType: RelatedType.sysCfgEnum,
-            relatedCode: fieldCfg.linkToSysCfgEnumCode,
-            sourceColumn: dataIndex,
-            targetColumns: [], // 使用默认
-          });
-        }
-
-        if (fieldCfg && fieldCfg.linkToType === fieldLinkToTypes.linkToDict) {
-          columnsRelation.push({
-            relatedType: RelatedType.dict,
-            relatedCode: fieldCfg.linkToDictCode,
-            sourceColumn: dataIndex,
-            targetColumns: [], // 使用默认
-          });
-        }
-      }
-    }
-  }
-}
+/* eslint-disable prettier/prettier */
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import * as _ from 'lodash';
+import { CurdMixService } from '../curd/CurdMixService';
+import { IRequestCfgModel } from '../../libs/crud-pro/interfaces';
+import { ICrudStdAppInfoForSettingKey } from '../../models/bizmodels';
+import { BaseService } from '../base/BaseService';
+import { tableColumnRenders, fieldLinkToTypes } from './CrudStdConstant';
+import { RelatedType } from '../curd/CurdMixUtils';
+
+
+class ColumnsRelationMaker {
+  private cfgModel: IRequestCfgModel;
+  private appInfo: ICrudStdAppInfoForSettingKey;
+  constructor(cfgModel: IRequestCfgModel, appInfo: ICrudStdAppInfoForSettingKey) {
+    cfgModel.columnsRelation = [];
+    this.cfgModel = cfgModel;
+    this.appInfo = appInfo;
+  }
+
+  addColumnRelationByAccount(dataIndex: string) {
+    const columnsRelation = this.cfgModel.columnsRelation;
+    columnsRelation.push({
+      relatedType: RelatedType.accountBasic,
+      sourceColumn: dataIndex,
+      targetColumns: [], // 使用默认
+    });
+  }
+
+  addColumnRelationByDictEnumStatus(dataIndex: string) {
+    const appInfo = this.appInfo;
+    const tableFields = appInfo?.stdCrudCfgObj?.tableFields || [];
+    const columnsRelation = this.cfgModel.columnsRelation;
+    const fieldCfg = tableFields.find(f => {
+      return f.fieldIndex === dataIndex;
+    });
+
+    if (fieldCfg && fieldCfg.linkToType === fieldLinkToTypes.linkToCustom) {
+      columnsRelation.push({
+        relatedType: RelatedType.linkToCustom,
+        relatedCode: fieldCfg.linkToCustom,
+        sourceColumn: dataIndex,
+        targetColumns: [], // 使用默认
+      });
+    }
+
+    if (fieldCfg && fieldCfg.linkToType === fieldLinkToTypes.linkToSysCfgEnum) {
+      columnsRelation.push({
+        relatedType: RelatedType.sysCfgEnum,
+        relatedCode: fieldCfg.linkToSysCfgEnumCode,
+        sourceColumn: dataIndex,
+        targetColumns: [], // 使用默认
+      });
+    }
+
+    if (fieldCfg && fieldCfg.linkToType === fieldLinkToTypes.linkToDict) {
+      columnsRelation.push({
+        relatedType: RelatedType.dict,
+        relatedCode: fieldCfg.linkToDictCode,
+        sourceColumn: dataIndex,
+        targetColumns: [], // 使用默认
+      });
+    }
+  }
+
+
+}
+
+
+@Provide()
+export class CrudStdRelationService extends BaseService {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  protected curdMixService: CurdMixService;
+
+  async addCfgModelColumnsRelation(cfgModel: IRequestCfgModel, appInfo: ICrudStdAppInfoForSettingKey) {
+    const tableColumns = appInfo?.stdCrudCfgObj?.tableColumns;
+
+    if (!Array.isArray(tableColumns) || tableColumns.length === 0) {
+      return;
+    }
+
+    const maker = new ColumnsRelationMaker(cfgModel, appInfo);
+
+    for (let i = 0; i < tableColumns.length; i++) {
+      const tableColumn = tableColumns[i];
+      const dataIndex = _.get(tableColumn, 'dataIndex');
+      const componentName = _.get(tableColumn, 'component.componentName');
+
+      // 关联用户信息
+      if (componentName === tableColumnRenders.RenderUserInfo) {
+        maker.addColumnRelationByAccount(dataIndex);
+      }
+
+      // 关联枚举文案/状态标签颜色
+      if (componentName === tableColumnRenders.RenderDictEnumText || componentName === tableColumnRenders.RenderDictEnumStatus) {
+        maker.addColumnRelationByDictEnumStatus(dataIndex);
+      }
+
+      // 子属性的配置
+      const balloonTipFields = _.get(tableColumn, 'component.props.balloonTipFields');
+      if (Array.isArray(balloonTipFields) && balloonTipFields.length > 0) {
+        for (let j = 0; j < balloonTipFields.length; j++) {
+          const { component, name } = balloonTipFields[j] || {};
+          if (component === tableColumnRenders.RenderUserInfo) {
+            maker.addColumnRelationByAccount(name);
+          }
+        }
+      }
+
+
+
+    }
+  }
+}