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

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

@@ -1,6 +1,7 @@
 interface IEnumInfo {
     label: string;
     value: string | number;
+    style?: string;
     children?: IEnumInfo[];
 }
 declare function parseConfigContentToEnumInfo(configEntity: any): IEnumInfo[];

package/dist/libs/utils/parseConfig.js

@@ -14,6 +14,9 @@ function parseTreeTableToIEnumInfo(dataSource) {
             label: label || nodeName,
             value: value || key,
         };
+        if (item && typeof item.style === 'string' && item.style) {
+            enumInfo.style = item.style.trim();
+        }
         if (children) {
             enumInfo.children = children;
         }

package/dist/models/bizmodels.d.ts

@@ -17,6 +17,7 @@ export interface ITableBaseInfo {
 export interface IStdCrudCfgObj {
     tableBaseInfo: ITableBaseInfo;
     authSetting: any;
+    kanbanAuthSetting: any;
     actionColumns?: any[];
     queryFormFields?: any[];
     tableColumns?: any[];
@@ -29,9 +30,13 @@ export interface ICrudStdAppInfo {
     actionsMap?: any;
     status: number;
 }
+export interface ISettingKeyActionCfg {
+    settingKey: string;
+    hasOperationPerm: boolean;
+}
 export interface ICrudStdAppInfoForSettingKey extends ICrudStdAppInfo {
-    settingKeyActionCfg?: any;
-    buttonSettingKeyActionCfg?: any;
+    settingKeyActionCfg?: ISettingKeyActionCfg;
+    buttonSettingKeyActionCfg?: ISettingKeyActionCfg;
     authConfig?: string[];
     authType?: string;
 }

package/dist/service/AuthService.d.ts

@@ -39,7 +39,7 @@ export declare class AuthService {
      * @param loginName
      * @param workbenchCode
      */
-    createUserSession(loginName: string, workbenchCode: string): Promise<{
+    createUserSession(loginName: string, workbenchCode: string, bizExt?: any): Promise<{
         sessionId: string;
         loginName: string;
         accountId: any;

package/dist/service/AuthService.js

@@ -107,7 +107,7 @@ let AuthService = class AuthService {
      * @param loginName
      * @param workbenchCode
      */
-    async createUserSession(loginName, workbenchCode) {
+    async createUserSession(loginName, workbenchCode, bizExt) {
         const userAccount = await this.queryUserAccountByLoginName(loginName);
         if (!userAccount) {
             throw new exceptions_1.CommonException('USER_ACCOUNT_NOT_EXIST', '用户账号不存在');
@@ -126,7 +126,11 @@ let AuthService = class AuthService {
             accountId,
             workbenchCode,
             accountType: userSession_1.SYS_ACCOUNT_TYPE,
+            bizExt: {},
         };
+        if (bizExt && typeof bizExt === 'object') {
+            sessionInfo.bizExt = bizExt;
+        }
         await this.userSessionService.saveUserSession(sessionInfo);
         return {
             sessionId,

package/dist/service/EnumInfoService.js

@@ -86,7 +86,7 @@ let EnumInfoService = class EnumInfoService {
             return null;
         }
         const rows = (0, parseConfig_1.parseConfigContentToEnumInfo)(obj);
-        return rows.map(e => ({ label: e.label, value: e.value, children: e.children })).filter(filterEmpty);
+        return rows.map(e => ({ label: e.label, value: e.value, style: e.style, children: e.children })).filter(filterEmpty);
     }
     async queryEnumInfoItemByDict(code) {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();

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

@@ -10,6 +10,7 @@ import { ApiBaseService } from '../base/ApiBaseService';
 export declare const SPECIAL_SETTING_KEY: {
     QUERY_LIST: string;
     QUERY_ONE: string;
+    KANBAN_VIEW_STATUS_UPDATE: string;
 };
 export interface ICrudStdActionParams {
     appCode: string;

package/dist/service/crudstd/CrudStdService.js

@@ -28,6 +28,7 @@ const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
+    KANBAN_VIEW_STATUS_UPDATE: 'KANBAN_VIEW_STATUS_UPDATE', // 看板视图中更新状态
 };
 function isNotEmptyStr(str) {
     return typeof str === 'string' && str.trim().length > 0;
@@ -59,6 +60,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      * 执行普通CRUD
      */
     async executeStdQuery(stdAction, params, sqlSimpleName) {
+        var _a;
         const appCode = stdAction.appCode;
         const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
         const stdCrudCfgObj = appInfo.stdCrudCfgObj;
@@ -79,7 +81,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         if (typeof maxLimit === 'number' && maxLimit > 0) {
             cfgModel.maxLimit = maxLimit;
         }
-        if (!appInfo.settingKeyActionCfg.hasOperationPerm) {
+        if (!((_a = appInfo.settingKeyActionCfg) === null || _a === void 0 ? void 0 : _a.hasOperationPerm)) {
             throw new devops_1.BizException('没有权限');
         }
         // 软删除操作。
@@ -163,7 +165,16 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         const actionsMap = appInfo.actionsMap;
         const appSchema = appInfo.stdCrudCfgObj;
-        if (settingKey === exports.SPECIAL_SETTING_KEY.QUERY_LIST || settingKey === exports.SPECIAL_SETTING_KEY.QUERY_ONE) {
+        // 看板视图中更新状态
+        if (settingKey === exports.SPECIAL_SETTING_KEY.KANBAN_VIEW_STATUS_UPDATE) {
+            const kanbanAuthSettingValues = _.get(appSchema, 'kanbanAuthSetting.values');
+            const { update_auth_type, update_auth_config_by_func_code, update_auth_config_by_role_code } = (kanbanAuthSettingValues || {});
+            const authConfig = update_auth_type === 'byFuncCode' ? update_auth_config_by_func_code : update_auth_config_by_role_code;
+            const hasOperationPerm = this.ctx.userSession.isAuthPass(update_auth_type, authConfig);
+            appInfo.settingKeyActionCfg = { settingKey, hasOperationPerm };
+        }
+        // 列表查询或详情查询
+        else if (settingKey === exports.SPECIAL_SETTING_KEY.QUERY_LIST || settingKey === exports.SPECIAL_SETTING_KEY.QUERY_ONE) {
             const authSettingValues = _.get(appSchema, 'authSetting.values');
             const { auth_type, auth_config_by_func_code, auth_config_by_role_code } = authSettingValues || {};
             const authConfig = auth_type === 'byFuncCode' ? auth_config_by_func_code : auth_config_by_role_code;

package/package.json

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

package/src/libs/utils/parseConfig.ts

@@ -4,6 +4,7 @@ import { parseJsonObject } from './functions';
 interface IEnumInfo {
   label: string;
   value: string | number;
+  style?: string;
   children?: IEnumInfo[];
 }
 
@@ -18,6 +19,9 @@ function parseTreeTableToIEnumInfo(dataSource: any[]): IEnumInfo[] {
       label: label || nodeName,
       value: value || key,
     };
+    if (item && typeof item.style === 'string' && item.style) {
+      enumInfo.style = item.style.trim();
+    }
     if (children) {
       enumInfo.children = children;
     }

package/src/models/bizmodels.ts

@@ -20,6 +20,7 @@ export interface ITableBaseInfo {
 export interface IStdCrudCfgObj {
   tableBaseInfo: ITableBaseInfo;
   authSetting: any;
+  kanbanAuthSetting: any;
   actionColumns?: any[];
   queryFormFields?: any[];
   tableColumns?: any[];
@@ -34,9 +35,14 @@ export interface ICrudStdAppInfo {
   status: number;
 }
 
+export interface ISettingKeyActionCfg {
+  settingKey: string;
+  hasOperationPerm: boolean;
+}
+
 export interface ICrudStdAppInfoForSettingKey extends ICrudStdAppInfo {
-  settingKeyActionCfg?: any;
-  buttonSettingKeyActionCfg?: any;
+  settingKeyActionCfg?: ISettingKeyActionCfg;
+  buttonSettingKeyActionCfg?: ISettingKeyActionCfg;
   authConfig?: string[];
   authType?: string;
 }

package/src/service/AuthService.ts

@@ -130,7 +130,7 @@ export class AuthService {
    * @param loginName
    * @param workbenchCode
    */
-  public async createUserSession(loginName: string, workbenchCode: string) {
+  public async createUserSession(loginName: string, workbenchCode: string, bizExt?: any) {
     const userAccount = await this.queryUserAccountByLoginName(loginName);
 
     if (!userAccount) {
@@ -152,8 +152,13 @@ export class AuthService {
       accountId,
       workbenchCode,
       accountType: SYS_ACCOUNT_TYPE,
+      bizExt: {},
     };
 
+    if (bizExt && typeof bizExt === 'object') {
+      sessionInfo.bizExt = bizExt;
+    }
+
     await this.userSessionService.saveUserSession(sessionInfo);
 
     return {

package/src/service/EnumInfoService.ts

@@ -104,7 +104,7 @@ export class EnumInfoService {
     }
 
     const rows = parseConfigContentToEnumInfo(obj);
-    return rows.map(e => ({ label: e.label, value: e.value, children: e.children })).filter(filterEmpty);
+    return rows.map(e => ({ label: e.label, value: e.value, style: e.style, children: e.children })).filter(filterEmpty);
   }
 
   private async queryEnumInfoItemByDict(code: string): Promise<IEnumInfo[]> {

package/src/service/crudstd/CrudStdService.ts

@@ -22,6 +22,7 @@ import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 export const SPECIAL_SETTING_KEY = {
   QUERY_LIST: 'QUERY_LIST',
   QUERY_ONE: 'QUERY_ONE',
+  KANBAN_VIEW_STATUS_UPDATE: 'KANBAN_VIEW_STATUS_UPDATE',  // 看板视图中更新状态
 };
 
 export interface ICrudStdActionParams {
@@ -115,7 +116,7 @@ export class CrudStdService extends ApiBaseService {
       cfgModel.maxLimit = maxLimit;
     }
 
-    if (!appInfo.settingKeyActionCfg.hasOperationPerm) {
+    if (!appInfo.settingKeyActionCfg?.hasOperationPerm) {
       throw new BizException('没有权限');
     }
 
@@ -225,7 +226,19 @@ export class CrudStdService extends ApiBaseService {
     const actionsMap = appInfo.actionsMap;
     const appSchema = appInfo.stdCrudCfgObj;
 
-    if (settingKey === SPECIAL_SETTING_KEY.QUERY_LIST || settingKey === SPECIAL_SETTING_KEY.QUERY_ONE) {
+
+    // 看板视图中更新状态
+    if (settingKey === SPECIAL_SETTING_KEY.KANBAN_VIEW_STATUS_UPDATE) {
+
+      const kanbanAuthSettingValues = _.get(appSchema, 'kanbanAuthSetting.values');
+      const { update_auth_type, update_auth_config_by_func_code, update_auth_config_by_role_code } = (kanbanAuthSettingValues || {});
+      const authConfig = update_auth_type === 'byFuncCode' ? update_auth_config_by_func_code : update_auth_config_by_role_code;
+      const hasOperationPerm = this.ctx.userSession.isAuthPass(update_auth_type as any, authConfig);
+      appInfo.settingKeyActionCfg = { settingKey, hasOperationPerm };
+
+    } 
+    // 列表查询或详情查询
+    else if (settingKey === SPECIAL_SETTING_KEY.QUERY_LIST || settingKey === SPECIAL_SETTING_KEY.QUERY_ONE) {
       const authSettingValues = _.get(appSchema, 'authSetting.values');
       const { auth_type, auth_config_by_func_code, auth_config_by_role_code } = authSettingValues || {};
       const authConfig = auth_type === 'byFuncCode' ? auth_config_by_func_code : auth_config_by_role_code;