Commit 442c390f authored by XieZhiXiong's avatar XieZhiXiong

Merge branch 'v2-220418-1' of…

Merge branch 'v2-220418-1' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into feat-v2-220418-1-member
parents 584c0d7e 99589911
...@@ -5,8 +5,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'; ...@@ -5,8 +5,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd';
import TableLayout from './table'; import TableLayout from './table';
import { fetchOrderApi } from '../../apis'; import { fetchOrderApi } from '../../apis';
import { materialSupplyColumns, memberColumns } from './columns'; import { materialSupplyColumns, memberColumns } from './columns';
import { materialSupplySchema } from './schema'; import { materialSupplySchema, memberModalSchema } from './schema';
import { memberModalSchema } from '@/components/ModalTable/schema';
export interface MemberModalTableProps { export interface MemberModalTableProps {
schemaAction: ISchemaFormActions | ISchemaFormAsyncActions, schemaAction: ISchemaFormActions | ISchemaFormAsyncActions,
......
import { getIntl } from "umi" import { getIntl } from "umi"
import { ISchema } from "@formily/antd";
import { FORM_FILTER_PATH } from "@/formSchema/const"; import { FORM_FILTER_PATH } from "@/formSchema/const";
export const memberModalSchema: ISchema = {
type: 'object',
properties: {
megalayout: {
type: "object",
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'space-between'
}
},
properties: {
name: {
type: 'string',
"x-component": 'Search',
"x-component-props": {
placeholder: getIntl().formatMessage({ id: 'components.qingshuruhuiyuanmingcheng' }),
advanced: false,
}
}
}
},
}
}
export const materialSupplySchema = { export const materialSupplySchema = {
type: "object", type: "object",
properties: { properties: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment