midway-fatcms 0.0.1-beta.74 → 0.0.1-beta.76

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/schedule/anonymousContext.ts

@@ -49,13 +49,13 @@ class AnonymousContext {
     return this.app;
   }
 
+  //
+  // async getAsyncService(identifier: any): Promise<any> {
+  //   const ctx: koa.IMidwayKoaContext = this.createAnonymousContext();
+  //   return ctx.requestContext.getAsync(identifier);
+  // }
 
-  async getAsyncService(identifier: any): Promise<any> {
-    const ctx: koa.IMidwayKoaContext = this.createAnonymousContext();
-    return ctx.requestContext.getAsync(identifier);
-  }
-
-  createAnonymousContext() {
+  private createAnonymousContext() {
     const app = this.app;
     const ctx: koa.IMidwayKoaContext = app.createAnonymousContext();
     ctx.app = app;

package/src/service/SysAppService.ts

@@ -1,88 +1,88 @@
-import {Inject, Provide} from '@midwayjs/core';
-import {SystemTables} from '@/models/SystemTables';
-import {BaseService} from './base/BaseService';
-import {CurdProService} from './curd/CurdProService';
-import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
-import {CacheServiceFactory} from "@/service/base/cache/CacheServiceFactory";
-import {CacheNameEnum} from "@/models/bizmodels";
-
-@Provide()
-export class SysAppService extends BaseService {
-
-  @Inject()
-  private curdProService: CurdProService;
-
-  @Inject()
-  private cacheServiceFactory: CacheServiceFactory;
-
-  private get sysAppDao(){
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app)
-  }
-
-  private get sysAppPageDao(){
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app_page)
-  }
-
-
-  async getSysAppPageOne({page_path,workbench_code}:{page_path: string,workbench_code: string}): Promise<any> {
-    if (!page_path || typeof page_path !== 'string') {
-      throw new Error('[getSysAppPageOne] page_path required');
-    }
-    if (!workbench_code || typeof workbench_code !== 'string') {
-      throw new Error('[getSysAppPageOne] workbench_code required');
-    }
-    return await this.cacheServiceFactory.getJsonObjectCache({
-      cacheKey: `${workbench_code}#${page_path}`,
-      cacheName: CacheNameEnum.GetSysAppPageOne,
-      getter: async () => {
-        return await this.sysAppPageDao.getUniqueOne({
-          condition: {page_path, workbench_code, deleted_at: 0}
-        });
-      },
-    });
-  }
-
-
-  async getSysAppOne(app_code: string): Promise<any> {
-    if (!app_code || typeof app_code !== 'string') {
-      throw new Error('[getSysAppOne] app_code required');
-    }
-    return await this.cacheServiceFactory.getJsonObjectCache({
-      cacheKey: app_code,
-      cacheName: CacheNameEnum.GetSysAppOne,
-      getter: async () => {
-        return await this.sysAppDao.getUniqueOne({
-          condition: {app_code, deleted_at: 0}
-        });
-      },
-    });
-  }
-
-  public deletePrivateField(parsedAppInfo: any){
-    if (!parsedAppInfo) {
-      return null;
-    }
-    const parsedAppInfo2: any = { ...parsedAppInfo };
-    delete parsedAppInfo2.created_at;
-    delete parsedAppInfo2.created_by;
-    delete parsedAppInfo2.workbench_code_array;
-    delete parsedAppInfo2.modified_at;
-    delete parsedAppInfo2.modified_by;
-    delete parsedAppInfo2.modified_desc;
-    delete parsedAppInfo2.std_crud_db;
-    delete parsedAppInfo2.std_crud_tbl;
-    return parsedAppInfo2;
-  }
-
-  async removeSysAppOneCache(app_code: string) {
-    if (!app_code || typeof app_code !== 'string') {
-      throw new Error('[removeSysAppOneCache] app_code required');
-    }
-    return await this.cacheServiceFactory.removeItemCache({
-      cacheKey: app_code,
-      cacheName: CacheNameEnum.GetSysAppOne
-    });
-  }
-}
+import {Inject, Provide} from '@midwayjs/core';
+import {SystemTables} from '@/models/SystemTables';
+import {BaseService} from './base/BaseService';
+import {CurdProService} from './curd/CurdProService';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {CacheServiceFactory} from "@/service/base/cache/CacheServiceFactory";
+import {CacheNameEnum} from "@/models/bizmodels";
+
+@Provide()
+export class SysAppService extends BaseService {
+
+  @Inject()
+  private curdProService: CurdProService;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+  private get sysAppDao(){
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app)
+  }
+
+  private get sysAppPageDao(){
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app_page)
+  }
+
+
+  async getSysAppPageOne({page_path,workbench_code}:{page_path: string,workbench_code: string}): Promise<any> {
+    if (!page_path || typeof page_path !== 'string') {
+      throw new Error('[getSysAppPageOne] page_path required');
+    }
+    if (!workbench_code || typeof workbench_code !== 'string') {
+      throw new Error('[getSysAppPageOne] workbench_code required');
+    }
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheKey: `${workbench_code}#${page_path}`,
+      cacheName: CacheNameEnum.GetSysAppPageOne,
+      getter: async () => {
+        return await this.sysAppPageDao.getUniqueOne({
+          condition: {page_path, workbench_code, deleted_at: 0}
+        });
+      },
+    });
+  }
+
+
+  async getSysAppOne(app_code: string): Promise<any> {
+    if (!app_code || typeof app_code !== 'string') {
+      throw new Error('[getSysAppOne] app_code required');
+    }
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheKey: app_code,
+      cacheName: CacheNameEnum.GetSysAppOne,
+      getter: async () => {
+        return await this.sysAppDao.getUniqueOne({
+          condition: {app_code, deleted_at: 0}
+        });
+      },
+    });
+  }
+
+  public deletePrivateField(parsedAppInfo: any){
+    if (!parsedAppInfo) {
+      return null;
+    }
+    const parsedAppInfo2: any = { ...parsedAppInfo };
+    delete parsedAppInfo2.created_at;
+    delete parsedAppInfo2.created_by;
+    delete parsedAppInfo2.workbench_code_array;
+    delete parsedAppInfo2.modified_at;
+    delete parsedAppInfo2.modified_by;
+    delete parsedAppInfo2.modified_desc;
+    delete parsedAppInfo2.std_crud_db;
+    delete parsedAppInfo2.std_crud_tbl;
+    return parsedAppInfo2;
+  }
+
+  async removeSysAppOneCache(app_code: string) {
+    if (!app_code || typeof app_code !== 'string') {
+      throw new Error('[removeSysAppOneCache] app_code required');
+    }
+    return await this.cacheServiceFactory.removeItemCache({
+      cacheKey: app_code,
+      cacheName: CacheNameEnum.GetSysAppOne
+    });
+  }
+}