@zykj2024/much-library 1.1.2-beta.6 → 1.1.3

package/dist/McContainer/demo/actionBar.js

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  * compact: true
  */
 
-import { useToggle } from "../../../packages/hooks/src";
+import { useToggle } from '@zykj2024/much-hooks';
 import { Button, Space, Switch } from 'antd';
 import { AddOutlined } from 'much-icons';
 import { McContainer, McInput } from "../..";

package/dist/McContainer/demo/batch.js

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  * compact: true
  */
 
-import { useToggle } from "../../../packages/hooks/src";
+import { useToggle } from '@zykj2024/much-hooks';
 import { Button, Switch } from 'antd';
 import { McContainer, McInput, McInputNumber } from "../..";
 import { useState } from 'react';

package/dist/McContainer/demo/pagination.js

@@ -1,3 +1,5 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
  * title: 分页器配置
@@ -8,20 +10,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Col, Row, Switch } from 'antd';
 import { McContainer } from "../..";
 import { useState } from 'react';
+import { fetchMockRequest } from "../mock";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var tableData = Array.from({
-  length: 5
-}, function (_, index) {
-  return {
-    id: index + 1,
-    name: "\u59D3\u540D".concat(index + 1),
-    age: 18 + index
-  };
-});
 export default (function () {
-  var _useState = useState(tableData),
+  var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     dataSource = _useState2[0],
     setDataSource = _useState2[1];
@@ -39,13 +33,44 @@ export default (function () {
     setShowPagination = _useState8[1];
   var columns = [{
     title: 'ID',
-    dataIndex: 'id'
+    dataIndex: 'id',
+    width: 100
   }, {
     title: '姓名',
-    dataIndex: 'name'
+    dataIndex: 'name',
+    width: 100
   }, {
     title: '年龄',
-    dataIndex: 'age'
+    dataIndex: 'age',
+    width: 100
+  }, {
+    title: '城市',
+    dataIndex: 'city',
+    width: 100
+  }, {
+    title: '日期',
+    dataIndex: 'date',
+    width: 180
+  }, {
+    title: '爱好',
+    dataIndex: 'funny',
+    width: 100
+  }, {
+    title: '地址',
+    dataIndex: 'address',
+    width: 100
+  }, {
+    title: '电话',
+    dataIndex: 'phone',
+    width: 100
+  }, {
+    title: '邮箱',
+    dataIndex: 'email',
+    width: 100
+  }, {
+    title: '描述',
+    dataIndex: 'desc',
+    width: 100
   }, {
     title: '操作',
     dataIndex: 'option',
@@ -56,17 +81,32 @@ export default (function () {
       });
     }
   }];
-  var onQuery = function onQuery() {
-    return new Promise(function (resolve) {
-      setLoading(true);
-      setTimeout(function () {
-        setDataSource(tableData);
-        setTotal(tableData === null || tableData === void 0 ? void 0 : tableData.length);
-        setLoading(false);
-        resolve();
-      }, 1000);
-    });
-  };
+  var onQuery = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$fetchMockReque, data, total;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setLoading(true);
+            _context.next = 3;
+            return fetchMockRequest();
+          case 3:
+            _yield$fetchMockReque = _context.sent;
+            data = _yield$fetchMockReque.data;
+            total = _yield$fetchMockReque.total;
+            setDataSource(data);
+            setTotal(total);
+            setLoading(false);
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onQuery() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Row, {
       children: /*#__PURE__*/_jsxs(Col, {
@@ -76,8 +116,7 @@ export default (function () {
         })]
       })
     }), /*#__PURE__*/_jsx(McContainer, {
-      height: "100%",
-      immediateQuery: false,
+      height: "300px",
       loading: loading,
       onQuery: onQuery,
       queryRender: null,

package/dist/McContainer/demo/standard.d.ts

@@ -1,6 +1,6 @@
 /**
  * title: 标准用法
- * description: 标准用法功能全面，可以直接用于常规页面
+ * description: 标准用法功能全面，可以直接用于常规页面。设置`autoBackPagination`为`true`时，非第一页删除最后一条数据后，会自动跳转到上一页。
  * transform: true
  */
 declare const _default: () => import("react/jsx-runtime").JSX.Element;

package/dist/McContainer/demo/standard.js

@@ -1,7 +1,9 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
  * title: 标准用法
- * description: 标准用法功能全面，可以直接用于常规页面
+ * description: 标准用法功能全面，可以直接用于常规页面。设置`autoBackPagination`为`true`时，非第一页删除最后一条数据后，会自动跳转到上一页。
  * transform: true
  */
 
@@ -9,27 +11,17 @@ import { Button, Col, Row, Space } from 'antd';
 import { AddOutlined } from 'much-icons';
 import { McCascader, McContainer, McDateRange, McInput, McPopoverButton } from "../..";
 import { useEffect, useRef, useState } from 'react';
+import { deleteMockRequest, fetchMockRequest } from "../mock";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var tableData = Array.from({
-  length: 21
-}, function (_, index) {
-  return {
-    id: index + 1,
-    name: "\u59D3\u540D".concat(index + 1),
-    age: 18 + index,
-    city: "\u57CE\u5E02".concat(index + 1),
-    date: "2024-01-0".concat(index + 1, " 12:00:00")
-  };
-});
 export default (function () {
   var mcContainerRef = useRef();
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     total = _useState2[0],
     setTotal = _useState2[1];
-  var _useState3 = useState(tableData),
+  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     dataSource = _useState4[0],
     setDataSource = _useState4[1];
@@ -45,29 +37,70 @@ export default (function () {
     _useState10 = _slicedToArray(_useState9, 2),
     searchJsonStr = _useState10[0],
     setSearchJsonStr = _useState10[1];
-  var onDelete = function onDelete(index) {
-    var _mcContainerRef$curre;
-    tableData.splice(index, 1);
-    (_mcContainerRef$curre = mcContainerRef.current) === null || _mcContainerRef$curre === void 0 || _mcContainerRef$curre.query();
-  };
+  var onDelete = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
+      var _mcContainerRef$curre;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return deleteMockRequest(id);
+          case 2:
+            (_mcContainerRef$curre = mcContainerRef.current) === null || _mcContainerRef$curre === void 0 || _mcContainerRef$curre.query();
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onDelete(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var columns = [{
     title: 'ID',
-    dataIndex: 'id'
+    dataIndex: 'id',
+    width: 100
   }, {
     title: '姓名',
-    dataIndex: 'name'
+    dataIndex: 'name',
+    width: 100
   }, {
     title: '年龄',
-    dataIndex: 'age'
+    dataIndex: 'age',
+    width: 100
   }, {
     title: '城市',
-    dataIndex: 'city'
+    dataIndex: 'city',
+    width: 100
   }, {
     title: '日期',
-    dataIndex: 'date'
+    dataIndex: 'date',
+    width: 180
+  }, {
+    title: '爱好',
+    dataIndex: 'funny',
+    width: 100
+  }, {
+    title: '地址',
+    dataIndex: 'address',
+    width: 100
+  }, {
+    title: '电话',
+    dataIndex: 'phone',
+    width: 100
+  }, {
+    title: '邮箱',
+    dataIndex: 'email',
+    width: 100
+  }, {
+    title: '描述',
+    dataIndex: 'desc',
+    width: 100
   }, {
     title: '操作',
     dataIndex: 'option',
+    fixed: 'right',
     width: 100,
     render: function render(_, record, index) {
       return /*#__PURE__*/_jsxs(Space, {
@@ -110,23 +143,33 @@ export default (function () {
       name: '姓名1'
     });
   }, []);
-  var onQuery = function onQuery(values) {
-    setSearchJsonStr(JSON.stringify(values !== null && values !== void 0 ? values : {}));
-    return new Promise(function (resolve) {
-      setLoading(true);
-      setTimeout(function () {
-        var startIndex = (values.current - 1) * values.pageSize;
-        // 计算结束索引
-        var endIndex = startIndex + values.pageSize;
-        // 使用 slice 方法截取当前页的数据
-        var data = tableData.slice(startIndex, endIndex);
-        setDataSource(data || []);
-        setTotal(tableData.length || 0);
-        setLoading(false);
-        resolve();
-      }, 1000);
-    });
-  };
+  var onQuery = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
+      var _yield$fetchMockReque, data, total;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            setSearchJsonStr(JSON.stringify(values !== null && values !== void 0 ? values : {}));
+            setLoading(true);
+            _context2.next = 4;
+            return fetchMockRequest(values);
+          case 4:
+            _yield$fetchMockReque = _context2.sent;
+            data = _yield$fetchMockReque.data;
+            total = _yield$fetchMockReque.total;
+            setDataSource(data || []);
+            setTotal(total || 0);
+            setLoading(false);
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onQuery(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Row, {
       children: /*#__PURE__*/_jsxs(Col, {
@@ -136,9 +179,8 @@ export default (function () {
       })
     }), /*#__PURE__*/_jsx(McContainer, {
       ref: mcContainerRef,
-      height: "100%",
+      height: "500px",
       loading: loading,
-      immediateQuery: false,
       onQuery: onQuery,
       queryItems: queryItems,
       actionBar: /*#__PURE__*/_jsx(Button, {

package/dist/McContainer/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useUpdateEffect } from "../../packages/hooks/src";
+import { useUpdateEffect } from '@zykj2024/much-hooks';
 import { Button, Spin, Table } from 'antd';
 import { isNumber } from 'lodash';
 import { CaretDownFilled, DoubleLeftOutlined } from 'much-icons';

package/dist/McContainer/mock/index.d.ts

@@ -0,0 +1,21 @@
+export type I_ListItem = {
+    id: number;
+    name?: string;
+    age?: number;
+    city?: string;
+    date?: string;
+    funny?: string;
+    address?: string;
+    phone?: string;
+    email?: string;
+    desc?: string;
+};
+/** 列表数据源 */
+export declare const tableData: I_ListItem[];
+/** 获取列表数据 */
+export declare const fetchMockRequest: (values?: any) => Promise<{
+    data: any;
+    total: number;
+}>;
+/** 删除某条列表数据 */
+export declare const deleteMockRequest: (id: number) => Promise<void>;

package/dist/McContainer/mock/index.js

@@ -0,0 +1,50 @@
+/** 列表数据源 */
+export var tableData = Array.from({
+  length: 21
+}, function (_, index) {
+  return {
+    id: index + 1,
+    name: "\u59D3\u540D".concat(index + 1),
+    age: 18 + index,
+    city: "\u57CE\u5E02".concat(index + 1),
+    date: "2025-01-0".concat(index + 1, " 12:00:00"),
+    funny: "\u7231\u597D".concat(index + 1),
+    address: "\u5730\u5740".concat(index + 1),
+    phone: "\u7535\u8BDD".concat(index + 1),
+    email: "\u90AE\u7BB1".concat(index + 1),
+    desc: "\u63CF\u8FF0".concat(index + 1)
+  };
+});
+
+/** 获取列表数据 */
+export var fetchMockRequest = function fetchMockRequest(values) {
+  var _ref = values !== null && values !== void 0 ? values : {},
+    current = _ref.current,
+    pageSize = _ref.pageSize;
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      var data = tableData;
+      if (current && pageSize) {
+        var startIndex = (values.current - 1) * values.pageSize;
+        var endIndex = startIndex + values.pageSize;
+        data = tableData.slice(startIndex, endIndex);
+      }
+      resolve({
+        data: data,
+        total: tableData === null || tableData === void 0 ? void 0 : tableData.length
+      });
+    }, 1000);
+  });
+};
+
+/** 删除某条列表数据 */
+export var deleteMockRequest = function deleteMockRequest(id) {
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      tableData.splice(tableData.findIndex(function (item) {
+        return item.id === id;
+      }), 1);
+      resolve();
+    }, 1000);
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zykj2024/much-library",
-  "version": "1.1.2-beta.6",
+  "version": "1.1.3",
   "description": "react library",
   "license": "MIT",
   "module": "dist/index.js",
@@ -53,7 +53,7 @@
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@makotot/ghostui": "^2.0.0",
-    "@zykj2024/much-hooks": "^1.1.4-beta.1",
+    "@zykj2024/much-hooks": "1.0.2",
     "antd": "^5.16.2",
     "antd-style": "^3.6.2",
     "cross-env": "^7.0.3",