yuand 1.0.3 → 1.0.5

package/es/components/TableUseFetch/index.js

@@ -11,31 +11,40 @@ import useFetch from "../../hooks/useFetch";
 import useX from "../../hooks/useX";
 import useTable from "./useTable";
 import "./style.css";
+
+// 统一默认配置管理
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var defaultClassNames = {
-  root: "main-container",
-  form: "search-form",
-  table: "main-table"
-};
-var defaultStyles = {
-  root: {},
-  form: {
-    display: "flex",
-    justifyContent: "space-between"
+var DEFAULT_PAGE_SIZE_OPTIONS = [10, 20, 50, 100];
+var DEFAULT_CONFIG = {
+  classNames: {
+    root: "main-container",
+    form: "search-form",
+    table: "main-table"
+  },
+  styles: {
+    root: {},
+    form: {
+      display: "flex",
+      justifyContent: "space-between"
+    },
+    table: {},
+    toolbar: {
+      marginBottom: 15
+    }
   },
-  table: {},
-  toolbar: {
-    marginBottom: 15
+  pagination: {
+    showQuickJumper: true,
+    showSizeChanger: true,
+    hideOnSinglePage: false
   }
 };
-var DEFAULT_PAGE_SIZE_OPTIONS = [10, 20, 50, 100];
 var ProTable = function ProTable(props) {
-  var _pagination$showQuick, _pagination$showSizeC, _pagination$hideOnSin, _pagination$pageSizeO, _pagination$showTotal, _classNames$root, _classNames$form, _classNames$table;
+  var _pagination$showTotal, _pagination$pageSizeO, _classNames$root, _classNames$form, _classNames$table;
   var _props$classNames = props.classNames,
-    classNames = _props$classNames === void 0 ? defaultClassNames : _props$classNames,
+    classNames = _props$classNames === void 0 ? DEFAULT_CONFIG.classNames : _props$classNames,
     _props$styles = props.styles,
-    styles = _props$styles === void 0 ? defaultStyles : _props$styles,
+    styles = _props$styles === void 0 ? DEFAULT_CONFIG.styles : _props$styles,
     table = props.table,
     locale = props.locale,
     _props$dataKey = props.dataKey,
@@ -51,16 +60,14 @@ var ProTable = function ProTable(props) {
     alert = props.alert,
     _props$toolbar = props.toolbar,
     toolbar = _props$toolbar === void 0 ? null : _props$toolbar,
-    pagination = props.pagination,
+    _props$pagination = props.pagination,
+    pagination = _props$pagination === void 0 ? DEFAULT_CONFIG.pagination : _props$pagination,
     scroll = props.scroll,
     prop = _objectWithoutProperties(props, _excluded);
-  (_pagination$showQuick = pagination.showQuickJumper) !== null && _pagination$showQuick !== void 0 ? _pagination$showQuick : pagination.showQuickJumper = true;
-  (_pagination$showSizeC = pagination.showSizeChanger) !== null && _pagination$showSizeC !== void 0 ? _pagination$showSizeC : pagination.showSizeChanger = true;
-  (_pagination$hideOnSin = pagination.hideOnSinglePage) !== null && _pagination$hideOnSin !== void 0 ? _pagination$hideOnSin : pagination.hideOnSinglePage = false;
-  (_pagination$pageSizeO = pagination.pageSizeOptions) !== null && _pagination$pageSizeO !== void 0 ? _pagination$pageSizeO : pagination.pageSizeOptions = ProTable.pageSizeOptions;
   (_pagination$showTotal = pagination.showTotal) !== null && _pagination$showTotal !== void 0 ? _pagination$showTotal : pagination.showTotal = function (total) {
     return "\u5171 ".concat(total, " \u6761\u8BB0\u5F55");
   };
+  (_pagination$pageSizeO = pagination.pageSizeOptions) !== null && _pagination$pageSizeO !== void 0 ? _pagination$pageSizeO : pagination.pageSizeOptions = ProTable.pageSizeOptions;
   var formTitle = form.title,
     formExtra = form.extra,
     formRight = form.right,
@@ -163,6 +170,11 @@ var ProTable = function ProTable(props) {
         ready: true
       });
     }
+  }, []);
+  useEffect(function () {
+    return function () {
+      table.resetStore();
+    };
   }, [table]);
   var onFinish = function onFinish(values) {
     if (formHandleValues) {
@@ -206,10 +218,10 @@ var ProTable = function ProTable(props) {
     }, prop));
   };
   return /*#__PURE__*/_jsxs("div", {
-    className: (_classNames$root = classNames === null || classNames === void 0 ? void 0 : classNames.root) !== null && _classNames$root !== void 0 ? _classNames$root : defaultClassNames.root,
+    className: (_classNames$root = classNames === null || classNames === void 0 ? void 0 : classNames.root) !== null && _classNames$root !== void 0 ? _classNames$root : DEFAULT_CONFIG.classNames.root,
     style: styles.root,
     children: [!!formItems && /*#__PURE__*/_jsxs("div", {
-      className: (_classNames$form = classNames === null || classNames === void 0 ? void 0 : classNames.form) !== null && _classNames$form !== void 0 ? _classNames$form : defaultClassNames.form,
+      className: (_classNames$form = classNames === null || classNames === void 0 ? void 0 : classNames.form) !== null && _classNames$form !== void 0 ? _classNames$form : DEFAULT_CONFIG.classNames.form,
       style: styles.form,
       children: [/*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread({
         form: table.form,
@@ -234,7 +246,7 @@ var ProTable = function ProTable(props) {
         })]
       })), formRight]
     }), /*#__PURE__*/_jsxs("div", {
-      className: (_classNames$table = classNames === null || classNames === void 0 ? void 0 : classNames.table) !== null && _classNames$table !== void 0 ? _classNames$table : defaultClassNames.table,
+      className: (_classNames$table = classNames === null || classNames === void 0 ? void 0 : classNames.table) !== null && _classNames$table !== void 0 ? _classNames$table : DEFAULT_CONFIG.classNames.table,
       style: styles.table,
       children: [toolbar && /*#__PURE__*/_jsx("div", {
         style: styles.toolbar,

package/lib/components/TableUseFetch/index.js

@@ -42,27 +42,29 @@ var import_useX = __toESM(require("../../hooks/useX"));
 var import_useTable = __toESM(require("./useTable"));
 var import_style = require("./style.css");
 var import_jsx_runtime = require("react/jsx-runtime");
-var defaultClassNames = {
-  root: "main-container",
-  form: "search-form",
-  table: "main-table"
-};
-var defaultStyles = {
-  root: {},
-  form: {
-    display: "flex",
-    justifyContent: "space-between"
+var DEFAULT_PAGE_SIZE_OPTIONS = [10, 20, 50, 100];
+var DEFAULT_CONFIG = {
+  classNames: {
+    root: "main-container",
+    form: "search-form",
+    table: "main-table"
   },
-  table: {},
-  toolbar: {
-    marginBottom: 15
+  styles: {
+    root: {},
+    form: { display: "flex", justifyContent: "space-between" },
+    table: {},
+    toolbar: { marginBottom: 15 }
+  },
+  pagination: {
+    showQuickJumper: true,
+    showSizeChanger: true,
+    hideOnSinglePage: false
   }
 };
-var DEFAULT_PAGE_SIZE_OPTIONS = [10, 20, 50, 100];
 var ProTable = (props) => {
   const {
-    classNames = defaultClassNames,
-    styles = defaultStyles,
+    classNames = DEFAULT_CONFIG.classNames,
+    styles = DEFAULT_CONFIG.styles,
     table,
     locale,
     dataKey = "data",
@@ -73,15 +75,12 @@ var ProTable = (props) => {
     form = {},
     alert,
     toolbar = null,
-    pagination,
+    pagination = DEFAULT_CONFIG.pagination,
     scroll,
     ...prop
   } = props;
-  pagination.showQuickJumper ?? (pagination.showQuickJumper = true);
-  pagination.showSizeChanger ?? (pagination.showSizeChanger = true);
-  pagination.hideOnSinglePage ?? (pagination.hideOnSinglePage = false);
-  pagination.pageSizeOptions ?? (pagination.pageSizeOptions = ProTable.pageSizeOptions);
   pagination.showTotal ?? (pagination.showTotal = (total2) => `共 ${total2} 条记录`);
+  pagination.pageSizeOptions ?? (pagination.pageSizeOptions = ProTable.pageSizeOptions);
   const {
     title: formTitle,
     extra: formExtra,
@@ -178,6 +177,11 @@ var ProTable = (props) => {
         ready: true
       });
     }
+  }, []);
+  (0, import_react.useEffect)(() => {
+    return () => {
+      table.resetStore();
+    };
   }, [table]);
   const onFinish = (values) => {
     if (formHandleValues) {
@@ -224,13 +228,13 @@ var ProTable = (props) => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     "div",
     {
-      className: (classNames == null ? void 0 : classNames.root) ?? defaultClassNames.root,
+      className: (classNames == null ? void 0 : classNames.root) ?? DEFAULT_CONFIG.classNames.root,
       style: styles.root,
       children: [
         !!formItems && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
           "div",
           {
-            className: (classNames == null ? void 0 : classNames.form) ?? defaultClassNames.form,
+            className: (classNames == null ? void 0 : classNames.form) ?? DEFAULT_CONFIG.classNames.form,
             style: styles.form,
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
@@ -258,7 +262,7 @@ var ProTable = (props) => {
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
           "div",
           {
-            className: (classNames == null ? void 0 : classNames.table) ?? defaultClassNames.table,
+            className: (classNames == null ? void 0 : classNames.table) ?? DEFAULT_CONFIG.classNames.table,
             style: styles.table,
             children: [
               toolbar && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: styles.toolbar, children: toolbar }),

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "yuand",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "hyu",
   "module": "./es/index",
   "main": "./lib/index",
   "types": "./es/index.d.ts",
-  "repository": "git@github.com:suyi660/and-yu.git",
+  "repository": "https://github.com/hyusuyi/yuand.git",
   "scripts": {
     "dev": "father dev",
     "build": "sudo father build",