@quansitech/antd-admin 1.0.0 → 1.1.0

package/components/Column/types.d.ts

@@ -1,29 +1,30 @@
-import type {FormInstance} from "antd/lib/form";
-import {ProSchema} from "@ant-design/pro-components";
-import {Rule} from "rc-field-form/lib/interface";
-import {Key} from "react";
-
-export type ColumnProps = {
-    className: any,
-    onChange?: <T = any>(value: T) => void;
-    onBlur?: <T = any>(event: T) => void;
-    schema?: ProSchema<Entity, ExtraProps, ComponentsType, ValueType>,
-    config: {
-        onSelect?: (value: any) => void;
-        onChange?: <T = any>(value: T) => void;
-        value?: any;
-        type: ComponentsType;
-        recordKey?: React.Key | React.Key[];
-        record?: Entity;
-        isEditable?: boolean;
-        defaultRender: (newItem: ProSchema<Entity, ExtraProps, ComponentsType, ValueType>) => JSX.Element | null;
-        options?: any[];
-    }
-    form: FormInstance,
-    fieldProps: any,
-    rules?: Rule[],
-    dataIndex?: Key,
-    value?: any,
-
-    record?: any,
+import type {FormInstance} from "antd/lib/form";
+import {ProSchema} from "@ant-design/pro-components";
+import {Rule} from "rc-field-form/lib/interface";
+import {Key} from "react";
+
+export type ColumnProps = {
+    className: any,
+    onChange?: <T = any>(value: T) => void;
+    onBlur?: <T = any>(event: T) => void;
+    schema?: ProSchema<Entity, ExtraProps, ComponentsType, ValueType>,
+    index?: number,
+    config: {
+        onSelect?: (value: any) => void;
+        onChange?: <T = any>(value: T) => void;
+        value?: any;
+        type: ComponentsType;
+        recordKey?: React.Key | React.Key[];
+        record?: Entity;
+        isEditable?: boolean;
+        defaultRender: (newItem: ProSchema<Entity, ExtraProps, ComponentsType, ValueType>) => JSX.Element | null;
+        options?: any[];
+    }
+    form: FormInstance,
+    fieldProps: any,
+    rules?: Rule[],
+    dataIndex?: Key,
+    value?: any,
+
+    record?: any,
 }

package/components/Form/Action/Button.tsx

@@ -1,125 +1,129 @@
-import {FormActionType} from "./types";
-import {Button, Popconfirm} from "antd";
-import {useContext, useEffect, useState} from "react";
-import http from "../../../lib/http";
-import {FormContext} from "../../FormContext";
-import {modal, replaceParams, replaceUrl, routerNavigateTo} from "../../../lib/helpers";
-import {ModalContext} from "../../ModalContext";
-import {TableContext} from "../../TableContext";
-
-export default function (props: FormActionType & {
-    props: any,
-
-    // 操作
-    submit?: boolean | {
-        confirm?: string
-    },
-    request?: RequestOptions,
-    link?: {
-        url: string,
-    }
-    back?: boolean,
-    reset?: boolean,
-    modal?: ModalOptions,
-}) {
-
-    const [loading, setLoading] = useState(false)
-    const formContext = useContext(FormContext)
-    const tableContext = useContext(TableContext)
-    const modalContext = useContext(ModalContext)
-
-    const onClick = async () => {
-        try {
-            setLoading(true)
-            const handleAfterAction = async (req?: RequestOptions) => {
-                if (req?.afterAction?.includes('tableReload')) {
-                    if (modalContext.contexts) {
-                        modalContext.setAfterClose(() => {
-                            modalContext.contexts?.tableContext?.actionRef.reload()
-                        })
-                    }
-                    if (tableContext.actionRef) {
-                        await tableContext.actionRef.reload()
-                    }
-                }
-                if (req?.afterAction?.includes('closeModal') && modalContext.inModal) {
-                    modalContext.closeModal()
-                }
-            }
-
-            if (props.submit) {
-                formContext.formRef?.current?.submit()
-                return
-            }
-            if (props.request) {
-                await http({
-                    method: props.request.method,
-                    url: props.request.url,
-                    headers: props.request.headers || {},
-                    data: replaceParams(props.request.data || {}, {
-                        ...(await formContext.formRef?.current?.getFieldsValue()),
-                    })
-                })
-
-                await handleAfterAction(props.request)
-                return
-            }
-            if (props.modal) {
-                await modal({
-                    ...props.modal,
-                    content: {
-                        ...props.modal.content,
-                        url: replaceUrl(props.modal.content.url as string, formContext.formRef?.current?.getFieldsValue())
-                    }
-                })
-                return
-            }
-
-            if (props.link) {
-                routerNavigateTo(replaceUrl(props.link.url, await formContext.formRef?.current?.getFieldsValue()))
-                return
-            }
-            if (props.reset) {
-                formContext.formRef?.current?.resetFields()
-                return
-            }
-            if (props.back) {
-                history.back()
-                return
-            }
-        } finally {
-            setLoading(false)
-        }
-    }
-
-    useEffect(() => {
-        if (props.submit) {
-            setLoading(props.loading || false)
-        }
-    }, [props.loading]);
-
-    const MyButton = ({onClick}: {
-        onClick?: () => void,
-    }) => {
-
-        return <>
-            <Button {...props.props}
-                    onClick={onClick}
-                    loading={loading}
-            >{props.title}</Button>
-        </>
-    }
-
-    const confirm = (typeof props.submit === 'object' ? props.submit.confirm : null)
-        || props.request?.confirm
-
-    return <>
-        {
-            confirm ?
-                <Popconfirm title={confirm} onConfirm={onClick}>
-                    <MyButton></MyButton>
-                </Popconfirm>
-                : <MyButton onClick={onClick}></MyButton>
-        }
-    </>
+import {FormActionType} from "./types";
+import {Button, Popconfirm} from "antd";
+import {useContext, useEffect, useState} from "react";
+import http from "../../../lib/http";
+import {FormContext} from "../../FormContext";
+import {modalShow, replaceParams, replaceUrl, routerNavigateTo} from "../../../lib/helpers";
+import {ModalContext} from "../../ModalContext";
+import {TableContext} from "../../TableContext";
+
+export default function (props: FormActionType & {
+    props: any,
+
+    // 操作
+    submit?: boolean | {
+        confirm?: string
+    },
+    request?: RequestOptions,
+    link?: {
+        url: string,
+    }
+    back?: boolean,
+    reset?: boolean,
+    modal?: ModalOptions,
+}) {
+
+    const [loading, setLoading] = useState(false)
+    const formContext = useContext(FormContext)
+    const tableContext = useContext(TableContext)
+    const modalContext = useContext(ModalContext)
+
+    const onClick = async () => {
+        try {
+            setLoading(true)
+            const handleAfterAction = async (req?: RequestOptions) => {
+                if (req?.afterAction?.includes('tableReload')) {
+                    if (modalContext.contexts) {
+                        modalContext.setAfterClose(() => {
+                            modalContext.contexts?.tableContext?.actionRef.reload()
+                        })
+                    }
+                    if (tableContext.actionRef) {
+                        await tableContext.actionRef.reload()
+                    }
+                }
+                if (req?.afterAction?.includes('closeModal') && modalContext.inModal) {
+                    modalContext.closeModal()
+                }
+            }
+
+            if (props.submit) {
+                formContext.formRef?.current?.submit()
+                return
+            }
+            if (props.request) {
+                await http({
+                    method: props.request.method,
+                    url: props.request.url,
+                    headers: props.request.headers || {},
+                    data: replaceParams(props.request.data || {}, {
+                        ...(await formContext.formRef?.current?.getFieldsValue()),
+                    })
+                })
+
+                await handleAfterAction(props.request)
+                return
+            }
+            if (props.modal) {
+                await modalShow({
+                    ...props.modal,
+                    content: {
+                        ...props.modal.content,
+                        url: replaceUrl(props.modal.content.url as string, formContext.formRef?.current?.getFieldsValue())
+                    }
+                })
+                return
+            }
+
+            if (props.link) {
+                routerNavigateTo(replaceUrl(props.link.url, await formContext.formRef?.current?.getFieldsValue()))
+                return
+            }
+            if (props.reset) {
+                formContext.formRef?.current?.resetFields()
+                return
+            }
+            if (props.back) {
+                if (modalContext.inModal) {
+                    modalContext.closeModal()
+                } else {
+                    history.back()
+                }
+                return
+            }
+        } finally {
+            setLoading(false)
+        }
+    }
+
+    useEffect(() => {
+        if (props.submit) {
+            setLoading(props.loading || false)
+        }
+    }, [props.loading]);
+
+    const MyButton = ({onClick}: {
+        onClick?: () => void,
+    }) => {
+
+        return <>
+            <Button {...props.props}
+                    onClick={onClick}
+                    loading={loading}
+            >{props.title}</Button>
+        </>
+    }
+
+    const confirm = (typeof props.submit === 'object' ? props.submit.confirm : null)
+        || props.request?.confirm
+
+    return <>
+        {
+            confirm ?
+                <Popconfirm title={confirm} onConfirm={onClick}>
+                    <MyButton></MyButton>
+                </Popconfirm>
+                : <MyButton onClick={onClick}></MyButton>
+        }
+    </>
 }

package/components/Form/Action/types.d.ts

@@ -1,5 +1,6 @@
-export type FormActionType = {
-    type: string,
-    title: string,
-    loading?: boolean,
+export type FormActionType = {
+    type: string,
+    title: string,
+    loading?: boolean,
+    badge?: string | number
 }

package/components/Form/Actions.tsx

@@ -1,35 +1,39 @@
-import {FormActionType} from "./Action/types";
-import {lazy, useEffect, useState} from "react";
-import {ReactComponentLike} from "prop-types";
-import {Space} from "antd";
-import container from "../../lib/container";
-import upperFirst from "lodash/upperFirst";
-
-export default function (props: {
-    actions?: FormActionType[]
-    loading?: boolean
-}) {
-    const [components, setComponents] = useState<{
-        Component: ReactComponentLike,
-        props: FormActionType,
-    }[]>([])
-
-    useEffect(() => {
-        setComponents(props.actions?.map(a => {
-            return {
-                Component: lazy(container.get('Form.Action.' + upperFirst(a.type))),
-                props: {
-                    ...a,
-                },
-            }
-        }) || [])
-    }, []);
-
-    return <>
-        <Space>
-            {components.map(item => (
-                <item.Component key={item.props.title} loading={props.loading} {...item.props}></item.Component>
-            ))}
-        </Space>
-    </>
+import {FormActionType} from "./Action/types";
+import {lazy, useEffect, useState} from "react";
+import {ReactComponentLike} from "prop-types";
+import {Badge, Space} from "antd";
+import container from "../../lib/container";
+import {upperFirst} from "lodash";
+
+export default function (props: {
+    actions?: FormActionType[]
+    loading?: boolean
+}) {
+    const [components, setComponents] = useState<{
+        Component: ReactComponentLike,
+        props: FormActionType,
+    }[]>([])
+
+    useEffect(() => {
+        setComponents(props.actions?.map(a => {
+            return {
+                Component: lazy(container.get('Form.Action.' + upperFirst(a.type))),
+                props: {
+                    ...a,
+                },
+            }
+        }) || [])
+    }, []);
+
+    return <>
+        <Space>
+            {components.map(item => (
+                item.props.badge ?
+                    <Badge key={item.props.title} count={item.props.badge} style={{zIndex: 100}}>
+                        <item.Component loading={props.loading} {...item.props}></item.Component>
+                    </Badge> :
+                    <item.Component key={item.props.title} loading={props.loading} {...item.props}></item.Component>
+            ))}
+        </Space>
+    </>
 }