@ruiapp/rapid-core 0.1.83 → 0.2.1

package/dist/bootstrapApplicationConfig.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
         maintainedBy: string;
         namespace: string;
         name: string;
+        code: string;
         singularCode: string;
         pluralCode: string;
         schema: string;
@@ -77,6 +78,7 @@ declare const _default: {
         maintainedBy: string;
         namespace: string;
         name: string;
+        code: string;
         singularCode: string;
         pluralCode: string;
         schema: string;
@@ -170,6 +172,7 @@ declare const _default: {
         maintainedBy: string;
         namespace: string;
         name: string;
+        code: string;
         singularCode: string;
         pluralCode: string;
         schema: string;
@@ -246,6 +249,7 @@ declare const _default: {
         maintainedBy: string;
         namespace: string;
         name: string;
+        code: string;
         singularCode: string;
         pluralCode: string;
         schema: string;
@@ -322,6 +326,7 @@ declare const _default: {
         maintainedBy: string;
         namespace: string;
         name: string;
+        code: string;
         singularCode: string;
         pluralCode: string;
         schema: string;
@@ -357,6 +362,7 @@ declare const _default: {
         })[];
         indexes?: undefined;
     })[];
+    dataDictionaries: any[];
     routes: {
         namespace: string;
         name: string;

package/dist/helpers/metaHelper.d.ts

@@ -5,6 +5,6 @@ export declare function isOneRelationProperty(property: RpdDataModelProperty): b
 export declare function isManyRelationProperty(property: RpdDataModelProperty): boolean;
 export declare function getEntityProperties(server: IRpdServer, model: RpdDataModel): RpdDataModelProperty[];
 export declare function getEntityPropertiesIncludingBase(server: IRpdServer, model: RpdDataModel): RpdDataModelProperty[];
-export declare function getEntityPropertyByCode(server: IRpdServer, model: RpdDataModel, propertyCode: string): RpdDataModelProperty;
-export declare function getEntityProperty(server: IRpdServer, model: RpdDataModel, predicate: (item: RpdDataModelProperty) => boolean): RpdDataModelProperty;
-export declare function getEntityPropertyByFieldName(server: IRpdServer, model: RpdDataModel, fieldName: string): RpdDataModelProperty;
+export declare function getEntityPropertyByCode(server: IRpdServer, model: RpdDataModel, propertyCode: string): RpdDataModelProperty | undefined;
+export declare function getEntityProperty(server: IRpdServer, model: RpdDataModel, predicate: (item: RpdDataModelProperty) => boolean): RpdDataModelProperty | undefined;
+export declare function getEntityPropertyByFieldName(server: IRpdServer, model: RpdDataModel, fieldName: string): RpdDataModelProperty | undefined;

package/dist/index.js

@@ -1407,6 +1407,7 @@ var bootstrapApplicationConfig = {
             maintainedBy: "metaManager",
             namespace: "meta",
             name: "model",
+            code: "Model",
             singularCode: "model",
             pluralCode: "models",
             schema: "public",
@@ -1434,6 +1435,13 @@ var bootstrapApplicationConfig = {
                     type: "text",
                     required: false,
                 },
+                {
+                    name: "code",
+                    code: "code",
+                    columnName: "code",
+                    type: "text",
+                    required: false,
+                },
                 {
                     name: "singular code",
                     code: "singularCode",
@@ -1547,6 +1555,7 @@ var bootstrapApplicationConfig = {
             maintainedBy: "metaManager",
             namespace: "meta",
             name: "property",
+            code: "Property",
             singularCode: "property",
             pluralCode: "properties",
             schema: "public",
@@ -1717,6 +1726,7 @@ var bootstrapApplicationConfig = {
             maintainedBy: "metaManager",
             namespace: "meta",
             name: "data dictionary",
+            code: "DataDictionary",
             singularCode: "data_dictionary",
             pluralCode: "data_dictionaries",
             schema: "public",
@@ -1808,6 +1818,7 @@ var bootstrapApplicationConfig = {
             maintainedBy: "metaManager",
             namespace: "meta",
             name: "data dictionary entry",
+            code: "DataDictionaryEntry",
             singularCode: "data_dictionary_entry",
             pluralCode: "data_dictionary_entries",
             schema: "public",
@@ -1885,6 +1896,7 @@ var bootstrapApplicationConfig = {
             maintainedBy: "dataManager",
             namespace: "meta",
             name: "routes",
+            code: "Route",
             singularCode: "route",
             pluralCode: "routes",
             schema: "public",
@@ -1957,6 +1969,7 @@ var bootstrapApplicationConfig = {
             ],
         },
     ],
+    dataDictionaries: [],
     routes: [
         {
             namespace: "meta",
@@ -2322,10 +2335,7 @@ async function findEntities(server, dataAccessor, options) {
     let relationPropertyCodes = Object.keys(relationOptions) || [];
     if (!options.properties || !options.properties.length) {
         propertiesToSelect = getEntityPropertiesIncludingBase(server, model).filter((property) => {
-            if (!property) {
-                throw new Error(`Property '${property}' was not found in ${model.namespace}.${model.singularCode}`);
-            }
-            return !options.keepNonPropertyFields || isRelationProperty(property) || relationPropertyCodes.includes(property.code);
+            return !isRelationProperty(property) || relationPropertyCodes.includes(property.code);
         });
     }
     else {
@@ -2334,9 +2344,6 @@ async function findEntities(server, dataAccessor, options) {
     const columnsToSelect = [];
     const relationPropertiesToSelect = [];
     lodash.forEach(propertiesToSelect, (property) => {
-        if (!property) {
-            throw new Error(`Property '${property}' was not found in ${model.namespace}.${model.singularCode}`);
-        }
         if (isRelationProperty(property)) {
             relationPropertiesToSelect.push(property);
             if (property.relation === "one" && !property.linkTableName) {
@@ -2684,10 +2691,14 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
         else {
             const filterField = filter.field;
             let property = getEntityPropertyByCode(server, model, filterField);
+            let filterValue = filter.value;
             let columnName = "";
             if (property) {
                 if (isOneRelationProperty(property)) {
                     columnName = property.targetIdColumnName;
+                    if (lodash.isPlainObject(filterValue)) {
+                        filterValue = filterValue.id;
+                    }
                 }
                 else if (isManyRelationProperty(property)) {
                     throw new Error(`Operator "${operator}" is not supported on many-relation property "${property.code}"`);
@@ -2709,6 +2720,9 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                     });
                     if (property) {
                         columnName = property.targetIdColumnName;
+                        if (lodash.isPlainObject(filterValue)) {
+                            filterValue = filterValue.id;
+                        }
                     }
                     else {
                         columnName = filterField;
@@ -2722,7 +2736,7 @@ async function convertEntityFiltersToRowFilters(server, model, baseModel, filter
                     name: columnName,
                     tableName: property && property.isBaseProperty ? baseModel.tableName : model.tableName,
                 },
-                value: filter.value,
+                value: filterValue,
                 itemType: filter.itemType,
             });
         }
@@ -2875,7 +2889,8 @@ async function createEntity(server, dataAccessor, options, plugin) {
     lodash.keys(entity).forEach((propertyCode) => {
         const property = getEntityPropertyByCode(server, model, propertyCode);
         if (!property) {
-            throw new Error(`Property '${property}' was not found in ${model.namespace}.${model.singularCode}`);
+            // Unknown property
+            return;
         }
         if (isRelationProperty(property)) {
             if (property.relation === "many") {
@@ -3107,7 +3122,8 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     lodash.keys(changes).forEach((propertyCode) => {
         const property = getEntityPropertyByCode(server, model, propertyCode);
         if (!property) {
-            throw new Error(`Property '${property}' was not found in ${model.namespace}.${model.singularCode}`);
+            // Unknown property
+            return;
         }
         if (isRelationProperty(property)) {
             if (property.relation === "many") {
@@ -3213,7 +3229,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
             await server.queryDatabaseObject(`DELETE FROM ${server.queryBuilder.quoteTable({
                 schema: property.linkSchema,
                 tableName: property.linkTableName,
-            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1
+            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1
               AND ${server.queryBuilder.quoteObject(property.targetIdColumnName)} <> ALL($2::int[])`, [id, targetIdsToKeep]);
         }
         else {
@@ -3482,11 +3498,11 @@ class EntityManager {
                 const command = `INSERT INTO ${queryBuilder.quoteTable({
                     schema: relationProperty.linkSchema,
                     tableName: relationProperty.linkTableName,
-                })} (${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)})
-    SELECT $1, $2 WHERE NOT EXISTS (
-      SELECT ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}
-        FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
-        WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2
+                })} (${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)})
+    SELECT $1, $2 WHERE NOT EXISTS (
+      SELECT ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}
+        FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
+        WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2
       )`;
                 const params = [id, relation.id];
                 await server.queryDatabaseObject(command, params);
@@ -3526,7 +3542,7 @@ class EntityManager {
         const { queryBuilder } = server;
         if (relationProperty.linkTableName) {
             for (const relation of relations) {
-                const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
+                const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
     WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2;`;
                 const params = [id, relation.id];
                 await server.queryDatabaseObject(command, params);
@@ -3628,7 +3644,7 @@ class RapidServer {
         return this.#applicationConfig;
     }
     appendApplicationConfig(config) {
-        const { models, routes } = config;
+        const { models, dataDictionaries, routes } = config;
         if (models) {
             for (const model of models) {
                 const originalModel = lodash.find(this.#applicationConfig.models, (item) => item.singularCode == model.singularCode);
@@ -3651,6 +3667,19 @@ class RapidServer {
                 }
             }
         }
+        if (dataDictionaries) {
+            for (const dataDictionary of dataDictionaries) {
+                const originalDataDictionary = lodash.find(this.#applicationConfig.dataDictionaries, (item) => item.code == dataDictionary.code);
+                if (originalDataDictionary) {
+                    originalDataDictionary.name = dataDictionary.name;
+                    originalDataDictionary.description = dataDictionary.description;
+                    originalDataDictionary.entries = dataDictionary.entries;
+                }
+                else {
+                    this.#applicationConfig.dataDictionaries.push(dataDictionary);
+                }
+            }
+        }
         if (routes) {
             for (const route of routes) {
                 const originalRoute = lodash.find(this.#applicationConfig.routes, (item) => item.code == route.code);
@@ -4123,8 +4152,9 @@ class MetaManager {
         const logger = server.getLogger();
         try {
             logger.info("Loading meta of models...");
-            const models = await listCollections(server, applicationConfig);
-            server.appendApplicationConfig({ models });
+            const models = await listDataModels(server);
+            const dataDictionaries = await listDataDictionaries(server);
+            server.appendApplicationConfig({ models, dataDictionaries });
         }
         catch (error) {
             logger.crit("Failed to load meta of models.", { error });
@@ -4184,7 +4214,7 @@ async function handleEntityDeleteEvent(server, sender, payload) {
         }
     }
 }
-function listCollections(server, applicationConfig) {
+function listDataModels(server) {
     const entityManager = server.getEntityManager("model");
     const model = entityManager.getModel();
     const properties = getEntityPropertiesIncludingBase(server, model);
@@ -4192,6 +4222,14 @@ function listCollections(server, applicationConfig) {
         properties: properties.map((item) => item.code),
     });
 }
+function listDataDictionaries(server) {
+    const dataDictionaryManager = server.getEntityManager("data_dictionary");
+    const model = dataDictionaryManager.getModel();
+    const properties = getEntityPropertiesIncludingBase(server, model);
+    return dataDictionaryManager.findEntities({
+        properties: properties.map((item) => item.code),
+    });
+}
 async function syncDatabaseSchema(server, applicationConfig) {
     const logger = server.getLogger();
     logger.info("Synchronizing database schema...");
@@ -4207,7 +4245,7 @@ async function syncDatabaseSchema(server, applicationConfig) {
             await server.queryDatabaseObject(`CREATE TABLE IF NOT EXISTS ${queryBuilder.quoteTable(model)} ()`, []);
         }
     }
-    const sqlQueryColumnInformations = `SELECT table_schema, table_name, column_name, data_type, udt_name, is_nullable, column_default, character_maximum_length, numeric_precision, numeric_scale
+    const sqlQueryColumnInformations = `SELECT table_schema, table_name, column_name, data_type, udt_name, is_nullable, column_default, character_maximum_length, numeric_precision, numeric_scale
   FROM information_schema.columns;`;
     const columnsInDb = await server.queryDatabaseObject(sqlQueryColumnInformations, []);
     for (const model of applicationConfig.models) {
@@ -5482,6 +5520,7 @@ var pluginConfig = {
             ],
         },
     ],
+    dataDictionaries: [],
     routes: [],
 };
 
@@ -7410,9 +7449,9 @@ class EntityAccessControlPlugin {
         if (!userId) {
             return;
         }
-        const actions = await server.queryDatabaseObject(`select distinct a.* from sys_actions a
-      inner join oc_role_sys_action_links ra on a.id = ra.action_id
-      inner join oc_role_user_links ru on ru.role_id = ra.role_id
+        const actions = await server.queryDatabaseObject(`select distinct a.* from sys_actions a
+      inner join oc_role_sys_action_links ra on a.id = ra.action_id
+      inner join oc_role_user_links ru on ru.role_id = ra.role_id
       where ru.user_id = $1;`, [userId]);
         routeContext.state.allowedActions = actions.map((item) => item.code);
     }

package/dist/plugins/webhooks/pluginConfig.d.ts

@@ -43,6 +43,7 @@ declare const _default: {
             autoIncrement?: undefined;
         })[];
     }[];
+    dataDictionaries: any[];
     routes: any[];
 };
 export default _default;

package/dist/types.d.ts

@@ -154,12 +154,14 @@ export interface RpdApplicationConfig {
     code?: string;
     name?: string;
     models: RpdDataModel[];
+    dataDictionaries: RpdDataDictionary[];
     routes: RpdRoute[];
 }
 export interface RpdDataModel {
     maintainedBy?: string;
     name: string;
     namespace: string;
+    code?: string;
     singularCode: string;
     pluralCode: string;
     schema?: string;
@@ -283,11 +285,19 @@ export type RpdDataDictionary = {
     /**
      * 字典名称
      */
+    name?: string;
+    /**
+     * 描述
+     */
     description?: string;
     /**
      * 字典项值类型
      */
-    type: "string" | "integer";
+    valueType: "string" | "integer";
+    /**
+     * 字典级别
+     */
+    level: "sys" | "app" | "user";
     /**
      * 字典项
      */
@@ -305,6 +315,14 @@ export type RpdDataDictionaryEntry = {
      * 值
      */
     value: string;
+    /**
+     * 颜色
+     */
+    color?: string;
+    /**
+     * 图标
+     */
+    icon?: string;
     /**
      * 描述
      */

package/package.json

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

package/rollup.config.js

@@ -1,16 +1,16 @@
-import typescript from "rollup-plugin-typescript2";
-import tscAlias from "rollup-plugin-tsc-alias";
-
-export default {
-  input: ["src/index.ts"],
-  output: [
-    {
-      dir: "dist",
-      entryFileNames: "[name].js",
-      format: "cjs",
-      exports: "named",
-    },
-  ],
-  plugins: [typescript(), tscAlias()],
-  external: [],
-};
+import typescript from "rollup-plugin-typescript2";
+import tscAlias from "rollup-plugin-tsc-alias";
+
+export default {
+  input: ["src/index.ts"],
+  output: [
+    {
+      dir: "dist",
+      entryFileNames: "[name].js",
+      format: "cjs",
+      exports: "named",
+    },
+  ],
+  plugins: [typescript(), tscAlias()],
+  external: [],
+};