@fle-ui/plus-table 1.2.24 → 1.2.25

package/lib/index.d.ts

@@ -1,6 +1,5 @@
-import React, { ReactElement } from 'react';
-import type { ProColumns, ActionType } from '@ant-design/pro-components';
-import type { InputProps } from 'antd';
+import React from 'react';
+import type { ProTableProps, ProColumns } from '@ant-design/pro-components';
 import './FormSearch/index.less';
 interface PlusColumns extends ProColumns {
     baseSearch?: boolean;
@@ -17,49 +16,15 @@ export type settingsColumns = {
         sort?: number;
     };
 };
-type OptionsFunctionType = (e: React.MouseEvent<HTMLSpanElement>, action?: ActionType) => void;
-type OptionsType = OptionsFunctionType | boolean;
-type SettingOptionType = {
-    draggable?: boolean;
-    checkable?: boolean;
-    showListItemOption?: boolean;
-    checkedReset?: boolean;
-    listsHeight?: number;
-    extra?: React.ReactNode;
-    children?: React.ReactNode;
-    settingIcon?: React.ReactNode;
-};
-interface SearchProps extends InputProps {
-    inputPrefixCls?: string;
-    onSearch?: (value: string, event?: React.ChangeEvent<HTMLInputElement> | React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLInputElement>, info?: {
-        source?: 'clear' | 'input';
-    }) => void;
-    enterButton?: React.ReactNode;
-    loading?: boolean;
-}
-type OptionSearchProps = Omit<SearchProps, 'onSearch'> & {
-    /** 如果 onSearch 返回一个false，直接拦截请求 */
-    onSearch?: (keyword: string) => Promise<boolean | undefined> | boolean | undefined;
-};
-export type optionsConfig = {
-    density?: boolean;
-    fullScreen?: OptionsType;
-    reload?: OptionsType;
-    setting?: boolean | SettingOptionType;
-    search?: (OptionSearchProps & {
-        name?: string;
-    }) | boolean;
-    reloadIcon?: React.ReactNode;
-    densityIcon?: React.ReactNode;
-};
-type PlusProps = {
+interface PlusTableProps<DataSource, U, ValueType> extends Omit<ProTableProps<DataSource, U, ValueType>, 'columns'> {
     action?: Array<'advancedFilter' | 'columnSetting' | 'viewInvisibleData'>;
     columns: PlusColumns[];
-    request?: any;
     top?: number;
-    fetchSetting?: () => Promise<settingsColumns>;
-    updateSetting?: (params: any) => Promise<settingsColumns>;
-    resetSetting?: () => Promise<settingsColumns>;
+    fetchSetting?: () => Promise<Record<string, any>>;
+    updateSetting?: (params: settingsColumns) => void;
+    resetSetting?: () => Promise<{
+        success: boolean;
+    }>;
     showDefaultSetting?: boolean;
     defaultColumnsState?: {
         [key: string]: {
@@ -67,16 +32,13 @@ type PlusProps = {
             fixed: 'left' | 'right' | undefined;
         };
     };
-    headerTitle?: ReactElement;
     hasShowFull?: boolean;
-    pagination?: {
-        pageSize?: number;
-        current?: number;
-    };
-    actionRef: any;
-    formRef?: any;
-    options?: optionsConfig;
-    [key: string | symbol]: any;
-};
-declare const PlusTable: React.ForwardRefExoticComponent<Omit<PlusProps, "ref"> & React.RefAttributes<unknown>>;
-export default PlusTable;
+    getContainer?: string | HTMLElement | (() => HTMLElement) | false;
+}
+interface PlusTableRef {
+    getFieldsValue: () => Promise<any>;
+    setFiledsValue: (params: any) => Promise<void>;
+    setFiledValue: (key: string, value: any) => Promise<void>;
+}
+declare const _default: React.ForwardRefExoticComponent<PlusTableProps<Record<string, any>, Record<string, any>, unknown> & React.RefAttributes<PlusTableRef>>;
+export default _default;

package/lib/index.js

@@ -11,7 +11,7 @@ var _index = _interopRequireDefault(require("./FormSearch/index"));
 var _icons = require("@ant-design/icons");
 var _common = require("./utils/common");
 require("./FormSearch/index.less");
-var _excluded = ["mode", "columns", "hasShowFull", "request", "pagination", "formRef", "actionRef", "defaultColumnsState", "options", "action", "showDefaultSetting"];
+var _excluded = ["columns", "hasShowFull", "request", "pagination", "formRef", "actionRef", "defaultColumnsState", "options", "action", "showDefaultSetting"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -33,16 +33,15 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+function PlusTable(props, ref) {
   var _otherProps$scroll;
-  var mode = props.mode,
-    columns = props.columns,
+  var columns = props.columns,
     _props$hasShowFull = props.hasShowFull,
     hasShowFull = _props$hasShowFull === void 0 ? true : _props$hasShowFull,
     request = props.request,
     pagination = props.pagination,
     formRef = props.formRef,
-    actionRef = props.actionRef,
+    propsActionRef = props.actionRef,
     defaultColumnsState = props.defaultColumnsState,
     _props$options = props.options,
     options = _props$options === void 0 ? {} : _props$options,
@@ -64,6 +63,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     columnsStateMap = _useState6[0],
     setColumnsStateMap = _useState6[1];
+  var actionRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(propsActionRef, function () {
+    return actionRef.current;
+  });
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       getFieldsValue: function () {
@@ -182,7 +185,6 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             return _context5.abrupt("return", (_props$resetSetting = props.resetSetting) === null || _props$resetSetting === void 0 ? void 0 : _props$resetSetting.call(props).then(function (res) {
-              console.log(res);
               res.success && init();
             }));
           case 1:
@@ -263,7 +265,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onChange: handleOnChangeColumn //列状态的值发生改变之后触发
   };
   var propsRequest = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params, sort, filter) {
       var _searchRef$current5, _drawFormRef$current4;
       var res1, res2, res;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -277,24 +279,34 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             return drawFormRef === null || drawFormRef === void 0 ? void 0 : (_drawFormRef$current4 = drawFormRef.current) === null || _drawFormRef$current4 === void 0 ? void 0 : _drawFormRef$current4.getFieldsValue();
           case 5:
             res2 = _context8.sent;
-            _context8.next = 8;
+            if (!request) {
+              _context8.next = 12;
+              break;
+            }
+            _context8.next = 9;
             return request(_objectSpread(_objectSpread(_objectSpread({}, params), dealFetchParams(_objectSpread(_objectSpread(_objectSpread({}, res1), res2), params))), {}, {
               showFull: showFull
-            }));
-          case 8:
-            res = _context8.sent;
+            }), sort, filter);
+          case 9:
+            _context8.t0 = _context8.sent;
+            _context8.next = 13;
+            break;
+          case 12:
+            _context8.t0 = {};
+          case 13:
+            res = _context8.t0;
             return _context8.abrupt("return", res);
-          case 10:
+          case 15:
           case "end":
             return _context8.stop();
         }
       }, _callee8);
     }));
-    return function propsRequest(_x5) {
+    return function propsRequest(_x5, _x6, _x7) {
       return _ref5.apply(this, arguments);
     };
   }();
-  var optionsSetting = _typeof(options.setting) === 'object' ? options.setting : {};
+  var optionsSetting = _typeof(options) === 'object' && _typeof(options.setting) === 'object' ? options.setting : {};
   var __options = (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) && showDefaultSetting !== true ? _objectSpread(_objectSpread({}, options), {}, {
     setting: _objectSpread(_objectSpread({}, optionsSetting), {}, {
       checkedReset: false,
@@ -321,7 +333,9 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, otherProps, {
     // 公共配置 大家都有的
-    pagination: pagination,
+    pagination: _objectSpread({
+      size: 'default'
+    }, pagination),
     actionRef: actionRef,
     formRef: searchRef
     // 根据用户自定义的配置 如果配置了高级筛选就有这个配置
@@ -354,16 +368,18 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           key: "2",
           type: "default",
           onClick: function onClick() {
-            var _drawFormRef$current5;
+            var _drawFormRef$current5, _actionRef$current, _actionRef$current$re, _actionRef$current2, _actionRef$current2$r;
             drawFormRef === null || drawFormRef === void 0 ? void 0 : (_drawFormRef$current5 = drawFormRef.current) === null || _drawFormRef$current5 === void 0 ? void 0 : _drawFormRef$current5.resetFields();
-            actionRef.current.reset();
-            actionRef.current.reload();
+            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$re = _actionRef$current.reset) === null || _actionRef$current$re === void 0 ? void 0 : _actionRef$current$re.call(_actionRef$current);
+            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$r = _actionRef$current2.reload) === null || _actionRef$current2$r === void 0 ? void 0 : _actionRef$current2$r.call(_actionRef$current2);
           },
           size: "middle"
-        }, "\u91CD\u7F6E"), columns.filter(function (item) {
-          return item.search !== false;
-        }).length > 3 ? /*#__PURE__*/_react.default.createElement("a", {
+        }, "\u91CD\u7F6E"), /*#__PURE__*/_react.default.createElement("a", {
           key: "3",
+          style: {
+            wordBreak: 'break-word',
+            whiteSpace: 'nowrap'
+          },
           onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
             var _drawFormRef$current6, _searchRef$current6;
             return _regeneratorRuntime().wrap(function _callee9$(_context9) {
@@ -380,7 +396,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               }
             }, _callee9);
           }))
-        }, /*#__PURE__*/_react.default.createElement(_icons.BarsOutlined, null), "\u9AD8\u7EA7\u7B5B\u9009") : null];
+        }, /*#__PURE__*/_react.default.createElement(_icons.BarsOutlined, null), "\u9AD8\u7EA7\u7B5B\u9009")];
       }
     } : props.search
     // 根据用户自定义的配置 如果配置了列设置就有这个配置完全受控
@@ -411,8 +427,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         search: false
       });
     }) : columns,
-    toolBarRender: function toolBarRender(searchConfig) {
-      var _otherProps$toolBarRe;
+    toolBarRender: function toolBarRender(searchConfig, rows) {
       return [(action === null || action === void 0 ? void 0 : action.includes('viewInvisibleData')) ? /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
         onChange: function onChange(e) {
           setShowFull(e.target.checked);
@@ -420,7 +435,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.reload();
           }, 100);
         }
-      }, "\u663E\u793A\u6240\u6709\u6570\u636E") : null, otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$toolBarRe = otherProps.toolBarRender) === null || _otherProps$toolBarRe === void 0 ? void 0 : _otherProps$toolBarRe.call(otherProps)];
+      }, "\u663E\u793A\u6240\u6709\u6570\u636E") : null, typeof otherProps.toolBarRender === 'function' && otherProps.toolBarRender(searchConfig, rows)];
     },
     options: __options
   })), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
@@ -479,10 +494,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }, "\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
           type: "default",
           onClick: function onClick() {
-            var _drawFormRef$current10;
+            var _drawFormRef$current10, _actionRef$current3, _actionRef$current3$r, _actionRef$current4, _actionRef$current4$r;
             drawFormRef === null || drawFormRef === void 0 ? void 0 : (_drawFormRef$current10 = drawFormRef.current) === null || _drawFormRef$current10 === void 0 ? void 0 : _drawFormRef$current10.resetFields();
-            actionRef.current.reset();
-            actionRef.current.reload();
+            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$r = _actionRef$current3.reset) === null || _actionRef$current3$r === void 0 ? void 0 : _actionRef$current3$r.call(_actionRef$current3);
+            actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$r = _actionRef$current4.reload) === null || _actionRef$current4$r === void 0 ? void 0 : _actionRef$current4$r.call(_actionRef$current4);
           },
           size: "middle"
         }, "\u91CD\u7F6E"))];
@@ -495,5 +510,5 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     manualRequest: true,
     action: actionRef
   })));
-});
-var _default = exports.default = PlusTable;
+}
+var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(PlusTable);

package/lib/json/columnKeys.js

@@ -9,14 +9,6 @@ var _default = exports.default = {
   code: '2000',
   message: null,
   data: [{
-    id: 12966348,
-    title: '商品编码',
-    field: 'goodsNumber',
-    sort: 0,
-    hideInTable: 0,
-    fixed: 1,
-    disabled: 1
-  }, {
     id: 12966347,
     title: '商品名称',
     field: 'mainImage,name',
@@ -192,13 +184,5 @@ var _default = exports.default = {
     hideInTable: 1,
     fixed: 0,
     disabled: 0
-  }, {
-    id: 12966341,
-    title: '操作',
-    field: 'option',
-    sort: 23,
-    hideInTable: 0,
-    fixed: 2,
-    disabled: 1
   }]
 };