@teamix/pro 1.2.7 → 1.2.11

package/lib/actions/request.js

@@ -51,7 +51,7 @@ function doRequest(action, context, history, extraParams) {
   }, others), context, history, extraParams);
 }
 
-function useRequestAction(action, context) {
+function useRequestAction(action, actionContext) {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -62,7 +62,7 @@ function useRequestAction(action, context) {
   var onFinish = action.onFinish,
       others = _objectWithoutProperties(action, _excluded2);
 
-  return _objectSpread(_objectSpread({}, (0, _base.eventHandler)(action, function () {
+  return _objectSpread(_objectSpread({}, (0, _base.eventHandler)(action, actionContext, function (context) {
     setLoading(true);
     doRequest(_objectSpread({}, others), context, history).then(function () {
       setLoading(false);

package/lib/card/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ProTagItem } from '../utils/components/tags';
 import { ProActionGroupProps } from '../actions';
 import './index.scss';
 export * from './card-container';
@@ -13,6 +14,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     tooltip?: React.ReactNode;
     /** 标题右侧图标 */
     tooltipIcon?: React.ReactNode;
+    /** 标签组 */
+    tags?: ProTagItem[];
     /** 标题右侧描述 */
     description?: React.ReactNode;
     /** 额外信息区域，位于卡片右上角，可以配置一些常用轻量操作 */
@@ -23,11 +26,11 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     image?: string;
     /** 卡片标题下方是否有分割线 */
     divider?: boolean;
-    /** 卡片是否有边框 */
-    bordered?: boolean;
     /**
-     * @deprecated 已经没有这个效果了，将在下一个 minor 版本移除
+     * @deprecated 建议使用 borderColor = 'none' 代替
      */
+    bordered?: boolean;
+    /** 卡片在 hover 时拥有阴影效果 */
     hoveredShadow?: boolean;
     /** 卡片是否为紧凑模式，紧凑模式下卡片没有内边距和边框 */
     compacted?: boolean;
@@ -35,6 +38,10 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     centered?: boolean;
     /** 加载中状态 */
     loading?: boolean;
+    /** 空状态 */
+    empty?: boolean;
+    /** 边框颜色 */
+    borderColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent' | 'none';
     /** 背景色 */
     backgroundColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent';
     /** 内容区栅格排列 flex 方向，仅仅在卡片嵌套模式下生效 */
@@ -77,6 +84,17 @@ export declare const ProCard: {
         (props: React.HTMLAttributes<HTMLElement>): JSX.Element;
         isProCardDivider: boolean;
     };
+    Selectable: {
+        (props: import("./selectable").ProCardSelectableProps): JSX.Element;
+        defaultProps: {
+            hoveredShadow: boolean;
+        }; /** 标签组 */
+        isProCard: boolean;
+    };
+    Tab: {
+        (props: import("@alifd/next/types/tab").TabProps): JSX.Element;
+        Item: typeof import("@alifd/next/types/tab").Item;
+    };
     isProCard: boolean;
 };
 export default ProCard;

package/lib/card/index.js

@@ -10,7 +10,9 @@ exports.default = exports.ProCard = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _classnames2 = _interopRequireDefault(require("classnames"));
+var _classnames3 = _interopRequireDefault(require("classnames"));
+
+var _result = _interopRequireDefault(require("@teamix/result"));
 
 var _components = require("@alicloudfe/components");
 
@@ -18,6 +20,8 @@ var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _utils = require("@teamix/utils");
 
+var _tags = require("../utils/components/tags");
+
 var _skeleton = require("../skeleton");
 
 var _actions = require("../actions");
@@ -26,6 +30,10 @@ var _utils2 = require("./utils");
 
 var _divider = _interopRequireDefault(require("./divider"));
 
+var _selectable = _interopRequireDefault(require("./selectable"));
+
+var _tab = _interopRequireDefault(require("./tab"));
+
 require("./index.scss");
 
 var _cardContainer = require("./card-container");
@@ -42,7 +50,7 @@ Object.keys(_cardContainer).forEach(function (key) {
   });
 });
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "description", "extra", "actions", "style", "className", "image", "divider", "bordered", "compacted", "centered", "loading", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -100,24 +108,28 @@ var getFlexDirectionClassName = function getFlexDirectionClassName(direction, sp
 };
 
 var ProCard = function ProCard(props) {
-  var _classnames;
+  var _classnames, _classnames2;
 
   var children = props.children,
       title = props.title,
       subTitle = props.subTitle,
       tooltip = props.tooltip,
       tooltipIcon = props.tooltipIcon,
+      tags = props.tags,
       description = props.description,
       extra = props.extra,
       actions = props.actions,
       style = props.style,
       className = props.className,
       image = props.image,
+      hoveredShadow = props.hoveredShadow,
       divider = props.divider,
       bordered = props.bordered,
       compacted = props.compacted,
       centered = props.centered,
       loading = props.loading,
+      empty = props.empty,
+      borderColor = props.borderColor,
       backgroundColor = props.backgroundColor,
       contentClassName = props.contentClassName,
       contentStyle = props.contentStyle,
@@ -189,13 +201,12 @@ var ProCard = function ProCard(props) {
 
       return /*#__PURE__*/_react.default.createElement("div", {
         style: _objectSpread(_objectSpread({}, childCardStyle), colStyle),
-        className: (0, _classnames2.default)(cls('col'), colClassName),
+        className: (0, _classnames3.default)(cls('col'), colClassName),
         key: "pro-card-col-".concat(index)
       }, /*#__PURE__*/_react.default.cloneElement(element));
     }
 
     if (element === null || element === void 0 ? void 0 : (_element$type2 = element.type) === null || _element$type2 === void 0 ? void 0 : _element$type2.isProCardDivider) {
-      console.log('isProCardDivider');
       return /*#__PURE__*/_react.default.cloneElement(element, {
         style: dividerStyle
       });
@@ -204,13 +215,12 @@ var ProCard = function ProCard(props) {
     return element;
   });
 
-  var cardClassName = (0, _classnames2.default)(cls(), className, backgroundColor, {
-    noBorder: !bordered,
-    compacted: compacted
-  });
-  var cardContentClassName = (0, _classnames2.default)(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames = {
+  var cardClassName = (0, _classnames3.default)(cls(), className, backgroundColor, (_classnames = {
+    'border-none': !bordered
+  }, _defineProperty(_classnames, "border-".concat(borderColor), borderColor), _defineProperty(_classnames, "compacted", compacted), _defineProperty(_classnames, "hoverable", hoveredShadow), _classnames));
+  var cardContentClassName = (0, _classnames3.default)(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames2 = {
     'contain-pro-card': containProCard
-  }, _defineProperty(_classnames, "split-".concat(split), split), _defineProperty(_classnames, 'flex-wrap', wrap), _defineProperty(_classnames, "centered", centered), _classnames));
+  }, _defineProperty(_classnames2, "split-".concat(split), split), _defineProperty(_classnames2, 'flex-wrap', wrap), _defineProperty(_classnames2, "centered", centered || empty), _classnames2));
   var cardContentMargin = containProCard && !split ? {
     marginRight: -horizonal,
     marginLeft: -horizonal,
@@ -229,7 +239,7 @@ var ProCard = function ProCard(props) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls('title')
     }, hasCollapse && /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames2.default)(cls('title-collapse'), {
+      className: (0, _classnames3.default)(cls('title-collapse'), {
         collapsed: collapseState
       }),
       onClick: onCollapseChanged
@@ -245,7 +255,7 @@ var ProCard = function ProCard(props) {
     }, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
       align: "t",
       trigger: tooltipTrigger
-    }, tooltip)), description && /*#__PURE__*/_react.default.createElement("div", {
+    }, tooltip)), tags && (0, _tags.renderTags)(tags, 'small'), description && /*#__PURE__*/_react.default.createElement("div", {
       className: cls('title-description')
     }, description));
   };
@@ -270,7 +280,16 @@ var ProCard = function ProCard(props) {
   }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Content, null), !loading && /*#__PURE__*/_react.default.createElement("div", {
     className: cardContentClassName,
     style: cardContentStyle
-  }, childrenModified)));
+  }, empty && /*#__PURE__*/_react.default.createElement("div", {
+    className: cls('empty')
+  }, childrenModified ? childrenModified : /*#__PURE__*/_react.default.createElement(_result.default, {
+    theme: "hybridcloud-container",
+    img: "noData",
+    title: (0, _utils.getMessage)('noData'),
+    style: {
+      padding: '50px 0 60px'
+    }
+  })), !empty && childrenModified)));
 };
 
 exports.ProCard = ProCard;
@@ -280,6 +299,8 @@ ProCard.defaultProps = {
   direction: 'row'
 };
 ProCard.Divider = _divider.default;
+ProCard.Selectable = _selectable.default;
+ProCard.Tab = _tab.default;
 ProCard.isProCard = true;
 var _default = ProCard;
 exports.default = _default;

package/lib/card/index.scss

@@ -153,6 +153,25 @@
     }
   }
 
+  &-tab {
+    margin-top: calc(0px - var(--s-2));
+
+    & > .next-tabs-bar {
+      border-bottom: none;
+    }
+
+    & > .next-tabs-content {
+      padding-top: var(--s-5, 20px);
+    }
+  }
+
+  &-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: var(--color-text1-8, #848484);
+  }
+
   & > .next-card-actions {
     & > .teamix-pro-actions {
       & > .next-btn {
@@ -166,8 +185,10 @@
     }
   }
 
-  &.noBorder {
-    border: none;
+  &.hoverable {
+    &:hover {
+      box-shadow: var(--shadow-3, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
+    }
   }
 
   &.compacted {
@@ -183,6 +204,54 @@
     }
   }
 
+  &.border {
+    &-blue {
+      border-color: var(--color-notice-5);
+    }
+
+    &-orange {
+      border-color: var(--color-warning-5);
+    }
+
+    &-yellow {
+      border-color: var(--color-help-5);
+    }
+
+    &-red {
+      border-color: var(--color-error-5);
+    }
+
+    &-green {
+      border-color: var(--color-success-5);
+    }
+
+    &-grey {
+      border-color: var(--color-line1-1);
+    }
+
+    &-transparent {
+      border-color: transparent;
+    }
+
+    &-none {
+      border: none;
+    }
+  }
+
+  &-selectable {
+    cursor: pointer;
+
+    &-icon {
+      &-selected {
+        color: var(--color-notice-5);
+      }
+
+      &-unselected {
+        color: var(--color-line1-1);
+      }
+    }
+  }
+
   &.blue {
     background-color: var(--color-notice-1);
   }

package/lib/card/selectable.d.ts

@@ -0,0 +1,13 @@
+import { ProCardProps } from './index';
+export interface ProCardSelectableProps extends Omit<ProCardProps, 'onSelect'> {
+    selected?: boolean;
+    onSelect?: (selected: boolean) => void;
+}
+declare const ProCardSelectable: {
+    (props: ProCardSelectableProps): JSX.Element;
+    defaultProps: {
+        hoveredShadow: boolean;
+    };
+    isProCard: boolean;
+};
+export default ProCardSelectable;

package/lib/card/selectable.js

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _icon = _interopRequireDefault(require("@teamix/icon"));
+
+var _utils = require("@teamix/utils");
+
+var _index = require("./index");
+
+var _excluded = ["selected", "onSelect", "className", "onClick"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
+
+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 cls = (0, _utils.baseClass)('teamix-pro-card-selectable');
+
+var ProCardSelectable = function ProCardSelectable(props) {
+  var selected = props.selected,
+      onSelect = props.onSelect,
+      className = props.className,
+      _onClick = props.onClick,
+      others = _objectWithoutProperties(props, _excluded);
+
+  return /*#__PURE__*/_react.default.createElement(_index.ProCard, _objectSpread({
+    className: (0, _classnames.default)(cls(), className),
+    borderColor: selected ? 'blue' : 'grey',
+    extra: /*#__PURE__*/_react.default.createElement(_icon.default, {
+      className: cls('icon', selected ? 'icon-selected' : 'icon-unselected'),
+      type: selected ? 'success-fill' : 'circle-line'
+    }),
+    onClick: function onClick(e) {
+      _onClick && _onClick(e);
+      onSelect && onSelect(!selected);
+    }
+  }, others));
+};
+
+ProCardSelectable.defaultProps = {
+  hoveredShadow: true
+};
+ProCardSelectable.isProCard = true;
+var _default = ProCardSelectable;
+exports.default = _default;

package/lib/card/tab.d.ts

@@ -0,0 +1,6 @@
+import { TabProps } from '@alicloudfe/components/types/tab';
+declare const ProCardTab: {
+    (props: TabProps): JSX.Element;
+    Item: typeof import("@alifd/next/types/tab").Item;
+};
+export default ProCardTab;

package/lib/card/tab.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _components = require("@alicloudfe/components");
+
+var _excluded = ["className"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
+
+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 ProCardTab = function ProCardTab(props) {
+  var className = props.className,
+      others = _objectWithoutProperties(props, _excluded);
+
+  return /*#__PURE__*/_react.default.createElement(_components.Tab, _objectSpread({
+    className: (0, _classnames.default)('teamix-pro-card-tab', className)
+  }, others));
+};
+
+ProCardTab.Item = _components.Tab.Item;
+var _default = ProCardTab;
+exports.default = _default;

package/lib/form/Filter/index.js

@@ -50,8 +50,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 searchText = (0, _utils.getMessage)('search');
-
 var getEventProps = function getEventProps(triggerType, onFilter) {
   var keydownEvent = {
     onSubmit: onFilter
@@ -200,7 +198,8 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
               onResetValidateSuccess: onReset,
               style: _objectSpread({}, triggerType === 'submit' ? {} : {
                 marginRight: -16
-              })
+              }),
+              children: (0, _utils.getMessage)('reset')
             }
           }, {
             component: 'Submit',
@@ -209,9 +208,9 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
                 marginRight: -8
               } : {
                 display: 'none'
-              })
-            },
-            content: searchText
+              }),
+              children: (0, _utils.getMessage)('search')
+            }
           }]
         }]
       }])

package/lib/form/ProForm/index.js

@@ -84,7 +84,8 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       context: context
     });
   }, [scope, context]);
-  var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit);
+  var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit); // todo 需要formily支持断点下的属性更新
+
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints ? {
       breakpoints: breakpoints,
@@ -136,28 +137,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     schema: schema,
     scope: mergedScope,
     components: components
-  }), children); // return outerForm === false ? ( // 特殊表单，无需渲染form实例，例如FormDialog等
-  //   <FormLayout
-  //     className={cls(prefixCls, className)}
-  //     {...otherProps}
-  //     {...getTeamixLayout}
-  //   >
-  //     <SchemaForm schema={schema} scope={scope} components={components} />
-  //     {children}
-  //   </FormLayout>
-  // ) : (
-  //   <Form
-  //     className={cls(prefixCls, className)}
-  //     {...otherProps}
-  //     {...getTeamixLayout}
-  //     form={form}
-  //     onAutoSubmit={onAutoSubmit}
-  //     onAutoSubmitFailed={onSubmitFailed}
-  //   >
-  //     <SchemaForm schema={schema} scope={scope} components={components} />
-  //     {children}
-  //   </Form>
-  // );
+  }), children);
 });
 ProForm.defaultProps = {
   colon: false,

package/lib/form/ProForm/index.scss

@@ -288,3 +288,12 @@
     cursor: pointer;
   }
 }
+
+/* hack todo remove */
+.#{$form-item-cls}-control-content-component {
+  .teamix-pro-field-tooltip.teamix-pro-field-checkbox {
+    .teamix-pro-lable-icon-tip-icon {
+      transform: translate(0px, 4px);
+    }
+  }
+}

package/lib/form/SchemaForm/index.js

@@ -105,6 +105,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
+  // 创建 SchemaField
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
       components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
@@ -135,15 +136,15 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         Text: _index.default
       })
     });
-  }, []); // 合并schema中request的scope
+  }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = (0, _react.useMemo)(function () {
     return _objectSpread({}, scope);
-  }, [scope]); // 格式化schema
+  }, [scope]); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (schema) {
     var schemaProperties = {};
-    schema.forEach(function (item) {
+    schema === null || schema === void 0 ? void 0 : schema.forEach(function (item) {
       var newItem = (0, _warning.default)(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -279,15 +280,15 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     });
     return schemaProperties;
   }, [mergedScope]);
-  var schemaPro = (0, _react.useMemo)(function () {
+  var proFormSchema = (0, _react.useMemo)(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, []); // console.log(schemaPro);
+  }, []); // console.log(proFormSchema);
 
   return /*#__PURE__*/_react.default.createElement(SchemaField, {
-    schema: schemaPro,
+    schema: proFormSchema,
     components: components,
     scope: mergedScope
   });

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.6";
+declare const version = "1.2.10";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -248,8 +248,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 // import ProLayout from './layout';
+// import ProSidebar from './sidebar'
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.6';
+// export * from './sidebar';
+var version = '1.2.10';
 exports.version = version;

package/lib/info/components/tableInfo/index.js

@@ -58,8 +58,9 @@ var ProTableInfo = function ProTableInfo(props) {
       _layout$labelGutter = layout.labelGutter,
       labelGutter = _layout$labelGutter === void 0 ? '80px' : _layout$labelGutter;
 
-  var newColumns = function newColumns() {
-    return _toConsumableArray(new Array(colNum)).map(function (_, index) {
+  var getNewColumns = function getNewColumns() {
+    // 需要 fill 填充 否则有可能不执行
+    return _toConsumableArray(new Array(colNum)).fill(1).map(function (_, index) {
       return [{
         dataIndex: "label_".concat(index),
         align: 'left',
@@ -104,9 +105,7 @@ var ProTableInfo = function ProTableInfo(props) {
           var needCol = 1 + ((_columnsItem$colSpan = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan !== void 0 ? _columnsItem$colSpan : 1); // 如果剩余的col能满足下一组数据那么就放在这一组
 
           if (needCol <= col) {
-            var _columnsItem$colSpan2;
-
-            col = col - 1 - ((_columnsItem$colSpan2 = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan2 !== void 0 ? _columnsItem$colSpan2 : 1);
+            col = col - needCol;
             filterColumns.push(columnsItem);
           } else {
             var _filterColumns$0$colS;
@@ -119,6 +118,11 @@ var ProTableInfo = function ProTableInfo(props) {
             col = 0;
           }
         }
+
+        if (columnsCopy.length === 0) {
+          // 如果剩余仍有列数并且已经没有columns分配了
+          col = 0;
+        }
       }
 
       var itemData = filterColumns.map(function (item, index) {
@@ -185,7 +189,7 @@ var ProTableInfo = function ProTableInfo(props) {
   return /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, {
     className: "teamix-pro-info-table",
     cellProps: setCellProps,
-    columns: newColumns(),
+    columns: getNewColumns(),
     hasHeader: false,
     hasBorder: true,
     dataSource: newDataSource