@ruiapp/rapid-core 0.1.57 → 0.1.59

package/dist/index.js

@@ -1809,7 +1809,7 @@ function getEntityPropertiesIncludingBase(server, model) {
     });
     let baseProperties = [];
     if (baseModel) {
-        baseModel.properties.map((property) => {
+        baseProperties = baseModel.properties.map((property) => {
             property = lodash.cloneDeep(property);
             property.isBaseProperty = true;
             return property;
@@ -3654,10 +3654,10 @@ async function syncDatabaseSchema(server, applicationConfig) {
                             });
                         }
                         const contraintName = `${property.linkTableName}_pk`;
-                        columnDDL += `ALTER TABLE ${queryBuilder.quoteTable(({
+                        columnDDL += `ALTER TABLE ${queryBuilder.quoteTable({
                             schema: property.linkSchema,
                             tableName: property.linkTableName,
-                        }))} ADD CONSTRAINT ${queryBuilder.quoteObject(contraintName)} PRIMARY KEY (id);`;
+                        })} ADD CONSTRAINT ${queryBuilder.quoteObject(contraintName)} PRIMARY KEY (id);`;
                     }
                     else {
                         const targetModel = applicationConfig.models.find((item) => item.singularCode === property.targetSingularCode);
@@ -3801,6 +3801,7 @@ const pgPropertyTypeColumnMap = {
     text: "text",
     boolean: "bool",
     date: "date",
+    time: "time",
     datetime: "timestamptz",
     json: "jsonb",
     option: "text",

package/dist/types.d.ts

@@ -265,7 +265,7 @@ export interface RpdDataModelProperty {
      */
     linkSchema?: string;
 }
-export type RpdDataPropertyTypes = "integer" | "long" | "float" | "double" | "decimal" | "text" | "boolean" | "date" | "datetime" | "json" | "relation" | "relation[]" | "option";
+export type RpdDataPropertyTypes = "integer" | "long" | "float" | "double" | "decimal" | "text" | "boolean" | "date" | "time" | "datetime" | "json" | "relation" | "relation[]" | "option";
 /**
  * 数据字典
  */

package/package.json

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

package/src/dataAccess/metaHelper.ts

@@ -16,7 +16,7 @@ export function getEntityPropertiesIncludingBase(server: IRpdServer, model: RpdD
   });
   let baseProperties: RpdDataModelProperty[] = [];
   if (baseModel) {
-    baseModel.properties.map((property) => {
+    baseProperties = baseModel.properties.map((property) => {
       property = cloneDeep(property);
       property.isBaseProperty = true;
       return property;

package/src/plugins/metaManage/MetaManagePlugin.ts

@@ -231,10 +231,10 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
             }
 
             const contraintName = `${property.linkTableName}_pk`;
-            columnDDL += `ALTER TABLE ${queryBuilder.quoteTable(({
+            columnDDL += `ALTER TABLE ${queryBuilder.quoteTable({
               schema: property.linkSchema,
               tableName: property.linkTableName,
-            }))} ADD CONSTRAINT ${queryBuilder.quoteObject(contraintName)} PRIMARY KEY (id);`;
+            })} ADD CONSTRAINT ${queryBuilder.quoteObject(contraintName)} PRIMARY KEY (id);`;
           } else {
             const targetModel = applicationConfig.models.find((item) => item.singularCode === property.targetSingularCode);
             if (!targetModel) {
@@ -403,6 +403,7 @@ const pgPropertyTypeColumnMap: Partial<Record<RpdDataPropertyTypes, string>> = {
   text: "text",
   boolean: "bool",
   date: "date",
+  time: "time",
   datetime: "timestamptz",
   json: "jsonb",
   option: "text",

package/src/types.ts

@@ -22,7 +22,7 @@ export interface IDatabaseConfig {
 export type DatabaseQuery = {
   command: string;
   params?: unknown[] | Record<string, unknown>;
-}
+};
 
 export interface IDatabaseAccessor {
   queryDatabaseObject: (sql: string, params?: unknown[] | Record<string, unknown>) => Promise<any[]>;
@@ -162,7 +162,7 @@ export type EmitServerEventOptions<TEventName extends keyof RpdServerEventTypes>
   payload: RpdServerEventTypes[TEventName][1];
   sender?: RapidPlugin;
   routeContext?: RouteContext;
-}
+};
 
 export interface QuoteTableOptions {
   schema?: string;
@@ -296,7 +296,7 @@ export interface RpdDataModelProperty {
   linkSchema?: string;
 }
 
-export type RpdDataPropertyTypes = "integer" | "long" | "float" | "double" | "decimal" | "text" | "boolean" | "date" | "datetime" | "json" | "relation" | "relation[]" | "option";
+export type RpdDataPropertyTypes = "integer" | "long" | "float" | "double" | "decimal" | "text" | "boolean" | "date" | "time" | "datetime" | "json" | "relation" | "relation[]" | "option";
 
 /**
  * 数据字典
@@ -514,7 +514,6 @@ export interface RemoveEntityRelationsOptions {
   relations: { id?: number; [k: string]: any }[];
 }
 
-
 export type EntityWatcherType = EntityWatcher<"entity.create"> | EntityWatcher<"entity.update"> | EntityWatcher<"entity.delete"> | EntityWatcher<"entity.addRelations"> | EntityWatcher<"entity.removeRelations"> | EntityWatcher<any>;
 
 export interface EntityWatcher<TEventName extends keyof RpdServerEventTypes = any> {