@ruiapp/rapid-core 0.6.0 → 0.6.2

package/dist/bootstrapApplicationConfig.d.ts

@@ -17,6 +17,7 @@ declare const _default: {
             type: "integer";
             required: true;
             autoIncrement: true;
+            description?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
@@ -28,6 +29,7 @@ declare const _default: {
             type: "text";
             required: true;
             autoIncrement?: undefined;
+            description?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
@@ -39,12 +41,14 @@ declare const _default: {
             type: "text";
             required: false;
             autoIncrement?: undefined;
+            description?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
             defaultValue?: undefined;
         } | {
             name: string;
+            description: string;
             code: string;
             columnName: string;
             type: "json";
@@ -64,6 +68,19 @@ declare const _default: {
             columnName?: undefined;
             required?: undefined;
             autoIncrement?: undefined;
+            description?: undefined;
+            defaultValue?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "json";
+            required: false;
+            autoIncrement?: undefined;
+            description?: undefined;
+            relation?: undefined;
+            targetSingularCode?: undefined;
+            selfIdColumnName?: undefined;
             defaultValue?: undefined;
         } | {
             name: string;
@@ -73,6 +90,7 @@ declare const _default: {
             required: true;
             defaultValue: string;
             autoIncrement?: undefined;
+            description?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
@@ -109,8 +127,8 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
-            defaultValue?: undefined;
             description?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -121,8 +139,8 @@ declare const _default: {
             targetIdColumnName: string;
             columnName?: undefined;
             autoIncrement?: undefined;
-            defaultValue?: undefined;
             description?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -133,8 +151,8 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
-            defaultValue?: undefined;
             description?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -145,10 +163,11 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
-            defaultValue?: undefined;
             description?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
+            description: string;
             code: string;
             columnName: string;
             type: "json";
@@ -158,7 +177,6 @@ declare const _default: {
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
             defaultValue?: undefined;
-            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -175,25 +193,25 @@ declare const _default: {
             name: string;
             code: string;
             columnName: string;
-            type: "integer";
+            type: "json";
             required: false;
             autoIncrement?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
-            defaultValue?: undefined;
             description?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
             columnName: string;
-            description: string;
-            type: "text";
+            type: "integer";
             required: false;
             autoIncrement?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
+            description?: undefined;
             defaultValue?: undefined;
         })[];
         indexes: {
@@ -223,6 +241,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -234,6 +253,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -245,6 +265,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -256,6 +277,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -267,6 +289,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -278,6 +301,19 @@ declare const _default: {
             required?: undefined;
             autoIncrement?: undefined;
             defaultValue?: undefined;
+            description?: undefined;
+        } | {
+            name: string;
+            description: string;
+            code: string;
+            columnName: string;
+            type: "json";
+            required: false;
+            autoIncrement?: undefined;
+            defaultValue?: undefined;
+            relation?: undefined;
+            targetSingularCode?: undefined;
+            selfIdColumnName?: undefined;
         })[];
         indexes?: undefined;
     } | {
@@ -300,6 +336,7 @@ declare const _default: {
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
             defaultValue?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -311,6 +348,7 @@ declare const _default: {
             required?: undefined;
             autoIncrement?: undefined;
             defaultValue?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -322,6 +360,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -333,6 +372,7 @@ declare const _default: {
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
             defaultValue?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -344,6 +384,7 @@ declare const _default: {
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
             defaultValue?: undefined;
+            description?: undefined;
         } | {
             name: string;
             code: string;
@@ -355,8 +396,10 @@ declare const _default: {
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
             defaultValue?: undefined;
+            description?: undefined;
         } | {
             name: string;
+            description: string;
             code: string;
             columnName: string;
             type: "json";

package/dist/index.js

@@ -1641,8 +1641,17 @@ var bootstrapApplicationConfig = {
                     type: "text",
                     required: false,
                 },
+                {
+                    name: "i18n",
+                    description: "The i18n text names of the model attributes.",
+                    code: "i18n",
+                    columnName: "i18n",
+                    type: "json",
+                    required: false,
+                },
                 {
                     name: "locales",
+                    description: "The locale translations of the model attributes.",
                     code: "locales",
                     columnName: "locales",
                     type: "json",
@@ -1820,8 +1829,17 @@ var bootstrapApplicationConfig = {
                     type: "text",
                     required: false,
                 },
+                {
+                    name: "i18n",
+                    description: "The i18n text names of the property attributes.",
+                    code: "i18n",
+                    columnName: "i18n",
+                    type: "json",
+                    required: false,
+                },
                 {
                     name: "locales",
+                    description: "The locale translations of the property attributes.",
                     code: "locales",
                     columnName: "locales",
                     type: "json",
@@ -1949,14 +1967,6 @@ var bootstrapApplicationConfig = {
                     type: "text",
                     required: false,
                 },
-                {
-                    name: "i18n string storage",
-                    code: "i18nStringStorage",
-                    columnName: "i18n_string_storage",
-                    description: "The storage type of i18n strings. `json` or `i18nStringsTable`.",
-                    type: "text",
-                    required: false,
-                },
             ],
             indexes: [
                 {
@@ -2063,8 +2073,17 @@ var bootstrapApplicationConfig = {
                     targetSingularCode: "data_dictionary_entry",
                     selfIdColumnName: "dictionary_id",
                 },
+                {
+                    name: "i18n",
+                    description: "The i18n text names of the data dictionary attributes.",
+                    code: "i18n",
+                    columnName: "i18n",
+                    type: "json",
+                    required: false,
+                },
                 {
                     name: "locales",
+                    description: "The locale translations of the data dictionary attributes.",
                     code: "locales",
                     columnName: "locales",
                     type: "json",
@@ -2148,8 +2167,17 @@ var bootstrapApplicationConfig = {
                     type: "boolean",
                     required: false,
                 },
+                {
+                    name: "i18n",
+                    description: "The i18n text names of the data dictionary entry attributes.",
+                    code: "i18n",
+                    columnName: "i18n",
+                    type: "json",
+                    required: false,
+                },
                 {
                     name: "locales",
+                    description: "The locale translations of the data dictionary entry attributes.",
                     code: "locales",
                     columnName: "locales",
                     type: "json",
@@ -2236,12 +2264,12 @@ var bootstrapApplicationConfig = {
         {
             maintainedBy: "dataManager",
             namespace: "meta",
-            name: "i18n strings",
-            code: "I18nString",
-            singularCode: "i18n_string",
-            pluralCode: "i18n_strings",
+            name: "locale strings",
+            code: "LocaleString",
+            singularCode: "locale_string",
+            pluralCode: "locale_strings",
             schema: "public",
-            tableName: "meta_i18n_strings",
+            tableName: "meta_locale_strings",
             properties: [
                 {
                     name: "id",
@@ -5139,7 +5167,7 @@ async function syncDatabaseSchema(server, applicationConfig) {
             await server.queryDatabaseObject(`CREATE TABLE IF NOT EXISTS ${queryBuilder.quoteTable(model)} ()`, []);
         }
         if (!tableInDb || tableInDb.table_description != model.name) {
-            await server.queryDatabaseObject(`COMMENT ON TABLE ${queryBuilder.quoteTable(model)} IS ${queryBuilder.formatValueToSqlLiteral(model.name)};`, []);
+            await server.tryQueryDatabaseObject(`COMMENT ON TABLE ${queryBuilder.quoteTable(model)} IS ${queryBuilder.formatValueToSqlLiteral(model.name)};`, []);
         }
     }
     const sqlQueryColumnInformations = `SELECT c.table_schema, c.table_name, c.column_name, c.ordinal_position, d.description, c.data_type,  c.udt_name, c.is_nullable, c.column_default, c.character_maximum_length, c.numeric_precision, c.numeric_scale
@@ -5174,7 +5202,7 @@ async function syncDatabaseSchema(server, applicationConfig) {
                         await server.tryQueryDatabaseObject(columnDDL);
                     }
                     if (!columnInDb || columnInDb.description != property.name) {
-                        await server.queryDatabaseObject(`COMMENT ON COLUMN ${queryBuilder.quoteTable(model)}.${queryBuilder.quoteObject(property.targetIdColumnName)} IS ${queryBuilder.formatValueToSqlLiteral(property.name)};`, []);
+                        await server.tryQueryDatabaseObject(`COMMENT ON COLUMN ${queryBuilder.quoteTable(model)}.${queryBuilder.quoteObject(property.targetIdColumnName)} IS ${queryBuilder.formatValueToSqlLiteral(property.name)};`, []);
                     }
                 }
                 else if (property.relation === "many") {
@@ -5278,7 +5306,7 @@ async function syncDatabaseSchema(server, applicationConfig) {
                     }
                 }
                 if (!columnInDb || columnInDb.description != property.name) {
-                    await server.queryDatabaseObject(`COMMENT ON COLUMN ${queryBuilder.quoteTable(model)}.${queryBuilder.quoteObject(property.columnName || property.code)} IS ${queryBuilder.formatValueToSqlLiteral(property.name)};`, []);
+                    await server.tryQueryDatabaseObject(`COMMENT ON COLUMN ${queryBuilder.quoteTable(model)}.${queryBuilder.quoteObject(property.columnName || property.code)} IS ${queryBuilder.formatValueToSqlLiteral(property.name)};`, []);
                 }
             }
         }

package/dist/types.d.ts

@@ -199,10 +199,14 @@ export interface RpdDataModel {
     /**
      * 多语言配置
      */
+    i18n?: Record<string, string>;
+    /**
+     * 本地化资源
+     */
     locales?: Record<string, RpdDataModelLocale>;
 }
 /**
- * 实体多语言配置
+ * 实体本地化资源配置
  */
 export type RpdDataModelLocale = {
     name: string;
@@ -309,8 +313,15 @@ export interface RpdDataModelProperty {
     /**
      * 多语言配置
      */
+    i18n?: Record<string, string>;
+    /**
+     * 本地化资源
+     */
     locales?: Record<string, RpdDataModelPropertyLocale>;
 }
+/**
+ * 实体属性本地化资源配置
+ */
 export type RpdDataModelPropertyLocale = {
     name: string;
     description?: string;
@@ -345,6 +356,18 @@ export type RpdDataDictionary = {
      * 字典项
      */
     entries: RpdDataDictionaryEntry[];
+    /**
+     * 多语言配置
+     */
+    i18n?: Record<string, string>;
+    /**
+     * 本地化资源
+     */
+    locales?: Record<string, RpdDataDictionaryLocale>;
+};
+export type RpdDataDictionaryLocale = {
+    name: string;
+    description?: string;
 };
 /**
  * 数据字典项
@@ -378,6 +401,21 @@ export type RpdDataDictionaryEntry = {
      * 是否禁用
      */
     disabled: boolean;
+    /**
+     * 多语言配置
+     */
+    i18n?: Record<string, string>;
+    /**
+     * 本地化资源
+     */
+    locales?: Record<string, RpdDataDictionaryEntryLocale>;
+};
+/**
+ * 数据字典项本地化资源配置
+ */
+export type RpdDataDictionaryEntryLocale = {
+    name: string;
+    description?: string;
 };
 export interface RpdDataModelExtension {
     code: string;
@@ -585,7 +623,7 @@ export type EntityWatchHandlerContext<TEventName extends keyof RpdServerEventTyp
 export interface EntityWatchPluginInitOptions {
     watchers: EntityWatcherType[];
 }
-export interface I18nString {
+export interface LocaleString {
     namespace: string;
     name: string;
     lingual: string;

package/package.json

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

package/src/bootstrapApplicationConfig.ts

@@ -36,8 +36,17 @@ export default {
           type: "text",
           required: false,
         },
+        {
+          name: "i18n",
+          description: "The i18n text names of the model attributes.",
+          code: "i18n",
+          columnName: "i18n",
+          type: "json",
+          required: false,
+        },
         {
           name: "locales",
+          description: "The locale translations of the model attributes.",
           code: "locales",
           columnName: "locales",
           type: "json",
@@ -215,8 +224,17 @@ export default {
           type: "text",
           required: false,
         },
+        {
+          name: "i18n",
+          description: "The i18n text names of the property attributes.",
+          code: "i18n",
+          columnName: "i18n",
+          type: "json",
+          required: false,
+        },
         {
           name: "locales",
+          description: "The locale translations of the property attributes.",
           code: "locales",
           columnName: "locales",
           type: "json",
@@ -344,14 +362,6 @@ export default {
           type: "text",
           required: false,
         },
-        {
-          name: "i18n string storage",
-          code: "i18nStringStorage",
-          columnName: "i18n_string_storage",
-          description: "The storage type of i18n strings. `json` or `i18nStringsTable`.",
-          type: "text",
-          required: false,
-        },
       ],
       indexes: [
         {
@@ -458,8 +468,17 @@ export default {
           targetSingularCode: "data_dictionary_entry",
           selfIdColumnName: "dictionary_id",
         },
+        {
+          name: "i18n",
+          description: "The i18n text names of the data dictionary attributes.",
+          code: "i18n",
+          columnName: "i18n",
+          type: "json",
+          required: false,
+        },
         {
           name: "locales",
+          description: "The locale translations of the data dictionary attributes.",
           code: "locales",
           columnName: "locales",
           type: "json",
@@ -543,8 +562,17 @@ export default {
           type: "boolean",
           required: false,
         },
+        {
+          name: "i18n",
+          description: "The i18n text names of the data dictionary entry attributes.",
+          code: "i18n",
+          columnName: "i18n",
+          type: "json",
+          required: false,
+        },
         {
           name: "locales",
+          description: "The locale translations of the data dictionary entry attributes.",
           code: "locales",
           columnName: "locales",
           type: "json",
@@ -631,12 +659,12 @@ export default {
     {
       maintainedBy: "dataManager",
       namespace: "meta",
-      name: "i18n strings",
-      code: "I18nString",
-      singularCode: "i18n_string",
-      pluralCode: "i18n_strings",
+      name: "locale strings",
+      code: "LocaleString",
+      singularCode: "locale_string",
+      pluralCode: "locale_strings",
       schema: "public",
-      tableName: "meta_i18n_strings",
+      tableName: "meta_locale_strings",
       properties: [
         {
           name: "id",

package/src/plugins/metaManage/MetaManagePlugin.ts

@@ -223,7 +223,7 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
       await server.queryDatabaseObject(`CREATE TABLE IF NOT EXISTS ${queryBuilder.quoteTable(model)} ()`, []);
     }
     if (!tableInDb || tableInDb.table_description != model.name) {
-      await server.queryDatabaseObject(`COMMENT ON TABLE ${queryBuilder.quoteTable(model)} IS ${queryBuilder.formatValueToSqlLiteral(model.name)};`, []);
+      await server.tryQueryDatabaseObject(`COMMENT ON TABLE ${queryBuilder.quoteTable(model)} IS ${queryBuilder.formatValueToSqlLiteral(model.name)};`, []);
     }
   }
 
@@ -264,7 +264,7 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
           }
 
           if (!columnInDb || columnInDb.description != property.name) {
-            await server.queryDatabaseObject(
+            await server.tryQueryDatabaseObject(
               `COMMENT ON COLUMN ${queryBuilder.quoteTable(model)}.${queryBuilder.quoteObject(
                 property.targetIdColumnName,
               )} IS ${queryBuilder.formatValueToSqlLiteral(property.name)};`,
@@ -377,7 +377,7 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
         }
 
         if (!columnInDb || columnInDb.description != property.name) {
-          await server.queryDatabaseObject(
+          await server.tryQueryDatabaseObject(
             `COMMENT ON COLUMN ${queryBuilder.quoteTable(model)}.${queryBuilder.quoteObject(
               property.columnName || property.code,
             )} IS ${queryBuilder.formatValueToSqlLiteral(property.name)};`,

package/src/types.ts

@@ -227,11 +227,16 @@ export interface RpdDataModel {
   /**
    * 多语言配置
    */
+  i18n?: Record<string, string>;
+
+  /**
+   * 本地化资源
+   */
   locales?: Record<string, RpdDataModelLocale>;
 }
 
 /**
- * 实体多语言配置
+ * 实体本地化资源配置
  */
 export type RpdDataModelLocale = {
   name: string;
@@ -345,9 +350,17 @@ export interface RpdDataModelProperty {
   /**
    * 多语言配置
    */
+  i18n?: Record<string, string>;
+
+  /**
+   * 本地化资源
+   */
   locales?: Record<string, RpdDataModelPropertyLocale>;
 }
 
+/**
+ * 实体属性本地化资源配置
+ */
 export type RpdDataModelPropertyLocale = {
   name: string;
   description?: string;
@@ -409,6 +422,21 @@ export type RpdDataDictionary = {
    * 字典项
    */
   entries: RpdDataDictionaryEntry[];
+
+  /**
+   * 多语言配置
+   */
+  i18n?: Record<string, string>;
+
+  /**
+   * 本地化资源
+   */
+  locales?: Record<string, RpdDataDictionaryLocale>;
+};
+
+export type RpdDataDictionaryLocale = {
+  name: string;
+  description?: string;
 };
 
 /**
@@ -449,6 +477,24 @@ export type RpdDataDictionaryEntry = {
    * 是否禁用
    */
   disabled: boolean;
+
+  /**
+   * 多语言配置
+   */
+  i18n?: Record<string, string>;
+
+  /**
+   * 本地化资源
+   */
+  locales?: Record<string, RpdDataDictionaryEntryLocale>;
+};
+
+/**
+ * 数据字典项本地化资源配置
+ */
+export type RpdDataDictionaryEntryLocale = {
+  name: string;
+  description?: string;
 };
 
 export interface RpdDataModelExtension {
@@ -749,7 +795,7 @@ export interface EntityWatchPluginInitOptions {
   watchers: EntityWatcherType[];
 }
 
-export interface I18nString {
+export interface LocaleString {
   namespace: string;
   name: string;
   lingual: string;