@fle-ui/plus-table 1.2.22 → 1.2.24

package/es/index.js

@@ -27,8 +27,8 @@ import React, { useEffect, useRef, useState, useImperativeHandle, forwardRef } f
 import { ProTable } from '@ant-design/pro-components';
 import FormRender from './FormSearch/index';
 import { BarsOutlined } from '@ant-design/icons';
-import './FormSearch/index.less';
 import { simulateClick } from './utils/common';
+import './FormSearch/index.less';
 var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var _otherProps$scroll;
   var mode = props.mode,
@@ -140,29 +140,28 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var handleOnChangeColumn = function handleOnChangeColumn(map) {
     // 列设置更新
-    setColumnsStateMap(map);
+    setColumnsStateMap(function (columnsStateMap) {
+      var newObj = {};
+      for (var key in map) {
+        newObj[key] = _objectSpread(_objectSpread({}, columnsStateMap[key]), map[key]);
+      }
+      return newObj;
+    });
   };
   var handleSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var newObj, key;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            newObj = {}; // 保存列设置的操作
             if (!props.updateSetting) {
-              _context4.next = 6;
+              _context4.next = 4;
               break;
             }
-            for (key in columnsStateMap) {
-              newObj[key] = _objectSpread(_objectSpread({}, columnsStateMap[key]), {}, {
-                hideInTable: columnsStateMap[key].show ? 0 : 1
-              });
-            }
-            _context4.next = 5;
-            return props.updateSetting(newObj);
-          case 5:
+            _context4.next = 3;
+            return props.updateSetting(columnsStateMap);
+          case 3:
             simulateClick();
-          case 6:
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -178,7 +177,10 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         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));
+            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:
           case "end":
             return _context5.stop();

package/lib/index.js

@@ -9,8 +9,8 @@ var _proComponents = require("@ant-design/pro-components");
 var _antd = require("antd");
 var _index = _interopRequireDefault(require("./FormSearch/index"));
 var _icons = require("@ant-design/icons");
-require("./FormSearch/index.less");
 var _common = require("./utils/common");
+require("./FormSearch/index.less");
 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); }
@@ -144,29 +144,28 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   var handleOnChangeColumn = function handleOnChangeColumn(map) {
     // 列设置更新
-    setColumnsStateMap(map);
+    setColumnsStateMap(function (columnsStateMap) {
+      var newObj = {};
+      for (var key in map) {
+        newObj[key] = _objectSpread(_objectSpread({}, columnsStateMap[key]), map[key]);
+      }
+      return newObj;
+    });
   };
   var handleSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var newObj, key;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            newObj = {}; // 保存列设置的操作
             if (!props.updateSetting) {
-              _context4.next = 6;
+              _context4.next = 4;
               break;
             }
-            for (key in columnsStateMap) {
-              newObj[key] = _objectSpread(_objectSpread({}, columnsStateMap[key]), {}, {
-                hideInTable: columnsStateMap[key].show ? 0 : 1
-              });
-            }
-            _context4.next = 5;
-            return props.updateSetting(newObj);
-          case 5:
+            _context4.next = 3;
+            return props.updateSetting(columnsStateMap);
+          case 3:
             (0, _common.simulateClick)();
-          case 6:
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -182,7 +181,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         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));
+            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:
           case "end":
             return _context5.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-table",
-  "version": "1.2.22",
+  "version": "1.2.24",
   "description": "@fle-ui/plus-table",
   "keywords": [
     "fle-ui",
@@ -46,5 +46,5 @@
     "@ant-design/pro-components": "^2.7.0",
     "dayjs": "^1.11.10"
   },
-  "gitHead": "e5c3642fbf11e8311345a851eacdfbf1f7528c19"
+  "gitHead": "6516adaf2e6579cf5d357fe403153ea356b344b9"
 }