@teamix/pro 1.5.17 → 1.5.19

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

@@ -10,13 +10,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { isValidElement, useEffect, useMemo, useState } from 'react';
 import { Grid, Loading } from '@alicloudfe/components';
-import { getDeepValue, getMessage, ProCard, ProInfo } from '../../../';
+import { getDeepValue, ProCard, ProInfo } from '../../../';
 import { ProSkeletonRaw } from '../../../skeleton';
 import { usePrefixCls } from '@teamix/utils';
 import './index.scss';
 import { renderCell } from '../../utils/columnRender';
 import LoadMore from '../LoadMore';
-import Result from '@teamix/result';
+import { EmptyContent } from '@teamix/pro-field';
 var Row = Grid.Row,
   Col = Grid.Col;
 var cls = usePrefixCls('teamix-pro-table-card-view');
@@ -35,7 +35,9 @@ var CardView = function CardView(props) {
     context = props.context,
     scrollHeight = props.scrollHeight,
     _props$showSkeleton = props.showSkeleton,
-    showSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton;
+    showSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton,
+    emptyProps = props.emptyProps,
+    emptyContent = props.emptyContent;
   // 加载状态
   var _useState = useState('none'),
     _useState2 = _slicedToArray(_useState, 2),
@@ -358,14 +360,7 @@ var CardView = function CardView(props) {
   };
   // 渲染卡片主体
   var renderCardBox = function renderCardBox() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, skeletonVisible && /*#__PURE__*/React.createElement(ProSkeletonRaw.Content, null), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && /*#__PURE__*/React.createElement(Result, {
-      theme: "hybridcloud-container",
-      img: "noData",
-      title: getMessage('noData'),
-      style: {
-        padding: '50px 0 60px'
-      }
-    }), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/React.createElement(Row, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, skeletonVisible && /*#__PURE__*/React.createElement(ProSkeletonRaw.Content, null), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && !emptyContent && /*#__PURE__*/React.createElement(EmptyContent, _objectSpread({}, emptyProps)), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && emptyContent && /*#__PURE__*/React.createElement("div", null, emptyContent), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/React.createElement(Row, {
       gutter: 16,
       wrap: true,
       style: {

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

@@ -73,11 +73,11 @@ var ToolBar = function ToolBar(props) {
   useEffect(debounce(function () {
     if ((layoutInlineSize === null || layoutInlineSize === void 0 ? void 0 : layoutInlineSize.width) && leftWidth && toolBarContentRef.current && toolBarAutoWidth) {
       var _toolBarContentRef$cu;
-      var width = layoutInlineSize.width,
-        height = layoutInlineSize.height;
-      if (width - leftWidth <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8 || height > 40) {
+      var width = layoutInlineSize.width;
+      // 60 为容错
+      if (width - leftWidth - 60 <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8) {
         setFlat(false);
-      } else if (height === 40) {
+      } else {
         setFlat(true);
       }
     }
@@ -142,9 +142,12 @@ var ToolBar = function ToolBar(props) {
         })
       }, Component));
     }));
-  }, [toolBarList]);
+  }, [toolBarList, props.columns]);
   var renderUnFlatShape = function renderUnFlatShape() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Balloon.Tooltip, {
+    if (toolBar === false) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null);
+    }
+    return /*#__PURE__*/React.createElement(Balloon.Tooltip, {
       triggerType: ['click'],
       popupProps: {
         cache: true
@@ -156,7 +159,7 @@ var ToolBar = function ToolBar(props) {
         type: "more-line"
       })),
       align: "tr"
-    }, renderFlatShape));
+    }, renderFlatShape);
   };
   return /*#__PURE__*/React.createElement("div", {
     className: cls('', {

package/es/table/index.js

@@ -968,7 +968,9 @@ var ProTable = function ProTable(props) {
         scrollHeight: fullscreenState || fixedTableBody ? "calc(100vh - ".concat(headerHeight, "px)") : undefined,
         actionRef: actionRef,
         context: context,
-        columns: genProColumnToColumn(filteredColumns, showSkeleton, actionRef, context)
+        columns: genProColumnToColumn(filteredColumns, showSkeleton, actionRef, context),
+        emptyProps: emptyProps,
+        emptyContent: otherProps === null || otherProps === void 0 ? void 0 : otherProps.emptyContent
       }));
     } else {
       // 不传 columns 直接返回原始 Table

package/es/table/typing.d.ts

@@ -406,6 +406,10 @@ export declare type ProTableCardViewProps = {
     cardProps?: ProTableCardProps['cardProps'];
     /** 表格分页器参数 **/
     tablePaginationProps?: PaginationProps;
+    /** 空数据配置 **/
+    emptyProps?: ProTableProps['emptyProps'];
+    /** 自定义渲染空数据 **/
+    emptyContent?: ProTableProps['emptyContent'];
 };
 export declare type ProTableBindUrlProps = {
     /** 翻页器区域 **/

package/es/xconsole.scss

@@ -500,4 +500,27 @@
     border: 0 solid #d9d9d9;
     border: var(--colortag-border-width,0) solid var(--color-line1-2,#d9d9d9);
   }
+  .teamix-pro-table-toolbar-filter-column-all-select {
+    .next-menu-item-inner {
+      display: flex;
+    }
+  }
+  .next-dialog-centered {
+    text-align: center;
+  }
+  .next-dialog-wrapper {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+
+    .next-dialog-v2 {
+      margin: 40px 0;
+      display: inline-block;
+      text-align: left;
+      vertical-align: middle;
+      position: relative;
+    }
+  }
 }

package/lib/form/Filter/index.scss

@@ -41,6 +41,7 @@ $query-filter: #{$teamix-pro-form}-query-filter;
       width: inherit;
       input {
         width: inherit;
+        display: block;
       }
     }
   }

package/lib/form/Filter/index2.scss

@@ -11,6 +11,7 @@
       width: inherit;
       input {
         width: inherit;
+        display: block;
       }
     }
   }

package/lib/image/index.d.ts

@@ -0,0 +1,21 @@
+export declare type ProImageProps = {
+    src: {
+        /** 中文亮色图片地址，默认 url */
+        'cn-light': string;
+        /** 英文文亮色图片地址 */
+        'en-light'?: string;
+        /** 繁体亮色图片地址 */
+        'tw-light'?: string;
+        /** 中文暗色图片地址 */
+        'cn-dark'?: string;
+        /** 英文暗色图片地址 */
+        'en-dark'?: string;
+        /** 繁体暗色图片地址 */
+        'tw-dark'?: string;
+    } & Record<string, string>;
+    theme?: 'dark' | 'light';
+    /** 自定义改造 url 的函数 */
+    transformUrl?: (value: string) => string;
+};
+declare const _default: (props: ProImageProps) => JSX.Element | null;
+export default _default;

package/lib/image/index.js

@@ -0,0 +1,82 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _utils = require("@teamix/utils");
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
+var _excluded = ["src", "transformUrl"];
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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; }
+var localeMap = {
+  'en-us': 'en',
+  'zh-cn': 'cn',
+  'zh-tW': 'tw'
+};
+var _default = function _default(props) {
+  var src = props.src,
+    transformUrl = props.transformUrl,
+    extra = _objectWithoutProperties(props, _excluded);
+  var _useState = (0, _react.useState)(props.theme || 'light'),
+    _useState2 = _slicedToArray(_useState, 2),
+    theme = _useState2[0],
+    setTheme = _useState2[1];
+  var targetSrc = src ? src['cn-light'] : '';
+  var lan = localeMap[(0, _utils.getLanguage)().toLowerCase()] || 'cn';
+  function getTheme() {
+    var _window$getComputedSt, _window;
+    var cssTheme = (_window$getComputedSt = (_window = window).getComputedStyle) === null || _window$getComputedSt === void 0 ? void 0 : _window$getComputedSt.call(_window, window.document.body).getPropertyValue('--alicloudfe-components-theme').trim();
+    if (cssTheme.indexOf('-dark') !== -1) {
+      return 'dark';
+    } else {
+      return 'light';
+    }
+  }
+  function setImgTheme() {
+    setTheme(props.theme || getTheme());
+  }
+  (0, _ahooks.useMutationObserver)(function (mutationsList) {
+    mutationsList.forEach(function (mutation) {
+      if (mutation.attributeName === 'class') {
+        setImgTheme();
+      }
+    });
+  }, document.querySelector('html'), {
+    attributes: true
+  });
+  (0, _ahooks.useMutationObserver)(function (mutationsList) {
+    mutationsList.forEach(function (mutation) {
+      if (mutation.attributeName === 'class') {
+        setImgTheme();
+      }
+    });
+  }, document.body, {
+    attributes: true
+  });
+  // const theme = props.theme || getTheme() || 'light';
+  targetSrc = src["".concat(lan, "-").concat(theme)] || src["".concat(lan, "-light")] || src["cn-".concat(theme)] || src['cn-light'];
+  if (targetSrc && transformUrl) {
+    targetSrc = transformUrl(targetSrc);
+  }
+  if (!targetSrc) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement("img", _objectSpread({
+    src: targetSrc
+  }, extra));
+};
+exports.default = _default;

package/lib/image/index.scss

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

package/lib/index.d.ts

@@ -11,6 +11,7 @@ import ProSkeleton from './skeleton';
 import utils from './utils';
 import ProSidebar from './sidebar';
 import { ProTimeline } from './timeline';
+import ProImage from './image';
 import * as nocode from './nocode';
 import * as templates from './templates';
 import TeamixIcon from '@teamix/icon';
@@ -28,5 +29,6 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.5.17";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };
+export * from './image';
+declare const version = "1.5.19";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -19,6 +19,7 @@ var _exportNames = {
   utils: true,
   ProSidebar: true,
   ProTimeline: true,
+  ProImage: true,
   nocode: true,
   templates: true,
   TeamixIcon: true
@@ -47,6 +48,12 @@ Object.defineProperty(exports, "ProForm", {
     return _form.default;
   }
 });
+Object.defineProperty(exports, "ProImage", {
+  enumerable: true,
+  get: function get() {
+    return _image.default;
+  }
+});
 Object.defineProperty(exports, "ProInfo", {
   enumerable: true,
   get: function get() {
@@ -254,6 +261,18 @@ Object.keys(_timeline).forEach(function (key) {
     }
   });
 });
+var _image = _interopRequireWildcard(require("./image"));
+Object.keys(_image).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _image[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _image[key];
+    }
+  });
+});
 var nocode = _interopRequireWildcard(require("./nocode"));
 exports.nocode = nocode;
 Object.keys(nocode).forEach(function (key) {
@@ -280,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.17';
+var version = '1.5.19';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

package/lib/sidebar/utils/index.d.ts

@@ -1,3 +1,4 @@
+import { ProSidebarDataSourceItem } from '../typing';
 /**
  * 深度遍历节点
  * @param data 数据
@@ -5,7 +6,6 @@
  * @param aliasMap 标识
  * @param level 深度
  */
-import { ProSidebarDataSourceItem } from '../typing';
 export declare function loop<T>(data: T[], func: any, aliasMap?: {
     children: string;
 }, level?: number): void;

package/lib/sidebar/utils/index.js

@@ -31,6 +31,13 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
+/**
+ * 深度遍历节点
+ * @param data 数据
+ * @param func 处理方法
+ * @param aliasMap 标识
+ * @param level 深度
+ */
 function loop(data, func, aliasMap) {
   var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
   var _ref = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},

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

@@ -12,7 +12,7 @@ var _utils = require("@teamix/utils");
 require("./index.scss");
 var _columnRender = require("../../utils/columnRender");
 var _LoadMore = _interopRequireDefault(require("../LoadMore"));
-var _result = _interopRequireDefault(require("@teamix/result"));
+var _proField = require("@teamix/pro-field");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
@@ -44,7 +44,9 @@ var CardView = function CardView(props) {
     context = props.context,
     scrollHeight = props.scrollHeight,
     _props$showSkeleton = props.showSkeleton,
-    showSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton;
+    showSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton,
+    emptyProps = props.emptyProps,
+    emptyContent = props.emptyContent;
   // 加载状态
   var _useState = (0, _react.useState)('none'),
     _useState2 = _slicedToArray(_useState, 2),
@@ -367,14 +369,7 @@ var CardView = function CardView(props) {
   };
   // 渲染卡片主体
   var renderCardBox = function renderCardBox() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, skeletonVisible && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Content, null), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && /*#__PURE__*/_react.default.createElement(_result.default, {
-      theme: "hybridcloud-container",
-      img: "noData",
-      title: (0, _.getMessage)('noData'),
-      style: {
-        padding: '50px 0 60px'
-      }
-    }), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/_react.default.createElement(Row, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, skeletonVisible && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Content, null), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && !emptyContent && /*#__PURE__*/_react.default.createElement(_proField.EmptyContent, _objectSpread({}, emptyProps)), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && emptyContent && /*#__PURE__*/_react.default.createElement("div", null, emptyContent), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/_react.default.createElement(Row, {
       gutter: 16,
       wrap: true,
       style: {

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

@@ -83,11 +83,11 @@ var ToolBar = function ToolBar(props) {
   (0, _react.useEffect)((0, _lodash.default)(function () {
     if ((layoutInlineSize === null || layoutInlineSize === void 0 ? void 0 : layoutInlineSize.width) && leftWidth && toolBarContentRef.current && toolBarAutoWidth) {
       var _toolBarContentRef$cu;
-      var width = layoutInlineSize.width,
-        height = layoutInlineSize.height;
-      if (width - leftWidth <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8 || height > 40) {
+      var width = layoutInlineSize.width;
+      // 60 为容错
+      if (width - leftWidth - 60 <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8) {
         setFlat(false);
-      } else if (height === 40) {
+      } else {
         setFlat(true);
       }
     }
@@ -152,9 +152,12 @@ var ToolBar = function ToolBar(props) {
         })
       }, Component));
     }));
-  }, [toolBarList]);
+  }, [toolBarList, props.columns]);
   var renderUnFlatShape = function renderUnFlatShape() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
+    if (toolBar === false) {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+    }
+    return /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
       triggerType: ['click'],
       popupProps: {
         cache: true
@@ -166,7 +169,7 @@ var ToolBar = function ToolBar(props) {
         type: "more-line"
       })),
       align: "tr"
-    }, renderFlatShape));
+    }, renderFlatShape);
   };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: cls('', {

package/lib/table/index.js

@@ -989,7 +989,9 @@ var ProTable = function ProTable(props) {
         scrollHeight: fullscreenState || fixedTableBody ? "calc(100vh - ".concat(headerHeight, "px)") : undefined,
         actionRef: actionRef,
         context: context,
-        columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context)
+        columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context),
+        emptyProps: emptyProps,
+        emptyContent: otherProps === null || otherProps === void 0 ? void 0 : otherProps.emptyContent
       }));
     } else {
       // 不传 columns 直接返回原始 Table

package/lib/table/typing.d.ts

@@ -406,6 +406,10 @@ export declare type ProTableCardViewProps = {
     cardProps?: ProTableCardProps['cardProps'];
     /** 表格分页器参数 **/
     tablePaginationProps?: PaginationProps;
+    /** 空数据配置 **/
+    emptyProps?: ProTableProps['emptyProps'];
+    /** 自定义渲染空数据 **/
+    emptyContent?: ProTableProps['emptyContent'];
 };
 export declare type ProTableBindUrlProps = {
     /** 翻页器区域 **/

package/lib/xconsole.scss

@@ -500,4 +500,27 @@
     border: 0 solid #d9d9d9;
     border: var(--colortag-border-width,0) solid var(--color-line1-2,#d9d9d9);
   }
+  .teamix-pro-table-toolbar-filter-column-all-select {
+    .next-menu-item-inner {
+      display: flex;
+    }
+  }
+  .next-dialog-centered {
+    text-align: center;
+  }
+  .next-dialog-wrapper {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+
+    .next-dialog-v2 {
+      margin: 40px 0;
+      display: inline-block;
+      text-align: left;
+      vertical-align: middle;
+      position: relative;
+    }
+  }
 }

package/package.json

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