@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.3

package/lib/table/components/Form/index.js

@@ -1,116 +1,90 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/table/components/Form/index.tsx
-var Form_exports = {};
-__export(Form_exports, {
-  default: () => Form_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(Form_exports);
-var import_omit = __toESM(require("rc-util/lib/omit"));
-var import_react = __toESM(require("react"));
-var import_utils = require("../../../utils");
-var import_utils2 = require("../../utils/index");
-var import_FormRender = __toESM(require("./FormRender"));
-var FormSearch = class extends import_react.default.Component {
-  constructor() {
-    super(...arguments);
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _util = require("@rc-component/util");
+var _react = _interopRequireDefault(require("react"));
+var _utils = require("../../../utils");
+var _index = require("../../utils/index");
+var _FormRender = _interopRequireDefault(require("./FormRender"));
+var _jsxRuntime = require("react/jsx-runtime");
+var FormSearch = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2.default)(FormSearch, _React$Component);
+  var _super = (0, _createSuper2.default)(FormSearch);
+  function FormSearch() {
+    var _this;
+    (0, _classCallCheck2.default)(this, FormSearch);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
     /** 查询表单相关的配置 */
-    this.onSubmit = (value, firstLoad) => {
-      var _a, _b;
-      const {
-        pagination,
-        beforeSearchSubmit = (searchParams) => searchParams,
-        action,
-        onSubmit,
-        onFormSearchSubmit
-      } = this.props;
-      const pageInfo = pagination ? (0, import_utils.omitUndefined)({
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onSubmit", function (value, firstLoad) {
+      var _this$props = _this.props,
+        pagination = _this$props.pagination,
+        _this$props$beforeSea = _this$props.beforeSearchSubmit,
+        beforeSearchSubmit = _this$props$beforeSea === void 0 ? function (searchParams) {
+          return searchParams;
+        } : _this$props$beforeSea,
+        action = _this$props.action,
+        onSubmit = _this$props.onSubmit,
+        onFormSearchSubmit = _this$props.onFormSearchSubmit;
+      // 只传入 pagination 中的 current 和 pageSize 参数
+      var pageInfo = pagination ? (0, _utils.omitUndefined)({
         current: pagination.current,
         pageSize: pagination.pageSize
       }) : {};
-      const submitParams = __spreadValues(__spreadProps(__spreadValues({}, value), {
+      var submitParams = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, value), {}, {
         _timestamp: Date.now()
-      }), pageInfo);
-      const omitParams = (0, import_omit.default)(
-        beforeSearchSubmit(submitParams),
-        Object.keys(pageInfo)
-      );
+      }, pageInfo);
+      var omitParams = (0, _util.omit)(beforeSearchSubmit(submitParams), Object.keys(pageInfo));
       onFormSearchSubmit(omitParams);
       if (!firstLoad) {
-        (_b = (_a = action.current) == null ? void 0 : _a.setPageInfo) == null ? void 0 : _b.call(_a, {
+        var _action$current, _action$current$setPa;
+        // back first page
+        (_action$current = action.current) === null || _action$current === void 0 || (_action$current$setPa = _action$current.setPageInfo) === null || _action$current$setPa === void 0 || _action$current$setPa.call(_action$current, {
           current: 1
         });
       }
+      // 不是第一次提交就不触发，第一次提交是 js 触发的
+      // 为了解决 https://github.com/ant-design/pro-components/issues/579
       if (onSubmit && !firstLoad) {
-        onSubmit == null ? void 0 : onSubmit(value);
+        onSubmit === null || onSubmit === void 0 || onSubmit(value);
       }
-    };
-    this.onReset = (value) => {
-      var _a, _b;
-      const {
-        pagination,
-        beforeSearchSubmit = (searchParams) => searchParams,
-        action,
-        onFormSearchSubmit,
-        onReset
-      } = this.props;
-      const pageInfo = pagination ? (0, import_utils.omitUndefined)({
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onReset", function (value) {
+      var _action$current2, _action$current2$setP;
+      var _this$props2 = _this.props,
+        pagination = _this$props2.pagination,
+        _this$props2$beforeSe = _this$props2.beforeSearchSubmit,
+        beforeSearchSubmit = _this$props2$beforeSe === void 0 ? function (searchParams) {
+          return searchParams;
+        } : _this$props2$beforeSe,
+        action = _this$props2.action,
+        onFormSearchSubmit = _this$props2.onFormSearchSubmit,
+        onReset = _this$props2.onReset;
+      var pageInfo = pagination ? (0, _utils.omitUndefined)({
         current: pagination.current,
         pageSize: pagination.pageSize
       }) : {};
-      const omitParams = (0, import_omit.default)(
-        beforeSearchSubmit(__spreadValues(__spreadValues({}, value), pageInfo)),
-        Object.keys(pageInfo)
-      );
+      var omitParams = (0, _util.omit)(beforeSearchSubmit((0, _objectSpread2.default)((0, _objectSpread2.default)({}, value), pageInfo)), Object.keys(pageInfo));
       onFormSearchSubmit(omitParams);
-      (_b = (_a = action.current) == null ? void 0 : _a.setPageInfo) == null ? void 0 : _b.call(_a, {
+      // back first page
+      (_action$current2 = action.current) === null || _action$current2 === void 0 || (_action$current2$setP = _action$current2.setPageInfo) === null || _action$current2$setP === void 0 || _action$current2$setP.call(_action$current2, {
         current: 1
       });
-      onReset == null ? void 0 : onReset();
-    };
+      onReset === null || onReset === void 0 || onReset();
+    });
     /**
      * 只 Diff 需要用的 props，能减少 5 次左右的render
      *
@@ -119,30 +93,29 @@ var FormSearch = class extends import_react.default.Component {
      * @see action 也是同样的原因
      * @returns
      */
-    this.isEqual = (next) => {
-      const {
-        columns,
-        loading,
-        formRef,
-        type,
-        cardBordered,
-        dateFormatter,
-        form,
-        search,
-        manualRequest
-      } = this.props;
-      const diffProps = {
-        columns,
-        loading,
-        formRef,
-        type,
-        cardBordered,
-        dateFormatter,
-        form,
-        search,
-        manualRequest
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isEqual", function (next) {
+      var _this$props3 = _this.props,
+        columns = _this$props3.columns,
+        loading = _this$props3.loading,
+        formRef = _this$props3.formRef,
+        type = _this$props3.type,
+        cardBordered = _this$props3.cardBordered,
+        dateFormatter = _this$props3.dateFormatter,
+        form = _this$props3.form,
+        search = _this$props3.search,
+        manualRequest = _this$props3.manualRequest;
+      var diffProps = {
+        columns: columns,
+        loading: loading,
+        formRef: formRef,
+        type: type,
+        cardBordered: cardBordered,
+        dateFormatter: dateFormatter,
+        form: form,
+        search: search,
+        manualRequest: manualRequest
       };
-      return !(0, import_utils.isDeepEqualReact)(diffProps, {
+      return !(0, _utils.isDeepEqualReact)(diffProps, {
         columns: next.columns,
         formRef: next.formRef,
         loading: next.loading,
@@ -153,52 +126,50 @@ var FormSearch = class extends import_react.default.Component {
         search: next.search,
         manualRequest: next.manualRequest
       });
-    };
-    this.shouldComponentUpdate = (next) => {
-      return this.isEqual(next);
-    };
-    this.render = () => {
-      const {
-        columns,
-        loading,
-        formRef,
-        type,
-        action,
-        cardBordered,
-        dateFormatter,
-        form,
-        search,
-        pagination,
-        ghost,
-        manualRequest
-      } = this.props;
-      const pageInfo = pagination ? (0, import_utils.omitUndefined)({
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "shouldComponentUpdate", function (next) {
+      return _this.isEqual(next);
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "render", function () {
+      var _this$props4 = _this.props,
+        columns = _this$props4.columns,
+        loading = _this$props4.loading,
+        formRef = _this$props4.formRef,
+        type = _this$props4.type,
+        action = _this$props4.action,
+        cardBordered = _this$props4.cardBordered,
+        dateFormatter = _this$props4.dateFormatter,
+        form = _this$props4.form,
+        search = _this$props4.search,
+        pagination = _this$props4.pagination,
+        ghost = _this$props4.ghost,
+        manualRequest = _this$props4.manualRequest;
+      var pageInfo = pagination ? (0, _utils.omitUndefined)({
         current: pagination.current,
         pageSize: pagination.pageSize
       }) : {};
-      return /* @__PURE__ */ import_react.default.createElement(
-        import_FormRender.default,
-        {
-          submitButtonLoading: loading,
-          columns,
-          type,
-          ghost,
-          formRef,
-          onSubmit: this.onSubmit,
-          manualRequest,
-          onReset: this.onReset,
-          dateFormatter,
-          search,
-          form: __spreadProps(__spreadValues({
-            autoFocusFirstInput: false
-          }, form), {
-            extraUrlParams: __spreadValues(__spreadValues({}, pageInfo), form == null ? void 0 : form.extraUrlParams)
-          }),
-          action,
-          bordered: (0, import_utils2.isBordered)("search", cardBordered)
-        }
-      );
-    };
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormRender.default, {
+        submitButtonLoading: loading,
+        columns: columns,
+        type: type,
+        ghost: ghost,
+        formRef: formRef,
+        onSubmit: _this.onSubmit,
+        manualRequest: manualRequest,
+        onReset: _this.onReset,
+        dateFormatter: dateFormatter,
+        search: search,
+        form: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          autoFocusFirstInput: false
+        }, form), {}, {
+          extraUrlParams: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, pageInfo), form === null || form === void 0 ? void 0 : form.extraUrlParams)
+        }),
+        action: action,
+        bordered: (0, _index.isBordered)('search', cardBordered)
+      });
+    });
+    return _this;
   }
-};
-var Form_default = FormSearch;
+  return (0, _createClass2.default)(FormSearch);
+}(_react.default.Component);
+var _default = exports.default = FormSearch;

package/lib/table/components/ListToolBar/HeaderMenu.js

@@ -1,147 +1,93 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/table/components/ListToolBar/HeaderMenu.tsx
-var HeaderMenu_exports = {};
-__export(HeaderMenu_exports, {
-  default: () => HeaderMenu_default
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(HeaderMenu_exports);
-var import_icons = require("@ant-design/icons");
-var import_antd = require("antd");
-var import_classnames = __toESM(require("classnames"));
-var import_useMergedState = __toESM(require("rc-util/lib/hooks/useMergedState"));
-var import_react = __toESM(require("react"));
-var import_provider = require("../../../provider");
-var HeaderMenu = (props) => {
-  const { hashId } = (0, import_react.useContext)(import_provider.ProProvider);
-  const {
-    items = [],
-    type = "inline",
-    prefixCls,
-    activeKey: propActiveKey,
-    defaultActiveKey
-  } = props;
-  const [activeKey, setActiveKey] = (0, import_useMergedState.default)(
-    propActiveKey || defaultActiveKey,
-    {
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _icons = require("@ant-design/icons");
+var _util = require("@rc-component/util");
+var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireWildcard(require("react"));
+var _provider = require("../../../provider");
+var _jsxRuntime = require("react/jsx-runtime");
+var HeaderMenu = function HeaderMenu(props) {
+  var _useContext = (0, _react.useContext)(_provider.ProProvider),
+    hashId = _useContext.hashId;
+  var _props$items = props.items,
+    items = _props$items === void 0 ? [] : _props$items,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 'inline' : _props$type,
+    prefixCls = props.prefixCls,
+    propActiveKey = props.activeKey,
+    defaultActiveKey = props.defaultActiveKey;
+  var _useMergedState = (0, _util.useMergedState)(propActiveKey || defaultActiveKey, {
       value: propActiveKey,
       onChange: props.onChange
-    }
-  );
+    }),
+    _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
+    activeKey = _useMergedState2[0],
+    setActiveKey = _useMergedState2[1];
   if (items.length < 1) {
     return null;
   }
-  const activeItem = items.find((item) => {
+  var activeItem = items.find(function (item) {
     return item.key === activeKey;
   }) || items[0];
-  if (type === "inline") {
-    return /* @__PURE__ */ import_react.default.createElement(
-      "div",
-      {
-        className: (0, import_classnames.default)(
-          `${prefixCls}-menu`,
-          `${prefixCls}-inline-menu`,
-          hashId
-        )
-      },
-      items.map((item, index) => /* @__PURE__ */ import_react.default.createElement(
-        "div",
-        {
-          key: item.key || index,
-          onClick: () => {
+  if (type === 'inline') {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: (0, _classnames.default)("".concat(prefixCls, "-menu"), "".concat(prefixCls, "-inline-menu"), hashId),
+      children: items.map(function (item, index) {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          onClick: function onClick() {
             setActiveKey(item.key);
           },
-          className: (0, import_classnames.default)(
-            `${prefixCls}-inline-menu-item`,
-            activeItem.key === item.key ? `${prefixCls}-inline-menu-item-active` : void 0,
-            hashId
-          )
-        },
-        item.label
-      ))
-    );
+          className: (0, _classnames.default)("".concat(prefixCls, "-inline-menu-item"), activeItem.key === item.key ? "".concat(prefixCls, "-inline-menu-item-active") : undefined, hashId),
+          children: item.label
+        }, item.key || index);
+      })
+    });
   }
-  if (type === "tab") {
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Tabs,
-      {
-        items: items.map((item) => {
-          var _a;
-          return __spreadProps(__spreadValues({}, item), {
-            key: (_a = item.key) == null ? void 0 : _a.toString()
-          });
-        }),
-        activeKey: activeItem.key,
-        onTabClick: (key) => setActiveKey(key)
+  if (type === 'tab') {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tabs, {
+      items: items.map(function (item) {
+        var _item$key;
+        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+          key: (_item$key = item.key) === null || _item$key === void 0 ? void 0 : _item$key.toString()
+        });
+      }),
+      activeKey: activeItem.key,
+      onTabClick: function onTabClick(key) {
+        return setActiveKey(key);
       }
-    );
+    });
   }
-  return /* @__PURE__ */ import_react.default.createElement(
-    "div",
-    {
-      className: (0, import_classnames.default)(`${prefixCls}-menu`, `${prefixCls}-dropdownmenu`)
-    },
-    /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Dropdown,
-      {
-        trigger: ["click"],
-        menu: {
-          selectedKeys: [activeItem.key],
-          onClick: (item) => {
-            setActiveKey(item.key);
-          },
-          items: items.map((item, index) => ({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: (0, _classnames.default)("".concat(prefixCls, "-menu"), "".concat(prefixCls, "-dropdownmenu")),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
+      trigger: ['click'],
+      menu: {
+        selectedKeys: [activeItem.key],
+        onClick: function onClick(item) {
+          setActiveKey(item.key);
+        },
+        items: items.map(function (item, index) {
+          return {
             key: item.key || index,
             disabled: item.disabled,
             label: item.label
-          }))
-        }
+          };
+        })
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: `${prefixCls}-dropdownmenu-label` }, activeItem.label, /* @__PURE__ */ import_react.default.createElement(import_icons.DownOutlined, null))
-    )
-  );
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
+        className: "".concat(prefixCls, "-dropdownmenu-label"),
+        children: [activeItem.label, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DownOutlined, {})]
+      })
+    })
+  });
 };
-var HeaderMenu_default = HeaderMenu;
+var _default = exports.default = HeaderMenu;