diff --git a/packages/core/client/src/collection-manager/Configuration/CollectionFieldsTableArray.tsx b/packages/core/client/src/collection-manager/Configuration/CollectionFieldsTableArray.tsx index fe8cb176a0..b1a6be2bbb 100644 --- a/packages/core/client/src/collection-manager/Configuration/CollectionFieldsTableArray.tsx +++ b/packages/core/client/src/collection-manager/Configuration/CollectionFieldsTableArray.tsx @@ -4,8 +4,8 @@ import { observer, RecursionField, Schema, useField, useFieldSchema } from '@for import { Table, TableColumnProps } from 'antd'; import { default as classNames } from 'classnames'; import React, { useState } from 'react'; -import { RecordIndexProvider, RecordProvider, useCollectionManager, useRequest, useSchemaInitializer } from '../..'; import { useTranslation } from 'react-i18next'; +import { RecordIndexProvider, RecordProvider, useCollectionManager, useRequest, useSchemaInitializer } from '../..'; const isColumnComponent = (schema: Schema) => { return schema['x-component']?.endsWith('.Column') > -1; @@ -95,8 +95,8 @@ const groupColumns = [ type CategorizeKey = 'primaryAndForeignKey' | 'relation' | 'systemInfo' | 'basic'; const sortKeyArr: Array = ['primaryAndForeignKey', 'relation', 'basic', 'systemInfo']; const CategorizeKeyNameMap = new Map([ - ['primaryAndForeignKey', 'Primary key & Foreign key fields'], - ['relation', 'Relation fields'], + ['primaryAndForeignKey', 'PK & FK fields'], + ['relation', 'Association fields'], ['systemInfo', 'System fields'], ['basic', 'General fields'], ]); diff --git a/packages/core/client/src/locale/en_US.ts b/packages/core/client/src/locale/en_US.ts index 6127b53c36..0fd3ecb586 100644 --- a/packages/core/client/src/locale/en_US.ts +++ b/packages/core/client/src/locale/en_US.ts @@ -121,8 +121,8 @@ export default { "Configure columns": "Configure columns", "Edit field": "Edit field", "Configure fields of {{title}}": "Configure fields of {{title}}", - "Primary key & Foreign key fields": "Primary key & Foreign key fields", - "Relation fields": "Relation fields", + "PK & FK fields": "PK & FK fields", + "Association fields": "Association fields", "System fields": "System fields", "General fields": "General fields", "Basic": "Basic", diff --git a/packages/core/client/src/locale/zh_CN.ts b/packages/core/client/src/locale/zh_CN.ts index 6c46e32b1a..dcfd462786 100644 --- a/packages/core/client/src/locale/zh_CN.ts +++ b/packages/core/client/src/locale/zh_CN.ts @@ -125,8 +125,8 @@ export default { "Configure columns": "配置字段", "Edit field": "编辑字段", "Configure fields of {{title}}": "「{{title}}」的字段配置", - "Primary key & Foreign key fields": "主外键字段", - "Relation fields": "关系字段", + "PK & FK fields": "主外键字段", + "Association fields": "关系字段", "System fields": "系统字段", "General fields": "普通字段", "Basic": "基本类型", diff --git a/yarn.lock b/yarn.lock index 407580e3f0..9da753220c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5352,14 +5352,7 @@ resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@^16.9.8": - version "16.9.17" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.17.tgz#29100cbcc422d7b7dba7de24bb906de56680dd34" - integrity sha512-qSRyxEsrm5btPXnowDOs5jSkgT8ldAA0j6Qp+otHUh+xHzy3sXmgNfyhucZjAjkgpdAUw9rJe0QRtX/l+yaS4g== - dependencies: - "@types/react" "^16" - -"@types/react-dom@^17.0.0": +"@types/react-dom@^16.9.8", "@types/react-dom@^17.0.0": version "17.0.11" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466" integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q== @@ -5419,7 +5412,7 @@ "@types/history" "*" "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.11", "@types/react@^17.0.0": +"@types/react@*", "@types/react@>=16.9.11", "@types/react@^16.9.43", "@types/react@^17.0.0": version "17.0.34" resolved "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz#797b66d359b692e3f19991b6b07e4b0c706c0102" integrity sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg== @@ -5428,15 +5421,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^16", "@types/react@^16.9.43": - version "16.14.34" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.34.tgz#d129324ffda312044e1c47aab18696e4ed493282" - integrity sha512-b99nWeGGReLh6aKBppghVqp93dFJtgtDOzc8NXM6hewD8PQ2zZG5kBLgbx+VJr7Q7WBMjHxaIl3dwpwwPIUgyA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - "@types/resolve@1.17.1": version "1.17.1" resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"