diff --git a/packages/client/src/schemas/add-new/index.tsx b/packages/client/src/schemas/add-new/index.tsx
index 79977c3f6..4f38c5f2b 100644
--- a/packages/client/src/schemas/add-new/index.tsx
+++ b/packages/client/src/schemas/add-new/index.tsx
@@ -415,6 +415,57 @@ function generateCardItemSchema(component) {
'x-component-props': {
fieldNames: [],
},
+ properties: {
+ column1: {
+ type: 'void',
+ title: '操作类型',
+ 'x-component': 'Filter.Column',
+ 'x-component-props': {
+ operations: [
+ {
+ label: '等于',
+ value: 'eq',
+ selected: true,
+ schema: { 'x-component': 'Select' },
+ },
+ {
+ label: '不等于',
+ value: 'ne',
+ schema: { 'x-component': 'Select' },
+ },
+ {
+ label: '包含',
+ value: 'in',
+ schema: {
+ 'x-component': 'Select',
+ 'x-component-props': { mode: 'tags' },
+ },
+ },
+ {
+ label: '不包含',
+ value: 'notIn',
+ schema: {
+ 'x-component': 'Select',
+ 'x-component-props': { mode: 'tags' },
+ },
+ },
+ { label: '非空', value: '$notNull', noValue: true },
+ { label: '为空', value: '$null', noValue: true },
+ ],
+ },
+ properties: {
+ type: {
+ type: 'string',
+ 'x-component': 'Select',
+ enum: [
+ { label: '新增数据', value: 'create' },
+ { label: '更新数据', value: 'update' },
+ { label: '删除数据', value: 'destroy' },
+ ],
+ },
+ },
+ },
+ },
},
},
},
@@ -456,7 +507,8 @@ function generateCardItemSchema(component) {
'x-read-pretty': true,
'x-decorator': 'Form',
'x-decorator-props': {
- useResource: '{{ Table.useActionLogDetailsResource }}',
+ useResource:
+ '{{ Table.useActionLogDetailsResource }}',
},
'x-component': 'Action.Drawer',
'x-component-props': {
@@ -806,7 +858,9 @@ AddNew.CardItem = observer((props: any) => {
操作日志
- 新建模板
+
+ 新建模板
+
}
diff --git a/packages/client/src/schemas/table/SimpleDesignableBar.tsx b/packages/client/src/schemas/table/SimpleDesignableBar.tsx
index 4db46f291..97109ea7f 100644
--- a/packages/client/src/schemas/table/SimpleDesignableBar.tsx
+++ b/packages/client/src/schemas/table/SimpleDesignableBar.tsx
@@ -17,12 +17,13 @@ import {
SchemaField,
useDesignable,
removeSchema,
+ updateSchema,
} from '../';
import get from 'lodash/get';
-import { Button, Dropdown, Menu, Space } from 'antd';
+import { Button, Dropdown, Menu, Select, Space } from 'antd';
import { MenuOutlined, DragOutlined } from '@ant-design/icons';
import cls from 'classnames';
-import { FormLayout } from '@formily/antd';
+import { FormDialog, FormLayout } from '@formily/antd';
import './style.less';
import AddNew from '../add-new';
import { DraggableBlockContext } from '../../components/drag-and-drop';
@@ -31,6 +32,7 @@ import constate from 'constate';
import { useEffect } from 'react';
import { uid } from '@formily/shared';
import { getSchemaPath } from '../../components/schema-renderer';
+import { set } from 'lodash';
export const SimpleDesignableBar = observer((props) => {
const field = useField();
@@ -40,6 +42,8 @@ export const SimpleDesignableBar = observer((props) => {
if (!designable) {
return null;
}
+ const defaultPageSize =
+ field?.componentProps?.pagination?.defaultPageSize || 10;
return (
{
}}
overlay={