midway-fatcms 0.0.1-beta.65 → 0.0.1-beta.67

package/dist/libs/utils/parseConfig.js

@@ -1,47 +1,47 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseConfigContentToEnumInfo = void 0;
-const _ = require("lodash");
-const functions_1 = require("./functions");
-function parseTreeTableToIEnumInfo(dataSource) {
-    if (!dataSource || !Array.isArray(dataSource)) {
-        return undefined;
-    }
-    return dataSource.map((item) => {
-        const { key, nodeName, value, label } = item;
-        const children = parseTreeTableToIEnumInfo(item.children);
-        const enumInfo = {
-            label: label || nodeName,
-            value: value || key,
-        };
-        if (item && typeof item.style === 'string' && item.style) {
-            enumInfo.style = item.style.trim();
-        }
-        if (children) {
-            enumInfo.children = children;
-        }
-        return enumInfo;
-    });
-}
-function parseConfigContentToEnumInfo(configEntity) {
-    const { config_content, config_type } = configEntity;
-    const configObj = (0, functions_1.parseJsonObject)(config_content);
-    if (!configObj) {
-        return null;
-    }
-    if (config_type === 'treeTable') {
-        const dataSource = _.get(configObj, 'data.dataSource');
-        if (Array.isArray(dataSource)) {
-            return parseTreeTableToIEnumInfo(dataSource);
-        }
-        return [];
-    }
-    if (configObj.data && Array.isArray(configObj.data)) {
-        return configObj.data;
-    }
-    if (Array.isArray(configObj)) {
-        return configObj;
-    }
-    return [];
-}
-exports.parseConfigContentToEnumInfo = parseConfigContentToEnumInfo;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseConfigContentToEnumInfo = void 0;
+const _ = require("lodash");
+const functions_1 = require("./functions");
+function parseTreeTableToIEnumInfo(dataSource) {
+    if (!dataSource || !Array.isArray(dataSource)) {
+        return undefined;
+    }
+    return dataSource.map((item) => {
+        const { key, nodeName, value, label } = item;
+        const children = parseTreeTableToIEnumInfo(item.children);
+        const enumInfo = {
+            label: label || nodeName,
+            value: value || key,
+        };
+        if (item && typeof item.style === 'string' && item.style) {
+            enumInfo.style = item.style.trim();
+        }
+        if (children) {
+            enumInfo.children = children;
+        }
+        return enumInfo;
+    });
+}
+function parseConfigContentToEnumInfo(configEntity) {
+    const { config_content, config_type } = configEntity;
+    const configObj = (0, functions_1.parseJsonObject)(config_content);
+    if (!configObj) {
+        return null;
+    }
+    if (config_type === 'treeTable') {
+        const dataSource = _.get(configObj, 'data.dataSource');
+        if (Array.isArray(dataSource)) {
+            return parseTreeTableToIEnumInfo(dataSource);
+        }
+        return [];
+    }
+    if (configObj.data && Array.isArray(configObj.data)) {
+        return configObj.data;
+    }
+    if (Array.isArray(configObj)) {
+        return configObj;
+    }
+    return [];
+}
+exports.parseConfigContentToEnumInfo = parseConfigContentToEnumInfo;

package/dist/libs/utils/parseCreateSql.d.ts

@@ -1,10 +1,10 @@
-/**
- * 移除引号
- * @param s
- */
-declare function parseTableFieldTitleFromComment(s: string): string;
-declare function parseCreateSqlToTitleMap(createSqlStr: string): {
-    tableTitle: string;
-    fieldsTitleMap: {};
-};
-export { parseCreateSqlToTitleMap, parseTableFieldTitleFromComment };
+/**
+ * 移除引号
+ * @param s
+ */
+declare function parseTableFieldTitleFromComment(s: string): string;
+declare function parseCreateSqlToTitleMap(createSqlStr: string): {
+    tableTitle: string;
+    fieldsTitleMap: {};
+};
+export { parseCreateSqlToTitleMap, parseTableFieldTitleFromComment };

package/dist/libs/utils/parseCreateSql.js

@@ -1,87 +1,87 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTableFieldTitleFromComment = exports.parseCreateSqlToTitleMap = void 0;
-function isChineseChar(char) {
-    const reg = /[\u4e00-\u9fff]/;
-    return reg.test(char);
-}
-function isLetterOrNumber(char) {
-    const reg = /^[a-zA-Z0-9]$/;
-    return reg.test(char);
-}
-function isTitleValidChar(c) {
-    return isChineseChar(c) || isLetterOrNumber(c) || c === ' ';
-}
-/**
- * 移除引号
- * @param s
- */
-function parseTableFieldTitleFromComment(s) {
-    if (!s) {
-        return '';
-    }
-    s = s.trim();
-    s = s.replace(/'/gm, '');
-    const arr = [];
-    for (let i = 0; i < s.length; i++) {
-        const c = s.charAt(i);
-        if (isTitleValidChar(c)) {
-            arr.push(c);
-        }
-        else {
-            break;
-        }
-    }
-    return arr.join('');
-}
-exports.parseTableFieldTitleFromComment = parseTableFieldTitleFromComment;
-/**
- * 从最后一行中提取表格的标题
- * @param arr
- */
-function parseTableTitle(arr) {
-    if (arr.length === 0) {
-        return '';
-    }
-    // 最后一行
-    const key = ' COMMENT=';
-    const lastStr = arr[arr.length - 1].toUpperCase();
-    const s = lastStr.indexOf(key);
-    if (s < 0) {
-        return '';
-    }
-    const c = lastStr.substring(s + key.length).trim();
-    return parseTableFieldTitleFromComment(c);
-}
-function parseCreateSqlToTitleMap(createSqlStr) {
-    if (!createSqlStr) {
-        return {
-            tableTitle: '',
-            fieldsTitleMap: {},
-        };
-    }
-    const titleMap = {};
-    const arr0 = createSqlStr.split('\n').map(s => {
-        return s.trim();
-    });
-    const tableTitle = parseTableTitle(arr0);
-    let arr = arr0.filter(s => {
-        return !(s.endsWith('(') || s.startsWith('('));
-    });
-    arr = arr.filter(s => {
-        return s.includes(' COMMENT ');
-    });
-    for (let i = 0; i < arr.length; i++) {
-        const arrElement = arr[i].split(' COMMENT ');
-        const e0 = arrElement[0];
-        const e1 = arrElement[1];
-        const keyArr = e0.split(' ');
-        const field = keyArr[0].replace(/`/gm, '');
-        titleMap[field] = parseTableFieldTitleFromComment(e1).trim();
-    }
-    return {
-        tableTitle,
-        fieldsTitleMap: titleMap, // 列标题
-    };
-}
-exports.parseCreateSqlToTitleMap = parseCreateSqlToTitleMap;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTableFieldTitleFromComment = exports.parseCreateSqlToTitleMap = void 0;
+function isChineseChar(char) {
+    const reg = /[\u4e00-\u9fff]/;
+    return reg.test(char);
+}
+function isLetterOrNumber(char) {
+    const reg = /^[a-zA-Z0-9]$/;
+    return reg.test(char);
+}
+function isTitleValidChar(c) {
+    return isChineseChar(c) || isLetterOrNumber(c) || c === ' ';
+}
+/**
+ * 移除引号
+ * @param s
+ */
+function parseTableFieldTitleFromComment(s) {
+    if (!s) {
+        return '';
+    }
+    s = s.trim();
+    s = s.replace(/'/gm, '');
+    const arr = [];
+    for (let i = 0; i < s.length; i++) {
+        const c = s.charAt(i);
+        if (isTitleValidChar(c)) {
+            arr.push(c);
+        }
+        else {
+            break;
+        }
+    }
+    return arr.join('');
+}
+exports.parseTableFieldTitleFromComment = parseTableFieldTitleFromComment;
+/**
+ * 从最后一行中提取表格的标题
+ * @param arr
+ */
+function parseTableTitle(arr) {
+    if (arr.length === 0) {
+        return '';
+    }
+    // 最后一行
+    const key = ' COMMENT=';
+    const lastStr = arr[arr.length - 1].toUpperCase();
+    const s = lastStr.indexOf(key);
+    if (s < 0) {
+        return '';
+    }
+    const c = lastStr.substring(s + key.length).trim();
+    return parseTableFieldTitleFromComment(c);
+}
+function parseCreateSqlToTitleMap(createSqlStr) {
+    if (!createSqlStr) {
+        return {
+            tableTitle: '',
+            fieldsTitleMap: {},
+        };
+    }
+    const titleMap = {};
+    const arr0 = createSqlStr.split('\n').map(s => {
+        return s.trim();
+    });
+    const tableTitle = parseTableTitle(arr0);
+    let arr = arr0.filter(s => {
+        return !(s.endsWith('(') || s.startsWith('('));
+    });
+    arr = arr.filter(s => {
+        return s.includes(' COMMENT ');
+    });
+    for (let i = 0; i < arr.length; i++) {
+        const arrElement = arr[i].split(' COMMENT ');
+        const e0 = arrElement[0];
+        const e1 = arrElement[1];
+        const keyArr = e0.split(' ');
+        const field = keyArr[0].replace(/`/gm, '');
+        titleMap[field] = parseTableFieldTitleFromComment(e1).trim();
+    }
+    return {
+        tableTitle,
+        fieldsTitleMap: titleMap, // 列标题
+    };
+}
+exports.parseCreateSqlToTitleMap = parseCreateSqlToTitleMap;

package/dist/libs/utils/render-utils.d.ts

@@ -1,28 +1,37 @@
-import { Context } from '@midwayjs/koa';
-interface IRenderUtilsProps {
-    ctx: Context;
-    package_assets: any;
-    workbenchInfo: any;
-    userInfo?: any;
-    appInfo?: any;
-    fatcmscsrftoken: string;
-}
-declare class RenderUtils {
-    private readonly ctx;
-    private readonly fileList;
-    private readonly workbenchInfo;
-    private readonly userInfo;
-    private readonly appInfo;
-    private readonly fatcmscsrftoken;
-    constructor(props: IRenderUtilsProps);
-    renderCsrfToken(): string;
-    renderUserInfo(): string;
-    renderWorkbenchInfo(): string;
-    renderAppInfo(): string;
-    renderCookieInfo(keys: string): string;
-    renderJsAssets(): string;
-    renderCssAssets(): string;
-    renderExtLocalLoaderPortByDevHeader(): string;
-}
-declare function createRenderUtils(props: IRenderUtilsProps): RenderUtils;
-export { createRenderUtils };
+import { Context } from '@midwayjs/koa';
+import { ISessionInfo } from '../../models/userSession';
+interface IFileElement {
+    fileUrl: string;
+    fileType?: string;
+    isModule?: boolean;
+}
+interface IRenderUtilsProps {
+    ctx: Context;
+    package_assets: any;
+    workbenchInfo: any;
+    userInfo?: ISessionInfo;
+    appInfo?: any;
+    fatcmscsrftoken: string;
+}
+declare class RenderUtils {
+    readonly ctx: Context;
+    readonly fileList: IFileElement[];
+    readonly workbenchInfo: any;
+    readonly userInfo: ISessionInfo;
+    readonly appInfo: any;
+    readonly cookieInfo: any;
+    readonly fatcmscsrftoken: string;
+    readonly isMobileUserAgent: boolean;
+    readonly isMobileByQuery: boolean;
+    constructor(props: IRenderUtilsProps);
+    renderCsrfToken(): string;
+    renderUserInfo(): string;
+    renderWorkbenchInfo(): string;
+    renderAppInfo(): string;
+    renderCookieInfo(keys: string): string;
+    renderJsAssets(): string;
+    renderCssAssets(): string;
+    renderExtLocalLoaderPortByDevHeader(): string;
+}
+declare function createRenderUtils(props: IRenderUtilsProps): RenderUtils;
+export { createRenderUtils };

package/dist/libs/utils/render-utils.js

@@ -1,133 +1,154 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRenderUtils = void 0;
-const _ = require("lodash");
-const moment = require("moment");
-const functions_1 = require("./functions");
-const fatcms_request_1 = require("./fatcms-request");
-const TypeUtils_1 = require("../crud-pro/utils/TypeUtils");
-function parseCookie(cookieStr) {
-    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 {
-    constructor(props) {
-        var _a, _b;
-        this.ctx = props.ctx;
-        this.workbenchInfo = props.workbenchInfo || {};
-        this.userInfo = props.userInfo || {};
-        this.appInfo = props.appInfo || {};
-        this.fatcmscsrftoken = props.fatcmscsrftoken;
-        const packageAssets = (0, functions_1.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: (_a = this.workbenchInfo) === null || _a === void 0 ? void 0 : _a.workbench_code,
-                    app_code: (_b = this.appInfo) === null || _b === void 0 ? void 0 : _b.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) {
-        var _a;
-        try {
-            const cookies = parseCookie((_a = this.ctx.headers) === null || _a === void 0 ? void 0 : _a.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 = (0, fatcms_request_1.getExtLocalLoaderPort)(this.ctx);
-        if (loaderPort && TypeUtils_1.TypeUtils.isNumeric(loaderPort)) {
-            return `<script>window.__local_loader_port_from_dev_header = ${loaderPort}</script>`;
-        }
-        return '';
-    }
-}
-function createRenderUtils(props) {
-    return new RenderUtils(props);
-}
-exports.createRenderUtils = createRenderUtils;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRenderUtils = void 0;
+const _ = require("lodash");
+const moment = require("moment");
+const functions_1 = require("./functions");
+const fatcms_request_1 = require("./fatcms-request");
+const TypeUtils_1 = require("../crud-pro/utils/TypeUtils");
+function parseCookie(cookieStr) {
+    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 {
+    constructor(props) {
+        var _a, _b, _c, _d;
+        this.ctx = props.ctx;
+        const query = ((_a = props.ctx) === null || _a === void 0 ? void 0 : _a.query) || {};
+        const headers = ((_b = props.ctx) === null || _b === void 0 ? void 0 : _b.headers) || {};
+        this.workbenchInfo = props.workbenchInfo || {};
+        this.userInfo = props.userInfo || {};
+        this.appInfo = props.appInfo || {};
+        this.fatcmscsrftoken = props.fatcmscsrftoken;
+        this.cookieInfo = parseCookie(headers === null || headers === void 0 ? void 0 : headers.cookie);
+        this.isMobileUserAgent = isMobileUserAgent(headers['user-agent'] || '');
+        this.isMobileByQuery = `${query['__is_mobile_request__']}` === 'true';
+        const packageAssets = (0, functions_1.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: (_c = this.workbenchInfo) === null || _c === void 0 ? void 0 : _c.workbench_code,
+                    app_code: (_d = this.appInfo) === null || _d === void 0 ? void 0 : _d.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) {
+        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 = (0, fatcms_request_1.getExtLocalLoaderPort)(this.ctx);
+        if (loaderPort && TypeUtils_1.TypeUtils.isNumeric(loaderPort)) {
+            return `<script>window.__local_loader_port_from_dev_header = ${loaderPort}</script>`;
+        }
+        return '';
+    }
+}
+function createRenderUtils(props) {
+    return new RenderUtils(props);
+}
+exports.createRenderUtils = createRenderUtils;