mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 06:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
katherinehhh 2024-08-21 22:00:56 +08:00
commit 34ab7fb349
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/client/src/collection-manager/interfaces/properties/operators.ts
View File

@ -35,7 +35,7 @@ export const array = [
},
},
{
label: '{{t("contains")}}',
label: '{{t("is any of")}}',
value: '$anyOf',
schema: {
'x-component': 'Select',
@ -43,7 +43,7 @@ export const array = [
},
},
{
label: '{{t("does not contain")}}',
label: '{{t("is none of")}}',
value: '$noneOf',
schema: {
'x-component': 'Select',
@ -102,7 +102,7 @@ export const enumType = [
schema: { 'x-component': 'Select' },
},
{
label: '{{t("contains")}}',
label: '{{t("is any of")}}',
value: '$in',
schema: {
'x-component': 'Select',
@ -110,7 +110,7 @@ export const enumType = [
},
},
{
label: '{{t("does not contain")}}',
label: '{{t("is none of")}}',
value: '$notIn',
schema: {
'x-component': 'Select',
@ -135,7 +135,7 @@ export const boolean = [
export const tableoid = [
{
label: '{{t("contains")}}',
label: '{{t("is any of")}}',
value: '$childIn',
schema: {
'x-component': 'CollectionSelect',
@ -143,7 +143,7 @@ export const tableoid = [
},
},
{
label: '{{t("does not contain")}}',
label: '{{t("is none of")}}',
value: '$childNotIn',
schema: {
'x-component': 'CollectionSelect',
@ -165,7 +165,7 @@ export const collection = [
schema: { 'x-component': 'CollectionSelect' },
},
{
label: '{{t("contains")}}',
label: '{{t("is any of")}}',
value: '$in',
schema: {
'x-component': 'CollectionSelect',
@ -173,7 +173,7 @@ export const collection = [
},
},
{
label: '{{t("does not contain")}}',
label: '{{t("is none of")}}',
value: '$notIn',
schema: {
'x-component': 'CollectionSelect',

4
packages/core/client/src/locale/en_US.json
View File

@ -836,5 +836,7 @@
"Search": "Search",
"Clear default value": "Clear default value",
"Open in new window": "Open in new window",
"Sorry, the page you visited does not exist.": "Sorry, the page you visited does not exist."
"Sorry, the page you visited does not exist.": "Sorry, the page you visited does not exist.",
"is none of": "is none of",
"is any of": "is any of"
}

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

@ -966,6 +966,8 @@
"Search": "搜索",
"Clear default value": "清除默认值",
"Open in new window": "新窗口打开",
"is none of": "不包含任何一个",
"is any of": "包含任何一个",
"Paging mode": "分页模式",
"Simple Paginate": "简单分页",
"Sorry, the page you visited does not exist.": "抱歉，你访问的页面不存在。",

6
packages/core/client/src/schema-component/antd/table-v2/Table.tsx
View File

@ -631,8 +631,9 @@ export const Table: any = withDynamicSchemaProps(
if (!dragSort && !showIndex) {
return originNode;
}
const current = props?.pagination?.current;
const pageSize = props?.pagination?.pageSize || 20;
const current = paginationProps?.current;
const pageSize = paginationProps?.pageSize || 20;
if (current) {
index = index + (current - 1) * pageSize + 1;
} else {
@ -681,6 +682,7 @@ export const Table: any = withDynamicSchemaProps(
getRowKey,
isRowSelect,
memoizedRowSelection,
paginationProps,
],
);