@teamix/pro 1.2.7 → 1.2.8

package/es/sidebar/index.js

@@ -0,0 +1,66 @@
+var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch"];
+
+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 _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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+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, { useState } from 'react';
+import './index.scss';
+import { baseClass } from '@teamix/utils';
+import ProSidebarContainer from './components/sidebar-container';
+import ProSidebarTree from './components/tree';
+var cls = baseClass('teamix-pro-sidebar');
+
+var ProSidebar = function ProSidebar(props) {
+  var dataSource = props.dataSource,
+      className = props.className,
+      style = props.style,
+      _searchOnChange = props.searchOnChange,
+      _props$showSearch = props.showSearch,
+      showSearch = _props$showSearch === void 0 ? true : _props$showSearch,
+      others = _objectWithoutProperties(props, _excluded); // 搜索的关键词
+
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      searchKey = _useState2[0],
+      setSearchKey = _useState2[1];
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls(_defineProperty({
+      '': true
+    }, className, true)),
+    style: style
+  }, /*#__PURE__*/React.createElement(ProSidebarContainer, _objectSpread({
+    searchOnChange: function searchOnChange(value) {
+      if (showSearch) {
+        _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
+        setSearchKey(value);
+      }
+    },
+    showSearch: showSearch
+  }, others), /*#__PURE__*/React.createElement(ProSidebarTree, {
+    dataSource: dataSource,
+    searchKey: searchKey
+  })));
+};
+
+export default ProSidebar;

package/es/sidebar/index.scss

@@ -0,0 +1,3 @@
+.teamix-pro-sidebar {
+  color: var(--color-brand1-6);
+}

package/es/sidebar/typing.d.ts

@@ -0,0 +1,51 @@
+/// <reference types="react" />
+import { MessageProps } from '@alifd/next/types/message';
+import { TreeProps } from '@alifd/next/types/tree';
+import { ProCardProps, ProFieldProps } from '..';
+/** ProSidebar 定义 */
+export declare type ProSidebarProps = {
+    /** 数据源 */
+    dataSource?: ProSidebarDataSource;
+} & React.HTMLAttributes<HTMLElement> & ProSidebarContainerProps;
+/** 数据源定义 */
+export declare type ProSidebarDataSource = ProSidebarDataSourceItem[];
+export declare type ProSidebarDataSourceItem = {
+    /** 展示值 */
+    label?: React.ReactNode;
+    /** 绑定值 */
+    value?: any;
+    /** icon */
+    icon?: React.ReactNode;
+    /** 标签 */
+    tag?: React.ReactNode;
+    /** 右侧操作、状态区 */
+    extra?: React.ReactNode;
+    /** 子项 */
+    children?: ProSidebarDataSourceItem[];
+};
+/** sidebar 容器定义 */
+export declare type ProSidebarContainerProps = {
+    children?: React.ReactNode;
+    /** 搜索输入提示 */
+    searchPlaceholder?: string;
+    /** 搜索输入其他参数 ProField 参数 */
+    searchProps?: ProFieldProps;
+    /** 是否展示搜索框 */
+    showSearch?: boolean;
+    /** 自定义搜索 */
+    customSearch?: React.ReactNode;
+    /** 搜索框变化的回调函数 */
+    searchOnChange?: (value: any) => void;
+    /** 通知提示消息区域 */
+    message?: React.ReactNode;
+    /** 自定义消息通知区域 */
+    customMessage?: React.ReactNode;
+    /** 消息通知区域的其他参数 */
+    messageProps?: MessageProps;
+} & ProCardProps;
+/** ProSidebarTree 内容定义 */
+export declare type ProSidebarTreeProps = {
+    dataSource?: ProSidebarDataSource;
+    /** 搜索过滤关键词 */
+    searchKey?: string;
+} & TreeProps;

package/es/sidebar/typing.js

@@ -0,0 +1 @@
+export {};

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
@@ -97,6 +97,7 @@ var ProTable = function ProTable(props) {
       getRowSelection = props.getRowSelection,
       primaryKey = props.primaryKey,
       footerAction = props.footerAction,
+      footer = props.footer,
       url = props.url,
       pageKey = props.pageKey,
       pageSizeKey = props.pageSizeKey,
@@ -722,7 +723,7 @@ var ProTable = function ProTable(props) {
       }
     }
 
-    if (showPagination || footerAction) {
+    if (showPagination) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection
@@ -751,6 +752,14 @@ var ProTable = function ProTable(props) {
           return onChangePaginationSize(number);
         }
       }, props.paginationProps))));
+    } else if (!showPagination) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: cls('footer', {
+          'footer-has-rowSelection': rowSelection
+        })
+      }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
+        className: cls('footer-right-wrapper')
+      }, showSkeleton ? /*#__PURE__*/React.createElement(Skeleton.Footer.Pagination, null) : footer));
     }
   };
 

package/es/table/index.scss

@@ -13,6 +13,7 @@ $fullscreenPadding: 24px;
   --checkbox-semi-select-icon-content: '\ead5';
   &-footer {
     padding: 8px 0;
+    width: 100%;
   }
   &-footer-fixed {
     position: fixed;

package/es/table/typing.d.ts

@@ -100,6 +100,8 @@ export declare type ProTableProps = {
     getRowSelection?: (rowSelection: rowSelectionType) => void;
     /** 表格底部（左侧）配置 */
     footerAction?: ProActionGroupProps | React.ReactNode;
+    /** 表格底部（右层）配置 */
+    footer?: React.ReactNode;
     /** 筛选区自动搜索的防抖时间（毫秒） */
     filterDebounce?: number;
     /** ProTable action 的引用，便于手动触发一些方法  */

package/lib/actions/index.js

@@ -259,7 +259,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
-    popupTriggerType: "hover",
+    popupTriggerType: "click",
+    autoWidth: false,
     menuProps: {
       mode: 'popup',
       triggerType: 'hover'

package/lib/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/lib/card/index.js

@@ -10,7 +10,7 @@ exports.default = exports.ProCard = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _classnames2 = _interopRequireDefault(require("classnames"));
+var _classnames3 = _interopRequireDefault(require("classnames"));
 
 var _components = require("@alicloudfe/components");
 
@@ -26,6 +26,8 @@ var _utils2 = require("./utils");
 
 var _divider = _interopRequireDefault(require("./divider"));
 
+var _selectable = _interopRequireDefault(require("./selectable"));
+
 require("./index.scss");
 
 var _cardContainer = require("./card-container");
@@ -42,7 +44,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", "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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -100,7 +102,7 @@ var getFlexDirectionClassName = function getFlexDirectionClassName(direction, sp
 };
 
 var ProCard = function ProCard(props) {
-  var _classnames;
+  var _classnames, _classnames2;
 
   var children = props.children,
       title = props.title,
@@ -113,11 +115,13 @@ 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,
@@ -189,7 +193,7 @@ 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));
     }
@@ -204,13 +208,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), _classnames2));
   var cardContentMargin = containProCard && !split ? {
     marginRight: -horizonal,
     marginLeft: -horizonal,
@@ -229,7 +232,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
@@ -280,6 +283,7 @@ ProCard.defaultProps = {
   direction: 'row'
 };
 ProCard.Divider = _divider.default;
+ProCard.Selectable = _selectable.default;
 ProCard.isProCard = true;
 var _default = ProCard;
 exports.default = _default;

package/lib/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/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/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/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.7";
 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.7';
 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

package/lib/nocode/configurators/Card.js

@@ -7,9 +7,7 @@ exports.default = void 0;
 var initialValues = {
   title: '卡片标题',
   children: '卡片内容卡片内容卡片内容',
-  extra: '操作',
-  bordered: true,
-  hoveredShadow: true
+  extra: '操作'
 };
 var schema = [{
   component: 'FormTab',
@@ -60,10 +58,6 @@ var schema = [{
       children: [{
         title: '整体样式',
         children: [{
-          name: 'bordered',
-          title: '边框',
-          component: 'Switch'
-        }, {
           name: 'divider',
           title: '头部分割线',
           component: 'Switch'
@@ -78,7 +72,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/lib/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;