@magicbe/antd-crud 0.0.49 → 0.0.52

package/dist/components/Action.js

@@ -2,6 +2,17 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -48,6 +59,7 @@ import { useTableContext } from "./Context";
 import AddForm from "./Add";
 import EditForm from "./Edit";
 import { useCrudConfigContext } from "../config";
+import { useDrawerContentContext } from "./Drawer";
 var _a = createEmotion({ key: "action" }), css = _a.css, cx = _a.cx;
 var wrapper_css = css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    margin-bottom: 25px;\n"], ["\n    margin-bottom: 25px;\n"])));
 /**操作 */
@@ -145,6 +157,7 @@ export var AppendAction = function (_a) {
     var _c = Modal.useModal(), modalInstance = _c[0], modalContextHolder = _c[1];
     var showErrorModal = useCrudConfigContext().showErrorModal;
     var _d = useTableContext(), table_ref = _d.table_ref, filter_ref = _d.filter_ref, form_ref = _d.form_ref, add = _d.add, drawer = _d.drawer;
+    var drawer_props = useDrawerContentContext().drawer_props;
     /**添加表单抽屉 */
     var _e = useState(false), add_drawer_open = _e[0], setAdd_drawer_open = _e[1];
     var _f = useState(), init_data = _f[0], setInit_data = _f[1];
@@ -242,7 +255,7 @@ export var AppendAction = function (_a) {
             return drawer.add;
         return 600;
     }, [drawer]);
-    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: switchAddDrawer }), _jsx(Drawer, { title: "\u65B0\u589E", width: drawer_width, onClose: switchAddDrawer, open: add_drawer_open, extra: add_extra, destroyOnClose: true, keyboard: false, children: _jsx(AddForm, { ref: form_ref, default_data: init_data }) }), modalContextHolder] }));
+    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: switchAddDrawer }), _jsx(Drawer, __assign({}, drawer_props, { title: "\u65B0\u589E", width: drawer_width, onClose: switchAddDrawer, open: add_drawer_open, extra: add_extra, destroyOnClose: true, keyboard: false, children: _jsx(AddForm, { ref: form_ref, default_data: init_data }) })), modalContextHolder] }));
 };
 var delete_action_default_children = (_jsxs(Button, { type: "primary", danger: true, children: [_jsx(DeleteOutlined, {}), "\u5220\u9664"] }));
 /**删除方法 */
@@ -355,6 +368,7 @@ export var EditAction = function (_a) {
     var _c = Modal.useModal(), modalInstance = _c[0], modalContextHolder = _c[1];
     var showErrorModal = useCrudConfigContext().showErrorModal;
     var _d = useTableContext(), table_ref = _d.table_ref, filter_ref = _d.filter_ref, form_ref = _d.form_ref, edit = _d.edit, drawer = _d.drawer;
+    var drawer_props = useDrawerContentContext().drawer_props;
     /**编辑 */
     var _e = useState(false), edit_drawer_open = _e[0], setEdit_drawer_open = _e[1];
     var _f = useState(false), loading = _f[0], setLoading = _f[1];
@@ -454,6 +468,6 @@ export var EditAction = function (_a) {
             return drawer.add;
         return 600;
     }, [drawer]);
-    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: onClick }), _jsx(Drawer, { title: "\u7F16\u8F91", width: drawer_width, onClose: switchEditDrawer, open: edit_drawer_open, extra: edit_extra, destroyOnClose: true, keyboard: false, children: _jsx(EditForm, { ref: form_ref, default_data: init_data }) }), modalContextHolder] }));
+    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: onClick }), _jsx(Drawer, __assign({}, drawer_props, { title: "\u7F16\u8F91", width: drawer_width, onClose: switchEditDrawer, open: edit_drawer_open, extra: edit_extra, destroyOnClose: true, keyboard: false, children: _jsx(EditForm, { ref: form_ref, default_data: init_data }) })), modalContextHolder] }));
 };
 var templateObject_1;

package/dist/components/Context.d.ts

@@ -4,7 +4,6 @@ interface TableContextProps<RecordType> extends ContentProps<RecordType> {
     filter_ref: React.RefObject<FilterRef>;
     action_ref: React.RefObject<ActionRef>;
     table_ref: React.RefObject<TableRef>;
-    content_ref: React.RefObject<HTMLDivElement>;
     form_ref: React.RefObject<FormRef>;
 }
 type RefTable = <RecordType = AnyObject>(props: React.PropsWithChildren<ContentProps<RecordType>> & React.RefAttributes<ContentRef>) => React.ReactElement;

package/dist/components/Context.js

@@ -28,16 +28,14 @@ var TableContextProviderPrev = function (_a, ref) {
     var filter_ref = React.createRef();
     var action_ref = React.createRef();
     var table_ref = React.createRef();
-    var content_ref = React.createRef();
     var form_ref = React.createRef();
     useImperativeHandle(ref, function () { return ({
         filter_ref: filter_ref,
         action_ref: action_ref,
         table_ref: table_ref,
-        content_ref: content_ref,
         form_ref: form_ref,
     }); });
-    return (_jsx(TableContext.Provider, { value: __assign(__assign({}, props), { drawer: drawer, filter_ref: filter_ref, action_ref: action_ref, table_ref: table_ref, content_ref: content_ref, form_ref: form_ref }), children: children }));
+    return (_jsx(TableContext.Provider, { value: __assign(__assign({}, props), { drawer: drawer, filter_ref: filter_ref, action_ref: action_ref, table_ref: table_ref, form_ref: form_ref }), children: children }));
 };
 export var TableContextProvider = React.forwardRef(TableContextProviderPrev);
 export var useTableContext = function () { return useContext(TableContext); };

package/dist/components/Drawer.d.ts

@@ -0,0 +1,13 @@
+import { DrawerProps } from "antd";
+import React, { FC, PropsWithChildren } from "react";
+export interface DrawerContentProps extends PropsWithChildren {
+    style?: React.CSSProperties;
+    className?: string;
+    drawer_props: DrawerProps;
+}
+export interface DrawerContentContextProps {
+    drawer_content_ref: React.RefObject<HTMLDivElement>;
+    drawer_props: DrawerProps;
+}
+export declare const DrawerContentContextProvider: FC<DrawerContentProps>;
+export declare const useDrawerContentContext: () => DrawerContentContextProps;

package/dist/components/Drawer.js

@@ -0,0 +1,40 @@
+var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import createEmotion from "@emotion/css/create-instance";
+import React from "react";
+var _a = createEmotion({ key: "drawer-content" }), css = _a.css, cx = _a.cx;
+var DrawerContentContext = React.createContext({});
+export var DrawerContentContextProvider = function (_a) {
+    var children = _a.children, style = _a.style, className = _a.className, props = __rest(_a, ["children", "style", "className"]);
+    var drawer_content_ref = React.createRef();
+    var drawer_props = __assign({ getContainer: function () { return drawer_content_ref.current; }, rootStyle: { position: 'absolute' } }, props.drawer_props);
+    var wraper_cls = css(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        position: relative;\n    "], ["\n        position: relative;\n    "])));
+    return (_jsx("div", { style: style, className: cx(wraper_cls, className), ref: drawer_content_ref, children: _jsx(DrawerContentContext.Provider, { value: { drawer_content_ref: drawer_content_ref, drawer_props: drawer_props }, children: children }) }));
+};
+export var useDrawerContentContext = function () { return React.useContext(DrawerContentContext); };
+var templateObject_1;

package/dist/components/Field.js

@@ -38,7 +38,6 @@ var presets = {
     "Radio.Group": Radio.Group,
     "Switch": Switch,
 };
-TimePicker.RangePicker;
 var Field = function (props) {
     var form = Form.useFormInstance();
     var field = props.field, dataIndex = props.dataIndex, title = props.title;

package/dist/components/Table.js

@@ -70,8 +70,9 @@ import AddForm from "./Add";
 import EditForm from "./Edit";
 import { css } from "@emotion/css";
 import { useCrudConfigContext } from "../config";
+import { useDrawerContentContext } from "./Drawer";
 var Table = React.forwardRef(function (_a, ref) {
-    var _b = useTableContext(), getSources = _b.getSources, selectionType = _b.rowSelection, action = _b.action, content_ref = _b.content_ref, filter_ref = _b.filter_ref, pageSizeOptions = _b.pageSizeOptions, _c = _b.actionColumn, actionColumn = _c === void 0 ? {} : _c, _pagination_ = _b.pagination, props = __rest(_b, ["getSources", "rowSelection", "action", "content_ref", "filter_ref", "pageSizeOptions", "actionColumn", "pagination"]);
+    var _b = useTableContext(), getSources = _b.getSources, selectionType = _b.rowSelection, action = _b.action, filter_ref = _b.filter_ref, pageSizeOptions = _b.pageSizeOptions, _c = _b.actionColumn, actionColumn = _c === void 0 ? {} : _c, _pagination_ = _b.pagination, props = __rest(_b, ["getSources", "rowSelection", "action", "filter_ref", "pageSizeOptions", "actionColumn", "pagination"]);
     var _d = useState([]), sources = _d[0], setSources = _d[1];
     var _e = useState(), total = _e[0], setTotal = _e[1];
     var _f = useState(), page = _f[0], setPage = _f[1];
@@ -172,11 +173,23 @@ var Table = React.forwardRef(function (_a, ref) {
         setSelected_keys(keys);
         setSelected_rows(rows);
     };
-    var rowSelection = !!selectionType ? {
-        selectedRowKeys: selected_keys,
-        onChange: onRowSelectionChange,
-        type: selectionType,
-    } : undefined;
+    var rowSelection = useMemo(function () {
+        if (!selectionType)
+            return undefined;
+        if (isObject(selectionType)) {
+            var onChange = function (keys, rows, info) {
+                var _a;
+                onRowSelectionChange(keys, rows);
+                (_a = selectionType.onChange) === null || _a === void 0 ? void 0 : _a.call(selectionType, keys, rows, info);
+            };
+            return (__assign(__assign({}, selectionType), { onChange: onChange }));
+        }
+        return ({
+            selectedRowKeys: selected_keys,
+            onChange: onRowSelectionChange,
+            type: selectionType,
+        });
+    }, [selectionType]);
     var loadRecords = function (params) {
         var _a;
         if (params === void 0) { params = {}; }
@@ -198,6 +211,8 @@ var Table = React.forwardRef(function (_a, ref) {
         loadRecords: loadRecords,
         selected_keys: selected_keys,
         selected_rows: selected_rows,
+        setSelected_keys: setSelected_keys,
+        setSelected_rows: setSelected_rows,
     }); });
     useEffect(loadRecords, []);
     return (_jsx(AntdTable, __assign({}, props, { rowSelection: rowSelection, columns: columns, loading: loading, onChange: loadRecords, dataSource: sources, pagination: pagination })));
@@ -210,12 +225,13 @@ var action_cls = css(templateObject_1 || (templateObject_1 = __makeTemplateObjec
 var append_action_default_children = (_jsxs(Button, { type: "link", size: "small", className: action_cls, children: [_jsx(PlusOutlined, {}), "\u65B0\u589E"] }));
 export var AppendAction = function (_a) {
     var _b = _a.children, children = _b === void 0 ? append_action_default_children : _b, row = _a.row;
+    var _c = Modal.useModal(), modalInstance = _c[0], modalContextHolder = _c[1];
+    var _d = useState(false), add_drawer_open = _d[0], setAdd_drawer_open = _d[1];
+    var _e = useState(false), loading = _e[0], setLoading = _e[1];
+    var _f = useState(), init_data = _f[0], setInit_data = _f[1];
     var showErrorModal = useCrudConfigContext().showErrorModal;
-    var _c = useTableContext(), rowKey = _c.rowKey, table_ref = _c.table_ref, filter_ref = _c.filter_ref, form_ref = _c.form_ref, add = _c.add, drawer = _c.drawer;
-    var _d = Modal.useModal(), modalInstance = _d[0], modalContextHolder = _d[1];
-    var _e = useState(false), add_drawer_open = _e[0], setAdd_drawer_open = _e[1];
-    var _f = useState(false), loading = _f[0], setLoading = _f[1];
-    var _g = useState(), init_data = _g[0], setInit_data = _g[1];
+    var _g = useTableContext(), rowKey = _g.rowKey, table_ref = _g.table_ref, filter_ref = _g.filter_ref, form_ref = _g.form_ref, add = _g.add, drawer = _g.drawer;
+    var drawer_props = useDrawerContentContext().drawer_props;
     var _h = useMemo(function () {
         var key = get(row, String(rowKey));
         return ({ keys: [key], rows: [row] });
@@ -329,23 +345,24 @@ export var AppendAction = function (_a) {
             return drawer.add;
         return 600;
     }, [drawer]);
-    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: onClick }), _jsx(Drawer, { title: "\u65B0\u589E", width: drawer_width, onClose: switchAddDrawer, open: add_drawer_open, extra: add_extra, destroyOnClose: true, keyboard: false, children: _jsx(AddForm, { default_data: init_data, ref: form_ref }) }), modalContextHolder] }));
+    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: onClick }), _jsx(Drawer, __assign({}, drawer_props, { title: "\u65B0\u589E", width: drawer_width, onClose: switchAddDrawer, open: add_drawer_open, extra: add_extra, destroyOnClose: true, keyboard: false, children: _jsx(AddForm, { default_data: init_data, ref: form_ref }) })), modalContextHolder] }));
 };
 var edit_action_default_children = (_jsxs(Button, { type: "link", size: "small", className: action_cls, children: [_jsx(EditFilled, {}), "\u7F16\u8F91"] }));
 export var EditAction = function (_a) {
     var _b = _a.children, children = _b === void 0 ? edit_action_default_children : _b, row = _a.row;
+    var _c = Modal.useModal(), modalInstance = _c[0], modalContextHolder = _c[1];
+    var _d = useState(false), edit_drawer_open = _d[0], setEdit_drawer_open = _d[1];
+    var _e = useState(), init_data = _e[0], setInit_data = _e[1];
+    var _f = useState(false), loading = _f[0], setLoading = _f[1];
+    var _g = useState(false), clickLoading = _g[0], setClickLoading = _g[1];
     var showErrorModal = useCrudConfigContext().showErrorModal;
-    var _c = useTableContext(), edit = _c.edit, rowKey = _c.rowKey, table_ref = _c.table_ref, filter_ref = _c.filter_ref, form_ref = _c.form_ref, drawer = _c.drawer;
-    var _d = Modal.useModal(), modalInstance = _d[0], modalContextHolder = _d[1];
-    var _e = useState(false), edit_drawer_open = _e[0], setEdit_drawer_open = _e[1];
-    var _f = useState(), init_data = _f[0], setInit_data = _f[1];
-    var _g = useState(false), loading = _g[0], setLoading = _g[1];
-    var _h = useState(false), clickLoading = _h[0], setClickLoading = _h[1];
+    var _h = useTableContext(), edit = _h.edit, rowKey = _h.rowKey, table_ref = _h.table_ref, filter_ref = _h.filter_ref, form_ref = _h.form_ref, drawer = _h.drawer;
+    var _j = useDrawerContentContext().drawer_props, drawer_props = _j === void 0 ? {} : _j;
     var switchEditDrawer = function () { return setEdit_drawer_open(!edit_drawer_open); };
-    var _j = useMemo(function () {
+    var _k = useMemo(function () {
         var key = get(row, String(rowKey));
         return ({ keys: [key], rows: [row] });
-    }, [row]), keys = _j.keys, rows = _j.rows;
+    }, [row]), keys = _k.keys, rows = _k.rows;
     var onClick = function () { return __awaiter(void 0, void 0, void 0, function () {
         var init, data, error_2;
         return __generator(this, function (_a) {
@@ -446,7 +463,7 @@ export var EditAction = function (_a) {
             return drawer.add;
         return 600;
     }, [drawer]);
-    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: onClick, loading: clickLoading }), _jsx(Drawer, { title: "\u7F16\u8F91", width: drawer_width, onClose: switchEditDrawer, open: edit_drawer_open, extra: edit_extra, destroyOnClose: true, keyboard: false, children: _jsx(EditForm, { ref: form_ref, default_data: init_data }) }), modalContextHolder] }));
+    return (_jsxs(Fragment, { children: [React.cloneElement(children, { onClick: onClick, loading: clickLoading }), _jsx(Drawer, __assign({}, drawer_props, { title: "\u7F16\u8F91", width: drawer_width, onClose: switchEditDrawer, open: edit_drawer_open, extra: edit_extra, destroyOnClose: true, keyboard: false, children: _jsx(EditForm, { ref: form_ref, default_data: init_data }) })), modalContextHolder] }));
 };
 var delete_action_default_children = (_jsxs(Button, { size: "small", type: "link", danger: true, className: action_cls, children: [_jsx(DeleteOutlined, {}), "\u5220\u9664"] }));
 export var DeleteAction = function (_a) {

package/dist/components/index.js

@@ -10,14 +10,13 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React from "react";
+import React, { Fragment } from "react";
 import Filter from "./Filter";
 import Action from "./Action";
 import Table from "./Table";
-import { TableContextProvider, useTableContext } from "./Context";
+import { TableContextProvider, } from "./Context";
 var Content = function () {
-    var content_ref = useTableContext().content_ref;
-    return (_jsxs("div", { ref: content_ref, children: [_jsx(Filter, {}), _jsx(Action, {}), _jsx(Table, {})] }));
+    return (_jsxs(Fragment, { children: [_jsx(Filter, {}), _jsx(Action, {}), _jsx(Table, {})] }));
 };
 var ContentPrev = function (props, ref) {
     var _a = props.children, children = _a === void 0 ? _jsx(Content, {}) : _a;

package/dist/index.d.ts

@@ -4,4 +4,5 @@ export { TableContextProvider, useTableContext, } from "./components/Context";
 export { default as Filter, } from "./components/Filter";
 export { default as Action, AppendAction as MastAppend, DeleteAction as MastDelete, EditAction as MastEdit, } from "./components/Action";
 export { default as Table, AppendAction as RowAppend, DeleteAction as RowDelete, EditAction as RowEdit, } from "./components/Table";
+export { type DrawerContentProps, type DrawerContentContextProps, DrawerContentContextProvider, useDrawerContentContext, } from "./components/Drawer";
 export { default as CrudConfigProvider, type CustomConfigProviderProps, CrudConfigContextProvider, useCrudConfigContext, } from "./config";

package/dist/index.js

@@ -3,4 +3,5 @@ export { TableContextProvider, useTableContext, } from "./components/Context";
 export { default as Filter, } from "./components/Filter";
 export { default as Action, AppendAction as MastAppend, DeleteAction as MastDelete, EditAction as MastEdit, } from "./components/Action";
 export { default as Table, AppendAction as RowAppend, DeleteAction as RowDelete, EditAction as RowEdit, } from "./components/Table";
+export { DrawerContentContextProvider, useDrawerContentContext, } from "./components/Drawer";
 export { default as CrudConfigProvider, CrudConfigContextProvider, useCrudConfigContext, } from "./config";

package/dist/interface.d.ts

@@ -172,7 +172,7 @@ export interface ContentProps<RecordType = AnyObject> extends Omit<AntdTableProp
     del?: del;
     edit?: edit;
     action?: Action;
-    rowSelection?: RowSelectionType;
+    rowSelection?: RowSelectionType | AntdTableProps['rowSelection'];
     pagination?: false;
     drawer?: number | DrawerProps;
     pageSizeOptions?: PaginationProps["pageSizeOptions"];
@@ -183,7 +183,6 @@ export interface ContentRef {
     filter_ref: React.RefObject<FilterRef>;
     action_ref: React.RefObject<ActionRef>;
     table_ref: React.RefObject<TableRef>;
-    content_ref: React.RefObject<HTMLDivElement>;
     form_ref: React.RefObject<FormRef>;
 }
 /**表单REF */
@@ -215,5 +214,7 @@ export interface TableRef {
     loadRecords: loadRecords;
     selected_keys: React.Key[];
     selected_rows: AnyObject[];
+    setSelected_keys: React.Dispatch<React.SetStateAction<React.Key[]>>;
+    setSelected_rows: React.Dispatch<React.SetStateAction<AnyObject[]>>;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicbe/antd-crud",
-  "version": "0.0.49",
+  "version": "0.0.52",
   "description": "antd crud table",
   "author": "wang quan",
   "private": false,