midway-fatcms 0.0.1-beta.71 → 0.0.1-beta.72

package/src/libs/utils/functions.ts

@@ -4,9 +4,13 @@ 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;
+  if (createUniqueIdIndex > Date.now()) {
+    createUniqueIdIndex = 0;
+  }
+  const p1 = md5(Date.now() + '' + Math.random() + '_' + createUniqueIdIndex + '_' +  Math.random());
+  const p2 = `${Date.now().toString(32)}`.padStart(10, '0');
+  const p3 = `${createUniqueIdIndex.toString(32)}`.padStart(10, '0');
+  return p1 + p2 + p3;
 }
 
 function parseJsonObject(str: any): any {

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

@@ -1,216 +1,216 @@
-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';
-import { ISessionInfo } from '@/models/userSession';
-
-// 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?: ISessionInfo;
-  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;
-}
-
-
-function isMobileUserAgent(userAgent = '') {
-  // 空值处理
-  if (!userAgent) return false;
-
-  // 转为小写统一匹配
-  const ua = userAgent.toLowerCase();
-
-  // 【核心】移动端关键词（覆盖主流系统）
-  const mobileKeywords = /android|iphone|ipod|ios|mobile|blackberry|iemobile|opera mini|windows phone|harmonyos/i;
-  // 【排除项】平板/PC关键词（避免误判）
-  const excludeKeywords = /ipad|tablet|playbook|kindle|pc|windows nt|macintosh|linux x86_64/i;
-
-  // 判断规则：包含移动端关键词 + 不包含排除项关键词
-  const isMatchMobile = mobileKeywords.test(ua);
-  const isExclude = excludeKeywords.test(ua);
-
-  return isMatchMobile && !isExclude;
-}
-
-class RenderUtils {
-  public readonly ctx: Context;
-  public readonly fileList: IFileElement[];
-  public readonly workbenchInfo: any;
-  public readonly userInfo: ISessionInfo;
-  public readonly appInfo: any;
-  public readonly cookieInfo: any;
-  public readonly fatcmscsrftoken: string;
-  public readonly isMobileUserAgent: boolean;
-  public readonly isMobileByQuery: boolean;
-
-  constructor(props: IRenderUtilsProps) {
-    this.ctx = props.ctx;
-    const query = props.ctx?.query || {};
-    const headers = props.ctx?.headers || {};
-    this.workbenchInfo = props.workbenchInfo || {};
-    this.userInfo = props.userInfo || ({} as ISessionInfo);
-    this.appInfo = props.appInfo || {};
-    this.fatcmscsrftoken = props.fatcmscsrftoken;
-    this.cookieInfo = parseCookie(headers?.cookie);
-    this.isMobileUserAgent = isMobileUserAgent(headers['user-agent'] || '');
-    this.isMobileByQuery = `${query['__is_mobile_request__']}` === 'true'
-
-    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() {
-    const userInfoClone = { ...this.userInfo };
-    delete userInfoClone.privateKey;
-    return `<script>window.__user_info = ${JSON.stringify(userInfoClone)}  </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 = this.cookieInfo;
-      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';
+import { ISessionInfo } from '@/models/userSession';
+
+// 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?: ISessionInfo;
+  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;
+}
+
+
+function isMobileUserAgent(userAgent = '') {
+  // 空值处理
+  if (!userAgent) return false;
+
+  // 转为小写统一匹配
+  const ua = userAgent.toLowerCase();
+
+  // 【核心】移动端关键词（覆盖主流系统）
+  const mobileKeywords = /android|iphone|ipod|ios|mobile|blackberry|iemobile|opera mini|windows phone|harmonyos/i;
+  // 【排除项】平板/PC关键词（避免误判）
+  const excludeKeywords = /ipad|tablet|playbook|kindle|pc|windows nt|macintosh|linux x86_64/i;
+
+  // 判断规则：包含移动端关键词 + 不包含排除项关键词
+  const isMatchMobile = mobileKeywords.test(ua);
+  const isExclude = excludeKeywords.test(ua);
+
+  return isMatchMobile && !isExclude;
+}
+
+class RenderUtils {
+  public readonly ctx: Context;
+  public readonly fileList: IFileElement[];
+  public readonly workbenchInfo: any;
+  public readonly userInfo: ISessionInfo;
+  public readonly appInfo: any;
+  public readonly cookieInfo: any;
+  public readonly fatcmscsrftoken: string;
+  public readonly isMobileUserAgent: boolean;
+  public readonly isMobileByQuery: boolean;
+
+  constructor(props: IRenderUtilsProps) {
+    this.ctx = props.ctx;
+    const query = props.ctx?.query || {};
+    const headers = props.ctx?.headers || {};
+    this.workbenchInfo = props.workbenchInfo || {};
+    this.userInfo = props.userInfo || ({} as ISessionInfo);
+    this.appInfo = props.appInfo || {};
+    this.fatcmscsrftoken = props.fatcmscsrftoken;
+    this.cookieInfo = parseCookie(headers?.cookie);
+    this.isMobileUserAgent = isMobileUserAgent(headers['user-agent'] || '');
+    this.isMobileByQuery = `${query['__is_mobile_request__']}` === 'true'
+
+    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() {
+    const userInfoClone = { ...this.userInfo };
+    delete userInfoClone.privateKey;
+    return `<script>window.__user_info = ${JSON.stringify(userInfoClone)}  </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 = this.cookieInfo;
+      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/models/WorkbenchInfoTools.ts

@@ -1,19 +1,19 @@
-import { parseJsonObject } from "@/libs/utils/functions";
-import { IWorkbenchConfig, IWorkbenchEntity} from "./SystemEntities";
-
-
-
-export class WorkbenchInfoTools {
-    private parsedConfigContent: IWorkbenchConfig = null;
-    constructor(private readonly workbenchInfo: IWorkbenchEntity) {
-    }
-
-    public getWorkbenchConfig(): IWorkbenchConfig {
-        if (this.parsedConfigContent) {
-            return this.parsedConfigContent;
-        }
-        const configObj: IWorkbenchConfig = parseJsonObject(this.workbenchInfo?.config_content);
-        this.parsedConfigContent = configObj || {};
-        return this.parsedConfigContent;
-    }
-}
+import { parseJsonObject } from "@/libs/utils/functions";
+import { IWorkbenchConfig, IWorkbenchEntity} from "./SystemEntities";
+
+
+
+export class WorkbenchInfoTools {
+    private parsedConfigContent: IWorkbenchConfig = null;
+    constructor(private readonly workbenchInfo: IWorkbenchEntity) {
+    }
+
+    public getWorkbenchConfig(): IWorkbenchConfig {
+        if (this.parsedConfigContent) {
+            return this.parsedConfigContent;
+        }
+        const configObj: IWorkbenchConfig = parseJsonObject(this.workbenchInfo?.config_content);
+        this.parsedConfigContent = configObj || {};
+        return this.parsedConfigContent;
+    }
+}

package/src/models/bizmodels.ts

@@ -147,11 +147,11 @@ export enum CacheNameEnum {
   CurdMixByLinkToCustom = 'CurdMixByLinkToCustom',
   CurdMixByWorkbench = 'CurdMixByWorkbench',
   GetSysConfigOne = 'GetSysConfigOne',
+  GetDataDictItemsByDictCode = 'GetDataDictItemsByDictCode',
   GetWorkbenchCachedObj = 'GetWorkbenchCachedObj',
   GetSysAppOne = 'GetSysAppOne',
   GetSysAppPageOne = 'GetSysAppPageOne',
   GetWorkbenchMenu = 'GetWorkbenchMenu',
-  GetEnumInfoByCode = 'GetEnumInfoByCode',
 
   UserSessionBySessionId = 'UserSessionBySessionId', // 只能是Redis
   UserSessionByAsyncTaskId = 'UserSessionByAsyncTaskId', // 只能是Redis

package/src/models/userSession.ts

@@ -27,6 +27,7 @@ interface ISessionInfo {
   publicKey: string; // 公钥
   privateKey: string; // 私钥
   bizExt?: any;
+  sessionIdCreatedAt: number
 }
 
 interface IConsumerUserInfo {
@@ -61,6 +62,7 @@ function createEmptySessionInfo(superAdmin: boolean): ISessionInfo {
     accountType: '',
     publicKey: '',
     privateKey: '',
+    sessionIdCreatedAt: 0,
   };
 }
 

package/src/schedule/anonymousContext.ts

@@ -16,6 +16,7 @@ const anonymousUserInfo: ISessionInfo = {
   accountType: SYS_ACCOUNT_TYPE,
   publicKey: '',
   privateKey: '',
+  sessionIdCreatedAt: 0
 };
 
 const anonymousWorkbenchInfo: IWorkbenchEntity = {