@vtx/components 4.0.0-beta.2 → 4.0.0-beta.21

package/es/index.js

@@ -22,7 +22,7 @@ export * from "./vtx-time-picker";
 export * from "./vtx-upload";
 export * from "./vtx-tree-select";
 export * from "./vtx-signature";
-export * from "./vtx-transfer";
+export * from "./vtx-transfer-select";
 
 // data display
 export * from "./vtx-datagrid";
@@ -31,8 +31,10 @@ export * from "./vtx-image";
 export * from "./vtx-rps-frame";
 export * from "./vtx-statistics-column";
 export * from "./vtx-tree";
+export * from "./vtx-transfer";
 export * from "./vtx-split-pane";
 export * from "./vtx-icon";
+export * from "./vtx-descriptions";
 
 // feedback
 export * from "./vtx-modal";

package/es/utils/filterSpecialCharacters.js

@@ -9,6 +9,52 @@ function isNotEmpty(value) {
   return Array.isArray(value) && value.length > 0;
 }
 
+// 特殊符号，- _ 排除
+export var SpecialCharacters = [
+// 小括号
+'(', ')', '（', '）',
+// 中括号
+'\\[', '\\]', '［', '］',
+// 大括号
+'{', '}', '｛', '｝',
+// 方头括号
+'【', '】',
+// 尖括号
+'<', '>',
+// 书名号
+'《', '》',
+// 斜杠
+'/',
+// 反斜杠
+'\\\\',
+// 逗号
+',', '，',
+// 句号
+'.', '。',
+// 冒号
+':', '：',
+// 分号
+';', '；',
+// 顿号
+'、',
+// 破折号
+'——',
+// 感叹号
+'!', '！',
+// 问号
+'?', '？',
+// 加减等于
+'+', '=',
+// 单引号
+"'", '‘', '’',
+// 双引号
+'"', '“', '”',
+// 金钱
+'$', '￥',
+// 百分号
+'%', '％',
+// 其它
+'@', '#', '`', '~', '*', '^', '……', '|', '&'];
 /**
  * 过滤特殊字符
  * @param {String} value 值
@@ -22,52 +68,7 @@ export default function filterSpecialCharacters(value) {
     include = _ref$include === void 0 ? [] : _ref$include,
     _ref$exclude = _ref.exclude,
     exclude = _ref$exclude === void 0 ? [] : _ref$exclude;
-  // 特殊符号，- _ 排除
-  var specialCharacter = [
-  // 小括号
-  '(', ')', '（', '）',
-  // 中括号
-  '\\[', '\\]', '［', '］',
-  // 大括号
-  '{', '}', '｛', '｝',
-  // 方头括号
-  '【', '】',
-  // 尖括号
-  '<', '>',
-  // 书名号
-  '《', '》',
-  // 斜杠
-  '/',
-  // 反斜杠
-  '\\\\',
-  // 逗号
-  ',', '，',
-  // 句号
-  '.', '。',
-  // 冒号
-  ':', '：',
-  // 分号
-  ';', '；',
-  // 顿号
-  '、',
-  // 破折号
-  '——',
-  // 感叹号
-  '!', '！',
-  // 问号
-  '?', '？',
-  // 加减等于
-  '+', '=',
-  // 单引号
-  "'", '‘', '’',
-  // 双引号
-  '"', '“', '”',
-  // 金钱
-  '$', '￥',
-  // 百分号
-  '%', '％',
-  // 其它
-  '@', '#', '`', '~', '*', '^', '……', '|', '&'];
+  var specialCharacter = JSON.parse(JSON.stringify(SpecialCharacters));
 
   // 新增
   if (isNotEmpty(include)) {

package/es/utils/index.js

@@ -15,7 +15,6 @@ import { useDebounceValue } from "./hooks/useDebounceValue";
 import { useDeepCompareEffect, useDeepCompareEffectDebounce } from "./hooks/useDeepCompareEffect";
 import useDeepCompareMemo from "./hooks/useDeepCompareMemo";
 import { useDocumentTitle } from "./hooks/useDocumentTitle";
-import { useFetchData } from "./hooks/useFetchData";
 import { useLatest } from "./hooks/useLatest";
 import { usePrevious } from "./hooks/usePrevious";
 import { useReactiveRef } from "./hooks/useReactiveRef";
@@ -56,7 +55,7 @@ export { conversionMomentValue, conversionMomentValue as conversionSubmitValue,
 // function
 transformKeySubmitValue, useBreakpoint, useDebounceFn, useDebounceValue, useDeepCompareEffect, useDeepCompareEffectDebounce, useDeepCompareMemo, useDocumentTitle,
 // hooks
-useEditableArray, useEditableMap, useFetchData, useLatest, useMountMergeState, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle, genColumnKey, getPlaceholder };
+useEditableArray, useEditableMap, useLatest, useMountMergeState, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle, genColumnKey, getPlaceholder };
 
 // 注意：以下类型导出在JavaScript中不可用，已移除
 // export type {

package/es/vtx-color-picker/index.js

@@ -7,52 +7,17 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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, { forwardRef, useContext, useMemo, useState, useCallback } from 'react';
 import { Input, Space, ColorPicker, Row, Col } from 'antd';
 import classnames from 'classnames';
-import React, { forwardRef, useCallback, useContext } from 'react';
+import PropTypes from 'prop-types';
 import { useStyle } from "./style";
 import { getPlaceholder } from "../utils";
-import { VtxProvider } from "../vtx-provider";
+import { useIntl, VtxProvider } from "../vtx-provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var getVtxPresets = function getVtxPresets() {
-  return [{
-    label: '基础颜色',
-    key: 'basic',
-    colors: ['#0EBF37', '#1890FF', '#FAAD14', '#FF4D4F', '#898989', '#13C2C2', '#FA8C16', '#722ED1', '#EB2F96', '#2F54EB']
-  }, {
-    label: '图表颜色',
-    key: 'chart',
-    colors: ['#249AF8', '#1FC678', '#FFB737', '#4ABEFF', '#FD6865', '#A09CF7', '#1BCEBF', '#F58E44', '#27AD8E', '#F18F86', '#7996FF', '#5AD8A6', '#E9C140', '#79C2E6', '#FF9E9E', '#D396DE', '#3CBDCB', '#F29F64', '#85ACD7', '#FDA3C7']
-  }];
-};
-var getNormalPresets = function getNormalPresets() {
-  return [{
-    label: '',
-    key: '1',
-    colors: ['#F5222D', '#FA8C16 ', '#FAAD14', '#52C41A', '#389E0D', '#CF1322', '#1677FF', '#5B83FB', '#9254DE', '#5D7092']
-  }];
-};
-var getHorizontalPresets = function getHorizontalPresets(token) {
-  return [{
-    label: '主要',
-    key: '主要',
-    colors: ['#E6F4FF', '#BAE0FF', '#91CAFF', '#69B1FF', '#4096FF', '#1677FF', '#0958D9', '#003EB3', '#002C8C', '#001D66']
-  }, {
-    label: '红色',
-    key: '红色',
-    colors: ['#FFF1F0', '#FFCCC7', '#FFA39E', '#FF7875', '#FF4D4F', '#F5222D', '#CF1322', '#A8071A', '#820014', '#5C0011']
-  }, {
-    label: '绿色',
-    key: '绿色',
-    colors: ['#F6FFED', '#D9F7BE', '#B7EB8F', '#95DE64', '#73D13D', '#52C41A', '#389E0D', '#237804', '#135200', '#092B00']
-  }, {
-    label: '青色',
-    key: '青色',
-    colors: ['#E6FFFB', '#B5F5EC', '#87E8DE', '#5CDBD3', '#36CFC9', '#13C2C2', '#08979C', '#006D75', '#00474F', '#002329']
-  }];
-};
 var VtxColorPicker = /*#__PURE__*/forwardRef(function (props, ref) {
+  var intl = useIntl();
   var value = props.value,
     _onChange = props.onChange,
     className = props.className,
@@ -64,6 +29,43 @@ var VtxColorPicker = /*#__PURE__*/forwardRef(function (props, ref) {
     input = _props$input === void 0 ? true : _props$input,
     panelStyle = props.panelStyle,
     rest = _objectWithoutProperties(props, _excluded);
+  var getVtxPresets = function getVtxPresets() {
+    return [{
+      label: intl.getMessage('colorPicker.basic', '基础颜色'),
+      key: 'basic',
+      colors: ['#0EBF37', '#1890FF', '#FAAD14', '#FF4D4F', '#898989', '#13C2C2', '#FA8C16', '#722ED1', '#EB2F96', '#2F54EB']
+    }, {
+      label: intl.getMessage('colorPicker.chart', '图表颜色'),
+      key: 'chart',
+      colors: ['#249AF8', '#1FC678', '#FFB737', '#4ABEFF', '#FD6865', '#A09CF7', '#1BCEBF', '#F58E44', '#27AD8E', '#F18F86', '#7996FF', '#5AD8A6', '#E9C140', '#79C2E6', '#FF9E9E', '#D396DE', '#3CBDCB', '#F29F64', '#85ACD7', '#FDA3C7']
+    }];
+  };
+  var getNormalPresets = function getNormalPresets() {
+    return [{
+      label: '',
+      key: '1',
+      colors: ['#F5222D', '#FA8C16', '#FAAD14', '#52C41A', '#389E0D', '#CF1322', '#1677FF', '#5B83FB', '#9254DE', '#5D7092']
+    }];
+  };
+  var getHorizontalPresets = function getHorizontalPresets(token) {
+    return [{
+      label: intl.getMessage('colorPicker.primary', '主要'),
+      key: '主要',
+      colors: ['#E6F4FF', '#BAE0FF', '#91CAFF', '#69B1FF', '#4096FF', '#1677FF', '#0958D9', '#003EB3', '#002C8C', '#001D66']
+    }, {
+      label: intl.getMessage('colorPicker.danger', '红色'),
+      key: '红色',
+      colors: ['#FFF1F0', '#FFCCC7', '#FFA39E', '#FF7875', '#FF4D4F', '#F5222D', '#CF1322', '#A8071A', '#820014', '#5C0011']
+    }, {
+      label: intl.getMessage('colorPicker.success', '绿色'),
+      key: '绿色',
+      colors: ['#F6FFED', '#D9F7BE', '#B7EB8F', '#95DE64', '#73D13D', '#52C41A', '#389E0D', '#237804', '#135200', '#092B00']
+    }, {
+      label: intl.getMessage('colorPicker.info', '青色'),
+      key: '青色',
+      colors: ['#E6FFFB', '#B5F5EC', '#87E8DE', '#5CDBD3', '#36CFC9', '#13C2C2', '#08979C', '#006D75', '#00474F', '#002329']
+    }];
+  };
   var _useContext = useContext(VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('color-picker', props.prefixCls);
@@ -155,10 +157,19 @@ var VtxColorPicker = /*#__PURE__*/forwardRef(function (props, ref) {
         }
         _onChange === null || _onChange === void 0 || _onChange(res, css);
       },
+      value: value,
       disabled: disabled
     }, panelStyleProps), rest))]
   }));
 });
 VtxColorPicker.displayName = 'VtxColorPicker';
+VtxColorPicker.propTypes = {
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+  onChange: PropTypes.func,
+  className: PropTypes.string,
+  style: PropTypes.object,
+  disabled: PropTypes.bool,
+  placeholder: PropTypes.oneOfType([PropTypes.string, PropTypes.node])
+};
 export { VtxColorPicker };
 export default VtxColorPicker;

package/es/vtx-combogrid/Combogrid.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText"];
+var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -27,10 +27,6 @@ function VtxCombogrid(props, ref) {
   var intl = useIntl();
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('', 'vtx-combogrid');
-  var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
   var _useState = useState(!!props.defaultExpandSearch),
     _useState2 = _slicedToArray(_useState, 2),
     more = _useState2[0],
@@ -51,7 +47,16 @@ function VtxCombogrid(props, ref) {
     defaultPageSize = props.defaultPageSize,
     _props$customEnumText = props.customEnumText,
     customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
+    _props$headFootHeight = props.headFootHeight,
+    headFootHeight = _props$headFootHeight === void 0 ? 95 : _props$headFootHeight,
+    popoverWidth = props.popoverWidth,
     rest = _objectWithoutProperties(props, _excluded);
+  var prefixCls = getPrefixCls('', 'vtx-combogrid');
+  var _useStyle = useStyle(prefixCls, {
+      popoverWidth: popoverWidth
+    }),
+    wrapSSR = _useStyle.wrapSSR,
+    hashId = _useStyle.hashId;
   var TextEnum = _objectSpread({
     indexTitle: intl.getMessage('indexTitle', '序号'),
     actionMoreText: intl.getMessage('actionMoreText', '更多'),
@@ -86,7 +91,7 @@ function VtxCombogrid(props, ref) {
     columns: columns,
     startIndex: (current - 1) * pageSize + 1,
     size: 'small',
-    headFootHeight: 95,
+    headFootHeight: headFootHeight,
     indexTitle: TextEnum.indexTitle,
     onRowSelectionClear: clearSelectedRow,
     pagination: _objectSpread(_objectSpread({}, pagination), {}, {

package/es/vtx-combogrid/index.js

@@ -109,7 +109,7 @@ export { VtxCombogrid };
 VtxCombogrid.propTypes = {
   prefixCls: PropTypes.string,
   placeholder: PropTypes.string,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
   allowClear: PropTypes.bool,
   disabled: PropTypes.bool,
   className: PropTypes.string,

package/es/vtx-combogrid/style/index.js

@@ -5,10 +5,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useStyle as useAntdStyle } from "../../vtx-provider";
-var genVtxStyle = function genVtxStyle(token) {
+var genVtxStyle = function genVtxStyle(token, options) {
   var componentCls = token.componentCls;
   return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "&-popover", {
-    width: 550,
+    width: options.popoverWidth || 550,
     '.ant-form-item': {
       marginBottom: 12
     }
@@ -32,11 +32,11 @@ var genVtxStyle = function genVtxStyle(token) {
     }
   }));
 };
-export function useStyle(prefixCls) {
+export function useStyle(prefixCls, options) {
   return useAntdStyle(prefixCls, function (token) {
     var vtxToken = _objectSpread(_objectSpread({}, token), {}, {
       componentCls: ".".concat(prefixCls)
     });
-    return [genVtxStyle(vtxToken)];
+    return [genVtxStyle(vtxToken, options)];
   });
 }

package/es/vtx-datagrid/Store/Provide.js

@@ -15,7 +15,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useMergedState } from '@rc-component/util';
-import { request } from '@vtx/utils';
+import request from '@vtx/utils/lib/request';
 import getSignature from '@vtx/utils/lib/getSignature';
 import { createContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useIntl } from "../../vtx-provider";
@@ -38,13 +38,14 @@ function useContainer() {
     _props$indexFixed = props.indexFixed,
     indexFixed = _props$indexFixed === void 0 ? false : _props$indexFixed,
     _props$indexTitle = props.indexTitle,
-    indexTitle = _props$indexTitle === void 0 ? '序号' : _props$indexTitle,
+    indexTitle = _props$indexTitle === void 0 ? intl.getMessage('indexTitle', '序号') : _props$indexTitle,
     _props$indexWidth = props.indexWidth,
     indexWidth = _props$indexWidth === void 0 ? 70 : _props$indexWidth,
     onColumnsSave = props.onColumnsSave,
     disabledColumnKeys = props.disabledColumnKeys,
     hideColumnSetting = props.hideColumnSetting,
-    customEnumText = props.customEnumText;
+    _props$customEnumText = props.customEnumText,
+    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText;
   var TextEnum = _objectSpread({
     refreshText: intl.getMessage('tableToolBar.reload', '刷新'),
     densityDefaultText: intl.getMessage('tableToolBar.densityDefault', '默认'),
@@ -73,8 +74,8 @@ function useContainer() {
     noFixedTitle: intl.getMessage('tableToolBar.noFixedTitle', '不固定'),
     rightFixedTitle: intl.getMessage('tableToolBar.rightFixedTitle', '固定在右侧'),
     columnAll: intl.getMessage('tableToolBar.columnAll', '全部'),
-    total: intl.getMessage('pagination.total.total', '共'),
-    item: intl.getMessage('pagination.total.item', '条')
+    paginationTotalText: intl.getMessage('pagination.total.total', '共'),
+    paginationItemText: intl.getMessage('pagination.total.item', '条')
   }, customEnumText);
   var isFirst = useRef(true);
   var actionRef = useRef();

package/es/vtx-datagrid/ToolBar/components/ColumnSetting/index.js

@@ -29,6 +29,7 @@ import { VtxProvider } from "../../../../vtx-provider";
 import { TableContext } from "../../../Store/Provide";
 import VtxIcon from "../../../../vtx-icon";
 import { useStyle } from "./style";
+// omit 用于从对象中排除指定的属性，返回一个新对象
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -360,7 +361,6 @@ export default function ColumnSetting(props) {
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
-  var localColumns = props.columns;
   var _useContext8 = useContext(TableContext),
     uniqueKey = _useContext8.uniqueKey,
     columnsMap = _useContext8.columnsMap,
@@ -368,7 +368,9 @@ export default function ColumnSetting(props) {
     defaultColumnKeyMap = _useContext8.defaultColumnKeyMap,
     setSortKeyColumns = _useContext8.setSortKeyColumns,
     saveColumns = _useContext8.saveColumns,
-    TextEnum = _useContext8.TextEnum;
+    TextEnum = _useContext8.TextEnum,
+    tableColumn = _useContext8.tableColumn;
+  var localColumns = props.localColumns;
   var checkedColumnKeys = props.checkedColumnKeys,
     onColumnsSave = props.onColumnsSave;
 
@@ -499,7 +501,10 @@ export default function ColumnSetting(props) {
           children: TextEnum.columnSettingSaveText
         })]
       }) : null]
-    })
+    }),
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    }
     // open={true}
     ,
     children: /*#__PURE__*/_jsx(Tooltip, {

package/es/vtx-datagrid/ToolBar/components/Density/index.js

@@ -28,6 +28,9 @@ function Density() {
         selectedKeys: [counter.tableSize]
       },
       trigger: ['click'],
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       children: /*#__PURE__*/_jsx(Tooltip, {
         title: TextEnum.columnDensityText,
         children: /*#__PURE__*/_jsx("span", {

package/es/vtx-datagrid/ToolBar/components/TableStyle/index.js

@@ -31,6 +31,9 @@ function TableStyle() {
       trigger: ['click'],
       placement: "bottomRight",
       title: null,
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       content: list === null || list === void 0 ? void 0 : list.map(function (v) {
         return /*#__PURE__*/_jsx("div", {
           children: /*#__PURE__*/_jsx(Checkbox, {

package/es/vtx-datagrid/ToolBar/index.js

@@ -21,9 +21,9 @@ function ToolBar(props) {
     onRefresh = props.onRefresh,
     hideColumnHeight = props.hideColumnHeight,
     hideColumnSetting = props.hideColumnSetting,
-    columns = props.columns,
     onColumnsSave = props.onColumnsSave,
     uniqueKey = props.uniqueKey,
+    columns = props.columns,
     TextEnum = props.TextEnum;
   var _useStyle = useStyle("".concat(prefix, "-toolbar")),
     wrapSSR = _useStyle.wrapSSR,
@@ -72,7 +72,7 @@ function ToolBar(props) {
           }), !hideColumnSetting && /*#__PURE__*/_jsx("div", {
             className: "".concat(prefix, "-toolbar-setting-item"),
             children: /*#__PURE__*/_jsx(ColumnSetting, {
-              columns: columns,
+              localColumns: columns,
               uniqueKey: uniqueKey,
               onColumnsSave: onColumnsSave
             })

package/es/vtx-datagrid/index.js

@@ -25,12 +25,19 @@ import ToolBar from "./ToolBar";
 import { Container, TableContext } from "./Store/Provide";
 import { useStyle } from "./style/index";
 import { useAntdColumnResize } from 'react-antd-column-resize';
+import { useIntl } from "../vtx-provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var isMac = navigator.userAgent.indexOf('Mac OS') !== -1;
 export var indexColumnKey = '_serialNum';
+export var DEFAULT_HEIGHTS = {
+  HEAD_FOOT: 115,
+  ALERT: 49,
+  TOOLBAR: 56
+};
 function VtxTable(props) {
   var _rest$dataSource, _rest$rowSelection, _rest$rowSelection3, _rest$rowSelection4;
+  var intl = useIntl();
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-datagrid');
@@ -66,7 +73,7 @@ function VtxTable(props) {
     toolbar = _props$toolbar === void 0 ? true : _props$toolbar,
     toolbarClassName = props.toolbarClassName,
     _props$toolbarTilte = props.toolbarTilte,
-    toolbarTilte = _props$toolbarTilte === void 0 ? '查询结果' : _props$toolbarTilte,
+    toolbarTilte = _props$toolbarTilte === void 0 ? intl.getMessage('datagrid.queryResults', '查询结果') : _props$toolbarTilte,
     buttonGroup = props.buttonGroup,
     _props$refreshIconVis = props.refreshIconVisible,
     refreshIconVisible = _props$refreshIconVis === void 0 ? true : _props$refreshIconVis,
@@ -80,14 +87,14 @@ function VtxTable(props) {
     _props$autoFit = props.autoFit,
     autoFit = _props$autoFit === void 0 ? true : _props$autoFit,
     _props$headFootHeight = props.headFootHeight,
-    headFootHeight = _props$headFootHeight === void 0 ? 115 : _props$headFootHeight,
+    headFootHeight = _props$headFootHeight === void 0 ? DEFAULT_HEIGHTS.HEAD_FOOT : _props$headFootHeight,
     _props$columnResizabl = props.columnResizable,
     columnResizable = _props$columnResizabl === void 0 ? true : _props$columnResizabl,
     components = props.components,
     className = props.className,
     style = props.style,
     _props$emptyText = props.emptyText,
-    emptyText = _props$emptyText === void 0 ? '暂无数据' : _props$emptyText,
+    emptyText = _props$emptyText === void 0 ? intl.getMessage('select.empty', '暂无数据') : _props$emptyText,
     onRowSelectionClear = props.onRowSelectionClear,
     onColumnsSave = props.onColumnsSave,
     uniqueKey = props.uniqueKey,
@@ -109,9 +116,20 @@ function VtxTable(props) {
       var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
         return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
       })[0];
+      var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
+        return dom.className.includes('ant-table-placeholder');
+      })[0];
       if (bodyDiv) {
         bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
       }
+      console.log('tablePlaceholder', tablePlaceholder);
+      if (tablePlaceholder) {
+        tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+        var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
+          return dom.className.includes('ant-table-cell');
+        })[0];
+        tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+      }
       setState({
         scrollY: bodyHeight
       });
@@ -123,14 +141,12 @@ function VtxTable(props) {
     var resizeObserver = new ResizeObserver(function () {
       calculateHeight();
     });
-    // componentDidMount
     if (autoFit && rootDomRef.current) {
       resizeObserver.observe(rootDomRef.current, {
         box: 'border-box'
       });
     }
     return function () {
-      // componentWillUnmount
       if (autoFit) {
         resizeObserver.disconnect();
       }
@@ -152,7 +168,7 @@ function VtxTable(props) {
       showSizeChanger: true,
       showQuickJumper: true,
       showTotal: function showTotal(total) {
-        return "".concat(TextEnum.total, " ").concat(total, " ").concat(TextEnum.item);
+        return "".concat(TextEnum.paginationTotalText, " ").concat(total, " ").concat(TextEnum.paginationItemText);
       }
     }, pagination);
   };
@@ -176,9 +192,6 @@ function VtxTable(props) {
       });
     };
     var _tableColumn = loopFilter(counter.tableColumn);
-    if (!columnsMap['_serialNum']) {
-      return [];
-    }
     return sortByKeyArrayExtract(_tableColumn, sortKeyColumns, columnsMap, 'key');
   }, [columnsMap, counter.tableColumn, sortKeyColumns]);
 
@@ -227,8 +240,8 @@ function VtxTable(props) {
     selectedRowKeys: (_rest$rowSelection4 = rest.rowSelection) === null || _rest$rowSelection4 === void 0 ? void 0 : _rest$rowSelection4.selectedRowKeys,
     onRowSelectionClear: onRowSelectionClear
   }) : null;
-  alertHeight.current = !hideSelectionClear && hasAlert ? 49 : 0;
-  toolbarHeight.current = toolbar ? 56 : 0;
+  alertHeight.current = !hideSelectionClear && hasAlert ? DEFAULT_HEIGHTS.ALERT : 0;
+  toolbarHeight.current = toolbar ? DEFAULT_HEIGHTS.TOOLBAR : 0;
   var _useAntdColumnResize = useAntdColumnResize(function () {
       return {
         columns: columns,
@@ -251,8 +264,7 @@ function VtxTable(props) {
     }
     var flag = false;
     (_result = result) === null || _result === void 0 || _result.map(function (v) {
-      var _columnsMap$v$key;
-      if (columnsMap !== null && columnsMap !== void 0 && columnsMap[v.key] && ((_columnsMap$v$key = columnsMap[v.key]) === null || _columnsMap$v$key === void 0 ? void 0 : _columnsMap$v$key.width) !== v.width) {
+      if (columnsMap[v.key].width !== v.width) {
         flag = true;
         columnsMap[v.key].width = v.width;
       }
@@ -280,7 +292,7 @@ function VtxTable(props) {
     hideColumnHeight: hideColumnHeight,
     hideColumnSetting: hideColumnSetting,
     onRefresh: onRefresh,
-    columns: _columns,
+    columns: tableColumn,
     onColumnsSave: onColumnsSave,
     uniqueKey: uniqueKey,
     prefixUrl: prefixUrl,

package/es/vtx-datagrid/style/index.js

@@ -20,18 +20,29 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', _defineProperty({}, '.ant-table-tbody', {
     '>tr.ant-table-placeholder': {
       position: 'absolute',
-      top: '25%',
+      bottom: 0,
       right: 0,
       left: 0,
       backgroundColor: 'transparent',
       borderTop: 'none',
+      height: '100%',
+      borderInlineEnd: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
+      borderBottom: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
       '>td.ant-table-cell': {
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
+        padding: 0,
         width: '100%',
         height: '100%',
-        border: 'none'
+        border: 'none',
+        '.ant-table-expanded-row-fixed': {
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          height: '100%',
+          width: '100%',
+          '&:after': {
+            borderInlineEnd: 'none'
+          }
+        }
       }
     }
   }))), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
@@ -47,10 +58,14 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', {
     '>table >tbody>tr>td': {
       borderInlineColor: 'transparent !important'
+    },
+    '>table >tbody>tr.ant-table-placeholder': {
+      borderInlineColor: 'transparent !important',
+      borderBottomColor: 'transparent !important'
     }
   }))))), "&.vtx-datagrid-striped", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty({}, '.ant-table-body', {
     '>table >tbody>tr:nth-child(odd)>td': {
-      backgroundColor: token.colorBgLayout,
+      backgroundColor: token.colorBgLayoutTable,
       '&.ant-table-cell-row-hover': {
         backgroundColor: token.colorFillAlterSolid
       }
@@ -66,7 +81,7 @@ var genVtxStyle = function genVtxStyle(token) {
     }
   }))))), "&.vtx-datagrid-header-background", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
     '>tr>th': {
-      background: token.colorBgLayout
+      background: token.colorBgLayoutTable
     }
   }))))));
 };