midway-fatcms 0.0.1-beta.57 → 0.0.1-beta.58

package/dist/service/crudstd/CrudStdService.js

@@ -29,17 +29,27 @@ exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
 };
+function isNotEmptyStr(str) {
+    return typeof str === 'string' && str.trim().length > 0;
+}
 function getExecuteTableNameBySettingKey(appInfo, stdAction) {
     const { settingKey } = stdAction || {};
     const stdCrudCfgObj = appInfo.stdCrudCfgObj;
     const actionsMap = appInfo.actionsMap || {};
+    // 操作按钮单独设置了mainTableName字段
     const actionCfg = actionsMap[settingKey];
     if (actionCfg) {
         const mainTableName = _.get(actionCfg, 'component.props.mainTableName');
-        if (typeof mainTableName === 'string' && mainTableName.trim().length > 0) {
+        if (isNotEmptyStr(mainTableName)) {
             return mainTableName.trim();
         }
     }
+    // 全局配置了mainTableName字段
+    const globalMainTableName = _.get(stdCrudCfgObj, 'othersSetting.values.globalMainTableName');
+    if (isNotEmptyStr(globalMainTableName)) {
+        return globalMainTableName.trim();
+    }
+    // 视图中配置的表。
     return stdCrudCfgObj.tableBaseInfo.tableName;
 }
 let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseService {

package/package.json

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

package/src/service/crudstd/CrudStdService.ts

@@ -36,6 +36,9 @@ export interface IRequestModelCrudProExt extends IRequestModel {
 }
 
 
+function isNotEmptyStr(str: any): boolean {
+  return typeof str === 'string' && str.trim().length > 0;
+}
 
 function getExecuteTableNameBySettingKey(appInfo: ICrudStdAppInfoForSettingKey, stdAction: ICrudStdActionParams): string {
   const { settingKey } = stdAction || {};
@@ -43,14 +46,23 @@ function getExecuteTableNameBySettingKey(appInfo: ICrudStdAppInfoForSettingKey,
   const stdCrudCfgObj = appInfo.stdCrudCfgObj;
   const actionsMap = appInfo.actionsMap || {};
 
+
+  // 操作按钮单独设置了mainTableName字段
   const actionCfg = actionsMap[settingKey];
   if (actionCfg) {
     const mainTableName = _.get(actionCfg, 'component.props.mainTableName');
-    if (typeof mainTableName === 'string' && mainTableName.trim().length > 0) {
+    if (isNotEmptyStr(mainTableName)) {
       return mainTableName.trim();
     }
   }
 
+  // 全局配置了mainTableName字段
+  const globalMainTableName: string = _.get(stdCrudCfgObj, 'othersSetting.values.globalMainTableName');
+  if (isNotEmptyStr(globalMainTableName)) {
+    return globalMainTableName.trim();
+  }
+
+  // 视图中配置的表。
   return stdCrudCfgObj.tableBaseInfo.tableName;
 }
 
@@ -342,16 +354,16 @@ export class CrudStdService extends ApiBaseService {
     const stdCrudCfgObj = appInfo.stdCrudCfgObj;
     //删除策略
     const deleteStrategy = _.get(stdCrudCfgObj, 'othersSetting.values.deleteStrategy');
-  
-    if(deleteStrategy !== 'soft') {
+
+    if (deleteStrategy !== 'soft') {
       return;
     }
 
     // 删除操作，如果是软删除修改为update语句。
     // 标准软删除：deleted_at 字段为0代表未删除，有任意时间字段代表已删除。
-    if(KeysOfSimpleSQL.SIMPLE_DELETE === sqlSimpleName) {
-      const userSession =  this.ctx?.userSession?.getSessionInfo();
-      if(!params.data) {
+    if (KeysOfSimpleSQL.SIMPLE_DELETE === sqlSimpleName) {
+      const userSession = this.ctx?.userSession?.getSessionInfo();
+      if (!params.data) {
         params.data = {};
       }
       params.data.deleted_at = Date.now(); // 默认值为 0； 0代表未删除
@@ -360,14 +372,14 @@ export class CrudStdService extends ApiBaseService {
       // 执行update操作
       cfgModel.sqlSimpleName = KeysOfSimpleSQL.SIMPLE_UPDATE;
 
-      if(!params.condition || Object.keys(params.condition).length === 0) {
+      if (!params.condition || Object.keys(params.condition).length === 0) {
         throw new Error('执行删除操作，必须指定删除条件')
       }
     }
 
     // 查询操作。强制查询未删除的。
     if (KeysOfSimpleSQL.SIMPLE_QUERY_ONE === sqlSimpleName || KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === sqlSimpleName) {
-      if(!params.condition) {
+      if (!params.condition) {
         params.condition = {};
       }
       params.condition.deleted_at = 0; // 未删除