@teamix/pro 1.2.6 → 1.2.10

package/es/actions/dialog-form.js

@@ -23,7 +23,7 @@ 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; }
 
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useEffect, createRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Loading } from '@alicloudfe/components';
 import ProForm, { createForm } from '../form';
@@ -136,7 +136,7 @@ export function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       others = _objectWithoutProperties(action, _excluded2);
 
-  var formRef = useRef();
+  var formRef = /*#__PURE__*/createRef();
   return useDialogAction(Object.assign({
     size: size,
     closeable: true,

package/es/actions/dialog.js

@@ -1,10 +1,5 @@
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "overlayProps"],
-    _excluded3 = ["className"];
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 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; }
 
@@ -12,6 +7,10 @@ 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; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 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; }
@@ -32,7 +31,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import classnames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { Dialog, Drawer } from '@alicloudfe/components';
-import { getTargetValue, uuid, goToLink } from '@teamix/utils';
+import { getTargetValue, uuid, goToLink, getMessage } from '@teamix/utils';
 import ProForm, { createForm } from '../form';
 import { renderProMessage } from '../utils/message';
 import { eventHandler } from './base';
@@ -110,28 +109,21 @@ export function useDialogAction(action, context) {
         message = _getTargetValue.message,
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
-        _getTargetValue$overl = _getTargetValue.overlayProps,
-        overlayProps = _getTargetValue$overl === void 0 ? {} : _getTargetValue$overl,
+        className = _getTargetValue.className,
         containerProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
     var isDrawer = dialogType === 'drawer';
     var container = isDrawer ? Drawer : Dialog;
-
-    var overlayClassName = overlayProps.className,
-        overlayOtherProps = _objectWithoutProperties(overlayProps, _excluded3);
-
     var dialogOnlyProps = {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
-      },
-      overlayProps: _objectSpread({
-        className: classnames('teamix-pro-action-dialog', overlayClassName, {
-          'has-footer-description': !!footerDescription
-        })
-      }, overlayOtherProps)
+      }
     };
-    var containerOtherProps = isDrawer ? {} : dialogOnlyProps;
+    var containerOtherProps = isDrawer ? {
+      okText: getMessage('ok'),
+      cancelText: getMessage('cancel')
+    } : dialogOnlyProps;
 
     var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
       if (footer instanceof Array || footer.component) {
@@ -240,7 +232,10 @@ export function useDialogAction(action, context) {
         className: classnames('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
       }, renderDialogFooterDescription(footerDescription))),
       closeable: !loading,
-      footerAlign: footerAlign
+      footerAlign: footerAlign,
+      className: classnames('teamix-pro-action-dialog', {
+        'has-footer-description': !!footerDescription
+      })
     }, containerOtherProps), containerProps);
 
     var ret = container.show(quickShowProps);

package/es/actions/index.js

@@ -169,13 +169,15 @@ export var ProActionButton = function ProActionButton(props) {
   }, buttonProps), buttonContent(children, icon, iconSize, context));
 };
 
-function renderMenuButtonItem(item, key, context) {
-  var config = item.config,
-      btnContext = item.context,
-      _onClick2 = item.onClick,
-      children = item.children,
-      icon = item.icon,
-      disabled = item.disabled;
+var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
+  var action = props.action,
+      context = props.context;
+  var config = action.config,
+      btnContext = action.context,
+      _onClick2 = action.onClick,
+      children = action.children,
+      icon = action.icon,
+      disabled = action.disabled;
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
@@ -184,30 +186,33 @@ function renderMenuButtonItem(item, key, context) {
       loading = _useAction.loading,
       menuItemProps = _objectWithoutProperties(_useAction, _excluded3);
 
-  var buttonProps = _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
+  var buttonProps = disabled ? {} : _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
     onClick: function onClick(e) {
       return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
-  return /*#__PURE__*/React.createElement(MenuButton.Item, _objectSpread({
-    key: key,
-    disabled: disabled
+  return /*#__PURE__*/React.createElement("div", _objectSpread({
+    className: cls('teamix-pro-action-menu-item', 'next-menu-item', {
+      'next-disabled': disabled
+    })
   }, buttonProps), buttonContent(children, icon, undefined, context));
-}
+};
 
-function renderCommonActionButtonMenuItem(action, key, context) {
+function renderCommonActionButtonMenuItem(action, context) {
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
     return /*#__PURE__*/React.createElement(Menu.SubMenu, {
-      key: key,
       label: menuBtn.label || menuBtn.children
     }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, j, context);
+      return renderCommonActionButtonMenuItem(a, context);
     }));
   }
 
-  return renderMenuButtonItem(action, key, context);
+  return /*#__PURE__*/React.createElement(ProActionMenuButtonItem, {
+    action: action,
+    context: context
+  });
 }
 
 export var ProActionMenuButton = function ProActionMenuButton(props) {
@@ -223,6 +228,7 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
 
   return /*#__PURE__*/React.createElement(MenuButton, _objectSpread({
     popupTriggerType: "hover",
+    autoWidth: false,
     menuProps: {
       mode: 'popup',
       triggerType: 'hover'
@@ -232,8 +238,8 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
     },
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
-  }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, i, context);
+  }, others), actions.map(function (action) {
+    return renderCommonActionButtonMenuItem(action, context);
   }));
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
@@ -337,9 +343,7 @@ export function ProActionGroup(props) {
     })
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: i
-    }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/React.createElement(Divider, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/React.createElement(Divider, {
       direction: "ver"
     }));
   }));

package/es/actions/index.scss

@@ -28,6 +28,19 @@
     flex-shrink: 0;
   }
 }
+.next-dialog.teamix-pro-action-dialog {
+  &.has-footer-description {
+    .next-message {
+      position: static;
+    }
+  }
+
+  &.quick-show-confirm-or-alert {
+    .teamix-pro-dialog-footer-description {
+      bottom: var(--dialog-footer-padding-bottom, 20px);
+    }
+  }
+}
 
 .teamix-pro-dialog-footer-description {
   position: absolute;
@@ -48,12 +61,6 @@
   }
 }
 
-.teamix-pro-action-dialog.has-footer-description {
-  .next-message {
-    position: static;
-  }
-}
-
 .teamix-pro-dialog-before-content {
   margin-bottom: var(--s-2);
 }
@@ -61,7 +68,7 @@
 .teamix-pro-dialog-message {
   margin-bottom: var(--s-2);
 
-  &+.next-loading {
+  & + .next-loading {
     .teamix-pro-form {
       margin-top: 20px;
     }

package/es/card/index.d.ts

@@ -23,11 +23,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 +35,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     centered?: boolean;
     /** 加载中状态 */
     loading?: boolean;
+    /** 边框颜色 */
+    borderColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent' | 'none';
     /** 背景色 */
     backgroundColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent';
     /** 内容区栅格排列 flex 方向，仅仅在卡片嵌套模式下生效 */
@@ -77,6 +79,13 @@ export declare const ProCard: {
         (props: React.HTMLAttributes<HTMLElement>): JSX.Element;
         isProCardDivider: boolean;
     };
+    Selectable: {
+        (props: import("./selectable").ProCardSelectableProps): JSX.Element;
+        defaultProps: {
+            hoveredShadow: boolean;
+        };
+        isProCard: boolean;
+    };
     isProCard: boolean;
 };
 export default ProCard;

package/es/card/index.js

@@ -1,5 +1,5 @@
 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", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -32,6 +32,7 @@ import { ProSkeletonRaw } from '../skeleton';
 import { ProActionGroup } from '../actions';
 import { formatSpacing, getColClassAndStyle } from './utils';
 import ProCardDivider from './divider';
+import ProCardSelectable from './selectable';
 import './index.scss';
 export * from './card-container';
 var cls = baseClass('teamix-pro-card');
@@ -66,7 +67,7 @@ var getFlexDirectionClassName = function getFlexDirectionClassName(direction, sp
 };
 
 export var ProCard = function ProCard(props) {
-  var _classnames;
+  var _classnames, _classnames2;
 
   var children = props.children,
       title = props.title,
@@ -79,11 +80,13 @@ export var ProCard = function ProCard(props) {
       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,
+      borderColor = props.borderColor,
       backgroundColor = props.backgroundColor,
       contentClassName = props.contentClassName,
       contentStyle = props.contentStyle,
@@ -161,7 +164,6 @@ export var ProCard = function ProCard(props) {
     }
 
     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.cloneElement(element, {
         style: dividerStyle
       });
@@ -169,13 +171,12 @@ export var ProCard = function ProCard(props) {
 
     return element;
   });
-  var cardClassName = classnames(cls(), className, backgroundColor, {
-    noBorder: !bordered,
-    compacted: compacted
-  });
-  var cardContentClassName = classnames(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames = {
+  var cardClassName = classnames(cls(), className, backgroundColor, (_classnames = {
+    'border-none': !bordered
+  }, _defineProperty(_classnames, "border-".concat(borderColor), borderColor), _defineProperty(_classnames, "compacted", compacted), _defineProperty(_classnames, "hoverable", hoveredShadow), _classnames));
+  var cardContentClassName = classnames(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), _classnames2));
   var cardContentMargin = containProCard && !split ? {
     marginRight: -horizonal,
     marginLeft: -horizonal,
@@ -243,5 +244,6 @@ ProCard.defaultProps = {
   direction: 'row'
 };
 ProCard.Divider = ProCardDivider;
+ProCard.Selectable = ProCardSelectable;
 ProCard.isProCard = true;
 export default ProCard;

package/es/card/index.scss

@@ -166,8 +166,10 @@
     }
   }
 
-  &.noBorder {
-    border: none;
+  &.hoverable {
+    &:hover {
+      box-shadow: var(--shadow-3, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
+    }
   }
 
   &.compacted {
@@ -183,6 +185,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/es/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/es/card/selectable.js

@@ -0,0 +1,45 @@
+var _excluded = ["selected", "onSelect", "className", "onClick"];
+
+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; }
+
+import React from 'react';
+import classnames from 'classnames';
+import TeamixIcon from '@teamix/icon';
+import { baseClass } from '@teamix/utils';
+import { ProCard } from './index';
+var cls = 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.createElement(ProCard, _objectSpread({
+    className: classnames(cls(), className),
+    borderColor: selected ? 'blue' : 'grey',
+    extra: /*#__PURE__*/React.createElement(TeamixIcon, {
+      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;
+export default ProCardSelectable;

package/es/form/Filter/index.js

@@ -29,7 +29,6 @@ import { usePrefixCls, getMessage } from '@teamix/utils';
 import { createForm } from '@formily/core';
 import ProForm from '../ProForm';
 import { mergeArrayValue } from '../utils';
-var searchText = getMessage('search');
 
 var getEventProps = function getEventProps(triggerType, onFilter) {
   var keydownEvent = {
@@ -177,7 +176,8 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
               onResetValidateSuccess: onReset,
               style: _objectSpread({}, triggerType === 'submit' ? {} : {
                 marginRight: -16
-              })
+              }),
+              children: getMessage('reset')
             }
           }, {
             component: 'Submit',
@@ -186,9 +186,9 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
                 marginRight: -8
               } : {
                 display: 'none'
-              })
-            },
-            content: searchText
+              }),
+              children: getMessage('search')
+            }
           }]
         }]
       }])

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

package/es/index.js

@@ -9,7 +9,8 @@ import ProPageContainer from './page-container';
 import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
-import utils from './utils';
+import utils from './utils'; // import ProSidebar from './sidebar'
+
 import * as nocode from './nocode';
 import * as templates from './templates';
 import TeamixIcon from '@teamix/icon'; // 设置图标源
@@ -24,7 +25,9 @@ export * from './nocode';
 export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
-export * from './table';
-var version = '1.2.5';
+export * from './table'; // export * from './sidebar';
+
+var version = '1.2.9';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
-ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils };
+ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
+hooks, nocode, templates, utils };

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

@@ -38,8 +38,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',
@@ -84,9 +85,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;
@@ -99,6 +98,11 @@ var ProTableInfo = function ProTableInfo(props) {
             col = 0;
           }
         }
+
+        if (columnsCopy.length === 0) {
+          // 如果剩余仍有列数并且已经没有columns分配了
+          col = 0;
+        }
       }
 
       var itemData = filterColumns.map(function (item, index) {
@@ -165,7 +169,7 @@ var ProTableInfo = function ProTableInfo(props) {
   return /*#__PURE__*/React.createElement(Table.StickyLock, {
     className: "teamix-pro-info-table",
     cellProps: setCellProps,
-    columns: newColumns(),
+    columns: getNewColumns(),
     hasHeader: false,
     hasBorder: true,
     dataSource: newDataSource

package/es/nocode/configurators/Card.js

@@ -1,9 +1,7 @@
 var initialValues = {
   title: '卡片标题',
   children: '卡片内容卡片内容卡片内容',
-  extra: '操作',
-  bordered: true,
-  hoveredShadow: true
+  extra: '操作'
 };
 var schema = [{
   component: 'FormTab',
@@ -54,10 +52,6 @@ var schema = [{
       children: [{
         title: '整体样式',
         children: [{
-          name: 'bordered',
-          title: '边框',
-          component: 'Switch'
-        }, {
           name: 'divider',
           title: '头部分割线',
           component: 'Switch'
@@ -72,7 +66,36 @@ var schema = [{
             label: '蓝色',
             value: 'blue'
           }, {
-            label: '绿生',
+            label: '绿色',
+            value: 'green'
+          }, {
+            label: '红色',
+            value: 'red'
+          }, {
+            label: '橙色',
+            value: 'orange'
+          }, {
+            label: '黄色',
+            value: 'yellow'
+          }, {
+            label: '灰色',
+            value: 'grey'
+          }, {
+            label: '透明',
+            value: 'transparent'
+          }]
+        }, {
+          name: 'borderColor',
+          title: '边框色',
+          component: 'Select',
+          dataSource: [{
+            label: '无边框',
+            value: 'none'
+          }, {
+            label: '蓝色',
+            value: 'blue'
+          }, {
+            label: '绿色',
             value: 'green'
           }, {
             label: '红色',

package/es/sidebar/components/sidebar-container/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { ProSidebarContainerProps } from '../../typing';
+import './index.scss';
+declare const ProSidebarContainer: React.FC<ProSidebarContainerProps>;
+export default ProSidebarContainer;