midway-fatcms 0.0.1-beta.46 → 0.0.1-beta.49

package/dist/controller/manage/CrudStandardDesignApi.js

@@ -20,11 +20,19 @@ const SystemTables_1 = require("../../models/SystemTables");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
 const common_dto_1 = require("../../libs/utils/common-dto");
+function getObjectKeysWithValue(obj) {
+    const keys = Object.keys(obj || {});
+    return keys.filter((key) => {
+        const valueObj = obj[key];
+        const valueKeys = Object.keys(valueObj || {});
+        return valueKeys.length > 0;
+    });
+}
 let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiController_1.BaseApiController {
     async getDataBaseList() {
-        const mysqlList = Object.keys(this.mysql2Config || {});
-        const postgresList = Object.keys(this.postgres2Config || {});
-        const sqlServerList = Object.keys(this.sqlserver2Config || {});
+        const mysqlList = getObjectKeysWithValue(this.mysql2Config);
+        const postgresList = getObjectKeysWithValue(this.postgres2Config);
+        const sqlServerList = getObjectKeysWithValue(this.sqlserver2Config);
         const toSelectList = (dbCfgNameList, dbType) => {
             return dbCfgNameList.map(dbName => {
                 const value = (0, DatabaseName_1.toDatabaseNameStr)(dbType, dbName);

package/dist/controller/manage/UserAccountManageApi.js

@@ -48,7 +48,7 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
                 'data.nick_name': [keys_1.KeysOfValidators.STRING, 'length:3,20', checkAccountCreateBlacklist],
             },
             allowCfg: {
-                data: ['login_name', 'nick_name', 'avatar', 'status'],
+                data: ['login_name', 'nick_name', 'avatar', 'status', 'modified_at', 'created_at'],
             },
         });
     }

package/dist/service/asyncTask/handler/ExportExcelByStdCrudHandler.js

@@ -79,10 +79,12 @@ class ExportExcelByStdCrudHandler {
             return selectedRowKeys.length;
         }
         const lastQueryParams = (_b = this.inputParams) === null || _b === void 0 ? void 0 : _b.lastQueryParams;
+        const filterValue = _.get(lastQueryParams, 'filterValue');
         const crudStdService = await this.getCrudStdService();
         const appCode = this.appCode;
         const params = {
             condition: (lastQueryParams === null || lastQueryParams === void 0 ? void 0 : lastQueryParams.condition) || {},
+            filterValue,
             pageSize: 1,
             pageNo: 1,
         };
@@ -107,10 +109,12 @@ class ExportExcelByStdCrudHandler {
         const selectedRowKeys = this.inputParams.selectedRowKeys || [];
         const primaryKey = this.inputParams.primaryKey || 'id';
         const lastQueryParams = this.inputParams.lastQueryParams;
+        const filterValue = _.get(lastQueryParams, 'filterValue');
         const crudStdService = await this.getCrudStdService();
         const appCode = this.appCode;
         const params = {
             condition: (lastQueryParams === null || lastQueryParams === void 0 ? void 0 : lastQueryParams.condition) || {},
+            filterValue: filterValue,
             pageSize: pageSize,
             pageNo: pageNo,
             orderBy: lastQueryParams === null || lastQueryParams === void 0 ? void 0 : lastQueryParams.orderBy,

package/dist/service/crudstd/CrudStdRelationService.js

@@ -10,62 +10,89 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudStdRelationService = void 0;
+/* eslint-disable prettier/prettier */
 const core_1 = require("@midwayjs/core");
 const _ = require("lodash");
 const CurdMixService_1 = require("../curd/CurdMixService");
 const BaseService_1 = require("../base/BaseService");
 const CrudStdConstant_1 = require("./CrudStdConstant");
 const CurdMixUtils_1 = require("../curd/CurdMixUtils");
+class ColumnsRelationMaker {
+    constructor(cfgModel, appInfo) {
+        cfgModel.columnsRelation = [];
+        this.cfgModel = cfgModel;
+        this.appInfo = appInfo;
+    }
+    addColumnRelationByAccount(dataIndex) {
+        const columnsRelation = this.cfgModel.columnsRelation;
+        columnsRelation.push({
+            relatedType: CurdMixUtils_1.RelatedType.accountBasic,
+            sourceColumn: dataIndex,
+            targetColumns: [], // 使用默认
+        });
+    }
+    addColumnRelationByDictEnumStatus(dataIndex) {
+        var _a;
+        const appInfo = this.appInfo;
+        const tableFields = ((_a = appInfo === null || appInfo === void 0 ? void 0 : appInfo.stdCrudCfgObj) === null || _a === void 0 ? void 0 : _a.tableFields) || [];
+        const columnsRelation = this.cfgModel.columnsRelation;
+        const fieldCfg = tableFields.find(f => {
+            return f.fieldIndex === dataIndex;
+        });
+        if (fieldCfg && fieldCfg.linkToType === CrudStdConstant_1.fieldLinkToTypes.linkToCustom) {
+            columnsRelation.push({
+                relatedType: CurdMixUtils_1.RelatedType.linkToCustom,
+                relatedCode: fieldCfg.linkToCustom,
+                sourceColumn: dataIndex,
+                targetColumns: [], // 使用默认
+            });
+        }
+        if (fieldCfg && fieldCfg.linkToType === CrudStdConstant_1.fieldLinkToTypes.linkToSysCfgEnum) {
+            columnsRelation.push({
+                relatedType: CurdMixUtils_1.RelatedType.sysCfgEnum,
+                relatedCode: fieldCfg.linkToSysCfgEnumCode,
+                sourceColumn: dataIndex,
+                targetColumns: [], // 使用默认
+            });
+        }
+        if (fieldCfg && fieldCfg.linkToType === CrudStdConstant_1.fieldLinkToTypes.linkToDict) {
+            columnsRelation.push({
+                relatedType: CurdMixUtils_1.RelatedType.dict,
+                relatedCode: fieldCfg.linkToDictCode,
+                sourceColumn: dataIndex,
+                targetColumns: [], // 使用默认
+            });
+        }
+    }
+}
 let CrudStdRelationService = class CrudStdRelationService extends BaseService_1.BaseService {
     async addCfgModelColumnsRelation(cfgModel, appInfo) {
-        var _a, _b;
+        var _a;
         const tableColumns = (_a = appInfo === null || appInfo === void 0 ? void 0 : appInfo.stdCrudCfgObj) === null || _a === void 0 ? void 0 : _a.tableColumns;
-        const tableFields = ((_b = appInfo === null || appInfo === void 0 ? void 0 : appInfo.stdCrudCfgObj) === null || _b === void 0 ? void 0 : _b.tableFields) || [];
-        if (!Array.isArray(tableColumns)) {
+        if (!Array.isArray(tableColumns) || tableColumns.length === 0) {
             return;
         }
-        const columnsRelation = [];
-        cfgModel.columnsRelation = columnsRelation;
+        const maker = new ColumnsRelationMaker(cfgModel, appInfo);
         for (let i = 0; i < tableColumns.length; i++) {
             const tableColumn = tableColumns[i];
             const dataIndex = _.get(tableColumn, 'dataIndex');
             const componentName = _.get(tableColumn, 'component.componentName');
             // 关联用户信息
             if (componentName === CrudStdConstant_1.tableColumnRenders.RenderUserInfo) {
-                columnsRelation.push({
-                    relatedType: CurdMixUtils_1.RelatedType.accountBasic,
-                    sourceColumn: dataIndex,
-                    targetColumns: [], // 使用默认
-                });
+                maker.addColumnRelationByAccount(dataIndex);
             }
             // 关联枚举文案/状态标签颜色
             if (componentName === CrudStdConstant_1.tableColumnRenders.RenderDictEnumText || componentName === CrudStdConstant_1.tableColumnRenders.RenderDictEnumStatus) {
-                const fieldCfg = tableFields.find(f => {
-                    return f.fieldIndex === dataIndex;
-                });
-                if (fieldCfg && fieldCfg.linkToType === CrudStdConstant_1.fieldLinkToTypes.linkToCustom) {
-                    columnsRelation.push({
-                        relatedType: CurdMixUtils_1.RelatedType.linkToCustom,
-                        relatedCode: fieldCfg.linkToCustom,
-                        sourceColumn: dataIndex,
-                        targetColumns: [], // 使用默认
-                    });
-                }
-                if (fieldCfg && fieldCfg.linkToType === CrudStdConstant_1.fieldLinkToTypes.linkToSysCfgEnum) {
-                    columnsRelation.push({
-                        relatedType: CurdMixUtils_1.RelatedType.sysCfgEnum,
-                        relatedCode: fieldCfg.linkToSysCfgEnumCode,
-                        sourceColumn: dataIndex,
-                        targetColumns: [], // 使用默认
-                    });
-                }
-                if (fieldCfg && fieldCfg.linkToType === CrudStdConstant_1.fieldLinkToTypes.linkToDict) {
-                    columnsRelation.push({
-                        relatedType: CurdMixUtils_1.RelatedType.dict,
-                        relatedCode: fieldCfg.linkToDictCode,
-                        sourceColumn: dataIndex,
-                        targetColumns: [], // 使用默认
-                    });
+                maker.addColumnRelationByDictEnumStatus(dataIndex);
+            }
+            // 子属性的配置
+            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);
+                    }
                 }
             }
         }

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

@@ -16,6 +16,9 @@ export interface ICrudStdActionParams {
     settingKey?: string;
     buttonSettingKey?: string;
 }
+export interface IRequestModelCrudProExt extends IRequestModel {
+    filterValue: string | number;
+}
 export declare class CrudStdService extends ApiBaseService {
     protected ctx: Context;
     protected curdMixService: CurdMixService;
@@ -24,7 +27,7 @@ export declare class CrudStdService extends ApiBaseService {
     /**
      * 执行普通CRUD
      */
-    executeStdQuery(stdAction: ICrudStdActionParams, params: IRequestModel, sqlSimpleName: KeysOfSimpleSQL): Promise<ExecuteContext>;
+    executeStdQuery(stdAction: ICrudStdActionParams, params: IRequestModelCrudProExt, sqlSimpleName: KeysOfSimpleSQL): Promise<ExecuteContext>;
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
      * @param appCode
@@ -37,7 +40,7 @@ export declare class CrudStdService extends ApiBaseService {
      * @param stdAction
      * @param params
      */
-    executeStdActionByReq(stdAction: ICrudStdActionParams, params: IRequestModel): Promise<ExecuteContext>;
+    executeStdActionByReq(stdAction: ICrudStdActionParams, params: IRequestModelCrudProExt): Promise<ExecuteContext>;
     /**
      * 查询APP信息
      * @param appCode
@@ -57,6 +60,7 @@ export declare class CrudStdService extends ApiBaseService {
      */
     private getParsedCrudStdAppInfoPrivate;
     private hasOperationPerm;
+    private fixCfgModelByFilterValue;
     private fixSubmitDataByKeepSubmitData;
     private fixDataFieldTypeBySqlTableField;
 }

package/dist/service/crudstd/CrudStdService.js

@@ -59,6 +59,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
             sqlDbType: dbType,
             sqlTable: getExecuteTableNameBySettingKey(appInfo, stdAction),
             sqlSimpleName,
+            updateCfg: {}
         };
         // 接口返回最大值
         const maxLimit = _.get(stdCrudCfgObj, 'othersSetting.values.maxLimit');
@@ -70,6 +71,8 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         // 根据用户配置，设置关联查询的数据信息。
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+        // 根据FilterValue参数，设置updateCfg
+        await this.fixCfgModelByFilterValue(params, cfgModel, appInfo, { dbType, dbName });
         // 根据用户配置的keepSubmitData字段修改提交的数据
         await this.fixSubmitDataByKeepSubmitData(params, cfgModel, appInfo, { dbType, dbName });
         // 根据表结构的数据类型，修正数据类型
@@ -208,6 +211,28 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         return true; // 无需鉴权
     }
+    async fixCfgModelByFilterValue(params, cfgModel, appInfo, arg3) {
+        const { filterValue } = params || {};
+        if (!filterValue && filterValue !== 0) {
+            return;
+        }
+        const filterList = _.get(appInfo, 'stdCrudCfgObj.filterList');
+        if (!Array.isArray(filterList) || filterList.length === 0) {
+            this.logWarn('filterValue存在，但是filterList没有设置');
+            return;
+        }
+        const filterItem = filterList.find(item => item.value === filterValue);
+        if (!filterItem) {
+            this.logWarn('filterValue存在，但是filterList中没有找到此配置项');
+            return;
+        }
+        const partialCondition = _.get(filterItem, 'partialCondition');
+        if (!partialCondition) {
+            this.logWarn('filterValue存在，但是filterList中的配置项没有设置partialCondition');
+            return;
+        }
+        Object.assign(cfgModel.updateCfg, partialCondition);
+    }
     async fixSubmitDataByKeepSubmitData(params, cfgModel, appInfo, arg3) {
         if (cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT || cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
             const submitData = params.data || {};

package/dist/service/curd/CurdMixByAccountService.js

@@ -35,7 +35,6 @@ let CurdMixByAccountService = class CurdMixByAccountService {
                 if (accountId) {
                     const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
                     accountIds.add(fatcmsUserAccountId);
-                    row['__fatcmsUserAccountId__'] = fatcmsUserAccountId;
                 }
             }
         });

package/dist/service/curd/CurdMixUtils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
 const _ = require("lodash");
 const functions_1 = require("../../libs/utils/functions");
 var RelatedType;
@@ -248,15 +249,16 @@ class CrudMixUtils {
      * @param columnRelation
      */
     copyUserInfoToRowNoRelatedCode(row, map, columnRelation) {
-        const { targetColumns } = columnRelation;
+        const { targetColumns, sourceColumn } = columnRelation;
         if (!targetColumns) {
             return;
         }
-        const tmpSourceColumn = '__fatcmsUserAccountId__';
-        const sourceValue = _.get(row, tmpSourceColumn);
-        if (!sourceValue) {
+        const accountId = _.get(row, sourceColumn);
+        if (!accountId) {
             return;
         }
+        const { toFatcmsUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
         const getValue = (code) => {
             if (!map) {
                 return null;
@@ -266,9 +268,9 @@ class CrudMixUtils {
             }
             return map[code];
         };
-        const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
+        const isSetArray = copyByArraySourceValue(row, fatcmsUserAccountId, targetColumns, getValue);
         if (!isSetArray) {
-            copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
+            copyBySingleSourceValue(row, fatcmsUserAccountId, targetColumns, getValue);
         }
     }
 }

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

@@ -1,3 +1,3 @@
-import { IRequestCfgModel2 } from "../../models/bizmodels";
+import { IRequestCfgModel2 } from '../../models/bizmodels';
 declare function fixCfgModel(cfgModel: IRequestCfgModel2): void;
 export { fixCfgModel };

package/dist/service/curd/fixCfgModel.js

@@ -4,10 +4,7 @@ exports.fixCfgModel = void 0;
 const bizmodels_1 = require("../../models/bizmodels");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 function isSimpleQuery(sqlSimpleName) {
-    return sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE;
+    return sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE;
 }
 function fixCfgModel(cfgModel) {
     if (!cfgModel.method) {
@@ -94,8 +91,7 @@ function fixCfgModel(cfgModel) {
         Object.assign(cfgModel.updateCfg, updateCfgObj2);
     }
     // 插入或更新
-    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
         const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
         const updateCfgObj2 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
         const updateCfgObj3 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的

package/package.json

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