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

package/dist/config/config.default.js

@@ -35,7 +35,7 @@ exports.default = (appInfo) => {
             jsonLimit: '10mb',
             textLimit: '10mb',
             xmlLimit: '10mb',
-            ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
+            ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/gw/file/uploadFilePublic', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
         },
         mysql2: {
             fatcms: {
@@ -119,7 +119,7 @@ exports.default = (appInfo) => {
             // base64: boolean，设置原始body是否是base64格式，默认为false，一般用于腾讯云的兼容
             base64: false,
             // 仅在匹配路径到 /api/upload 的时候去解析 body 中的文件信息
-            match: ['/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'],
+            match: ['/ns/gw/file/uploadFile', '/ns/gw/file/uploadFilePublic', '/ns/api/manage/deploy/uploadAssets'],
         },
         view: {
             rootDir: {

package/dist/controller/gateway/FileController.d.ts

@@ -8,6 +8,7 @@ import { CommonResult } from '../../libs/utils/common-dto';
 export declare class FileController extends BaseApiController {
     protected ctx: Context;
     protected fileCenterService: FileCenterService;
+    uploadFilePublic(files: any, fields: any, queryData: any): Promise<CommonResult>;
     /**
      * 上传普通文件。必须是登录用户才能上传。
      * @param files
@@ -15,6 +16,7 @@ export declare class FileController extends BaseApiController {
      * @param queryData
      */
     uploadFile(files: any, fields: any, queryData: any): Promise<CommonResult>;
+    private uploadFilePrivate;
     /**
      * 文件下载或预览
      * @param byMethod

package/dist/controller/gateway/FileController.js

@@ -29,6 +29,9 @@ function isTrue(obj) {
  * 文件上传下载服务
  */
 let FileController = class FileController extends BaseApiController_1.BaseApiController {
+    async uploadFilePublic(files, fields, queryData) {
+        return this.uploadFilePrivate(files, fields, queryData);
+    }
     /**
      * 上传普通文件。必须是登录用户才能上传。
      * @param files
@@ -36,6 +39,9 @@ let FileController = class FileController extends BaseApiController_1.BaseApiCon
      * @param queryData
      */
     async uploadFile(files, fields, queryData) {
+        return this.uploadFilePrivate(files, fields, queryData);
+    }
+    async uploadFilePrivate(files, fields, queryData) {
         const accessType = (queryData === null || queryData === void 0 ? void 0 : queryData.accessType) || (fields === null || fields === void 0 ? void 0 : fields.accessType) || bizmodels_1.AccessType.open;
         const referer = this.ctx.req.headers.referer;
         if (!Object.keys(bizmodels_1.AccessType).includes(accessType)) {
@@ -106,6 +112,15 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", FileCenterService_1.FileCenterService)
 ], FileController.prototype, "fileCenterService", void 0);
+__decorate([
+    (0, core_1.Post)('/uploadFilePublic', { middleware: [(0, permission_middleware_1.checkLogin)()] }),
+    __param(0, (0, core_1.Files)()),
+    __param(1, (0, core_1.Fields)()),
+    __param(2, (0, core_1.Query)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", Promise)
+], FileController.prototype, "uploadFilePublic", null);
 __decorate([
     (0, core_1.Post)('/uploadFile', { middleware: [(0, permission_middleware_1.checkPermission)([SystemPerm_1.SystemFuncCode.DocMangeWrite, SystemPerm_1.SystemFuncCode.FileMangeWrite, SystemPerm_1.SystemFuncCode.UserAccountMangeWrite])] }),
     __param(0, (0, core_1.Files)()),

package/dist/controller/gateway/PublicApiController.d.ts

@@ -24,4 +24,8 @@ export declare class PublicApiController extends BaseApiController {
      * 获取配置的枚举项信息： 都是无需鉴权的
      */
     getEnumInfo(): Promise<CommonResult>;
+    /**
+    * 获取应用配置信息
+    */
+    getSysAppInfoByAppCode(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
 }

package/dist/controller/gateway/PublicApiController.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicApiController = void 0;
 const core_1 = require("@midwayjs/core");
 const _ = require("lodash");
+const keys_1 = require("../../libs/crud-pro/models/keys");
 const BaseApiController_1 = require("../base/BaseApiController");
 const SystemTables_1 = require("../../models/SystemTables");
 const EnumInfoService_1 = require("../../service/EnumInfoService");
@@ -19,7 +20,7 @@ const common_dto_1 = require("../../libs/utils/common-dto");
 const functions_1 = require("../../libs/utils/functions");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const SystemPerm_1 = require("../../models/SystemPerm");
-const keys_1 = require("../../libs/crud-pro/models/keys");
+const keys_2 = require("../../libs/crud-pro/models/keys");
 /**
  * 公开的API，无需鉴权，所有人可以直接访问
  */
@@ -71,7 +72,7 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         // 特殊的devops菜单
         map['devops'] = {
             menu_list: [],
-            hasPermission: this.ctx.userSession.isAuthPass(keys_1.KeysOfAuthType.byRoleCode, [SystemPerm_1.SystemRoleCode.DevOpsWriter, SystemPerm_1.SystemRoleCode.DevOpsViewer, SystemPerm_1.SystemRoleCode.SuperAdmin]),
+            hasPermission: this.ctx.userSession.isAuthPass(keys_2.KeysOfAuthType.byRoleCode, [SystemPerm_1.SystemRoleCode.DevOpsWriter, SystemPerm_1.SystemRoleCode.DevOpsViewer, SystemPerm_1.SystemRoleCode.SuperAdmin]),
         };
         return common_dto_1.CommonResult.successRes(map);
     }
@@ -119,6 +120,16 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         const enumInfos = await this.enumInfoService.queryEnumInfo(codeList, refreshCache);
         return common_dto_1.CommonResult.successRes(enumInfos);
     }
+    /**
+    * 获取应用配置信息
+    */
+    async getSysAppInfoByAppCode() {
+        return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE, {
+            validateCfg: {
+                'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
+            },
+        });
+    }
 };
 __decorate([
     (0, core_1.Inject)(),
@@ -156,6 +167,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], PublicApiController.prototype, "getEnumInfo", null);
+__decorate([
+    (0, core_1.Post)('/getSysAppInfoByAppCode'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PublicApiController.prototype, "getSysAppInfoByAppCode", null);
 PublicApiController = __decorate([
     (0, core_1.Controller)('/ns/gw/api/publicApi')
 ], PublicApiController);

package/dist/libs/crud-pro/interfaces.d.ts

@@ -105,6 +105,8 @@ export interface IFuncCfgModel extends Record<any, any> {
     contextAsString?: string;
     contextAsNumber?: string;
     contextAsBool?: string;
+    executeExpressReturnObject?: string;
+    executeExpressReturnString?: string;
     message?: string;
 }
 export interface ISqlCfgModel extends IBaseCfgModel {

package/dist/libs/crud-pro/models/keys.d.ts

@@ -101,6 +101,10 @@ export declare const KeysOfConditions: {
     $NOT_LIKE_INCLUDE: string;
     $MATCH: string;
     $MATCH_BOOL: string;
+    /**
+     * SELECT * FROM tms_biz.表 WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('2512274'), '$');
+     */
+    $JSON_ARRAY_CONTAINS: string;
     COMPARE_KEYS: Set<string>;
     ALL_KEYS: Set<string>;
 };

package/dist/libs/crud-pro/models/keys.js

@@ -115,6 +115,10 @@ exports.KeysOfConditions = {
     $NOT_LIKE_INCLUDE: '$notLikeInclude',
     $MATCH: '$match',
     $MATCH_BOOL: '$matchBool',
+    /**
+     * SELECT * FROM tms_biz.表 WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('2512274'), '$');
+     */
+    $JSON_ARRAY_CONTAINS: '$jsonArrayContains',
     COMPARE_KEYS: new Set([]),
     ALL_KEYS: new Set([]),
 };
@@ -137,6 +141,7 @@ function initKeysOfConditions() {
     addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$LIKE_INCLUDE);
     addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_LIKE);
     addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$NOT_LIKE_INCLUDE);
+    addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$JSON_ARRAY_CONTAINS);
     addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$MATCH);
     addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$MATCH_BOOL);
     addIgnoreCase(exports.KeysOfConditions.COMPARE_KEYS, exports.KeysOfConditions.$RANGE);

package/dist/libs/crud-pro/services/CrudProExecuteFuncService.js

@@ -5,6 +5,8 @@ const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const TypeUtils_1 = require("../utils/TypeUtils");
 const MixinUtils_1 = require("../utils/MixinUtils");
 const _ = require("lodash");
+const moment = require("moment");
+const ejs = require("ejs");
 const exceptions_1 = require("../exceptions");
 const keys_1 = require("../models/keys");
 const { isNil, isNumeric } = TypeUtils_1.TypeUtils;
@@ -20,6 +22,17 @@ class CrudProExecuteFuncService extends CrudProServiceBase_1.CrudProServiceBase
         if (funCfg.___PLAIN_OBJECT___ === true) {
             return funCfg;
         }
+        const funcContextAny = funcContext;
+        funcContextAny.moment = moment;
+        funcContextAny._ = _;
+        if (isNotNil(funCfg.executeExpressReturnString)) {
+            const expressResult = ejs.render(funCfg.executeExpressReturnString, funcContextAny);
+            return expressResult;
+        }
+        if (isNotNil(funCfg.executeExpressReturnObject)) {
+            const expressResult = ejs.render(funCfg.executeExpressReturnObject, funcContextAny);
+            return JSON.parse(expressResult);
+        }
         if (isNotNil(funCfg.const)) {
             return funCfg.const;
         }

package/dist/libs/crud-pro/services/CrudProGenSqlCondition.js

@@ -208,6 +208,16 @@ class CrudProGenSqlCondition {
                         tmpSql = `${toSqlColumnName(key)} like concat('%', ?::text, '%')`; // like包含
                     }
                 }
+                else if (equalsIgnoreCase(keys_1.KeysOfConditions.$JSON_ARRAY_CONTAINS, compare)) {
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.mysql) {
+                        tmpArgList.push(value0);
+                        tmpSql = `JSON_CONTAINS( ${toSqlColumnName(key)} , JSON_ARRAY(?), '$')`; // MYSQL JSON_CONTAINS包含
+                    }
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
+                        tmpArgList.push(value0);
+                        tmpSql = `${toSqlColumnName(key)} @> ('["' || ? || '"]')::jsonb`; // POSTGRES JSON_CONTAINS包含
+                    }
+                }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$NOT_LIKE_INCLUDE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`; // like不包含
@@ -308,6 +318,11 @@ class CrudProGenSqlCondition {
                         throwCommonException(keys_1.KeysOfConditions.$NOT_LIKE_INCLUDE, '字符串');
                     }
                 }
+                else if (equalsIgnoreCase(keys_1.KeysOfConditions.$JSON_ARRAY_CONTAINS, compare)) {
+                    if (!isBasicType(value0)) {
+                        throwCommonException(keys_1.KeysOfConditions.$JSON_ARRAY_CONTAINS, '字符串或数字');
+                    }
+                }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$MATCH, compare)) {
                     if (!isBasicType(value0)) {
                         throwCommonException(keys_1.KeysOfConditions.$MATCH, '字符串');

package/dist/libs/crud-pro/utils/ModelUtils.js

@@ -36,7 +36,12 @@ const ModelUtils = {
         return defaultConfigs_1.DEFAULT_MAX_LIMIT;
     },
     checkFuncCfgValid(cfgModel) {
-        const arr = [cfgModel.functionName, cfgModel.const, cfgModel.constString, cfgModel.constNumber, cfgModel.constBool, cfgModel.context, cfgModel.contextAsString, cfgModel.contextAsNumber, cfgModel.contextAsBool];
+        const arr = [
+            cfgModel.functionName, cfgModel.const, cfgModel.constString, cfgModel.constNumber,
+            cfgModel.constBool, cfgModel.context,
+            cfgModel.contextAsString, cfgModel.contextAsNumber, cfgModel.contextAsBool,
+            cfgModel.executeExpressReturnObject, cfgModel.executeExpressReturnString
+        ];
         for (let i = 0; i < arr.length; i++) {
             const arrElement = arr[i];
             if (typeof arrElement !== 'undefined') {

package/dist/service/crudstd/CrudStdRelationService.js

@@ -65,6 +65,16 @@ class ColumnsRelationMaker {
         }
     }
 }
+function addMarkerColumnRelation(maker, dataIndex, componentName) {
+    // 关联用户信息
+    if (componentName === CrudStdConstant_1.tableColumnRenders.RenderUserInfo) {
+        maker.addColumnRelationByAccount(dataIndex);
+    }
+    // 关联枚举文案/状态标签颜色
+    if (componentName === CrudStdConstant_1.tableColumnRenders.RenderDictEnumText || componentName === CrudStdConstant_1.tableColumnRenders.RenderDictEnumStatus) {
+        maker.addColumnRelationByDictEnumStatus(dataIndex);
+    }
+}
 let CrudStdRelationService = class CrudStdRelationService extends BaseService_1.BaseService {
     async addCfgModelColumnsRelation(cfgModel, appInfo) {
         var _a;
@@ -77,22 +87,21 @@ let CrudStdRelationService = class CrudStdRelationService extends BaseService_1.
             const tableColumn = tableColumns[i];
             const dataIndex = _.get(tableColumn, 'dataIndex');
             const componentName = _.get(tableColumn, 'component.componentName');
-            // 关联用户信息
-            if (componentName === CrudStdConstant_1.tableColumnRenders.RenderUserInfo) {
-                maker.addColumnRelationByAccount(dataIndex);
-            }
-            // 关联枚举文案/状态标签颜色
-            if (componentName === CrudStdConstant_1.tableColumnRenders.RenderDictEnumText || componentName === CrudStdConstant_1.tableColumnRenders.RenderDictEnumStatus) {
-                maker.addColumnRelationByDictEnumStatus(dataIndex);
-            }
+            addMarkerColumnRelation(maker, dataIndex, componentName);
             // 子属性的配置
             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 === CrudStdConstant_1.tableColumnRenders.RenderUserInfo) {
-                        maker.addColumnRelationByAccount(name);
-                    }
+                    addMarkerColumnRelation(maker, name, component);
+                }
+            }
+            // 子属性的配置
+            const linkDataConfig = _.get(tableColumn, 'component.props.linkDataConfig');
+            if (Array.isArray(linkDataConfig) && linkDataConfig.length > 0) {
+                for (let j = 0; j < linkDataConfig.length; j++) {
+                    const { component, name } = linkDataConfig[j] || {};
+                    addMarkerColumnRelation(maker, name, component);
                 }
             }
         }

package/dist/service/curd/CurdMixByAccountService.js

@@ -20,21 +20,29 @@ const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const global_config_1 = require("../../libs/global-config/global-config");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.accountBasic);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
+const TMP_CTX_KEY2 = _.uniqueId('CurdMixByAccountService2');
 let CurdMixByAccountService = class CurdMixByAccountService {
     async handleExecuteContextPrepare(executeContext) {
-        const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const relations = dictMixUtils.pickColumnRelations(executeContext);
         if (!relations || relations.length === 0) {
             return;
         }
+        const isArrayModeMap = new Map();
         const accountIds = new Set();
         dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
             const { sourceColumn } = columnRelation;
             if (sourceColumn) {
                 const accountId = _.get(row, sourceColumn);
                 if (accountId) {
-                    const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
-                    accountIds.add(fatcmsUserAccountId);
+                    const { isArray, fatcmsUserAccountIdList, fatcmsUserAccountId } = (0, CurdMixUtils_1.toFatcmsUserAccountIdList)(accountId);
+                    if (isArray) {
+                        isArrayModeMap.set(sourceColumn, true);
+                        fatcmsUserAccountIdList.forEach(item => accountIds.add(item));
+                    }
+                    else if (fatcmsUserAccountId) {
+                        accountIds.add(fatcmsUserAccountId);
+                    }
                 }
             }
         });
@@ -59,9 +67,11 @@ let CurdMixByAccountService = class CurdMixByAccountService {
         const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
         const userInfos = res.getResRows();
         executeContext[TMP_CTX_KEY] = MixinUtils_1.MixinUtils.toNewMap(userInfos, (obj) => obj.account_id);
+        executeContext[TMP_CTX_KEY2] = isArrayModeMap;
     }
     async handleExecuteContext(executeContext) {
         const userInfoMap = executeContext[TMP_CTX_KEY];
+        const isArrayModeMap = executeContext[TMP_CTX_KEY2];
         if (!userInfoMap || userInfoMap.size === 0) {
             return;
         }
@@ -69,10 +79,21 @@ let CurdMixByAccountService = class CurdMixByAccountService {
             const sourceColumn = columnRelation.sourceColumn;
             const targetColumns = columnRelation.targetColumns;
             if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
-                columnRelation.targetColumns = [
-                    { from: 'nick_name', to: `${sourceColumn}_user.nick_name` },
-                    { from: 'avatar', to: `${sourceColumn}_user.avatar` },
-                ];
+                const isArrayMode = isArrayModeMap.get(sourceColumn) || false;
+                if (isArrayMode === true) {
+                    columnRelation.targetColumns = [
+                        { from: 'nick_name', to: `${sourceColumn}_array_info[$ARRAY_INDEX].nick_name` },
+                        { from: 'avatar', to: `${sourceColumn}_array_info[$ARRAY_INDEX].avatar` },
+                        { from: 'account_id', to: `${sourceColumn}_array_info[$ARRAY_INDEX].account_id` },
+                    ];
+                }
+                else {
+                    columnRelation.targetColumns = [
+                        { from: 'nick_name', to: `${sourceColumn}_user.nick_name` },
+                        { from: 'avatar', to: `${sourceColumn}_user.avatar` },
+                        { from: 'account_id', to: `${sourceColumn}_user.account_id` },
+                    ];
+                }
             }
             dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
         });

package/dist/service/curd/CurdMixUtils.d.ts

@@ -9,6 +9,12 @@ declare enum RelatedType {
     workbenchBasic = "workbenchBasic"
 }
 declare type FuncRowColumnRelation = (row: any, columnRelation: ColumnRelation) => void;
+interface IFatcmsUserAccountIdList {
+    isArray: boolean;
+    fatcmsUserAccountId?: string;
+    fatcmsUserAccountIdList?: string[];
+}
+declare function toFatcmsUserAccountIdList(accountId: any): IFatcmsUserAccountIdList;
 declare class CrudMixUtils {
     private readonly relatedType;
     constructor(relatedType: RelatedType);
@@ -48,4 +54,4 @@ declare class CrudMixUtils {
      */
     copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation): void;
 }
-export { CrudMixUtils, RelatedType, FuncRowColumnRelation };
+export { CrudMixUtils, RelatedType, FuncRowColumnRelation, toFatcmsUserAccountIdList };

package/dist/service/curd/CurdMixUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RelatedType = exports.CrudMixUtils = void 0;
+exports.toFatcmsUserAccountIdList = exports.RelatedType = exports.CrudMixUtils = void 0;
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const global_config_1 = require("../../libs/global-config/global-config");
@@ -94,6 +94,59 @@ function copyByArraySourceValue(row, sourceValue, targetColumns, getValue) {
     }
     return resultObj.isSetArray;
 }
+function toFatcmsUserAccountIdList(accountId) {
+    const { toFatcmsUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+    if (!accountId) {
+        return {
+            isArray: false,
+            fatcmsUserAccountId: null
+        };
+    }
+    // 数字形式
+    if (typeof accountId === 'number') {
+        return {
+            isArray: false,
+            fatcmsUserAccountId: toFatcmsUserAccountId("" + accountId),
+        };
+    }
+    if (typeof accountId === 'string') {
+        const json = (0, functions_1.parseJsonObject)(accountId);
+        // 数组形式
+        if (json && Array.isArray(json) && json.length > 0) {
+            return {
+                isArray: true,
+                fatcmsUserAccountIdList: json.map(item => {
+                    if (typeof item === 'string' || typeof item === 'number') {
+                        return toFatcmsUserAccountId("" + item);
+                    }
+                    return null;
+                }).filter(item => item !== null),
+            };
+        }
+        // 单值形式
+        return {
+            isArray: false,
+            fatcmsUserAccountId: toFatcmsUserAccountId(accountId),
+        };
+    }
+    // 数组形式
+    if (Array.isArray(accountId)) {
+        return {
+            isArray: true,
+            fatcmsUserAccountIdList: accountId.map(item => {
+                if (typeof item === 'string' || typeof item === 'number') {
+                    return toFatcmsUserAccountId("" + item);
+                }
+                return null;
+            }).filter(item => item !== null),
+        };
+    }
+    return {
+        isArray: false,
+        fatcmsUserAccountId: null
+    };
+}
+exports.toFatcmsUserAccountIdList = toFatcmsUserAccountIdList;
 class CrudMixUtils {
     constructor(relatedType) {
         this.relatedType = relatedType;
@@ -257,8 +310,7 @@ class CrudMixUtils {
         if (!accountId) {
             return;
         }
-        const { toFatcmsUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
+        const { isArray, fatcmsUserAccountIdList, fatcmsUserAccountId } = toFatcmsUserAccountIdList(accountId);
         const getValue = (code) => {
             if (!map) {
                 return null;
@@ -268,8 +320,10 @@ class CrudMixUtils {
             }
             return map[code];
         };
-        const isSetArray = copyByArraySourceValue(row, fatcmsUserAccountId, targetColumns, getValue);
-        if (!isSetArray) {
+        if (isArray) {
+            copyByArraySourceValue(row, fatcmsUserAccountIdList, targetColumns, getValue);
+        }
+        else if (fatcmsUserAccountId) {
             copyBySingleSourceValue(row, fatcmsUserAccountId, targetColumns, getValue);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.60",
+  "version": "0.0.1-beta.63",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/config/config.default.ts

@@ -41,7 +41,7 @@ export default (appInfo: any) => {
       jsonLimit: '10mb',
       textLimit: '10mb',
       xmlLimit: '10mb',
-      ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
+      ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/gw/file/uploadFilePublic', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
     },
 
     mysql2: {
@@ -130,7 +130,7 @@ export default (appInfo: any) => {
       // base64: boolean，设置原始body是否是base64格式，默认为false，一般用于腾讯云的兼容
       base64: false,
       // 仅在匹配路径到 /api/upload 的时候去解析 body 中的文件信息
-      match: ['/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'],
+      match: ['/ns/gw/file/uploadFile', '/ns/gw/file/uploadFilePublic', '/ns/api/manage/deploy/uploadAssets'],
     },
 
     view: {

package/src/controller/gateway/FileController.ts

@@ -5,7 +5,7 @@ import { BaseApiController } from '../base/BaseApiController';
 import { BizException } from '@/models/devops';
 import { AccessType, FILE_GET_TYPES } from '@/models/bizmodels';
 import { FileCenterService, PATH_PREFIX, toDownloadPaths, isImageFile } from '@/service/FileCenterService';
-import { checkPermission } from '@/middleware/permission.middleware';
+import { checkLogin, checkPermission } from '@/middleware/permission.middleware';
 import { CommonResult } from '@/libs/utils/common-dto';
 import { SystemFuncCode } from '@/models/SystemPerm';
 
@@ -24,6 +24,13 @@ export class FileController extends BaseApiController {
   @Inject()
   protected fileCenterService: FileCenterService;
 
+  @Post('/uploadFilePublic', { middleware: [checkLogin()] })
+  async uploadFilePublic(@Files() files, @Fields() fields, @Query() queryData): Promise<CommonResult> {
+    return this.uploadFilePrivate(files, fields, queryData);
+  }
+
+
+
   /**
    * 上传普通文件。必须是登录用户才能上传。
    * @param files
@@ -32,6 +39,13 @@ export class FileController extends BaseApiController {
    */
   @Post('/uploadFile', { middleware: [checkPermission([SystemFuncCode.DocMangeWrite, SystemFuncCode.FileMangeWrite, SystemFuncCode.UserAccountMangeWrite])] })
   async uploadFile(@Files() files, @Fields() fields, @Query() queryData): Promise<CommonResult> {
+    return this.uploadFilePrivate(files, fields, queryData);
+  }
+
+
+
+
+  private async uploadFilePrivate(files: any, fields: any, queryData: any) {
     const accessType = queryData?.accessType || fields?.accessType || AccessType.open;
     const referer = this.ctx.req.headers.referer;
 

package/src/controller/gateway/PublicApiController.ts

@@ -1,6 +1,7 @@
 import { Controller, Get, Inject, Post } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
+import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
 import { SystemTables } from '@/models/SystemTables';
 import { EnumInfoService } from '@/service/EnumInfoService';
@@ -137,4 +138,20 @@ export class PublicApiController extends BaseApiController {
     const enumInfos = await this.enumInfoService.queryEnumInfo(codeList, refreshCache);
     return CommonResult.successRes(enumInfos);
   }
+
+
+
+  /**
+  * 获取应用配置信息
+  */
+  @Post('/getSysAppInfoByAppCode')
+  async getSysAppInfoByAppCode() {
+    return this.executeSysSimpleSQL('sys_app', KeysOfSimpleSQL.SIMPLE_QUERY_ONE, {
+      validateCfg: {
+        'condition.app_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
+      },
+    });
+  }
+
+
 }

package/src/libs/crud-pro/interfaces.ts

@@ -125,6 +125,9 @@ export interface IFuncCfgModel extends Record<any, any> {
   contextAsNumber?: string; // 从context中取值
   contextAsBool?: string; // 从context中取值
 
+  executeExpressReturnObject?: string; // 执行表达式，返回对象。可以包含context中的变量。
+  executeExpressReturnString?: string; // 执行表达式，返回字符串。可以包含context中的变量。
+
   message?: string; // 在校验阶段有用，其他阶段没有用
 }
 

package/src/libs/crud-pro/models/keys.ts

@@ -121,6 +121,11 @@ export const KeysOfConditions = {
   $MATCH: '$match', // 全文索引 {age:1, name:{"$match":"张"} }
   $MATCH_BOOL: '$matchBool', // 全文索引 {age:1, name:{"$matchBool":"张"} }
 
+  /**
+   * SELECT * FROM tms_biz.表 WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('2512274'), '$');
+   */
+  $JSON_ARRAY_CONTAINS: '$jsonArrayContains', // 全文索引 { related_user1:{"$jsonArrayContains":"2512274"} }
+
   COMPARE_KEYS: new Set<string>([]),
   ALL_KEYS: new Set<string>([]),
 };
@@ -145,6 +150,7 @@ function initKeysOfConditions() {
   addIgnoreCase(KeysOfConditions.COMPARE_KEYS, KeysOfConditions.$LIKE_INCLUDE);
   addIgnoreCase(KeysOfConditions.COMPARE_KEYS, KeysOfConditions.$NOT_LIKE);
   addIgnoreCase(KeysOfConditions.COMPARE_KEYS, KeysOfConditions.$NOT_LIKE_INCLUDE);
+  addIgnoreCase(KeysOfConditions.COMPARE_KEYS, KeysOfConditions.$JSON_ARRAY_CONTAINS);
   addIgnoreCase(KeysOfConditions.COMPARE_KEYS, KeysOfConditions.$MATCH);
   addIgnoreCase(KeysOfConditions.COMPARE_KEYS, KeysOfConditions.$MATCH_BOOL);
   addIgnoreCase(KeysOfConditions.COMPARE_KEYS, KeysOfConditions.$RANGE);

package/src/libs/crud-pro/services/CrudProExecuteFuncService.ts

@@ -4,6 +4,8 @@ import { FuncContext } from '../models/FuncContext';
 import { TypeUtils } from '../utils/TypeUtils';
 import { MixinUtils } from '../utils/MixinUtils';
 import * as _ from 'lodash';
+import * as moment from 'moment';
+import * as ejs from 'ejs';
 import { CommonException, Exceptions } from '../exceptions';
 import { KeysOfFunCtx } from '../models/keys';
 
@@ -24,6 +26,21 @@ class CrudProExecuteFuncService extends CrudProServiceBase {
       return funCfg;
     }
 
+    const funcContextAny: any = funcContext;
+    funcContextAny.moment = moment;
+    funcContextAny._ = _;
+    
+    if (isNotNil(funCfg.executeExpressReturnString)) {
+      const expressResult = ejs.render(funCfg.executeExpressReturnString, funcContextAny);
+      return expressResult;
+    }
+
+    if (isNotNil(funCfg.executeExpressReturnObject)) {
+      const expressResult = ejs.render(funCfg.executeExpressReturnObject, funcContextAny);
+      return JSON.parse(expressResult);
+    }
+
+
     if (isNotNil(funCfg.const)) {
       return funCfg.const;
     }

package/src/libs/crud-pro/services/CrudProGenSqlCondition.ts

@@ -227,7 +227,22 @@ class CrudProGenSqlCondition {
           if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
             tmpSql = `${toSqlColumnName(key)} like concat('%', ?::text, '%')`; // like包含
           }
-        } else if (equalsIgnoreCase(KeysOfConditions.$NOT_LIKE_INCLUDE, compare)) {
+        }
+
+        else if (equalsIgnoreCase(KeysOfConditions.$JSON_ARRAY_CONTAINS, compare)) {
+          if (this.sqlCfg.sqlDbType === SqlDbType.mysql) {
+            tmpArgList.push(value0);
+            tmpSql = `JSON_CONTAINS( ${toSqlColumnName(key)} , JSON_ARRAY(?), '$')`; // MYSQL JSON_CONTAINS包含
+          }
+
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpArgList.push(value0);
+            tmpSql = `${toSqlColumnName(key)} @> ('["' || ? || '"]')::jsonb`; // POSTGRES JSON_CONTAINS包含
+          }
+
+        }
+
+        else if (equalsIgnoreCase(KeysOfConditions.$NOT_LIKE_INCLUDE, compare)) {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`; // like不包含
 
@@ -323,7 +338,12 @@ class CrudProGenSqlCondition {
           if (!isBasicType(value0)) {
             throwCommonException(KeysOfConditions.$NOT_LIKE_INCLUDE, '字符串');
           }
-        } else if (equalsIgnoreCase(KeysOfConditions.$MATCH, compare)) {
+        } else if (equalsIgnoreCase(KeysOfConditions.$JSON_ARRAY_CONTAINS, compare)) {
+          if (!isBasicType(value0)) {
+            throwCommonException(KeysOfConditions.$JSON_ARRAY_CONTAINS, '字符串或数字');
+          }
+        }
+        else if (equalsIgnoreCase(KeysOfConditions.$MATCH, compare)) {
           if (!isBasicType(value0)) {
             throwCommonException(KeysOfConditions.$MATCH, '字符串');
           }

package/src/libs/crud-pro/utils/ModelUtils.ts

@@ -41,7 +41,12 @@ const ModelUtils = {
     return DEFAULT_MAX_LIMIT;
   },
   checkFuncCfgValid(cfgModel: IFuncCfgModel): boolean {
-    const arr = [cfgModel.functionName, cfgModel.const, cfgModel.constString, cfgModel.constNumber, cfgModel.constBool, cfgModel.context, cfgModel.contextAsString, cfgModel.contextAsNumber, cfgModel.contextAsBool];
+    const arr = [
+      cfgModel.functionName, cfgModel.const, cfgModel.constString, cfgModel.constNumber,
+      cfgModel.constBool, cfgModel.context,
+      cfgModel.contextAsString, cfgModel.contextAsNumber, cfgModel.contextAsBool,
+      cfgModel.executeExpressReturnObject, cfgModel.executeExpressReturnString
+    ];
     for (let i = 0; i < arr.length; i++) {
       const arrElement = arr[i];
       if (typeof arrElement !== 'undefined') {

package/src/service/crudstd/CrudStdRelationService.ts

@@ -68,6 +68,19 @@ class ColumnsRelationMaker {
 }
 
 
+function addMarkerColumnRelation(maker: ColumnsRelationMaker, dataIndex: string, componentName: string) {
+  // 关联用户信息
+  if (componentName === tableColumnRenders.RenderUserInfo) {
+    maker.addColumnRelationByAccount(dataIndex);
+  }
+
+  // 关联枚举文案/状态标签颜色
+  if (componentName === tableColumnRenders.RenderDictEnumText || componentName === tableColumnRenders.RenderDictEnumStatus) {
+    maker.addColumnRelationByDictEnumStatus(dataIndex);
+  }
+}
+
+
 @Provide()
 export class CrudStdRelationService extends BaseService {
   @Inject()
@@ -90,24 +103,24 @@ export class CrudStdRelationService extends BaseService {
       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);
-      }
+      addMarkerColumnRelation(maker, dataIndex, componentName);
 
       // 子属性的配置
       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);
-          }
+          addMarkerColumnRelation(maker, name, component);
+        }
+      }
+
+
+      // 子属性的配置
+      const linkDataConfig = _.get(tableColumn, 'component.props.linkDataConfig');
+      if (Array.isArray(linkDataConfig) && linkDataConfig.length > 0) {
+        for (let j = 0; j < linkDataConfig.length; j++) {
+          const { component, name } = linkDataConfig[j] || {};
+          addMarkerColumnRelation(maker, name, component);
         }
       }
 

package/src/service/curd/CurdMixByAccountService.ts

@@ -3,7 +3,7 @@ import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
 import { CurdProService } from './CurdProService';
 import { HandleExecuteContextType, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
-import { CrudMixUtils, RelatedType } from './CurdMixUtils';
+import { CrudMixUtils, RelatedType, toFatcmsUserAccountIdList } from './CurdMixUtils';
 import { SystemTables } from '@/models/SystemTables';
 import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { ColumnRelation, IRequestCfgModel, IRequestModel } from '@/libs/crud-pro/interfaces';
@@ -13,6 +13,9 @@ import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 const dictMixUtils = new CrudMixUtils(RelatedType.accountBasic);
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
+const TMP_CTX_KEY2 = _.uniqueId('CurdMixByAccountService2');
+
+
 
 @Provide()
 export class CurdMixByAccountService implements IExecuteContextHandler {
@@ -23,21 +26,28 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {
-    const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const relations = dictMixUtils.pickColumnRelations(executeContext);
     if (!relations || relations.length === 0) {
       return;
     }
 
+    const isArrayModeMap = new Map<string, boolean>();
+
     const accountIds = new Set<string>();
     dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: ColumnRelation) => {
       const { sourceColumn } = columnRelation;
       if (sourceColumn) {
         const accountId = _.get(row, sourceColumn);
         if (accountId) {
-          const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
-          accountIds.add(fatcmsUserAccountId);
+          const { isArray, fatcmsUserAccountIdList, fatcmsUserAccountId } = toFatcmsUserAccountIdList(accountId);
+          if(isArray) {
+            isArrayModeMap.set(sourceColumn, true);
+            fatcmsUserAccountIdList.forEach(item => accountIds.add(item));
+          } else if(fatcmsUserAccountId) {
+            accountIds.add(fatcmsUserAccountId);
+          }
         }
       }
     });
@@ -66,10 +76,13 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
     const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
     const userInfos = res.getResRows();
     executeContext[TMP_CTX_KEY] = MixinUtils.toNewMap(userInfos, (obj: any) => obj.account_id);
+    executeContext[TMP_CTX_KEY2] = isArrayModeMap;
   }
 
   async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
     const userInfoMap = executeContext[TMP_CTX_KEY] as Map<string, any>;
+    const isArrayModeMap = executeContext[TMP_CTX_KEY2] as Map<string, boolean>;
+
     if (!userInfoMap || userInfoMap.size === 0) {
       return;
     }
@@ -78,10 +91,20 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
       const sourceColumn = columnRelation.sourceColumn;
       const targetColumns = columnRelation.targetColumns;
       if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
-        columnRelation.targetColumns = [
-          { from: 'nick_name', to: `${sourceColumn}_user.nick_name` },
-          { from: 'avatar', to: `${sourceColumn}_user.avatar` },
-        ];
+        const isArrayMode = isArrayModeMap.get(sourceColumn) || false;
+        if(isArrayMode === true) {
+          columnRelation.targetColumns = [
+            { from: 'nick_name', to: `${sourceColumn}_array_info[$ARRAY_INDEX].nick_name` },
+            { from: 'avatar', to: `${sourceColumn}_array_info[$ARRAY_INDEX].avatar` },
+            { from: 'account_id', to: `${sourceColumn}_array_info[$ARRAY_INDEX].account_id` },
+          ];
+        } else {
+          columnRelation.targetColumns = [
+            { from: 'nick_name', to: `${sourceColumn}_user.nick_name` },
+            { from: 'avatar', to: `${sourceColumn}_user.avatar` },
+            { from: 'account_id', to: `${sourceColumn}_user.account_id` },
+          ];
+        } 
       }
       dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
     });

package/src/service/curd/CurdMixUtils.ts

@@ -104,6 +104,74 @@ function copyByArraySourceValue(row: any, sourceValue: any, targetColumns: CopyA
   return resultObj.isSetArray;
 }
 
+
+
+interface IFatcmsUserAccountIdList {
+  isArray: boolean;
+  fatcmsUserAccountId?: string;
+  fatcmsUserAccountIdList?: string[];
+}
+
+function toFatcmsUserAccountIdList(accountId: any): IFatcmsUserAccountIdList {
+  const { toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
+
+  if (!accountId) {
+    return {
+      isArray: false,
+      fatcmsUserAccountId: null
+    };
+  }
+
+  // 数字形式
+  if (typeof accountId === 'number') {
+    return {
+      isArray: false,
+      fatcmsUserAccountId: toFatcmsUserAccountId("" + accountId),
+    }
+  }
+
+  if (typeof accountId === 'string') {
+    const json = parseJsonObject(accountId);
+
+    // 数组形式
+    if (json && Array.isArray(json) && json.length > 0) {
+      return {
+        isArray: true,
+        fatcmsUserAccountIdList: json.map(item => {
+          if (typeof item === 'string' || typeof item === 'number') {
+            return toFatcmsUserAccountId("" + item)
+          }
+          return null;
+        }).filter(item => item !== null),
+      }
+    }
+    // 单值形式
+    return {
+      isArray: false,
+      fatcmsUserAccountId: toFatcmsUserAccountId(accountId),
+    }
+  }
+
+  // 数组形式
+  if (Array.isArray(accountId)) {
+    return {
+      isArray: true,
+      fatcmsUserAccountIdList: accountId.map(item => {
+        if (typeof item === 'string' || typeof item === 'number') {
+          return toFatcmsUserAccountId("" + item)
+        }
+        return null;
+      }).filter(item => item !== null),
+    }
+  }
+
+  return {
+    isArray: false,
+    fatcmsUserAccountId: null
+  };
+}
+
+
 class CrudMixUtils {
   private readonly relatedType: RelatedType;
   constructor(relatedType: RelatedType) {
@@ -291,8 +359,7 @@ class CrudMixUtils {
       return;
     }
 
-    const { toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
-    const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
+    const { isArray, fatcmsUserAccountIdList, fatcmsUserAccountId } = toFatcmsUserAccountIdList(accountId);
 
     const getValue = (code: string) => {
       if (!map) {
@@ -304,11 +371,13 @@ class CrudMixUtils {
       return map[code];
     };
 
-    const isSetArray = copyByArraySourceValue(row, fatcmsUserAccountId, targetColumns, getValue);
-    if (!isSetArray) {
+    if (isArray) {
+      copyByArraySourceValue(row, fatcmsUserAccountIdList, targetColumns, getValue);
+    } else if (fatcmsUserAccountId) {
       copyBySingleSourceValue(row, fatcmsUserAccountId, targetColumns, getValue);
     }
+
   }
 }
 
-export { CrudMixUtils, RelatedType, FuncRowColumnRelation };
+export { CrudMixUtils, RelatedType, FuncRowColumnRelation, toFatcmsUserAccountIdList };