fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2024-12-14 15:04:02 +00:00
commit b10daeccde
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/client/src/collection-manager/templates/components/PreviewFields.tsx
View File

@ -266,7 +266,11 @@ const PreviewCom = (props) => {
};
function areEqual(prevProps, nextProps) {
return nextProps.name === prevProps.name && nextProps.sources === prevProps.sources;
return (
nextProps.viewName === prevProps.viewName &&
nextProps.schema === prevProps.schema &&
nextProps.source === prevProps.source
);
}
export const PreviewFields = React.memo(PreviewCom, areEqual);

6
packages/core/client/src/collection-manager/templates/view.tsx
View File

@ -73,7 +73,7 @@ export class ViewCollectionTemplate extends CollectionTemplate {
when: '{{isPG}}',
fulfill: {
state: {
value: "{{$deps[0].split('_')?.[0]}}",
value: "{{$deps[0].split('@')?.[0]}}",
},
},
otherwise: {
@ -91,7 +91,7 @@ export class ViewCollectionTemplate extends CollectionTemplate {
when: '{{isPG}}',
fulfill: {
state: {
value: '{{$deps[0].match(/^([^_]+)_(.*)$/)?.[2]}}',
value: "{{$deps[0].split('@')?.[1]}}",
},
},
otherwise: {
@ -125,6 +125,7 @@ export class ViewCollectionTemplate extends CollectionTemplate {
type: 'array',
'x-component': PreviewFields,
'x-hidden': '{{ !createOnly }}',
'x-decorator': 'FormItem',
'x-reactions': {
dependencies: ['name'],
fulfill: {
@ -133,6 +134,7 @@ export class ViewCollectionTemplate extends CollectionTemplate {
},
},
},
description: `{{t("Fields can only be used correctly if they are defined with an interface.")}}`,
},
preview: {
type: 'void',

3
packages/core/client/src/locale/zh-CN.json
View File

@ -1034,5 +1034,6 @@
"Package name": "包名",
"Associate":"关联",
"Please add or select record":"请添加或选择数据",
"No data":"暂无数据"
"No data":"暂无数据",
"Fields can only be used correctly if they are defined with an interface.": "只有字段设置了interface字段才能正常使用"
}

2
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx
View File

@ -163,7 +163,7 @@ export const ConfigurationTable = () => {
const schema = item.schema;
return {
label: schema ? `${schema}.${compile(item.name)}` : item.name,
value: schema ? `${schema}_${item.name}` : item.name,
value: schema ? `${schema}@${item.name}` : item.name,
};
});
});