@fle-ui/plus-table 1.0.15 → 1.1.1

package/es/FormSearch/index.js

@@ -150,8 +150,7 @@ var FormSearch = /*#__PURE__*/function (_React$Component) {
         search = _this$props4.search,
         pagination = _this$props4.pagination,
         ghost = _this$props4.ghost,
-        manualRequest = _this$props4.manualRequest,
-        changeValue = _this$props4.changeValue;
+        manualRequest = _this$props4.manualRequest;
       var pageInfo = pagination ? omitUndefined({
         current: pagination.current,
         pageSize: pagination.pageSize

package/es/index.d.ts

@@ -1,11 +1,12 @@
 import React, { ReactElement } from 'react';
-import type { ProColumns } from '@ant-design/pro-components';
+import type { ProColumns, ActionType } from '@ant-design/pro-components';
+import type { InputProps } from 'antd';
 import './FormSearch/index.less';
 interface PlusColumns extends ProColumns {
     baseSearch?: boolean;
 }
 export type { PlusColumns };
-type settingsColumns = {
+export type settingsColumns = {
     [key: string]: {
         hideInTable?: boolean;
         show?: boolean;
@@ -16,8 +17,43 @@ 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 = {
-    mode?: 'normal' | 'drawsearch';
+    action?: Array<'advancedFilter' | 'columnSetting' | 'viewInvisibleData'>;
     columns: PlusColumns[];
     request?: any;
     top?: number;
@@ -37,7 +73,7 @@ type PlusProps = {
     };
     actionRef: any;
     formRef?: any;
-    options?: any;
+    options?: optionsConfig;
     [key: string | symbol]: any;
 };
 declare const PlusTable: React.ForwardRefExoticComponent<Omit<PlusProps, "ref"> & React.RefAttributes<unknown>>;

package/es/index.js

@@ -9,7 +9,7 @@ import "antd/es/message/style";
 import _message from "antd/es/message";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-var _excluded = ["mode", "columns", "hasShowFull", "request", "pagination", "formRef", "actionRef", "defaultColumnsState", "options"];
+var _excluded = ["mode", "columns", "hasShowFull", "request", "pagination", "formRef", "actionRef", "defaultColumnsState", "options", "action"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -30,10 +30,10 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useRef, useState, useImperativeHandle, forwardRef } from 'react';
 import { ProTable } from '@ant-design/pro-components';
 import FormRender from './FormSearch/index';
-import { BarsOutlined, ReloadOutlined } from '@ant-design/icons';
+import { BarsOutlined } from '@ant-design/icons';
 import './FormSearch/index.less';
 var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _otherProps$scroll;
+  var _otherProps$scroll, _otherProps$scroll2;
   var mode = props.mode,
     columns = props.columns,
     _props$hasShowFull = props.hasShowFull,
@@ -45,6 +45,7 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     defaultColumnsState = props.defaultColumnsState,
     _props$options = props.options,
     options = _props$options === void 0 ? {} : _props$options,
+    action = props.action,
     otherProps = _objectWithoutProperties(props, _excluded);
   var searchRef = useRef(null);
   var _useState = useState(false),
@@ -124,8 +125,7 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
             }
             for (key in columnsStateMap) {
               columnsStateContainId[key] = _objectSpread(_objectSpread({}, columnsStateContainId[key]), {}, {
-                hideInTable: !columnsStateMap[key].show ? 0 : 1,
-                fixed: columnsStateMap[key].fixed
+                hideInTable: columnsStateMap[key].show ? 0 : 1
               });
             }
             _context2.next = 4;
@@ -238,33 +238,20 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     value: columnsStateMap,
     onChange: handleOnChangeColumn //列状态的值发生改变之后触发
   };
-  var _options = Object.prototype.toString.call(options) === '[object Object]' ? _objectSpread({
-    density: false,
-    reloadIcon: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ReloadOutlined, {
-      onClick: function onClick() {
-        return actionRef.current.reload();
-      }
-    })),
-    setting: {
-      checkedReset: false,
-      extra: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
-        onClick: function onClick() {
-          return handleSave();
-        }
-      }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement("a", {
-        onClick: function onClick() {
-          return handleReset();
-        }
-      }, "\u91CD\u7F6E")),
-      showListItemOption: true
-    }
-  }, options) : options;
   return /*#__PURE__*/React.createElement("div", {
     className: !searchDrawer ? 'page_plustable__body' : 'page_plustable__body turn-left'
-  },
-  // 高级搜索模式
-  mode === 'drawsearch' ? /*#__PURE__*/React.createElement(ProTable, _extends({}, otherProps, {
-    search: {
+  }, /*#__PURE__*/React.createElement(ProTable, _extends({}, otherProps, {
+    // 公共配置 大家都有的
+    pagination: pagination,
+    actionRef: actionRef,
+    formRef: searchRef,
+    scroll: {
+      y: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.y) || document.documentElement.clientHeight - 355,
+      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll2 = otherProps.scroll) === null || _otherProps$scroll2 === void 0 ? void 0 : _otherProps$scroll2.x) || 1300
+    }
+    // 根据用户自定义的配置 如果配置了高级筛选就有这个配置
+    ,
+    search: (action === null || action === void 0 ? void 0 : action.includes('advancedFilter')) ? {
       span: {
         xs: 12,
         sm: 12,
@@ -318,11 +305,10 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
           }))
         }, /*#__PURE__*/React.createElement(BarsOutlined, null), "\u9AD8\u7EA7\u7B5B\u9009") : null];
       }
-    },
-    columnsState: columnsState,
-    pagination: pagination,
-    actionRef: actionRef,
-    formRef: searchRef,
+    } : props.search
+    // 根据用户自定义的配置 如果配置了列设置就有这个配置完全受控
+    ,
+    columnsState: (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) ? columnsState : props.columnsState,
     request: ( /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
         var _searchRef$current4, _drawFormRef$current4;
@@ -354,8 +340,10 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
       return function (_x2) {
         return _ref6.apply(this, arguments);
       };
-    }()),
-    columns: columns.map(function (item) {
+    }())
+    // 同步高筛配置 只有高筛 才有特殊的配置 (baseSearch才会生效)
+    ,
+    columns: (action === null || action === void 0 ? void 0 : action.includes('advancedFilter')) ? columns.map(function (item) {
       // 只保留基本搜索栏的配置
       if (item.baseSearch) {
         return _objectSpread(_objectSpread({}, item), {}, {
@@ -376,10 +364,10 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
       return _objectSpread(_objectSpread({}, item), {}, {
         search: false
       });
-    }),
+    }) : columns,
     toolBarRender: function toolBarRender(searchConfig) {
       var _otherProps$toolBarRe;
-      return [hasShowFull ? /*#__PURE__*/React.createElement(_Checkbox, {
+      return [(action === null || action === void 0 ? void 0 : action.includes('viewInvisibleData')) ? /*#__PURE__*/React.createElement(_Checkbox, {
         onChange: function onChange(e) {
           setShowFull(e.target.checked);
           setTimeout(function () {
@@ -388,21 +376,23 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }, "\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)];
     },
-    scroll: {
-      y: document.documentElement.clientHeight - 355,
-      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.x) || 1300
-    },
     onChange: onTableChange,
-    options: _options
-  })) : /*#__PURE__*/React.createElement(ProTable // 普通模式
-  , _extends({
-    columns: columns,
-    request: request,
-    actionRef: actionRef,
-    formRef: formRef,
-    columnsState: columnsState,
-    options: _options
-  }, otherProps)), /*#__PURE__*/React.createElement(_Drawer, {
+    options: (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) ? _objectSpread({
+      setting: {
+        checkedReset: false,
+        extra: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
+          onClick: function onClick() {
+            return handleSave();
+          }
+        }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement("a", {
+          onClick: function onClick() {
+            return handleReset();
+          }
+        }, "\u91CD\u7F6E")),
+        showListItemOption: true
+      }
+    }, options) : options
+  })), /*#__PURE__*/React.createElement(_Drawer, {
     onClose: function onClose() {
       return setSearchDrawer(false);
     },

package/lib/FormSearch/index.js

@@ -157,8 +157,7 @@ var FormSearch = /*#__PURE__*/function (_React$Component) {
         search = _this$props4.search,
         pagination = _this$props4.pagination,
         ghost = _this$props4.ghost,
-        manualRequest = _this$props4.manualRequest,
-        changeValue = _this$props4.changeValue;
+        manualRequest = _this$props4.manualRequest;
       var pageInfo = pagination ? (0, _proUtils.omitUndefined)({
         current: pagination.current,
         pageSize: pagination.pageSize

package/lib/index.d.ts

@@ -1,11 +1,12 @@
 import React, { ReactElement } from 'react';
-import type { ProColumns } from '@ant-design/pro-components';
+import type { ProColumns, ActionType } from '@ant-design/pro-components';
+import type { InputProps } from 'antd';
 import './FormSearch/index.less';
 interface PlusColumns extends ProColumns {
     baseSearch?: boolean;
 }
 export type { PlusColumns };
-type settingsColumns = {
+export type settingsColumns = {
     [key: string]: {
         hideInTable?: boolean;
         show?: boolean;
@@ -16,8 +17,43 @@ 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 = {
-    mode?: 'normal' | 'drawsearch';
+    action?: Array<'advancedFilter' | 'columnSetting' | 'viewInvisibleData'>;
     columns: PlusColumns[];
     request?: any;
     top?: number;
@@ -37,7 +73,7 @@ type PlusProps = {
     };
     actionRef: any;
     formRef?: any;
-    options?: any;
+    options?: optionsConfig;
     [key: string | symbol]: any;
 };
 declare const PlusTable: React.ForwardRefExoticComponent<Omit<PlusProps, "ref"> & React.RefAttributes<unknown>>;

package/lib/index.js

@@ -11,7 +11,7 @@ var _antd = require("antd");
 var _index = _interopRequireDefault(require("./FormSearch/index"));
 var _icons = require("@ant-design/icons");
 require("./FormSearch/index.less");
-var _excluded = ["mode", "columns", "hasShowFull", "request", "pagination", "formRef", "actionRef", "defaultColumnsState", "options"];
+var _excluded = ["mode", "columns", "hasShowFull", "request", "pagination", "formRef", "actionRef", "defaultColumnsState", "options", "action"];
 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,7 +33,7 @@ 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) {
-  var _otherProps$scroll;
+  var _otherProps$scroll, _otherProps$scroll2;
   var mode = props.mode,
     columns = props.columns,
     _props$hasShowFull = props.hasShowFull,
@@ -45,6 +45,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     defaultColumnsState = props.defaultColumnsState,
     _props$options = props.options,
     options = _props$options === void 0 ? {} : _props$options,
+    action = props.action,
     otherProps = _objectWithoutProperties(props, _excluded);
   var searchRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
@@ -124,8 +125,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             }
             for (key in columnsStateMap) {
               columnsStateContainId[key] = _objectSpread(_objectSpread({}, columnsStateContainId[key]), {}, {
-                hideInTable: !columnsStateMap[key].show ? 0 : 1,
-                fixed: columnsStateMap[key].fixed
+                hideInTable: columnsStateMap[key].show ? 0 : 1
               });
             }
             _context2.next = 4;
@@ -238,33 +238,20 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     value: columnsStateMap,
     onChange: handleOnChangeColumn //列状态的值发生改变之后触发
   };
-  var _options = Object.prototype.toString.call(options) === '[object Object]' ? _objectSpread({
-    density: false,
-    reloadIcon: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_icons.ReloadOutlined, {
-      onClick: function onClick() {
-        return actionRef.current.reload();
-      }
-    })),
-    setting: {
-      checkedReset: false,
-      extra: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("a", {
-        onClick: function onClick() {
-          return handleSave();
-        }
-      }, "\u4FDD\u5B58"), /*#__PURE__*/_react.default.createElement("a", {
-        onClick: function onClick() {
-          return handleReset();
-        }
-      }, "\u91CD\u7F6E")),
-      showListItemOption: true
-    }
-  }, options) : options;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: !searchDrawer ? 'page_plustable__body' : 'page_plustable__body turn-left'
-  },
-  // 高级搜索模式
-  mode === 'drawsearch' ? /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, _extends({}, otherProps, {
-    search: {
+  }, /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, _extends({}, otherProps, {
+    // 公共配置 大家都有的
+    pagination: pagination,
+    actionRef: actionRef,
+    formRef: searchRef,
+    scroll: {
+      y: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.y) || document.documentElement.clientHeight - 355,
+      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll2 = otherProps.scroll) === null || _otherProps$scroll2 === void 0 ? void 0 : _otherProps$scroll2.x) || 1300
+    }
+    // 根据用户自定义的配置 如果配置了高级筛选就有这个配置
+    ,
+    search: (action === null || action === void 0 ? void 0 : action.includes('advancedFilter')) ? {
       span: {
         xs: 12,
         sm: 12,
@@ -318,11 +305,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           }))
         }, /*#__PURE__*/_react.default.createElement(_icons.BarsOutlined, null), "\u9AD8\u7EA7\u7B5B\u9009") : null];
       }
-    },
-    columnsState: columnsState,
-    pagination: pagination,
-    actionRef: actionRef,
-    formRef: searchRef,
+    } : props.search
+    // 根据用户自定义的配置 如果配置了列设置就有这个配置完全受控
+    ,
+    columnsState: (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) ? columnsState : props.columnsState,
     request: ( /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
         var _searchRef$current4, _drawFormRef$current4;
@@ -354,8 +340,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return function (_x2) {
         return _ref6.apply(this, arguments);
       };
-    }()),
-    columns: columns.map(function (item) {
+    }())
+    // 同步高筛配置 只有高筛 才有特殊的配置 (baseSearch才会生效)
+    ,
+    columns: (action === null || action === void 0 ? void 0 : action.includes('advancedFilter')) ? columns.map(function (item) {
       // 只保留基本搜索栏的配置
       if (item.baseSearch) {
         return _objectSpread(_objectSpread({}, item), {}, {
@@ -376,10 +364,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return _objectSpread(_objectSpread({}, item), {}, {
         search: false
       });
-    }),
+    }) : columns,
     toolBarRender: function toolBarRender(searchConfig) {
       var _otherProps$toolBarRe;
-      return [hasShowFull ? /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
+      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);
           setTimeout(function () {
@@ -388,21 +376,23 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       }, "\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)];
     },
-    scroll: {
-      y: document.documentElement.clientHeight - 355,
-      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.x) || 1300
-    },
     onChange: onTableChange,
-    options: _options
-  })) : /*#__PURE__*/_react.default.createElement(_proComponents.ProTable // 普通模式
-  , _extends({
-    columns: columns,
-    request: request,
-    actionRef: actionRef,
-    formRef: formRef,
-    columnsState: columnsState,
-    options: _options
-  }, otherProps)), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
+    options: (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) ? _objectSpread({
+      setting: {
+        checkedReset: false,
+        extra: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("a", {
+          onClick: function onClick() {
+            return handleSave();
+          }
+        }, "\u4FDD\u5B58"), /*#__PURE__*/_react.default.createElement("a", {
+          onClick: function onClick() {
+            return handleReset();
+          }
+        }, "\u91CD\u7F6E")),
+        showListItemOption: true
+      }
+    }, options) : options
+  })), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     onClose: function onClose() {
       return setSearchDrawer(false);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-table",
-  "version": "1.0.15",
+  "version": "1.1.1",
   "description": "@fle-ui/plus-table",
   "keywords": [
     "fle-ui",
@@ -46,5 +46,5 @@
     "@ant-design/pro-components": "^2.7.0",
     "dayjs": "^1.11.10"
   },
-  "gitHead": "ceed5aee479a4c01f421ea188635efa2dcbccb29"
+  "gitHead": "ff85e733d0486a973d61452855557f5916f3340f"
 }