@magicbe/antd-crud 0.0.28 → 0.0.31

package/dist/components/Add.js

@@ -28,14 +28,10 @@ import Field from "./Field";
 import { isObject, isString } from "lodash";
 import { useTableContext } from "./Context";
 var AddForm = React.forwardRef(function (_a, ref) {
-    var _b;
     var default_data = _a.default_data;
     var form = AntdForm.useForm()[0];
     var columns = useTableContext().columns;
-    var fields = (_b = columns === null || columns === void 0 ? void 0 : columns.filter(function (_a) {
-        var dataIndex = _a.dataIndex;
-        return !!dataIndex;
-    })) === null || _b === void 0 ? void 0 : _b.filter(function (_a) {
+    var fields = columns === null || columns === void 0 ? void 0 : columns.filter(function (_a) {
         var add = _a.add, edit = _a.edit;
         return !!add;
     }).map(function (_a) {

package/dist/components/Edit.js

@@ -28,14 +28,10 @@ import { useTableContext } from "./Context";
 import { isObject, isString } from "lodash";
 import Field from "./Field";
 var EditForm = React.forwardRef(function (_a, ref) {
-    var _b;
-    var _c = _a.default_data, default_data = _c === void 0 ? {} : _c;
+    var _b = _a.default_data, default_data = _b === void 0 ? {} : _b;
     var form = AntdForm.useForm()[0];
     var columns = useTableContext().columns;
-    var fields = (_b = columns === null || columns === void 0 ? void 0 : columns.filter(function (_a) {
-        var dataIndex = _a.dataIndex;
-        return !!dataIndex;
-    })) === null || _b === void 0 ? void 0 : _b.filter(function (_a) {
+    var fields = columns === null || columns === void 0 ? void 0 : columns.filter(function (_a) {
         var edit = _a.edit;
         return !!edit;
     }).map(function (_a) {

package/dist/components/Field.js

@@ -17,6 +17,7 @@ import { Form, Input, Select, Cascader, Checkbox, DatePicker, InputNumber, Radio
 var presets = {
     "Hidden": Fragment,
     "Input": Input,
+    "Input.Password": Input.Password,
     "TextArea": Input.TextArea,
     "InputNumber": InputNumber,
     "Select": Select,

package/dist/components/Filter.js

@@ -32,12 +32,12 @@ import Field from "./Field";
 import { Button, Form, Space } from "antd";
 import createEmotion from "@emotion/css/create-instance";
 import { SearchOutlined, UndoOutlined } from "@ant-design/icons";
-import { isFunction, isObject, isString } from "lodash";
+import { isObject, isString } from "lodash";
 var _a = createEmotion({ key: "filter" }), 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"])));
 var Filter = function (_a, ref) {
     var form = Form.useForm()[0];
-    var _b = useTableContext(), columns = _b.columns, table_ref = _b.table_ref, filter = _b.filter;
+    var _b = useTableContext(), columns = _b.columns, table_ref = _b.table_ref;
     var filters = columns === null || columns === void 0 ? void 0 : columns.filter(function (_a) {
         var filter = _a.filter;
         return filter;
@@ -67,20 +67,6 @@ var Filter = function (_a, ref) {
     var initialValues;
     if (!(filters === null || filters === void 0 ? void 0 : filters.length))
         return _jsx(Fragment, {});
-    if (filter === false)
-        return _jsx(Fragment, {});
-    if (isFunction(filter)) {
-        var Component = filter;
-        return _jsx(Component, { onFinish: onFinish, filters: filters, form: form });
-    }
-    if (isObject(filter)) {
-        var render = filter.render, _initialValues_ = filter.initialValues;
-        initialValues = _initialValues_;
-        if (!!render) {
-            var Component = render;
-            return _jsx(Component, { onFinish: onFinish, filters: filters, form: form, initialValues: _initialValues_ });
-        }
-    }
     return (_jsxs(Form, __assign({ layout: "inline", onFinish: onFinish, className: wrapper_css, form: form, initialValues: initialValues }, { children: [filters === null || filters === void 0 ? void 0 : filters.map(function (filter) { return _createElement(Field, __assign({}, filter, { key: String(filter.dataIndex) })); }), _jsxs(Space, { children: [_jsxs(Button, __assign({ htmlType: "submit", type: "primary" }, { children: [_jsx(SearchOutlined, {}), "\u67E5\u8BE2"] })), _jsxs(Button, __assign({ htmlType: "reset" }, { children: [_jsx(UndoOutlined, {}), "\u91CD\u7F6E"] }))] })] })));
 };
 export default React.forwardRef(Filter);

package/dist/components/Table.js

@@ -65,7 +65,7 @@ import { useTableContext } from "./Context";
 import AddForm from "./Add";
 import EditForm from "./Edit";
 var Table = 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, _pagination_ = _b.pagination, props = __rest(_b, ["getSources", "rowSelection", "action", "content_ref", "filter_ref", "pagination"]);
+    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, _pagination_ = _b.pagination, props = __rest(_b, ["getSources", "rowSelection", "action", "content_ref", "filter_ref", "pageSizeOptions", "pagination"]);
     var _c = useState([]), sources = _c[0], setSources = _c[1];
     var _d = useState(), total = _d[0], setTotal = _d[1];
     var _e = useState(), page = _e[0], setPage = _e[1];
@@ -159,6 +159,7 @@ var Table = function (_a, ref) {
             current: page,
             total: total,
             pageSize: size,
+            pageSizeOptions: pageSizeOptions,
             showTotal: function (totle) { return "\u5171\u8BA1 ".concat(totle, " \u6761\u6570\u636E"); },
             showSizeChanger: true,
             showQuickJumper: true,

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { type AnyObject, type BaseColumnField, type ColumnInputField, type ColumnTextAreaField, type ColumnInputNumberField, type ColumnSelectField, type ColumnCascaderField, type ColumnCheckboxField, type ColumnCheckboxGroupField, type ColumnDatePickerField, type ColumnDatePickerYearPickerField, type ColumnDatePickerMonthPickerField, type ColumnDatePickerWeekPickerField, type ColumnDatePickerTimePickerField, type ColumnDatePickerRangePickerField, type ColumnDatePickerQuarterPickerField, type ColumnTimePickerField, type ColumnTimePickerRangePickerField, type ColumnRadioField, type ColumnRadioGroupField, type ColumnSwitchField, type ColumnField, type ColumnFieldKeys, type ColumnType, type Source, type getSourceFunction, type GetSourceFunctionParams, type add, type addHandleMap, type edit, type editHandleMap, type del, type CustomFilter, type filter, type MasterCustomActionGroup, type RecordCustomActionGroup, type CustomActionGroup, type CustomAction, type ContentProps, type ContentRef, type FormRef, type FilterProps, type FilterRef, type ActionProps, type ActionRef, type TableProps, type getPageData, type loadRecords, type TableRef, } from "./interface";
+export { type AnyObject, type BaseColumnField, type ColumnInputField, type ColumnInputPasswordField, type ColumnTextAreaField, type ColumnInputNumberField, type ColumnSelectField, type ColumnCascaderField, type ColumnCheckboxField, type ColumnCheckboxGroupField, type ColumnDatePickerField, type ColumnDatePickerYearPickerField, type ColumnDatePickerMonthPickerField, type ColumnDatePickerWeekPickerField, type ColumnDatePickerTimePickerField, type ColumnDatePickerRangePickerField, type ColumnDatePickerQuarterPickerField, type ColumnTimePickerField, type ColumnTimePickerRangePickerField, type ColumnRadioField, type ColumnRadioGroupField, type ColumnSwitchField, type ColumnField, type ColumnFieldKeys, type ColumnType, type Source, type getSourceFunction, type GetSourceFunctionParams, type add, type addHandleMap, type edit, type editHandleMap, type del, type MasterCustomActionGroup, type RecordCustomActionGroup, type CustomActionGroup, type CustomAction, type ContentProps, type ContentRef, type FormRef, type FilterProps, type FilterRef, type ActionProps, type ActionRef, type TableProps, type getPageData, type loadRecords, type TableRef, } from "./interface";
 export { default as CrudTable, } from "./components";
 export { TableContextProvider, useTableContext, } from "./components/Context";
 export { default as Filter, } from "./components/Filter";

package/dist/interface.d.ts

@@ -1,7 +1,7 @@
-import { type TableProps as AntdTableProps, type InputProps, type SelectProps, type CascaderProps, type DatePickerProps, type InputNumberProps, type CheckboxProps, type RadioProps, type SwitchProps, type TimePickerProps, TreeSelectProps } from "antd";
+import { type TableProps as AntdTableProps, type InputProps, type SelectProps, type CascaderProps, type DatePickerProps, type InputNumberProps, type CheckboxProps, type RadioProps, type SwitchProps, type TimePickerProps, type TreeSelectProps, type PaginationProps } from "antd";
 import { type CheckboxGroupProps } from "antd/es/checkbox";
 import { FormInstance, Rule } from "antd/es/form";
-import { TextAreaProps } from "antd/es/input";
+import { PasswordProps, TextAreaProps } from "antd/es/input";
 import { type RadioGroupProps } from "antd/es/radio";
 import { RowSelectionType, type ColumnType as AntdColumnType } from "antd/es/table/interface";
 import React from "react";
@@ -18,6 +18,9 @@ export interface ColumnHiddenField extends BaseColumnField<"Hidden"> {
 /**输入框 */
 export interface ColumnInputField extends BaseColumnField<"Input", InputProps> {
 }
+/**密码输入框 */
+export interface ColumnInputPasswordField extends BaseColumnField<"Input.Password", PasswordProps> {
+}
 /**长文本输入框 */
 export interface ColumnTextAreaField extends BaseColumnField<"TextArea", TextAreaProps> {
 }
@@ -80,8 +83,8 @@ export interface CustormColumnField {
     option?: any;
     rules?: Rule[];
 }
-export type ColumnField = ColumnHiddenField | ColumnInputField | ColumnTextAreaField | ColumnInputNumberField | ColumnSelectField | ColumnCascaderField | ColumnTreeSelectField | ColumnCheckboxField | ColumnCheckboxGroupField | ColumnDatePickerField | ColumnDatePickerYearPickerField | ColumnDatePickerMonthPickerField | ColumnDatePickerWeekPickerField | ColumnDatePickerTimePickerField | ColumnDatePickerRangePickerField | ColumnDatePickerQuarterPickerField | ColumnTimePickerField | ColumnTimePickerRangePickerField | ColumnRadioField | ColumnRadioGroupField | ColumnSwitchField | CustormColumnField;
-export type ColumnFieldKeys = ColumnHiddenField["type"] | ColumnInputField["type"] | ColumnTextAreaField["type"] | ColumnInputNumberField["type"] | ColumnSelectField["type"] | ColumnCascaderField["type"] | ColumnTreeSelectField["type"] | ColumnCheckboxField["type"] | ColumnCheckboxGroupField["type"] | ColumnDatePickerField["type"] | ColumnDatePickerYearPickerField["type"] | ColumnDatePickerMonthPickerField["type"] | ColumnDatePickerWeekPickerField["type"] | ColumnDatePickerTimePickerField["type"] | ColumnDatePickerRangePickerField["type"] | ColumnDatePickerQuarterPickerField["type"] | ColumnTimePickerField["type"] | ColumnTimePickerRangePickerField["type"] | ColumnRadioField["type"] | ColumnRadioGroupField["type"] | ColumnSwitchField["type"];
+export type ColumnField = ColumnHiddenField | ColumnInputField | ColumnInputPasswordField | ColumnTextAreaField | ColumnInputNumberField | ColumnSelectField | ColumnCascaderField | ColumnTreeSelectField | ColumnCheckboxField | ColumnCheckboxGroupField | ColumnDatePickerField | ColumnDatePickerYearPickerField | ColumnDatePickerMonthPickerField | ColumnDatePickerWeekPickerField | ColumnDatePickerTimePickerField | ColumnDatePickerRangePickerField | ColumnDatePickerQuarterPickerField | ColumnTimePickerField | ColumnTimePickerRangePickerField | ColumnRadioField | ColumnRadioGroupField | ColumnSwitchField | CustormColumnField;
+export type ColumnFieldKeys = ColumnHiddenField["type"] | ColumnInputField["type"] | ColumnInputPasswordField["type"] | ColumnTextAreaField["type"] | ColumnInputNumberField["type"] | ColumnSelectField["type"] | ColumnCascaderField["type"] | ColumnTreeSelectField["type"] | ColumnCheckboxField["type"] | ColumnCheckboxGroupField["type"] | ColumnDatePickerField["type"] | ColumnDatePickerYearPickerField["type"] | ColumnDatePickerMonthPickerField["type"] | ColumnDatePickerWeekPickerField["type"] | ColumnDatePickerTimePickerField["type"] | ColumnDatePickerRangePickerField["type"] | ColumnDatePickerQuarterPickerField["type"] | ColumnTimePickerField["type"] | ColumnTimePickerRangePickerField["type"] | ColumnRadioField["type"] | ColumnRadioGroupField["type"] | ColumnSwitchField["type"];
 /**列 */
 export interface ColumnType<RecordType = AnyObject> extends Omit<AntdColumnType<RecordType>, "dataIndex" | "title"> {
     dataIndex?: string | string[];
@@ -138,13 +141,6 @@ export interface CustomFilterProps {
     form: FormInstance<any>;
     initialValues?: Record<string, any>;
 }
-export type CustomFilter = React.FC<CustomFilterProps>;
-export type CustomFilterObject = {
-    render?: CustomFilter;
-    initialValues?: Record<string, any>;
-};
-/**自定义过滤 */
-export type filter = false | CustomFilter | CustomFilterObject;
 export interface CustomActionGroup {
     add?: boolean | React.FC;
     del?: boolean | React.FC;
@@ -171,11 +167,11 @@ export interface ContentProps<RecordType = AnyObject> extends Omit<AntdTableProp
     add?: add;
     del?: del;
     edit?: edit;
-    filter?: filter;
     action?: Action;
     rowSelection?: RowSelectionType;
     pagination?: false;
     drawer?: number | DrawerProps;
+    pageSizeOptions?: PaginationProps["pageSizeOptions"];
 }
 /**主体暴露 */
 export interface ContentRef {

package/package.json

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