midway-fatcms 0.0.1-beta.53 → 0.0.1-beta.55

package/dist/controller/manage/UserAccountManageApi.js

@@ -45,7 +45,7 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'data.login_name': LOGIN_NAME_VALIDATE,
-                'data.nick_name': [keys_1.KeysOfValidators.STRING, 'length:3,20', checkAccountCreateBlacklist],
+                'data.nick_name': [keys_1.KeysOfValidators.STRING, 'length:2,20', checkAccountCreateBlacklist],
             },
             allowCfg: {
                 data: ['login_name', 'nick_name', 'avatar', 'status', 'modified_at', 'created_at'],
@@ -62,7 +62,7 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
             validateCfg: {
                 'data.login_name': LOGIN_NAME_VALIDATE,
-                'data.nick_name': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING, 'length:3,20', checkAccountCreateBlacklist],
+                'data.nick_name': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING, 'length:2,20', checkAccountCreateBlacklist],
                 'data.avatar': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });

package/dist/service/AuthService.d.ts

@@ -23,8 +23,9 @@ export declare class AuthService {
     /**
      * 创建一个toC端的UserSession
      * @param consumerUserInfo
+     * @param loadRoleCodes
      */
-    createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo): Promise<{
+    createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo, loadRoleCodes?: boolean): Promise<{
         sessionId: string;
         loginName: string;
         accountId: string;

package/dist/service/AuthService.js

@@ -69,14 +69,22 @@ let AuthService = class AuthService {
     /**
      * 创建一个toC端的UserSession
      * @param consumerUserInfo
+     * @param loadRoleCodes
      */
-    async createUserSessionForConsumer(consumerUserInfo) {
+    async createUserSessionForConsumer(consumerUserInfo, loadRoleCodes) {
         const sessionId = (0, functions_1.createUniqueId)();
+        const accountId = consumerUserInfo.accountId;
+        let roleCodes = [];
+        let functionCodes = [];
+        if (loadRoleCodes === true) {
+            roleCodes = await this.queryUserRoleCodeList(accountId);
+            functionCodes = await this.queryFunctionCodeList(roleCodes);
+        }
         const sessionInfo = {
             nickName: consumerUserInfo.nickName,
             avatar: consumerUserInfo.avatar,
-            roleCodes: [],
-            functionCodes: [],
+            roleCodes: roleCodes,
+            functionCodes: functionCodes,
             loginName: consumerUserInfo.loginName,
             sessionId,
             accountId: consumerUserInfo.accountId,

package/dist/service/crudstd/CrudStdService.d.ts

@@ -28,6 +28,8 @@ export declare class CrudStdService extends ApiBaseService {
      * 执行普通CRUD
      */
     executeStdQuery(stdAction: ICrudStdActionParams, params: IRequestModelCrudProExt, sqlSimpleName: KeysOfSimpleSQL): Promise<ExecuteContext>;
+    private handleResult;
+    private handleResultDataPermissionBySettingKey;
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
      * @param appCode

package/dist/service/crudstd/CrudStdService.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudStdService = exports.SPECIAL_SETTING_KEY = void 0;
 /* eslint-disable prettier/prettier */
 const _ = require("lodash");
+const ejs = require("ejs");
 const core_1 = require("@midwayjs/core");
 const CurdMixService_1 = require("../curd/CurdMixService");
 const keys_1 = require("../../libs/crud-pro/models/keys");
@@ -80,10 +81,57 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         // 业务系统自定义的修改：查询前的查询条件：cfgModel
         await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
         const crudExeCtx = await this.curdMixService.executeCrudByCfg(params, cfgModel);
+        // 处理结果
+        await this.handleResult(stdAction, params, cfgModel, appInfo, crudExeCtx);
         // 业务系统自定义的修改：查询后的返回值。
         await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateExecuteContextForCrudStd(params, cfgModel, appInfo, this.ctx, crudExeCtx);
         return crudExeCtx;
     }
+    async handleResult(stdAction, params, cfgModel, appInfo, crudExeCtx) {
+        await this.handleResultDataPermissionBySettingKey(stdAction, params, cfgModel, appInfo, crudExeCtx);
+    }
+    async handleResultDataPermissionBySettingKey(stdAction, params, cfgModel, appInfo, crudExeCtx) {
+        const { settingKey } = stdAction || {};
+        if (settingKey !== exports.SPECIAL_SETTING_KEY.QUERY_LIST && settingKey !== exports.SPECIAL_SETTING_KEY.QUERY_ONE) {
+            return;
+        }
+        const rows = crudExeCtx.getResRows();
+        if (!Array.isArray(rows)) {
+            return;
+        }
+        const actionColumns = _.get(appInfo, 'stdCrudCfgObj.actionColumns');
+        const checkDataPermissionObjBySettingKey = (record) => {
+            var _a;
+            const permissionObj = {};
+            let count = 0;
+            const sessionInfo = (_a = this.ctx.userSession) === null || _a === void 0 ? void 0 : _a.getSessionInfo();
+            for (let index = 0; index < actionColumns.length; index++) {
+                const column = actionColumns[index];
+                const rowAuthCfg = (0, functions_1.parseJsonObject)(column.rowAuthCfg);
+                if (rowAuthCfg && typeof rowAuthCfg.authByExpress === 'string') {
+                    const authByExpress = rowAuthCfg.authByExpress.trim();
+                    if (authByExpress) {
+                        const authResult = ejs.render(authByExpress, { record, sessionInfo, params, _ });
+                        permissionObj[column.settingKey] = authResult;
+                        count++;
+                    }
+                }
+            }
+            if (count > 0) {
+                return permissionObj;
+            }
+            return null;
+        };
+        if (Array.isArray(actionColumns) && actionColumns.length > 0) {
+            for (let index = 0; index < rows.length; index++) {
+                const row = rows[index];
+                const dataPermissionObjBySettingKey = checkDataPermissionObjBySettingKey(row);
+                if (dataPermissionObjBySettingKey) {
+                    row['__dataPermissionObjBySettingKey'] = dataPermissionObjBySettingKey;
+                }
+            }
+        }
+    }
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
      * @param appCode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.53",
+  "version": "0.0.1-beta.55",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -44,6 +44,7 @@
     "@midwayjs/upload": "^3.16.1",
     "@midwayjs/validate": "^3.16.1",
     "@midwayjs/view-ejs": "^3.20.4",
+    "@types/ejs": "3.1.5",
     "@types/humps": "2.0.6",
     "@types/jest": "^29.2.0",
     "@types/koa": "^2.13.4",
@@ -73,7 +74,8 @@
     "ts-jest": "^29.0.3",
     "typescript": "~4.8.0",
     "urlsafe-base64": "^1.0.0",
-    "fast-csv": "^5.0.2"
+    "fast-csv": "^5.0.2",
+    "ejs": "^3.1.10"
   },
   "dependencies": {}
 }