@teamix/pro 1.2.14 → 1.2.15

package/lib/form/Filter/index2.js

@@ -31,9 +31,10 @@ var _utils2 = require("../utils");
 
 require("./index2.scss");
 
-var _excluded = ["schema", "triggerType", "onFilter"],
-    _excluded2 = ["schema", "triggerType", "onFilter"],
-    _excluded3 = ["form", "addonAfter", "addonBefore", "onFilter"];
+var _excluded = ["schema", "onChange", "onSubmit"],
+    _excluded2 = ["form", "schema", "onSubmit", "onChange"],
+    _excluded3 = ["schema", "onSubmit", "onChange", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
+    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "mode", "expand"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -61,51 +62,23 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-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; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var getEventProps = function getEventProps(triggerType, onFilter) {
-  var keydownEvent = {
-    onSubmit: onFilter
-  };
-  var changeEvent = {
-    onChange: onFilter
-  };
-  var eventMap = {
-    keydown: keydownEvent,
-    change: _objectSpread(_objectSpread({}, keydownEvent), changeEvent),
-    submit: keydownEvent
-  };
-  return eventMap[triggerType];
-};
+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 schemaTemp = [{
-  name: 'taskName',
-  title: '实例名称',
-  component: 'Input',
-  required: true,
-  props: {
-    style: {
-      width: 180
-    },
-    placeholder: '请输入'
-  }
-}];
 /**
  * 简单筛选
  */
-
 var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
+      onChange = props.onChange,
+      onSubmit = props.onSubmit,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = (0, _utils.usePrefixCls)('', {
@@ -117,48 +90,87 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       props: {
         size: 8
       },
-      children: [].concat(_toConsumableArray(schema), [{
-        type: 'void',
-        decorator: null,
-        component: 'Submit',
-        props: {
-          style: _objectSpread({}, triggerType === 'submit' ? {} : {
-            display: 'none'
-          })
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
         }
-      }])
+      }
     }];
-  }, []);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
+  }, [schema]);
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    className: (0, _classnames.default)(prefixCls, props.className),
+    schema: simpleSchema,
     feedbackLayout: "popover",
     breakpoints: [],
-    inset: true
-  }, otherProps), eventProps), {}, {
+    inset: true,
+    onSubmit: onSubmit,
+    onChange: onChange
+  }));
+});
+/**
+ * 轻量筛选
+ */
+
+var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var form = props.form,
+      schema = props.schema,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter-light'
+  });
+  var LightSchema = (0, _react.useMemo)(function () {
+    return [{
+      component: 'LightFilter',
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
+        }
+      }
+    }];
+  }, [schema]); // useEffect(() => {
+  //   form.addEffects('onChange', () => {
+  //     onFieldValueChange('',(field:any) => {
+  //       console.log(field.value);
+  //     });
+  //   });
+  // }, [form, onChange]);
+
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
     className: (0, _classnames.default)(prefixCls, props.className),
-    schema: simpleSchema
+    schema: LightSchema,
+    feedbackLayout: "popover",
+    breakpoints: [],
+    bordered: false,
+    onSubmit: onSubmit,
+    onChange: onChange
   }));
 });
-SimpleFilter.defaultProps = {
-  triggerType: 'change'
-};
 /**
  * 高级筛选
  */
 
 var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var form = (0, _react.useMemo)(function () {
-    return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)();
-  }, []);
   var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
       onReset = props.onReset,
       layout = props.layout,
       labelAlign = props.labelAlign,
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
-      wrapperCol = props.wrapperCol;
+      wrapperCol = props.wrapperCol,
+      otherProps = _objectWithoutProperties(props, _excluded3);
+
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-advanced'
   });
@@ -186,26 +198,21 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
-              style: _objectSpread({}, triggerType === 'submit' ? {} : {
-                marginRight: -16
-              }),
               children: (0, _utils.getMessage)('reset')
             }
           }, {
             component: 'Submit',
             props: {
-              style: _objectSpread({}, triggerType === 'submit' ? {
+              style: {
                 marginRight: -8
-              } : {
-                display: 'none'
-              }),
+              },
               children: (0, _utils.getMessage)('search')
             }
           }]
         }]
       }])
     }];
-  }, []);
+  }, [schema, onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return {
       breakpoints: [990],
@@ -216,61 +223,39 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
     };
   }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "popover"
-  }, props), eventProps), getTeamixLayout), {}, {
-    form: form,
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: gridSchema,
-    onSubmit: onFilter
+    feedbackLayout: "popover"
+  }, otherProps), getTeamixLayout), {}, {
+    onSubmit: onSubmit
   }));
 });
 AdvancedFilter.defaultProps = {
-  triggerType: 'change',
   layout: 'horizontal',
   labelAlign: 'right',
   labelCol: 6,
   wrapperCol: 18
 };
 /**
- * 聚合筛选
+ * 查询筛选
  */
 
-var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
+var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var addonAfter = props.addonAfter,
+      addonBefore = props.addonBefore,
       onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded2);
+      mode = props.mode,
+      expand = props.expand,
+      otherProps = _objectWithoutProperties(props, _excluded4);
 
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-light'
-  });
-  var LightSchema = (0, _react.useMemo)(function () {
-    return [{
-      component: 'LightFilter',
-      children: schema
-    }];
-  }, [schema]);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "popover",
-    breakpoints: [],
-    bordered: false
-  }, otherProps), eventProps), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className),
-    schema: LightSchema
-  }));
-});
-LightFilter.defaultProps = {
-  triggerType: 'change'
-};
-/**
- * 查询筛选
- */
+  var form = (0, _react.useMemo)(function () {
+    return props.form || (0, _core.createForm)({
+      validateFirst: true
+    });
+  }, []);
 
-var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(expand),
       _useState2 = _slicedToArray(_useState, 2),
       advancedFilterVisible = _useState2[0],
       setAdvancedFilterVisible = _useState2[1];
@@ -280,17 +265,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       tagDataSource = _useState4[0],
       setTagDataSource = _useState4[1];
 
-  var outerForm = props.form,
-      addonAfter = props.addonAfter,
-      addonBefore = props.addonBefore,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded3);
-
-  var form = (0, _react.useMemo)(function () {
-    return outerForm || (0, _core.createForm)({
-      validateFirst: true
-    });
-  }, []);
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
   }); // 展开收起高级筛选
@@ -319,9 +293,20 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }).filter(function (item) {
       return (0, _utils.isSignificative)(item.value);
     });
-  }, []); // 表单值变化
+  }, []); // 表单值提交
+
+  var onFormSubmit = (0, _react.useCallback)(function (values) {
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, []); // 轻量表单onChange
+
+  var onLightValueChange = (0, _react.useCallback)(function (values) {
+    form.reset();
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, [form]); // 简单表单onChange
 
-  var onFormValueChange = (0, _react.useCallback)(function (values) {
+  var onSimpleValueChange = (0, _react.useCallback)(function (values) {
     setTagDataSource(getTagDataSource(form));
     onFilter && onFilter(values);
   }, []); // 关闭标签清空表单字段值
@@ -341,11 +326,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     className: "".concat(prefixCls, "-left")
   }, addonBefore ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonBefore")
-  }, addonBefore) : null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-light-wrap")
+  }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
   }, /*#__PURE__*/_react.default.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
-    onFilter: onFormValueChange
+    onFilter: onLightValueChange,
+    onSubmit: onFormSubmit
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
@@ -362,9 +348,15 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     type: "up-line"
   }) : /*#__PURE__*/_react.default.createElement(_icon.default, {
     type: "filter-line"
-  }), (0, _utils.getMessage)('advancedFilter'))))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
+  }), (0, _utils.getMessage)('advancedFilter'))))) : /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
+  }, /*#__PURE__*/_react.default.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onFilter: onSimpleValueChange,
+    onSubmit: onFormSubmit
+  })))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonAfter")
-  }, addonAfter) : null), /*#__PURE__*/_react.default.createElement("div", {
+  }, addonAfter) : null), mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-panel")
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
@@ -390,7 +382,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     className: (0, _classnames.default)("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
   }, /*#__PURE__*/_react.default.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
-    onFilter: onFormValueChange
-  })))));
+    onSubmit: onFormSubmit
+  })))) : null);
 });
-exports.QueryFilter = QueryFilter;
+exports.QueryFilter = QueryFilter;
+QueryFilter.defaultProps = {
+  mode: 'inline',
+  expand: false
+};

package/lib/form/Filter/index2.scss

@@ -14,7 +14,7 @@ $query-filter: #{$teamix-pro-form}-query-filter;
     flex: 0 1 auto;
     margin-right: 8px;
   }
-  .#{$query-filter}-light-wrap {
+  .#{$query-filter}-inline-form {
     flex: 0 0 auto;
     margin-right: 8px;
     margin-bottom: 8px;

package/lib/form/SchemaForm/reactions.js

@@ -68,11 +68,7 @@ var $dataSource = function $dataSource(services, onComplete, context) {
       readOnly: true
     });
     return services(field, context).then(function (res) {
-      var _res$map;
-
-      var isValueInDataSource = res === null || res === void 0 ? void 0 : (_res$map = res.map(function (v) {
-        return v.value;
-      })) === null || _res$map === void 0 ? void 0 : _res$map.includes(field.value);
+      var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };

package/lib/form/typing.d.ts

@@ -65,6 +65,12 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
 export interface QueryFilterProps extends ProFormProps {
+    /**
+     * @deprecated triggerType已弃用
+     */
+    triggerType?: 'keydown' | 'change' | 'submit';
+    mode?: 'inline' | 'panel';
+    expand?: boolean;
     addonBefore?: ReactNode;
     addonAfter?: ReactNode;
     onFilter?: (values: any) => void;

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.13";
+declare const version = "1.2.14";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.13';
+var version = '1.2.14';
 exports.version = version;

package/lib/page-header/index.js

@@ -82,21 +82,12 @@ var renderActionGroup = function renderActionGroup(group, defaultProps) {
   return group;
 };
 
-var isPresetColor = function isPresetColor(color) {
-  if (!color) {
-    return false;
-  }
-
-  var PRESET_COLOR_REG = /blue|green|orange|red|yellow/;
-  return PRESET_COLOR_REG.test(color);
-};
-
 var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgroundType) {
   var _classnames;
 
-  var isColorPresetColor = isPresetColor(color);
-  var isBgColorPresetColor = isPresetColor(backgroundColor);
-  var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat(cls("color-".concat(color))), isColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-color-".concat(backgroundColor))), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
+  var isColorPresetColor = (0, _utils.isPresetColor)(color);
+  var isBgColorPresetColor = (0, _utils.isPresetColor)(backgroundColor);
+  var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat((0, _utils.getColorClassName)(color)), isColorPresetColor), _defineProperty(_classnames, "".concat((0, _utils.getBackgroundColorClassName)(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
   var styleColor = isColorPresetColor ? undefined : color;
   var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
   var style = {

package/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -25,6 +25,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -138,10 +146,23 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
 
 
   var moveUp = function moveUp(e, dataIndex) {
+    var _newColumns$filter, _newColumns$filter2;
+
     e.stopPropagation();
-    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
-    var index = keyNewColumns.findIndex(function (_ref) {
-      var index = _ref.dataIndex;
+    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref) {
+      var lock = _ref.lock;
+      return !lock;
+    });
+    var headLock = (0, _utils2.cloneDeep)((_newColumns$filter = newColumns.filter(function (_ref2) {
+      var lock = _ref2.lock;
+      return lock === true || lock === 'left';
+    })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : []);
+    var tailLock = (0, _utils2.cloneDeep)((_newColumns$filter2 = newColumns.filter(function (_ref3) {
+      var lock = _ref3.lock;
+      return lock === 'right';
+    })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : []);
+    var index = keyNewColumns.findIndex(function (_ref4) {
+      var index = _ref4.dataIndex;
       return index === dataIndex;
     });
 
@@ -151,15 +172,28 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       keyNewColumns.push(keyNewColumns.shift());
     }
 
-    notifyTableRender(keyNewColumns);
+    notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
   }; // 向下
 
 
   var moveDown = function moveDown(e, dataIndex) {
+    var _newColumns$filter3, _newColumns$filter4;
+
     e.stopPropagation();
-    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
-    var index = keyNewColumns.findIndex(function (_ref2) {
-      var index = _ref2.dataIndex;
+    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref5) {
+      var lock = _ref5.lock;
+      return !lock;
+    });
+    var headLock = (0, _utils2.cloneDeep)((_newColumns$filter3 = newColumns.filter(function (_ref6) {
+      var lock = _ref6.lock;
+      return lock === true || lock === 'left';
+    })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : []);
+    var tailLock = (0, _utils2.cloneDeep)((_newColumns$filter4 = newColumns.filter(function (_ref7) {
+      var lock = _ref7.lock;
+      return lock === 'right';
+    })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : []);
+    var index = keyNewColumns.findIndex(function (_ref8) {
+      var index = _ref8.dataIndex;
       return index === dataIndex;
     });
 
@@ -169,7 +203,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       keyNewColumns.unshift(keyNewColumns.splice(index, 1)[0]);
     }
 
-    notifyTableRender(keyNewColumns);
+    notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
   }; // 通知表格渲染
 
 
@@ -237,23 +271,24 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       type: "primary"
     }, (0, _utils.getMessage)('reset'))), /*#__PURE__*/_react.default.createElement(_components.Menu.Divider, {
       key: "divider"
-    }), newColumns.map(function (_ref3, index) {
+    }), newColumns.map(function (_ref9, index) {
       var _newColumns$find;
 
-      var dataIndex = _ref3.dataIndex,
-          title = _ref3.title,
-          columnFiltersDisabled = _ref3.columnFiltersDisabled;
+      var dataIndex = _ref9.dataIndex,
+          title = _ref9.title,
+          columnFiltersDisabled = _ref9.columnFiltersDisabled,
+          lock = _ref9.lock;
       return /*#__PURE__*/_react.default.createElement(CheckboxItem, {
         key: index,
-        checked: (_newColumns$find = newColumns.find(function (_ref4) {
-          var key = _ref4.dataIndex;
+        checked: (_newColumns$find = newColumns.find(function (_ref10) {
+          var key = _ref10.dataIndex;
           return key === dataIndex;
         })) === null || _newColumns$find === void 0 ? void 0 : _newColumns$find.columnFilters,
         onChange: function onChange(check) {
           return onChangeColumns(check, dataIndex);
         },
         disabled: columnFiltersDisabled
-      }, title, /*#__PURE__*/_react.default.createElement("div", {
+      }, title, !lock && /*#__PURE__*/_react.default.createElement("div", {
         className: cls({
           sort: true
         })
@@ -310,8 +345,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         key: index,
         className: cls('col')
       }, /*#__PURE__*/_react.default.createElement(_components.Checkbox, {
-        checked: (_newColumns$find2 = newColumns.find(function (_ref5) {
-          var key = _ref5.dataIndex;
+        checked: (_newColumns$find2 = newColumns.find(function (_ref11) {
+          var key = _ref11.dataIndex;
           return key === dataIndex;
         })) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
         onChange: function onChange(check) {

package/lib/table/components/ToolBar/index.scss

@@ -40,6 +40,7 @@
         visibility: visible;
         cursor: pointer;
       }
+
     }
   }
   .next-menu-item-text {

package/lib/table/index.js

@@ -608,7 +608,11 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
-    // 监听 浏览器变化 更吸底状态
+    var _actionRef$current5, _actionRef$current5$i;
+
+    // 初始化 state 状态
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$i = _actionRef$current5.initState) === null || _actionRef$current5$i === void 0 ? void 0 : _actionRef$current5$i.call(_actionRef$current5); // 监听 浏览器变化 更吸底状态
+
     if (footerSuction) {
       getFooterSuctionState();
 
@@ -629,6 +633,8 @@ var ProTable = function ProTable(props) {
       if (window.onresize) {
         window.onresize = null;
       }
+
+      actionRef.current = undefined;
     };
   }, []);
 

package/lib/table/typing.d.ts

@@ -178,10 +178,12 @@ export declare type ProTableActionType = {
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
-    /** 获取state状态 */
+    /** 获取state 状态 */
     getState?: () => ProTableActionTypeState;
-    /** 设置state状态 */
+    /** 设置state 状态 */
     setState?: (key: string, value: any) => void;
+    /** 初始化 state 状态 */
+    initState?: () => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */