@ruiapp/rapid-core 0.7.4 → 0.7.6

package/dist/index.js

@@ -2815,18 +2815,30 @@ async function findEntities(server, dataAccessor, options) {
                     continue;
                 }
                 if (isManyRelation) {
-                    const relationLinks = await findManyRelationLinksViaLinkTable({
+                    const selectRelationOptions = relationOptions[relationProperty.code];
+                    const { relationLinks, targetEntities } = await findManyRelationLinksViaLinkTable({
                         server,
                         routeContext,
                         mainModel: relationModel,
                         relationProperty,
                         mainEntityIds: entityIds,
-                        selectRelationOptions: relationOptions[relationProperty.code],
+                        selectRelationOptions,
                     });
+                    // 如果查询关联实体时指定了orderBy，则按照targetEntities的顺序，否则按照relationLinks的顺序。
+                    const selectRelationOrderByOptionsSpecified = selectRelationOptions && lodash.isObject(selectRelationOptions) && selectRelationOptions.orderBy;
                     lodash.forEach(rows, (row) => {
-                        row[relationProperty.code] = lodash.filter(relationLinks, (link) => {
-                            return link[relationProperty.selfIdColumnName] == row["id"];
-                        }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+                        if (selectRelationOrderByOptionsSpecified) {
+                            row[relationProperty.code] = lodash.filter(targetEntities, (targetEntity) => {
+                                return lodash.find(relationLinks, (link) => {
+                                    return link[relationProperty.selfIdColumnName] == row["id"] && link[relationProperty.targetIdColumnName] == targetEntity["id"];
+                                });
+                            }).map((targetEntity) => mapDbRowToEntity(server, relationModel, targetEntity, options.keepNonPropertyFields));
+                        }
+                        else {
+                            row[relationProperty.code] = lodash.filter(relationLinks, (link) => {
+                                return link[relationProperty.selfIdColumnName] == row["id"];
+                            }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+                        }
                     });
                 }
             }
@@ -3139,8 +3151,8 @@ async function findManyRelationLinksViaLinkTable(options) {
     ORDER BY id
   `;
     const params = [mainEntityIds];
-    const links = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
-    const targetEntityIds = links.map((link) => link[relationProperty.targetIdColumnName]);
+    const relationLinks = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+    const targetEntityIds = relationLinks.map((link) => link[relationProperty.targetIdColumnName]);
     const dataAccessor = server.getDataAccessor({
         namespace: relationModel.namespace,
         singularCode: relationModel.singularCode,
@@ -3178,10 +3190,10 @@ async function findManyRelationLinksViaLinkTable(options) {
         }
     }
     const targetEntities = await findEntities(server, dataAccessor, findEntityOptions);
-    lodash.forEach(links, (link) => {
+    lodash.forEach(relationLinks, (link) => {
         link.targetEntity = lodash.find(targetEntities, (e) => e["id"] == link[relationProperty.targetIdColumnName]);
     });
-    return links;
+    return { relationLinks, targetEntities };
 }
 async function findManyRelatedEntitiesViaIdPropertyCode(options) {
     const { server, relationProperty, mainEntityIds, selectRelationOptions } = options;

package/dist/types.d.ts

@@ -302,6 +302,10 @@ export interface RpdDataModelProperty {
      * 当设置了 linkTableName 时，可以设置关联关系表所在的 Schema。
      */
     linkSchema?: string;
+    /**
+     * 数据字典编码。当类型为option时设置
+     */
+    dataDictionary?: string;
     /**
      * 当删除实体时，针对关系属性的联动处理。
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/entityManager.ts

@@ -270,19 +270,30 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
         }
 
         if (isManyRelation) {
-          const relationLinks = await findManyRelationLinksViaLinkTable({
+          const selectRelationOptions: FindEntityFindManyRelationEntitiesOptions | undefined = relationOptions[relationProperty.code];
+          const { relationLinks, targetEntities } = await findManyRelationLinksViaLinkTable({
             server,
             routeContext,
             mainModel: relationModel,
             relationProperty,
             mainEntityIds: entityIds,
-            selectRelationOptions: relationOptions[relationProperty.code],
+            selectRelationOptions,
           });
 
+          // 如果查询关联实体时指定了orderBy，则按照targetEntities的顺序，否则按照relationLinks的顺序。
+          const selectRelationOrderByOptionsSpecified = selectRelationOptions && isObject(selectRelationOptions) && selectRelationOptions.orderBy;
           forEach(rows, (row: any) => {
-            row[relationProperty.code] = filter(relationLinks, (link: any) => {
-              return link[relationProperty.selfIdColumnName!] == row["id"];
-            }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+            if (selectRelationOrderByOptionsSpecified) {
+              row[relationProperty.code] = filter(targetEntities, (targetEntity: any) => {
+                return find(relationLinks, (link: any) => {
+                  return link[relationProperty.selfIdColumnName!] == row["id"] && link[relationProperty.targetIdColumnName!] == targetEntity["id"];
+                });
+              }).map((targetEntity) => mapDbRowToEntity(server, relationModel, targetEntity, options.keepNonPropertyFields));
+            } else {
+              row[relationProperty.code] = filter(relationLinks, (link: any) => {
+                return link[relationProperty.selfIdColumnName!] == row["id"];
+              }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+            }
           });
         }
       } else {
@@ -628,8 +639,8 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
     ORDER BY id
   `;
   const params = [mainEntityIds];
-  const links = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
-  const targetEntityIds = links.map((link) => link[relationProperty.targetIdColumnName!]);
+  const relationLinks = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+  const targetEntityIds = relationLinks.map((link) => link[relationProperty.targetIdColumnName!]);
 
   const dataAccessor = server.getDataAccessor({
     namespace: relationModel.namespace,
@@ -672,11 +683,11 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
 
   const targetEntities = await findEntities(server, dataAccessor, findEntityOptions);
 
-  forEach(links, (link: any) => {
+  forEach(relationLinks, (link: any) => {
     link.targetEntity = find(targetEntities, (e: any) => e["id"] == link[relationProperty.targetIdColumnName!]);
   });
 
-  return links;
+  return { relationLinks, targetEntities };
 }
 
 async function findManyRelatedEntitiesViaIdPropertyCode(options: FindManyRelationEntitiesOptions) {

package/src/types.ts

@@ -337,6 +337,11 @@ export interface RpdDataModelProperty {
    */
   linkSchema?: string;
 
+  /**
+   * 数据字典编码。当类型为option时设置
+   */
+  dataDictionary?: string;
+
   /**
    * 当删除实体时，针对关系属性的联动处理。
    */