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

package/src/libs/utils/functions.ts

@@ -1,67 +1,73 @@
-import * as md5 from 'md5';
-
-let createUniqueIdIndex = 0;
-function createUniqueId(): string {
-  createUniqueIdIndex++;
-  const p1 = md5(Date.now() + '' + Math.random() + '_' + createUniqueIdIndex);
-  const p2 = Date.now().toString(32);
-  return p1 + p2;
-}
-
-function parseJsonObject(str: any): any {
-  if (typeof str === 'object') {
-    return str;
-  }
-
-  if (typeof str === 'string') {
-    str = str.trim();
-    if (str.startsWith('{') || str.startsWith('[')) {
-      try {
-        return JSON.parse(str);
-      } catch (e) {
-        return null;
-      }
-    }
-  }
-  return null;
-}
-
-function trimStringArray(obj: any[]): string[] {
-  return obj
-    .map(s => {
-      if (typeof s === 'string') {
-        return s.trim();
-      }
-      return null;
-    })
-    .filter(Boolean);
-}
-
-function parseStringTrimArray(obj: any, separator = ','): string[] {
-  if (Array.isArray(obj)) {
-    return trimStringArray(obj);
-  }
-
-  if (typeof obj === 'string') {
-    const str = obj.trim();
-    if (str.length > 0) {
-      // 可能是一个JSON数组
-      if (str.startsWith('[') && str.endsWith(']')) {
-        const arr = parseJsonObject(str);
-        return trimStringArray(arr);
-      }
-
-      // 使用分隔符分隔
-      if (str.includes(separator)) {
-        const arr = str.split(separator);
-        return trimStringArray(arr);
-      }
-
-      return [str];
-    }
-  }
-
-  return null;
-}
-
-export { createUniqueId, parseJsonObject, parseStringTrimArray };
+import * as md5 from 'md5';
+import * as moment from 'moment';
+
+let createUniqueIdIndex = 0;
+function createUniqueId(): string {
+  createUniqueIdIndex++;
+  const p1 = md5(Date.now() + '' + Math.random() + '_' + createUniqueIdIndex);
+  const p2 = Date.now().toString(32);
+  return p1 + p2;
+}
+
+function parseJsonObject(str: any): any {
+  if (typeof str === 'object') {
+    return str;
+  }
+
+  if (typeof str === 'string') {
+    str = str.trim();
+    if (str.startsWith('{') || str.startsWith('[')) {
+      try {
+        return JSON.parse(str);
+      } catch (e) {
+        return null;
+      }
+    }
+  }
+  return null;
+}
+
+function trimStringArray(obj: any[]): string[] {
+  return obj
+    .map(s => {
+      if (typeof s === 'string') {
+        return s.trim();
+      }
+      return null;
+    })
+    .filter(Boolean);
+}
+
+function parseStringTrimArray(obj: any, separator = ','): string[] {
+  if (Array.isArray(obj)) {
+    return trimStringArray(obj);
+  }
+
+  if (typeof obj === 'string') {
+    const str = obj.trim();
+    if (str.length > 0) {
+      // 可能是一个JSON数组
+      if (str.startsWith('[') && str.endsWith(']')) {
+        const arr = parseJsonObject(str);
+        return trimStringArray(arr);
+      }
+
+      // 使用分隔符分隔
+      if (str.includes(separator)) {
+        const arr = str.split(separator);
+        return trimStringArray(arr);
+      }
+
+      return [str];
+    }
+  }
+
+  return null;
+}
+
+
+function getCurrentFullMoment(): string {
+  return moment(Date.now()).format('YYYY-MM-DD HH:mm:ss.SSS');
+}
+
+export { createUniqueId, parseJsonObject, parseStringTrimArray, getCurrentFullMoment };

package/src/libs/utils/render-utils.ts

@@ -1,184 +1,184 @@
-import * as _ from 'lodash';
-import * as moment from 'moment';
-import {Context} from '@midwayjs/koa';
-import {parseJsonObject} from "./functions";
-import {getExtLocalLoaderPort} from "./fatcms-request";
-import {TypeUtils} from "../crud-pro/utils/TypeUtils";
-
-// const demo = {"schema":[
-//   {"title":"资源配置","name":"fileList","type":"array","properties":{"fileUrl":{"label":"文件URL","component":"Input","xProps":{"hasClear":true},"width":500}}}],
-//   "data":{"fileList":[{"settingKey":"n1iqmu8qnc_1","fileUrl":"aa"},{"settingKey":"n1iqmu8rml_2","fileUrl":"aa"}]
-// }}
-
-
-interface IFileElement {
-  fileUrl: string;
-  fileType?: string;
-  isModule?: boolean;
-}
-
-interface IRenderUtilsProps {
-  ctx: Context;
-  package_assets: any;
-  workbenchInfo: any;
-  userInfo?: any;
-  appInfo?: any;
-  fatcmscsrftoken: string;
-}
-
-function parseCookie(cookieStr:string) : any {
-  const cookies = {};
-
-  if (!cookieStr) {
-    return cookies;
-  }
-
-  // 分割每个 cookie 项
-  const cookieItems = cookieStr.split(';');
-
-  for (const item of cookieItems) {
-    // 去除空白字符
-    const trimmedItem = item.trim();
-    if (!trimmedItem) {
-      continue;
-    }
-
-    // 找到第一个等号的位置
-    const eqIndex = trimmedItem.indexOf('=');
-    if (eqIndex === -1) {
-      continue;
-    }
-
-    // 提取 key 和 value
-    const key = trimmedItem.substring(0, eqIndex).trim();
-    const value = trimmedItem.substring(eqIndex + 1).trim();
-
-    // 处理可能的引号
-    if (value.startsWith('"') && value.endsWith('"')) {
-      cookies[key] = value.slice(1, -1);
-    } else {
-      cookies[key] = value;
-    }
-  }
-
-  return cookies;
-}
-
-
-class RenderUtils {
-  private readonly ctx: Context;
-  private readonly fileList: IFileElement[];
-  private readonly workbenchInfo: any;
-  private readonly userInfo: any;
-  private readonly appInfo: any;
-  private readonly fatcmscsrftoken: string;
-
-  constructor(props: IRenderUtilsProps) {
-    this.ctx = props.ctx;
-    this.workbenchInfo = props.workbenchInfo || {};
-    this.userInfo = props.userInfo || {};
-    this.appInfo = props.appInfo || {};
-    this.fatcmscsrftoken = props.fatcmscsrftoken;
-    const packageAssets = parseJsonObject(props.package_assets) || {};
-    const fileList = _.get(packageAssets, 'data.fileList');
-    if (Array.isArray(fileList)) {
-      this.fileList = fileList.filter((f)=> {
-        return f && f.fileUrl && typeof f.fileUrl === 'string' && f.fileUrl.length > 5; // 至少五个字符。
-      });
-    } else {
-      this.fileList = [];
-      const time = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
-      console.info(time + ' 解析fileList为空==>' + JSON.stringify({
-        workbench_code: this.workbenchInfo?.workbench_code,
-        app_code: this.appInfo?.app_code,
-      }))
-    }
-  }
-
-  renderCsrfToken() {
-    return `<script>window.__fatcmscsrftoken = "${this.fatcmscsrftoken}";</script>`;
-  }
-
-  renderUserInfo() {
-    return `<script>window.__user_info = ${JSON.stringify(this.userInfo)}  </script>`;
-  }
-
-  renderWorkbenchInfo() {
-    const infoPick = _.pick(this.workbenchInfo, [
-      'id', 'workbench_code', 'workbench_name', 'workbench_domain', 'workbench_desc', 'config_type', 'config_content'
-    ]);
-    return `<script>window.__workbench_info = ${JSON.stringify(infoPick)}</script>`;
-  }
-
-  renderAppInfo() {
-    const infoPick = _.pick(this.appInfo, [
-      'id', 'app_code', 'app_name', 'app_type', 'app_desc', 'config_type', 'config_content'
-    ]);
-    return `<script>window.__app_info = ${JSON.stringify(infoPick)}</script>`;
-  }
-
-  renderCookieInfo(keys: string) {
-    try {
-      const cookies = parseCookie(this.ctx.headers?.cookie)
-      const cookieObj = {};
-      if (typeof keys === 'string') {
-        const keyArr = keys.split(',');
-        for (let i = 0; i < keyArr.length; i++) {
-          const keyName = keyArr[i];
-          cookieObj[keyName] = cookies[keyName];
-        }
-      }
-      return `<script>window.__cookie_info = ${JSON.stringify(cookieObj)}</script>`;
-    } catch (e) {
-      return `<script>window.__cookie_info_error = ${e}; </script>`;
-    }
-
-  }
-
-
-  renderJsAssets() {
-    const fileList = this.fileList.filter((s) => {
-      return s.fileType === 'js' || s.fileUrl.endsWith('.js');
-    });
-    const arr = fileList.map(f => {
-      if (f.isModule) {
-        return `<script type="module" crossorigin src="${f.fileUrl}" ></script>`
-      }
-      return `<script src="${f.fileUrl}" ></script>`
-    });
-    return arr.join('\n');
-  }
-
-  renderCssAssets() {
-    const fileList = this.fileList.filter((s) => {
-      return s.fileType === 'css' || s.fileUrl.endsWith('.css');
-    });
-    const fileUrlList = fileList.map(f => {
-      return f.fileUrl;
-    });
-
-    const arr = fileUrlList.map((url) => {
-      return `<link href="${url}" rel="stylesheet" />`;
-    });
-    return arr.join('\n');
-  }
-
-
-
-  renderExtLocalLoaderPortByDevHeader(){
-    const loaderPort = getExtLocalLoaderPort(this.ctx);
-    if (loaderPort && TypeUtils.isNumeric(loaderPort)) {
-      return `<script>window.__local_loader_port_from_dev_header = ${loaderPort}</script>`;
-    }
-    return '';
-  }
-
-}
-
-function createRenderUtils(props: IRenderUtilsProps) {
-  return new RenderUtils(props)
-}
-
-export {
-  createRenderUtils
-}
+import * as _ from 'lodash';
+import * as moment from 'moment';
+import {Context} from '@midwayjs/koa';
+import {parseJsonObject} from "./functions";
+import {getExtLocalLoaderPort} from "./fatcms-request";
+import {TypeUtils} from "../crud-pro/utils/TypeUtils";
+
+// const demo = {"schema":[
+//   {"title":"资源配置","name":"fileList","type":"array","properties":{"fileUrl":{"label":"文件URL","component":"Input","xProps":{"hasClear":true},"width":500}}}],
+//   "data":{"fileList":[{"settingKey":"n1iqmu8qnc_1","fileUrl":"aa"},{"settingKey":"n1iqmu8rml_2","fileUrl":"aa"}]
+// }}
+
+
+interface IFileElement {
+  fileUrl: string;
+  fileType?: string;
+  isModule?: boolean;
+}
+
+interface IRenderUtilsProps {
+  ctx: Context;
+  package_assets: any;
+  workbenchInfo: any;
+  userInfo?: any;
+  appInfo?: any;
+  fatcmscsrftoken: string;
+}
+
+function parseCookie(cookieStr:string) : any {
+  const cookies = {};
+
+  if (!cookieStr) {
+    return cookies;
+  }
+
+  // 分割每个 cookie 项
+  const cookieItems = cookieStr.split(';');
+
+  for (const item of cookieItems) {
+    // 去除空白字符
+    const trimmedItem = item.trim();
+    if (!trimmedItem) {
+      continue;
+    }
+
+    // 找到第一个等号的位置
+    const eqIndex = trimmedItem.indexOf('=');
+    if (eqIndex === -1) {
+      continue;
+    }
+
+    // 提取 key 和 value
+    const key = trimmedItem.substring(0, eqIndex).trim();
+    const value = trimmedItem.substring(eqIndex + 1).trim();
+
+    // 处理可能的引号
+    if (value.startsWith('"') && value.endsWith('"')) {
+      cookies[key] = value.slice(1, -1);
+    } else {
+      cookies[key] = value;
+    }
+  }
+
+  return cookies;
+}
+
+
+class RenderUtils {
+  private readonly ctx: Context;
+  private readonly fileList: IFileElement[];
+  private readonly workbenchInfo: any;
+  private readonly userInfo: any;
+  private readonly appInfo: any;
+  private readonly fatcmscsrftoken: string;
+
+  constructor(props: IRenderUtilsProps) {
+    this.ctx = props.ctx;
+    this.workbenchInfo = props.workbenchInfo || {};
+    this.userInfo = props.userInfo || {};
+    this.appInfo = props.appInfo || {};
+    this.fatcmscsrftoken = props.fatcmscsrftoken;
+    const packageAssets = parseJsonObject(props.package_assets) || {};
+    const fileList = _.get(packageAssets, 'data.fileList');
+    if (Array.isArray(fileList)) {
+      this.fileList = fileList.filter((f)=> {
+        return f && f.fileUrl && typeof f.fileUrl === 'string' && f.fileUrl.length > 5; // 至少五个字符。
+      });
+    } else {
+      this.fileList = [];
+      const time = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
+      console.info(time + ' 解析fileList为空==>' + JSON.stringify({
+        workbench_code: this.workbenchInfo?.workbench_code,
+        app_code: this.appInfo?.app_code,
+      }))
+    }
+  }
+
+  renderCsrfToken() {
+    return `<script>window.__fatcmscsrftoken = "${this.fatcmscsrftoken}";</script>`;
+  }
+
+  renderUserInfo() {
+    return `<script>window.__user_info = ${JSON.stringify(this.userInfo)}  </script>`;
+  }
+
+  renderWorkbenchInfo() {
+    const infoPick = _.pick(this.workbenchInfo, [
+      'id', 'workbench_code', 'workbench_name', 'workbench_domain', 'workbench_desc', 'config_type', 'config_content'
+    ]);
+    return `<script>window.__workbench_info = ${JSON.stringify(infoPick)}</script>`;
+  }
+
+  renderAppInfo() {
+    const infoPick = _.pick(this.appInfo, [
+      'id', 'app_code', 'app_name', 'app_type', 'app_desc', 'config_type', 'config_content'
+    ]);
+    return `<script>window.__app_info = ${JSON.stringify(infoPick)}</script>`;
+  }
+
+  renderCookieInfo(keys: string) {
+    try {
+      const cookies = parseCookie(this.ctx.headers?.cookie)
+      const cookieObj = {};
+      if (typeof keys === 'string') {
+        const keyArr = keys.split(',');
+        for (let i = 0; i < keyArr.length; i++) {
+          const keyName = keyArr[i];
+          cookieObj[keyName] = cookies[keyName];
+        }
+      }
+      return `<script>window.__cookie_info = ${JSON.stringify(cookieObj)}</script>`;
+    } catch (e) {
+      return `<script>window.__cookie_info_error = ${e}; </script>`;
+    }
+
+  }
+
+
+  renderJsAssets() {
+    const fileList = this.fileList.filter((s) => {
+      return s.fileType === 'js' || s.fileUrl.endsWith('.js');
+    });
+    const arr = fileList.map(f => {
+      if (f.isModule) {
+        return `<script type="module" crossorigin src="${f.fileUrl}" ></script>`
+      }
+      return `<script src="${f.fileUrl}" ></script>`
+    });
+    return arr.join('\n');
+  }
+
+  renderCssAssets() {
+    const fileList = this.fileList.filter((s) => {
+      return s.fileType === 'css' || s.fileUrl.endsWith('.css');
+    });
+    const fileUrlList = fileList.map(f => {
+      return f.fileUrl;
+    });
+
+    const arr = fileUrlList.map((url) => {
+      return `<link href="${url}" rel="stylesheet" />`;
+    });
+    return arr.join('\n');
+  }
+
+
+
+  renderExtLocalLoaderPortByDevHeader(){
+    const loaderPort = getExtLocalLoaderPort(this.ctx);
+    if (loaderPort && TypeUtils.isNumeric(loaderPort)) {
+      return `<script>window.__local_loader_port_from_dev_header = ${loaderPort}</script>`;
+    }
+    return '';
+  }
+
+}
+
+function createRenderUtils(props: IRenderUtilsProps) {
+  return new RenderUtils(props)
+}
+
+export {
+  createRenderUtils
+}

package/src/middleware/permission.middleware.ts

@@ -17,11 +17,10 @@ function checkPermission(codeList: string | string[]) {
     // 查询当前用户是否用此功能点的权限
     const hasPermission = userSession.hasAnyPermission(codeList);
     if (!hasPermission) {
-
       let message: string;
       const loginName = userSession.getSessionInfo().loginName;
       if (loginName === 'devopsviewer') {
-        message= "开放体验账号不支持这些操作：新增、修改、删除、上传";
+        message = '开放体验账号不支持这些操作：新增、修改、删除、上传';
       } else {
         message = '缺少权限: ' + JSON.stringify(codeList);
       }

package/src/models/AsyncTaskModel.ts

@@ -28,11 +28,11 @@ export interface SysAsyncTaskEntity {
   max_retries: number;
 
   parent_task_id: number | null;
-  created_at: Date;
-  started_at: Date | null;
-  updated_at: Date;
-  expired_at: Date | null;
-  completed_at: Date | null;
+  created_at: Date | string | null;
+  started_at: Date | string | null;
+  updated_at: Date | string | null;
+  expired_at: Date | string | null;
+  completed_at: Date | string | null;
   created_user_session: string;
 }
 
@@ -42,12 +42,15 @@ export enum SysAsyncTaskStatus {
   PENDING = 'PENDING', // 等待中，还未进入排队
   RUNNING = 'RUNNING', // 运行中
   SUCCEEDED = 'SUCCEEDED', // 终止状态：全部成功
-  PART_SUCCEEDED = 'PART_SUCCEEDED',// 终止状态：部分成功
+  PART_SUCCEEDED = 'PART_SUCCEEDED', // 终止状态：部分成功
   FAILED = 'FAILED', // 终止状态：失败
   CANCELLED = 'CANCELLED', // 取消
   PAUSED = 'PAUSED', // 暂停
 }
 
+/**
+ * 导出的文件名后缀
+ */
 export enum SysAsyncFileFormat {
   XLSX = 'xlsx',
   CSV = 'csv',

package/src/models/RedisKeys.ts

@@ -1,13 +1,13 @@
-
-
 const RedisKeys = {
-  ASYNC_TASK_LOCK : "FatAsyncTaskLock",
-  ASYNC_TASK_UPDATE_TIME : "FatAsyncTaskUpdateTime",
-  USER_SESSION_PREFIX : "FatUserSession_",
-  VISIT_STAT_LOCK_PREFIX : "FatVsLock_",
-  VISIT_STAT_DATE_PREFIX : "FatVsDate_",
-}
+  ASYNC_TASK_LOCK: 'FatAsyncTaskLock',
+  ASYNC_TASK_UPDATE_TIME: 'FatAsyncTaskUpdateTime',
+  USER_SESSION_PREFIX: 'FatUserSession_',
+  USER_ACTION_TIME_LIMIT_PREFIX: 'FatUserActionTimeLimit_',
+  VISIT_STAT_LOCK_PREFIX: 'FatVsLock_',
+  VISIT_STAT_DATE_PREFIX: 'FatVsDate_',
+  LINK_TO_CUSTOM_PREFIX: 'FatLinkToCustom@@',
+  CURD_MIX_BY_DICT_PREFIX: 'FatCurdMixByDict@@',
+  QUERY_ENUM_INFO_PREFIX: 'FatQueryEnum@@',
+};
 
-export {
-  RedisKeys
-}
+export { RedisKeys };