@teamix/pro 1.4.15 → 1.4.16

package/es/actions/base.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { MaybePromise } from '@teamix/utils';
+import { DialogAction } from './dialog';
 export interface BaseAction {
     /** 事件触发方式，默认是 onClick */
     trigger?: string;
@@ -18,7 +19,7 @@ export interface BaseAction {
     /** 事件开始执行完毕的回调函数 */
     onFinish?: (params?: any) => any;
 }
-export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
+export declare function eventHandler(action: BaseAction & DialogAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
     [x: string]: (e: React.MouseEvent<HTMLElement>) => Promise<void>;
 };
 export default eventHandler;

package/es/actions/base.js

@@ -11,7 +11,9 @@ export function eventHandler(action, actionContext, onTrigger) {
       preventDefault = action.preventDefault,
       stopPropagation = action.stopPropagation,
       beforeAction = action.beforeAction;
-  return _defineProperty({}, "".concat(trigger), function () {
+  var openIdentifier = action.openIdentifier;
+
+  var baseProps = _defineProperty({}, "".concat(trigger), function () {
     var _2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
       var _action$onTrigger;
 
@@ -73,5 +75,13 @@ export function eventHandler(action, actionContext, onTrigger) {
 
     return _;
   }());
+
+  if (openIdentifier) {
+    baseProps = Object.assign({}, baseProps, {
+      id: openIdentifier
+    });
+  }
+
+  return baseProps;
 }
 export default eventHandler;

package/es/actions/dialog.d.ts

@@ -29,6 +29,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     onOk?: any;
     /** 点击取消自定义回调函数  */
     onCancel?: any;
+    /** 打开工作区 id  */
+    openIdentifier?: string | number;
 }
 export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/es/actions/dialog.js

@@ -1,5 +1,5 @@
 var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className", "openIdentifier"];
 
 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; }
 
@@ -38,6 +38,7 @@ import { renderProMessage } from '../utils/message';
 import { eventHandler } from './base';
 import { doRequest } from './request';
 import { addContext } from './utils';
+import { useUrlState } from '@teamix/hooks';
 
 function addContextForReactNode(content, context) {
   if (typeof content === 'function' && context) {
@@ -81,6 +82,11 @@ export function useDialogAction(action, actionContext, hasForm) {
   var footerDescriptionRef = useRef();
   var history = useHistory();
 
+  var _useUrlState = useUrlState(),
+      _useUrlState2 = _slicedToArray(_useUrlState, 2),
+      urlState = _useUrlState2[0],
+      setUrlState = _useUrlState2[1];
+
   var onActionStart = function onActionStart(context, e) {
     var _objectSpread2;
 
@@ -121,7 +127,18 @@ export function useDialogAction(action, actionContext, hasForm) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
+        openIdentifier = _getTargetValue.openIdentifier,
         containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+    /**
+     *  判断是否含有 openIdentifierIdentifiy参数 ,更改对应 url
+     */
+
+
+    if (openIdentifier) {
+      setUrlState({
+        openIdentifier: openIdentifier
+      });
+    }
 
     var isDrawer = dialogType === 'drawer';
     var isPop = dialogType === 'pop';
@@ -230,7 +247,15 @@ export function useDialogAction(action, actionContext, hasForm) {
     var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({}, addContext(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "onCancel", function onCancel() {
+      setUrlState({
+        openIdentifier: undefined
+      });
       propsOnCancel && propsOnCancel(context);
+    }), _defineProperty(_objectSpread2, "onClose", function onClose() {
+      setUrlState({
+        openIdentifier: undefined
+      });
+      hide === null || hide === void 0 ? void 0 : hide();
     }), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/React.createElement(React.Fragment, null, beforeContent && /*#__PURE__*/React.createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/React.createElement("div", {

package/es/actions/drawer.js

@@ -1,5 +1,12 @@
+import { useEffect } from 'react';
 import useDialogAction from './dialog';
 export function useDrawerAction(action, context) {
+  useEffect(function () {
+    var _action$openIdentifie, _action$openIdentifie2;
+
+    var dom = document.getElementById((_action$openIdentifie = (_action$openIdentifie2 = action.openIdentifier) === null || _action$openIdentifie2 === void 0 ? void 0 : _action$openIdentifie2.toString()) !== null && _action$openIdentifie !== void 0 ? _action$openIdentifie : '');
+    dom === null || dom === void 0 ? void 0 : dom.click();
+  }, []);
   return useDialogAction(Object.assign({
     dialogType: 'drawer'
   }, action), context);

package/es/form/ProForm/index.js

@@ -94,9 +94,11 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), ProFieldComponents);
 
   var onAutoSubmit = useAutoSubmit(onSubmit, context);
+  console.log(otherProps);
   var autoTeamixLayout = useAutoLayout(_objectSpread(_objectSpread({}, otherProps), {}, {
     schema: schema
   }), formRef);
+  console.log(autoTeamixLayout);
   useMemo(function () {
     // 配置表单默认值
     if (initialValues) {

package/es/form/ProForm/index.scss

@@ -338,8 +338,15 @@
 }
 
 // ArrayTable
-.#{$form-array}-table-status-select {
-  display: none;
+.#{$form-array}-table {
+  &-status-select {
+    display: none;
+  }
+  .#{$css-prefix}formily-item:not(.#{$form-item-cls}-feedback-layout-popover) {
+    .#{$form-item-cls}-help {
+      z-index: 2 !important;
+    }
+  }
 }
 
 // SelectTable

package/es/form/ProForm/useAutoLayout.js

@@ -30,7 +30,7 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
       autoLabel = _ref2.autoLabel;
 
   var breakpoints = useMemo(function () {
-    return autoLabel ? false : breakpoints;
+    return autoLabel ? false : outBreakpoints;
   }, []); // 当前断点不支持Col更新
 
   var _useState = useState({

package/es/form/SchemaForm/initializeArrayTable.js

@@ -1,4 +1,5 @@
-var _excluded = ["title", "decoratorProps"];
+var _excluded = ["title", "decoratorProps"],
+    _excluded2 = ["title", "dataIndex", "cell", "htmlTitle", "sortable", "width", "align", "alignHeader", "filters", "filterMode", "filterMenuProps", "lock", "resizable", "colSpan"];
 
 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; }
 
@@ -12,15 +13,49 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var initializeColumn = function initializeColumn(item) {
   var title = item.title,
-      decoratorProps = item.decoratorProps,
-      children = _objectWithoutProperties(item, _excluded);
+      _item$decoratorProps = item.decoratorProps,
+      decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps,
+      children = _objectWithoutProperties(item, _excluded); // 将Table.Column属性和组件FormItem属性通过decoratorProps统一传入，再分别赋值
 
+
+  var columnTitle = decoratorProps.title,
+      dataIndex = decoratorProps.dataIndex,
+      cell = decoratorProps.cell,
+      htmlTitle = decoratorProps.htmlTitle,
+      sortable = decoratorProps.sortable,
+      width = decoratorProps.width,
+      align = decoratorProps.align,
+      alignHeader = decoratorProps.alignHeader,
+      filters = decoratorProps.filters,
+      filterMode = decoratorProps.filterMode,
+      filterMenuProps = decoratorProps.filterMenuProps,
+      lock = decoratorProps.lock,
+      resizable = decoratorProps.resizable,
+      colSpan = decoratorProps.colSpan,
+      formItemDecoratorProps = _objectWithoutProperties(decoratorProps, _excluded2);
+
+  var columnProperties = {
+    title: title !== null && title !== void 0 ? title : columnTitle,
+    dataIndex: dataIndex,
+    cell: cell,
+    htmlTitle: htmlTitle,
+    sortable: sortable,
+    width: width,
+    align: align,
+    alignHeader: alignHeader,
+    filters: filters,
+    filterMode: filterMode,
+    filterMenuProps: filterMenuProps,
+    lock: lock,
+    resizable: resizable,
+    colSpan: colSpan
+  };
   return {
     component: 'ArrayTable.Column',
-    props: _objectSpread(_objectSpread({}, decoratorProps), {}, {
-      title: title
-    }),
-    children: [_objectSpread({}, children)]
+    props: columnProperties,
+    children: [_objectSpread(_objectSpread({}, children), {}, {
+      decoratorProps: formItemDecoratorProps
+    })]
   };
 };
 

package/es/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.4.15";
+declare const version = "1.4.16";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

@@ -36,6 +36,6 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.4.15';
+var version = '1.4.16';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

package/es/table/components/Layout/index.js

@@ -124,16 +124,18 @@ var Layout = function Layout(props) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(QueryFilterLayout, {
         addonBefore: renderMainAction(),
-        addonAfter: renderAddonAfter()
-      }), afterDataFilter && /*#__PURE__*/React.createElement("div", {
-        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/React.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     } else {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(QueryFilterLayout, {
-        addonAfter: renderAddonAfter()
-      }), ' ', afterDataFilter && /*#__PURE__*/React.createElement("div", {
-        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/React.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     }
   }; // 区域组合渲染
 

package/lib/actions/base.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { MaybePromise } from '@teamix/utils';
+import { DialogAction } from './dialog';
 export interface BaseAction {
     /** 事件触发方式，默认是 onClick */
     trigger?: string;
@@ -18,7 +19,7 @@ export interface BaseAction {
     /** 事件开始执行完毕的回调函数 */
     onFinish?: (params?: any) => any;
 }
-export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
+export declare function eventHandler(action: BaseAction & DialogAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
     [x: string]: (e: React.MouseEvent<HTMLElement>) => Promise<void>;
 };
 export default eventHandler;

package/lib/actions/base.js

@@ -20,7 +20,9 @@ function eventHandler(action, actionContext, onTrigger) {
       preventDefault = action.preventDefault,
       stopPropagation = action.stopPropagation,
       beforeAction = action.beforeAction;
-  return _defineProperty({}, "".concat(trigger), function () {
+  var openIdentifier = action.openIdentifier;
+
+  var baseProps = _defineProperty({}, "".concat(trigger), function () {
     var _2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
       var _action$onTrigger;
 
@@ -82,6 +84,14 @@ function eventHandler(action, actionContext, onTrigger) {
 
     return _;
   }());
+
+  if (openIdentifier) {
+    baseProps = Object.assign({}, baseProps, {
+      id: openIdentifier
+    });
+  }
+
+  return baseProps;
 }
 
 var _default = eventHandler;

package/lib/actions/dialog.d.ts

@@ -29,6 +29,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     onOk?: any;
     /** 点击取消自定义回调函数  */
     onCancel?: any;
+    /** 打开工作区 id  */
+    openIdentifier?: string | number;
 }
 export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/lib/actions/dialog.js

@@ -30,8 +30,10 @@ var _request = require("./request");
 
 var _utils2 = require("./utils");
 
+var _hooks = require("@teamix/hooks");
+
 var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className", "openIdentifier"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -107,6 +109,11 @@ function useDialogAction(action, actionContext, hasForm) {
   var footerDescriptionRef = (0, _react.useRef)();
   var history = (0, _reactRouterDom.useHistory)();
 
+  var _useUrlState = (0, _hooks.useUrlState)(),
+      _useUrlState2 = _slicedToArray(_useUrlState, 2),
+      urlState = _useUrlState2[0],
+      setUrlState = _useUrlState2[1];
+
   var onActionStart = function onActionStart(context, e) {
     var _objectSpread2;
 
@@ -147,7 +154,18 @@ function useDialogAction(action, actionContext, hasForm) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
+        openIdentifier = _getTargetValue.openIdentifier,
         containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+    /**
+     *  判断是否含有 openIdentifierIdentifiy参数 ,更改对应 url
+     */
+
+
+    if (openIdentifier) {
+      setUrlState({
+        openIdentifier: openIdentifier
+      });
+    }
 
     var isDrawer = dialogType === 'drawer';
     var isPop = dialogType === 'pop';
@@ -256,7 +274,15 @@ function useDialogAction(action, actionContext, hasForm) {
     var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "onCancel", function onCancel() {
+      setUrlState({
+        openIdentifier: undefined
+      });
       propsOnCancel && propsOnCancel(context);
+    }), _defineProperty(_objectSpread2, "onClose", function onClose() {
+      setUrlState({
+        openIdentifier: undefined
+      });
+      hide === null || hide === void 0 ? void 0 : hide();
     }), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {

package/lib/actions/drawer.js

@@ -6,11 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.useDrawerAction = useDrawerAction;
 
+var _react = require("react");
+
 var _dialog = _interopRequireDefault(require("./dialog"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function useDrawerAction(action, context) {
+  (0, _react.useEffect)(function () {
+    var _action$openIdentifie, _action$openIdentifie2;
+
+    var dom = document.getElementById((_action$openIdentifie = (_action$openIdentifie2 = action.openIdentifier) === null || _action$openIdentifie2 === void 0 ? void 0 : _action$openIdentifie2.toString()) !== null && _action$openIdentifie !== void 0 ? _action$openIdentifie : '');
+    dom === null || dom === void 0 ? void 0 : dom.click();
+  }, []);
   return (0, _dialog.default)(Object.assign({
     dialogType: 'drawer'
   }, action), context);

package/lib/form/ProForm/index.js

@@ -126,9 +126,11 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), _ProField.default);
 
   var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit, context);
+  console.log(otherProps);
   var autoTeamixLayout = (0, _useAutoLayout.default)(_objectSpread(_objectSpread({}, otherProps), {}, {
     schema: schema
   }), formRef);
+  console.log(autoTeamixLayout);
   (0, _react.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {

package/lib/form/ProForm/index.scss

@@ -338,8 +338,15 @@
 }
 
 // ArrayTable
-.#{$form-array}-table-status-select {
-  display: none;
+.#{$form-array}-table {
+  &-status-select {
+    display: none;
+  }
+  .#{$css-prefix}formily-item:not(.#{$form-item-cls}-feedback-layout-popover) {
+    .#{$form-item-cls}-help {
+      z-index: 2 !important;
+    }
+  }
 }
 
 // SelectTable

package/lib/form/ProForm/useAutoLayout.js

@@ -39,7 +39,7 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
       autoLabel = _ref2.autoLabel;
 
   var breakpoints = (0, _react.useMemo)(function () {
-    return autoLabel ? false : breakpoints;
+    return autoLabel ? false : outBreakpoints;
   }, []); // 当前断点不支持Col更新
 
   var _useState = (0, _react.useState)({

package/lib/form/SchemaForm/initializeArrayTable.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["title", "decoratorProps"];
+var _excluded = ["title", "decoratorProps"],
+    _excluded2 = ["title", "dataIndex", "cell", "htmlTitle", "sortable", "width", "align", "alignHeader", "filters", "filterMode", "filterMenuProps", "lock", "resizable", "colSpan"];
 
 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; }
 
@@ -18,15 +19,49 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var initializeColumn = function initializeColumn(item) {
   var title = item.title,
-      decoratorProps = item.decoratorProps,
-      children = _objectWithoutProperties(item, _excluded);
+      _item$decoratorProps = item.decoratorProps,
+      decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps,
+      children = _objectWithoutProperties(item, _excluded); // 将Table.Column属性和组件FormItem属性通过decoratorProps统一传入，再分别赋值
 
+
+  var columnTitle = decoratorProps.title,
+      dataIndex = decoratorProps.dataIndex,
+      cell = decoratorProps.cell,
+      htmlTitle = decoratorProps.htmlTitle,
+      sortable = decoratorProps.sortable,
+      width = decoratorProps.width,
+      align = decoratorProps.align,
+      alignHeader = decoratorProps.alignHeader,
+      filters = decoratorProps.filters,
+      filterMode = decoratorProps.filterMode,
+      filterMenuProps = decoratorProps.filterMenuProps,
+      lock = decoratorProps.lock,
+      resizable = decoratorProps.resizable,
+      colSpan = decoratorProps.colSpan,
+      formItemDecoratorProps = _objectWithoutProperties(decoratorProps, _excluded2);
+
+  var columnProperties = {
+    title: title !== null && title !== void 0 ? title : columnTitle,
+    dataIndex: dataIndex,
+    cell: cell,
+    htmlTitle: htmlTitle,
+    sortable: sortable,
+    width: width,
+    align: align,
+    alignHeader: alignHeader,
+    filters: filters,
+    filterMode: filterMode,
+    filterMenuProps: filterMenuProps,
+    lock: lock,
+    resizable: resizable,
+    colSpan: colSpan
+  };
   return {
     component: 'ArrayTable.Column',
-    props: _objectSpread(_objectSpread({}, decoratorProps), {}, {
-      title: title
-    }),
-    children: [_objectSpread({}, children)]
+    props: columnProperties,
+    children: [_objectSpread(_objectSpread({}, children), {}, {
+      decoratorProps: formItemDecoratorProps
+    })]
   };
 };
 

package/lib/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.4.15";
+declare const version = "1.4.16";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -317,5 +317,5 @@ if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMI
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
 
-var version = '1.4.15';
+var version = '1.4.16';
 exports.version = version;

package/lib/table/components/Layout/index.js

@@ -145,16 +145,18 @@ var Layout = function Layout(props) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
         addonBefore: renderMainAction(),
-        addonAfter: renderAddonAfter()
-      }), afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
-        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/_react.default.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     } else {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
-        addonAfter: renderAddonAfter()
-      }), ' ', afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
-        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/_react.default.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     }
   }; // 区域组合渲染
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.4.15",
+  "version": "1.4.16",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",