midway-fatcms 0.0.1-beta.45 → 0.0.1-beta.47

package/dist/controller/gateway/CrudStdGatewayController.js

@@ -33,52 +33,44 @@ let CrudStdGatewayController = class CrudStdGatewayController extends BaseApiCon
      */
     async getObjectList() {
         const { stdAction, ...otherParams } = this.ctx.request.body;
-        const appCode = stdAction.appCode;
-        return this.crudStdService.executeStdQuery(appCode, CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_LIST, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+        stdAction.settingKey = CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_LIST;
+        return this.crudStdService.executeStdQuery(stdAction, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
     }
     /**
      * 单个查询
      */
     async getObjectOne() {
         const { stdAction, ...otherParams } = this.ctx.request.body;
-        const appCode = stdAction.appCode;
-        return this.crudStdService.executeStdQuery(appCode, CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_ONE, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE);
+        stdAction.settingKey = CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_ONE;
+        return this.crudStdService.executeStdQuery(stdAction, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE);
     }
     /**
      * 单个删除
      */
     async deleteObject() {
         const { stdAction, ...otherParams } = this.ctx.request.body;
-        const appCode = stdAction.appCode;
-        const settingKey = stdAction.settingKey;
-        return this.crudStdService.executeStdQuery(appCode, settingKey, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE);
+        return this.crudStdService.executeStdQuery(stdAction, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE);
     }
     /**
      * 单个创建
      */
     async createObject() {
         const { stdAction, ...otherParams } = this.ctx.request.body;
-        const appCode = stdAction.appCode;
-        const settingKey = stdAction.settingKey;
-        return this.crudStdService.executeStdQuery(appCode, settingKey, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT);
+        return this.crudStdService.executeStdQuery(stdAction, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT);
     }
     /**
      * 单个更新
      */
     async updateObject() {
         const { stdAction, ...otherParams } = this.ctx.request.body;
-        const appCode = stdAction.appCode;
-        const settingKey = stdAction.settingKey;
-        return this.crudStdService.executeStdQuery(appCode, settingKey, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE);
+        return this.crudStdService.executeStdQuery(stdAction, otherParams, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE);
     }
     /**
      * 执行操作
      */
     async executeStdAction() {
         const { stdAction, ...otherParams } = this.ctx.request.body;
-        const appCode = stdAction.appCode;
-        const settingKey = stdAction.settingKey;
-        return await this.crudStdService.executeStdActionByReq(appCode, settingKey, otherParams);
+        return await this.crudStdService.executeStdActionByReq(stdAction, otherParams);
     }
 };
 __decorate([

package/dist/libs/utils/functions.js

@@ -12,10 +12,14 @@ function createUniqueId() {
 }
 exports.createUniqueId = createUniqueId;
 function parseJsonObject(str) {
-    if (typeof str === 'object') {
+    const typeofStr = typeof str;
+    if (str === null || typeofStr === 'undefined') {
+        return null;
+    }
+    if (typeofStr === 'object') {
         return str;
     }
-    if (typeof str === 'string') {
+    if (typeofStr === 'string') {
         str = str.trim();
         if (str.startsWith('{') || str.startsWith('[')) {
             try {

package/dist/models/bizmodels.d.ts

@@ -31,6 +31,7 @@ export interface ICrudStdAppInfo {
 }
 export interface ICrudStdAppInfoForSettingKey extends ICrudStdAppInfo {
     settingKeyActionCfg?: any;
+    buttonSettingKeyActionCfg?: any;
     authConfig?: string[];
     authType?: string;
 }

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

@@ -90,7 +90,11 @@ class ExportExcelByStdCrudHandler {
             this.ctx.innerHeaders = {};
         }
         Object.assign(this.ctx.innerHeaders, this.inputParams.headers || {});
-        const a = await crudStdService.executeStdQuery(appCode, CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_LIST, params, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+        const stdAction = {
+            appCode: appCode,
+            settingKey: CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_LIST,
+        };
+        const a = await crudStdService.executeStdQuery(stdAction, params, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
         return pickData(a, 'total_count');
     }
     /**
@@ -116,7 +120,11 @@ class ExportExcelByStdCrudHandler {
                 $in: selectedRowKeys,
             };
         }
-        const a = await crudStdService.executeStdQuery(appCode, CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_LIST, params, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+        const stdAction = {
+            appCode: appCode,
+            settingKey: CrudStdService_1.SPECIAL_SETTING_KEY.QUERY_LIST,
+        };
+        const a = await crudStdService.executeStdQuery(stdAction, params, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
         return pickData(a, 'rows');
     }
 }

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

@@ -11,6 +11,11 @@ export declare const SPECIAL_SETTING_KEY: {
     QUERY_LIST: string;
     QUERY_ONE: string;
 };
+export interface ICrudStdActionParams {
+    appCode: string;
+    settingKey?: string;
+    buttonSettingKey?: string;
+}
 export declare class CrudStdService extends ApiBaseService {
     protected ctx: Context;
     protected curdMixService: CurdMixService;
@@ -19,7 +24,7 @@ export declare class CrudStdService extends ApiBaseService {
     /**
      * 执行普通CRUD
      */
-    executeStdQuery(appCode: string, settingKey: string, params: IRequestModel, sqlSimpleName: KeysOfSimpleSQL): Promise<ExecuteContext>;
+    executeStdQuery(stdAction: ICrudStdActionParams, params: IRequestModel, sqlSimpleName: KeysOfSimpleSQL): Promise<ExecuteContext>;
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
      * @param appCode
@@ -29,11 +34,10 @@ export declare class CrudStdService extends ApiBaseService {
     private getParsedCrudStdAppForSettingKey;
     /**
      * 执行动作
-     * @param appCode
-     * @param settingKey
+     * @param stdAction
      * @param params
      */
-    executeStdActionByReq(appCode: string, settingKey: string, params: IRequestModel): Promise<ExecuteContext>;
+    executeStdActionByReq(stdAction: ICrudStdActionParams, params: IRequestModel): Promise<ExecuteContext>;
     /**
      * 查询APP信息
      * @param appCode
@@ -53,5 +57,6 @@ export declare class CrudStdService extends ApiBaseService {
      */
     private getParsedCrudStdAppInfoPrivate;
     private hasOperationPerm;
+    private fixSubmitDataByKeepSubmitData;
     private fixDataFieldTypeBySqlTableField;
 }

package/dist/service/crudstd/CrudStdService.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudStdService = exports.SPECIAL_SETTING_KEY = void 0;
+/* eslint-disable prettier/prettier */
 const _ = require("lodash");
 const core_1 = require("@midwayjs/core");
 const CurdMixService_1 = require("../curd/CurdMixService");
@@ -27,7 +28,8 @@ exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
 };
-function getExecuteTableNameBySettingKey(appInfo, settingKey) {
+function getExecuteTableNameBySettingKey(appInfo, stdAction) {
+    const { settingKey } = stdAction || {};
     const stdCrudCfgObj = appInfo.stdCrudCfgObj;
     const actionsMap = appInfo.actionsMap || {};
     const actionCfg = actionsMap[settingKey];
@@ -43,8 +45,9 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
     /**
      * 执行普通CRUD
      */
-    async executeStdQuery(appCode, settingKey, params, sqlSimpleName) {
-        const appInfo = await this.getParsedCrudStdAppForSettingKey(appCode, settingKey);
+    async executeStdQuery(stdAction, params, sqlSimpleName) {
+        const appCode = stdAction.appCode;
+        const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
         const stdCrudCfgObj = appInfo.stdCrudCfgObj;
         if (!appInfo || appInfo.status !== 1) {
             throw new devops_1.BizException('应用不存在或已下线：' + appCode);
@@ -54,7 +57,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         const cfgModel = {
             sqlDatabase: dbName,
             sqlDbType: dbType,
-            sqlTable: getExecuteTableNameBySettingKey(appInfo, settingKey),
+            sqlTable: getExecuteTableNameBySettingKey(appInfo, stdAction),
             sqlSimpleName,
         };
         // 接口返回最大值
@@ -67,6 +70,8 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         // 根据用户配置，设置关联查询的数据信息。
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+        // 根据用户配置的keepSubmitData字段修改提交的数据
+        await this.fixSubmitDataByKeepSubmitData(params, cfgModel, appInfo, { dbType, dbName });
         // 根据表结构的数据类型，修正数据类型
         await this.fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, { dbType, dbName });
         // 业务系统自定义的修改：查询前的查询条件：cfgModel
@@ -82,7 +87,8 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      * @param settingKey
      * @private
      */
-    async getParsedCrudStdAppForSettingKey(appCode, settingKey) {
+    async getParsedCrudStdAppForSettingKey(stdAction) {
+        const { appCode, settingKey, buttonSettingKey } = stdAction || {};
         if (!appCode) {
             throw new devops_1.BizException('缺少参数:curdStdAppCode');
         }
@@ -110,18 +116,20 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
             }
             appInfo.settingKeyActionCfg = actionCfg;
         }
+        if (buttonSettingKey) {
+            appInfo.buttonSettingKeyActionCfg = actionsMap[buttonSettingKey];
+        }
         return appInfo;
     }
     /**
      * 执行动作
-     * @param appCode
-     * @param settingKey
+     * @param stdAction
      * @param params
      */
-    async executeStdActionByReq(appCode, settingKey, params) {
-        const appInfo = await this.getParsedCrudStdAppForSettingKey(appCode, settingKey);
+    async executeStdActionByReq(stdAction, params) {
+        const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
         if (!appInfo || appInfo.status !== 1) {
-            throw new devops_1.BizException('应用不存在或已下线：' + appCode);
+            throw new devops_1.BizException('应用不存在或已下线：' + stdAction.appCode);
         }
         const actionsMap = appInfo.actionsMap;
         const actionCfg = appInfo.settingKeyActionCfg;
@@ -170,12 +178,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         const { app_schema, ...others } = row;
         const stdCrudCfgObj = (0, functions_1.parseJsonObject)(app_schema);
-        // 为了方便查找到action对象
-        const actionsMap = {};
-        const keys = Object.keys(stdCrudCfgObj);
-        for (let i = 0; i < keys.length; i++) {
-            const key = keys[i];
-            const arrayCfg = stdCrudCfgObj[key];
+        const handleArrayCfg = (arrayCfg) => {
             if (Array.isArray(arrayCfg)) {
                 for (let j = 0; j < arrayCfg.length; j++) {
                     const actionCfg = arrayCfg[j];
@@ -183,8 +186,18 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
                     if (actionCfg.settingKey) {
                         actionsMap[actionCfg.settingKey] = actionCfg;
                     }
+                    const submitButtonCfg = _.get(actionCfg, 'component.props.submitButtonCfg');
+                    handleArrayCfg(submitButtonCfg);
                 }
             }
+        };
+        // 为了方便查找到action对象
+        const actionsMap = {};
+        const keys = Object.keys(stdCrudCfgObj);
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            const arrayCfg = stdCrudCfgObj[key];
+            handleArrayCfg(arrayCfg);
         }
         return { ...others, stdCrudCfgObj, actionsMap };
     }
@@ -195,6 +208,21 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         return true; // 无需鉴权
     }
+    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 || {};
+            //1. 按钮中配置的keepSubmitData
+            const buttonActionCfg = appInfo.buttonSettingKeyActionCfg || {};
+            const keepSubmitDataByButtonStr = _.get(buttonActionCfg, 'keepSubmitData');
+            const keepSubmitDataByButton = (0, functions_1.parseJsonObject)(keepSubmitDataByButtonStr);
+            //2. 全局配置的keepSubmitData
+            const keepSubmitDataByGlobalStr = _.get(appInfo, 'stdCrudCfgObj.othersSetting.values.keepSubmitData');
+            const keepSubmitDataByGlobal = (0, functions_1.parseJsonObject)(keepSubmitDataByGlobalStr);
+            //3. 合并
+            Object.assign(submitData, keepSubmitDataByButton);
+            Object.assign(submitData, keepSubmitDataByGlobal);
+        }
+    }
     async fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, arg3) {
         const tableFields = _.get(appInfo, 'stdCrudCfgObj.tableFields');
         const tableFieldMap = MixinUtils_1.MixinUtils.toMap(tableFields, (e) => {

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/package.json

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