@magicbe/antd-crud 0.0.39 → 0.0.41

package/dist/components/Add.js

@@ -25,7 +25,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useImperativeHandle } from "react";
 import { Form as AntdForm, Empty } from "antd";
 import Field from "./Field";
-import { isObject, isString } from "lodash";
+import { get, isObject, isString } from "lodash";
 import { useTableContext } from "./Context";
 var AddForm = React.forwardRef(function (_a, ref) {
     var default_data = _a.default_data;
@@ -46,6 +46,10 @@ var AddForm = React.forwardRef(function (_a, ref) {
             return Object.assign(column, { field: add });
         }
         return column;
+    }).sort(function (_a, _b) {
+        var field_a = _a.field;
+        var field_b = _b.field;
+        return (Number(get(field_a, "order")) - Number(get(field_b, "order")));
     });
     if (!(fields === null || fields === void 0 ? void 0 : fields.length)) {
         return _jsx(Empty, { description: "暂无数据字段!" });

package/dist/components/Edit.js

@@ -25,7 +25,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useImperativeHandle } from "react";
 import { Form as AntdForm, Empty } from "antd";
 import { useTableContext } from "./Context";
-import { isObject, isString } from "lodash";
+import { get, isObject, isString } from "lodash";
 import Field from "./Field";
 var EditForm = React.forwardRef(function (_a, ref) {
     var _b = _a.default_data, default_data = _b === void 0 ? {} : _b;
@@ -46,6 +46,10 @@ var EditForm = React.forwardRef(function (_a, ref) {
             return Object.assign(column, { field: edit });
         }
         return column;
+    }).sort(function (_a, _b) {
+        var field_a = _a.field;
+        var field_b = _b.field;
+        return (Number(get(field_a, "order")) - Number(get(field_b, "order")));
     });
     if (!(fields === null || fields === void 0 ? void 0 : fields.length)) {
         return _jsx(Empty, { description: "暂无数据字段!" });

package/dist/components/Filter.js

@@ -32,7 +32,7 @@ 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 { isObject, isString } from "lodash";
+import { get, 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) {
@@ -53,6 +53,10 @@ var Filter = function (_a, ref) {
             return Object.assign(column, { field: filter });
         }
         return column;
+    }).sort(function (_a, _b) {
+        var field_a = _a.field;
+        var field_b = _b.field;
+        return (Number(get(field_a, "order")) - Number(get(field_b, "order")));
     });
     var onFinish = function (value) {
         var _a, _b;
@@ -67,7 +71,7 @@ var Filter = function (_a, ref) {
     var initialValues;
     if (!(filters === null || filters === void 0 ? void 0 : filters.length))
         return _jsx(Fragment, {});
-    return (_jsxs(Form, { 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, { htmlType: "submit", type: "primary", children: [_jsx(SearchOutlined, {}), "\u67E5\u8BE2"] }), _jsxs(Button, { htmlType: "reset", children: [_jsx(UndoOutlined, {}), "\u91CD\u7F6E"] })] })] }));
+    return (_jsxs(Form, { 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, { size: 14, children: [_jsxs(Button, { htmlType: "submit", type: "primary", children: [_jsx(SearchOutlined, {}), "\u67E5\u8BE2"] }), _jsxs(Button, { htmlType: "reset", children: [_jsx(UndoOutlined, {}), "\u91CD\u7F6E"] })] })] }));
 };
 export default React.forwardRef(Filter);
 var templateObject_1;

package/dist/interface.d.ts

@@ -11,6 +11,7 @@ export interface BaseColumnField<T extends string, O = any> {
     type: T;
     option?: O;
     rules?: Rule[];
+    order?: number;
 }
 /**隐藏字段 */
 export interface ColumnHiddenField extends BaseColumnField<"Hidden"> {
@@ -82,6 +83,7 @@ export interface CustormColumnField {
     type: React.FC;
     option?: any;
     rules?: Rule[];
+    order?: number;
 }
 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"];

package/package.json

@@ -1,57 +1,56 @@
 {
-    "name": "@magicbe/antd-crud",
-    "version": "0.0.39",
-    "description": "antd crud table",
-    "author": "wang quan",
-    "private": false,
-    "main": "dist/index.js",
-    "module": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "license": "MIT",
-    "keywords": [
-        "Component",
-        "UI",
-        "React"
-    ],
-    "homepage": "http://www.wangquan.top",
-    "files": [
-        "dist"
-    ],
-    "dependencies": {
-        "@ant-design/icons": "^5.4.0",
-        "@emotion/css": "^11.13.0",
-        "antd": "5.22.5",
-        "deepmerge": "^4.3.1",
-        "lodash": "^4.17.21",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-    },
-    "devDependencies": {
-        "@storybook/addon-actions": "^6.5.15",
-        "@storybook/addon-essentials": "^6.5.15",
-        "@storybook/addon-interactions": "^6.5.15",
-        "@storybook/addon-links": "^6.5.15",
-        "@storybook/builder-webpack5": "^6.5.15",
-        "@storybook/manager-webpack5": "^6.5.15",
-        "@storybook/node-logger": "^6.5.15",
-        "@storybook/react": "6.5.15",
-        "@types/lodash": "^4.17.7",
-        "@types/node": "^16.18.10",
-        "@types/react": "^18.0.26",
-        "@types/react-dom": "^18.0.9",
-        "http-proxy-middleware": "^3.0.0",
-        "react-scripts": "^5.0.1",
-        "typescript": "5.7.3"
-    },
-    "scripts": {
-        "lint": "eslint --ext js,ts,tsx src --max-warnings 5",
-        "build": "tsc -p tsconfig.build.json",
-        "storybook": "start-storybook -p 6007 -s public",
-        "build-storybook": "build-storybook -s public"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "yarn lint"
-        }
+  "name": "@magicbe/antd-crud",
+  "version": "0.0.41",
+  "description": "antd crud table",
+  "author": "wang quan",
+  "private": false,
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "MIT",
+  "keywords": [
+    "Component",
+    "UI",
+    "React"
+  ],
+  "homepage": "http://www.wangquan.top",
+  "files": [
+    "dist"
+  ],
+  "dependencies": {
+    "@ant-design/icons": "^5.4.0",
+    "@emotion/css": "^11.13.0",
+    "antd": "5.22.5",
+    "deepmerge": "^4.3.1",
+    "lodash": "^4.17.21",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@storybook/addon-docs": "^9.1.2",
+    "@storybook/addon-onboarding": "^9.1.2",
+    "@storybook/preset-create-react-app": "^9.1.2",
+    "@storybook/react-webpack5": "^9.1.2",
+    "@types/lodash": "^4.17.7",
+    "@types/node": "^16.18.10",
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "http-proxy-middleware": "^3.0.0",
+    "prop-types": "^15.8.1",
+    "react-scripts": "^5.0.1",
+    "storybook": "^9.1.2",
+    "typescript": "5.7.3",
+    "webpack": "^5.101.2"
+  },
+  "scripts": {
+    "lint": "eslint --ext js,ts,tsx src --max-warnings 5",
+    "build": "tsc -p tsconfig.build.json",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "yarn lint"
     }
+  }
 }