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

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.46",
+  "version": "0.0.1-beta.47",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",