@fle-ui/plus-table 1.2.21-beta.0 → 1.2.22

package/es/json/columnKeys.js

@@ -0,0 +1,198 @@
+export default {
+  success: true,
+  code: '2000',
+  message: null,
+  data: [{
+    id: 12966348,
+    title: '商品编码',
+    field: 'goodsNumber',
+    sort: 0,
+    hideInTable: 0,
+    fixed: 1,
+    disabled: 1
+  }, {
+    id: 12966347,
+    title: '商品名称',
+    field: 'mainImage,name',
+    sort: 1,
+    hideInTable: 0,
+    fixed: 1,
+    disabled: 1
+  }, {
+    id: 12966344,
+    title: '销售类型',
+    field: 'isOnce,isPurchase',
+    sort: 2,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 1
+  }, {
+    id: 12966343,
+    title: '商品分类',
+    field: 'flagCategoryInfo',
+    sort: 3,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 1
+  }, {
+    id: 12966346,
+    title: '创建者',
+    field: 'userNickname',
+    sort: 4,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966345,
+    title: '现货库存',
+    field: 'stock',
+    sort: 5,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966330,
+    title: '挑选',
+    field: 'selfCheckStatus',
+    sort: 6,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966329,
+    title: '商品品牌',
+    field: 'brandName',
+    sort: 7,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966332,
+    title: '发票类型',
+    field: 'invoiceType',
+    sort: 8,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966331,
+    title: '商品描述',
+    field: 'description',
+    sort: 9,
+    hideInTable: 1,
+    fixed: 1,
+    disabled: 0
+  }, {
+    id: 12966326,
+    title: '商品单位',
+    field: 'unit',
+    sort: 10,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966325,
+    title: '商品标签',
+    field: 'flagTagsList',
+    sort: 11,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966328,
+    title: '适用行业',
+    field: 'flagIndustryList',
+    sort: 12,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966327,
+    title: '适用场景',
+    field: 'flagSceneList',
+    sort: 13,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966338,
+    title: '箱规',
+    field: 'boxNumber',
+    sort: 14,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966337,
+    title: '计量单位',
+    field: 'measureUnit',
+    sort: 15,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966340,
+    title: '（集采销售）是否含税',
+    field: 'purchase.isContainsTax',
+    sort: 16,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966339,
+    title: '集采批发价格',
+    field: 'purchase.purchasePriceTaxMin,purchase.purchasePriceTaxMax',
+    sort: 17,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966334,
+    title: '（一件代发销售）是否含税',
+    field: 'once.isContainsTax',
+    sort: 18,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966333,
+    title: '一件代发价格',
+    field: 'once.purchasePriceTaxMin,once.purchasePriceTaxMax',
+    sort: 19,
+    hideInTable: 0,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966336,
+    title: '是否支持7天无理由退货',
+    field: 'isAfterSales',
+    sort: 20,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966335,
+    title: '上架时间',
+    field: 'selfPutawayTime',
+    sort: 21,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966342,
+    title: '创建时间',
+    field: 'createTime',
+    sort: 22,
+    hideInTable: 1,
+    fixed: 0,
+    disabled: 0
+  }, {
+    id: 12966341,
+    title: '操作',
+    field: 'option',
+    sort: 23,
+    hideInTable: 0,
+    fixed: 2,
+    disabled: 1
+  }]
+};

package/lib/FormSearch/index.less

@@ -1,59 +1,59 @@
-.search-drawer {
-  // 搜索栏内部样式复写
-  ::-webkit-scrollbar {
-    width: 2px;
-  }
-  // .ant-tree-checkbox-checked
-  // .ant-tree-checkbox-disabled
-  // pointer-events: none;
-  .ant-pro-query-filter-row {
-    row-gap: 12px;
-  }
-  .ant-pro-table-search {
-    padding: 0;
-    .ant-form-item-control {
-      width: auto;
-    }
-    .ant-pro-table-search-query-filter {
-      border: none;
-    }
-    .ant-pro-query-filter {
-      background-color: #fff;
-      padding: 0;
-      .ant-row {
-        display: flex;
-        flex-direction: row;
-        .ant-form-item-label {
-          width: 86px;
-          line-height: 34px;
-          text-align: right;
-          label {
-            font-size: 12px;
-          }
-        }
-        .ant-form-item-control {
-          width: 240px;
-          .ant-form-item-control-input {
-            width: 240px;
-          }
-          .ant-picker {
-            min-width: 240px !important;
-            width: 240px;
-          }
-        }
-      }
-    }
-  }
-}
-.page_plustable__body {
-  // 为了复写pagecontainer的样式
-  background-color: #fff;
-  transition: all ease 0.3s;
-  // margin: 16px;
-  // padding: 16px;
-  height: 100%;
-  width: 100%;
-  &.turn-left {
-    width: calc(100% - 356px);
-  }
-}
+.search-drawer {
+  // 搜索栏内部样式复写
+  ::-webkit-scrollbar {
+    width: 2px;
+  }
+  // .ant-tree-checkbox-checked
+  // .ant-tree-checkbox-disabled
+  // pointer-events: none;
+  .ant-pro-query-filter-row {
+    row-gap: 12px;
+  }
+  .ant-pro-table-search {
+    padding: 0;
+    .ant-form-item-control {
+      width: auto;
+    }
+    .ant-pro-table-search-query-filter {
+      border: none;
+    }
+    .ant-pro-query-filter {
+      background-color: #fff;
+      padding: 0;
+      .ant-row {
+        display: flex;
+        flex-direction: row;
+        .ant-form-item-label {
+          width: 86px;
+          line-height: 34px;
+          text-align: right;
+          label {
+            font-size: 12px;
+          }
+        }
+        .ant-form-item-control {
+          width: 240px;
+          .ant-form-item-control-input {
+            width: 240px;
+          }
+          .ant-picker {
+            min-width: 240px !important;
+            width: 240px;
+          }
+        }
+      }
+    }
+  }
+}
+.page_plustable__body {
+  // 为了复写pagecontainer的样式
+  background-color: #fff;
+  transition: all ease 0.3s;
+  // margin: 16px;
+  // padding: 16px;
+  height: 100%;
+  width: 100%;
+  &.turn-left {
+    width: calc(100% - 356px);
+  }
+}

package/lib/index.d.ts

@@ -59,6 +59,8 @@ type PlusProps = {
     top?: number;
     fetchSetting?: () => Promise<settingsColumns>;
     updateSetting?: (params: any) => Promise<settingsColumns>;
+    resetSetting?: () => Promise<settingsColumns>;
+    showDefaultSetting?: boolean;
     defaultColumnsState?: {
         [key: string]: {
             show: boolean;

package/lib/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,11 +11,12 @@ var _index = _interopRequireDefault(require("./FormSearch/index"));
 var _icons = require("@ant-design/icons");
 require("./FormSearch/index.less");
 var _common = require("./utils/common");
-var _excluded = ["mode", "columns", "hasShowFull", "request", "pagination", "formRef", "actionRef", "defaultColumnsState", "options", "action"];
+var _excluded = ["mode", "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; }
 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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -47,6 +47,8 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _props$options = props.options,
     options = _props$options === void 0 ? {} : _props$options,
     action = props.action,
+    _props$showDefaultSet = props.showDefaultSetting,
+    showDefaultSetting = _props$showDefaultSet === void 0 ? true : _props$showDefaultSet,
     otherProps = _objectWithoutProperties(props, _excluded);
   var searchRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
@@ -58,24 +60,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     showFull = _useState4[0],
     setShowFull = _useState4[1];
   var drawFormRef = (0, _react.useRef)(null);
-  var _useState5 = (0, _react.useState)(pagination || {
-      current: 1,
-      pageSize: 20
-    }),
+  var _useState5 = (0, _react.useState)({}),
     _useState6 = _slicedToArray(_useState5, 2),
-    tablePagination = _useState6[0],
-    setTablePagination = _useState6[1];
-  var _useState7 = (0, _react.useState)({}),
-    _useState8 = _slicedToArray(_useState7, 2),
-    columnsStateMap = _useState8[0],
-    setColumnsStateMap = _useState8[1];
-  var _useState9 = (0, _react.useState)({}),
-    _useState10 = _slicedToArray(_useState9, 2),
-    columnsStateContainId = _useState10[0],
-    setColumnsStateContainId = _useState10[1]; // 上传时 候的对数组
-  var _Form$useForm = _antd.Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+    columnsStateMap = _useState6[0],
+    setColumnsStateMap = _useState6[1];
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       getFieldsValue: function () {
@@ -190,18 +178,12 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }();
   var handleReset = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _props$fetchSetting;
-      var res;
+      var _props$resetSetting;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context5.next = 2;
-            return (_props$fetchSetting = props.fetchSetting) === null || _props$fetchSetting === void 0 ? void 0 : _props$fetchSetting.call(props);
-          case 2:
-            res = _context5.sent;
-            setColumnsStateMap(res);
-            _antd.message.success('重置成功!');
-          case 5:
+            return _context5.abrupt("return", (_props$resetSetting = props.resetSetting) === null || _props$resetSetting === void 0 ? void 0 : _props$resetSetting.call(props));
+          case 1:
           case "end":
             return _context5.stop();
         }
@@ -213,28 +195,20 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }();
   var init = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var _props$fetchSetting2, res;
+      var _props$fetchSetting, res;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!props.fetchSetting) {
-              _context6.next = 6;
+              _context6.next = 5;
               break;
             }
             _context6.next = 3;
-            return (_props$fetchSetting2 = props.fetchSetting) === null || _props$fetchSetting2 === void 0 ? void 0 : _props$fetchSetting2.call(props);
+            return (_props$fetchSetting = props.fetchSetting) === null || _props$fetchSetting === void 0 ? void 0 : _props$fetchSetting.call(props);
           case 3:
             res = _context6.sent;
-            // show?: boolean;
-            // fixed?: 'right' | 'left' | undefined;
-            // order?: number;
-            // disable?: boolean | {
-            //     checkbox: boolean;
-            // };
-            // console.log(res);
-            setColumnsStateContainId(res);
             setColumnsStateMap(res);
-          case 6:
+          case 5:
           case "end":
             return _context6.stop();
         }
@@ -248,13 +222,6 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _searchRef$current4;
     searchRef === null || searchRef === void 0 ? void 0 : (_searchRef$current4 = searchRef.current) === null || _searchRef$current4 === void 0 ? void 0 : _searchRef$current4.setFieldsValue(drawFormRef.current.getFieldsValue());
   };
-  var onTableChange = function onTableChange(pagination) {
-    // 劫持分页改动
-    setTablePagination({
-      current: pagination.current,
-      pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || pagination.defaultPageSize
-    });
-  };
   var handleSearchAll = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(searchConfig) {
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -325,6 +292,25 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return _ref5.apply(this, arguments);
     };
   }();
+  var optionsSetting = _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,
+      showListItemOption: true,
+      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", {
+        style: {
+          color: '#333'
+        },
+        onClick: function onClick() {
+          return handleReset();
+        }
+      }, "\u91CD\u7F6E"))
+    })
+  }) : options;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "page_plustable__body"
   }, /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, _extends({
@@ -434,23 +420,7 @@ 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)];
     },
-    onChange: onTableChange,
-    options: (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) ? _objectSpread({
-      setting: {
-        checkedReset: false,
-        // children: <div></div>,
-        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
+    options: __options
   })), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     onClose: function onClose() {
       return setSearchDrawer(false);