@vtx/components 4.0.0-beta.8 → 4.0.0-beta.80

package/es/index.js

@@ -22,6 +22,7 @@ export * from "./vtx-time-picker";
 export * from "./vtx-upload";
 export * from "./vtx-tree-select";
 export * from "./vtx-signature";
+export * from "./vtx-transfer-select";
 
 // data display
 export * from "./vtx-datagrid";
@@ -30,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-combogrid/Combogrid.js

@@ -43,7 +43,8 @@ function VtxCombogrid(props, ref) {
     searchForms = _props$searchForms === void 0 ? [] : _props$searchForms,
     selectedRowKeys = props.selectedRowKeys,
     setSelectedRowKeys = props.setSelectedRowKeys,
-    spread = props.spread,
+    _props$spread = props.spread,
+    spread = _props$spread === void 0 ? false : _props$spread,
     defaultPageSize = props.defaultPageSize,
     _props$customEnumText = props.customEnumText,
     customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
@@ -130,16 +131,16 @@ function VtxCombogrid(props, ref) {
     });
   }
 
-  // 查询和清空会重置selectedRowKeys，因此也需清空文本中的value值
+  // 重置会清空 selectedRowKeys，因此也需清空文本中的 value 值
   var query = function query() {
     submit();
-    if (multiple && selectedRowKeys.length) {
+    if (!spread && multiple && selectedRowKeys.length) {
       clearSelectedRow();
     }
   };
   var clear = function clear() {
     reset();
-    if (multiple && selectedRowKeys.length) {
+    if (!spread && multiple && selectedRowKeys.length) {
       clearSelectedRow();
     }
   };

package/es/vtx-combogrid/index.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 = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled"];
+var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled", "spread"];
 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; }
@@ -48,6 +48,8 @@ var VtxCombogrid = /*#__PURE__*/forwardRef(function (props, ref) {
     content = _props$content === void 0 ? null : _props$content,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$spread = props.spread,
+    spread = _props$spread === void 0 ? false : _props$spread,
     rest = _objectWithoutProperties(props, _excluded);
   useEffect(function () {
     setSelectedRowKeys(defaultSelectedRowKeys);
@@ -71,11 +73,12 @@ var VtxCombogrid = /*#__PURE__*/forwardRef(function (props, ref) {
       defaultSelectedRowKeys: defaultSelectedRowKeys,
       setSelectedRowKeys: setSelectedRowKeys,
       setPopoverVisible: setVisible,
+      spread: spread,
       ref: comboRef
     })),
     trigger: "click",
-    visible: disabled ? false : visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: disabled ? false : visible,
+    onOpenChange: function onOpenChange(visible) {
       return setVisible(visible);
     },
     classNames: {
@@ -109,7 +112,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-datagrid/Store/Provide.js

@@ -3,35 +3,83 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
+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); }
 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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-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; }
-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 VtxEllipsisText from "../../vtx-ellipsis-text";
+import { createContext, useEffect, useMemo, useRef, useState, useCallback } from 'react';
 import { useIntl } from "../../vtx-provider";
 import { message } from 'antd';
-import { genColumnKey, isFunction, sortByGivenOrder, useDeepCompareEffectDebounce } from "../../utils";
+import { genColumnKey, isFunction, useDeepCompareEffectDebounce } from "../../utils";
 import renderColumnButtons from "../renderColumnButtons";
 import { getVtxToken } from '@vtx/utils';
+import { buildColumnKeyMap, buildSortKeyColumns, getVisibleColumnKeysFromMap } from "../columnState";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var indexColumnKey = '_serialNum';
+function useMergedState1(defaultValue, option) {
+  var _ref = option || {},
+    controlledValue = _ref.value,
+    onChange = _ref.onChange,
+    id = _ref.id;
+
+  // 1. 初始化内部非受控状态
+  var _useState = useState(defaultValue),
+    _useState2 = _slicedToArray(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  // 记录上一次的值，用于 onChange 回调传参
+  var prevValueRef = useRef(controlledValue !== null && controlledValue !== void 0 ? controlledValue : innerValue);
+  // 2. 受控模式下，同步更新 prevValueRef
+  useEffect(function () {
+    if (controlledValue !== undefined) {
+      prevValueRef.current = controlledValue;
+    }
+  }, [controlledValue]);
+  // 3. 统一的取值逻辑：优先用受控值，否则用内部值
+  var mergedValue = controlledValue !== undefined ? controlledValue : innerValue;
+  // 4. 统一的更新方法
+  var setValue = useCallback(function (value) {
+    var prevValue = mergedValue;
+    // 处理函数式更新（和 useState 保持一致）
+    var nextValue = typeof value === 'function' ? value(prevValue) : value;
+
+    // 受控模式：调用 onChange，不更新内部 state
+    if (controlledValue !== undefined) {
+      onChange === null || onChange === void 0 || onChange(nextValue, prevValue);
+    }
+    // 非受控模式：更新内部 state，同时触发 onChange
+    else {
+      setInnerValue(nextValue);
+      onChange === null || onChange === void 0 || onChange(nextValue, prevValue);
+    }
+    // 更新上一次值的缓存
+    prevValueRef.current = nextValue;
+  }, [controlledValue, mergedValue, onChange]);
+  // 5. 重置方法：恢复到初始默认值
+  var reset = useCallback(function () {
+    var resetValue = typeof defaultValue === 'function' ? defaultValue() : defaultValue;
+    setValue(resetValue);
+  }, [defaultValue, setValue]);
+  return [mergedValue, setValue, reset];
+}
 function useContainer() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _ref = getVtxToken() || {},
-    _ref$userId = _ref.userId,
-    userId = _ref$userId === void 0 ? '' : _ref$userId,
-    _ref$tenantId = _ref.tenantId,
-    tenantId = _ref$tenantId === void 0 ? '' : _ref$tenantId;
+  var _ref2 = getVtxToken() || {},
+    _ref2$userId = _ref2.userId,
+    userId = _ref2$userId === void 0 ? '' : _ref2$userId,
+    _ref2$tenantId = _ref2.tenantId,
+    tenantId = _ref2$tenantId === void 0 ? '' : _ref2$tenantId;
   var intl = useIntl();
   var _props$indexColumn = props.indexColumn,
     indexColumn = _props$indexColumn === void 0 ? true : _props$indexColumn,
@@ -87,22 +135,22 @@ function useContainer() {
   var columnsMapRef = useRef({});
   // 是否可拖拽， 除非columns 至少需要一项不设置 width 让其自适应。
   var isDragRef = useRef(false);
-  var _useState = useState({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    columnsMap = _useState2[0],
-    setColumnsMap = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState({}),
     _useState4 = _slicedToArray(_useState3, 2),
-    showTable = _useState4[0],
-    setShowTable = _useState4[1];
-  var _useState5 = useState(''),
+    columnsMap = _useState4[0],
+    setColumnsMap = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    keyWords = _useState6[0],
-    _setKeyWords = _useState6[1];
-  var _useState7 = useState({}),
+    showTable = _useState6[0],
+    setShowTable = _useState6[1];
+  var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 2),
-    tableConfig = _useState8[0],
-    setTableConfig = _useState8[1];
+    keyWords = _useState8[0],
+    _setKeyWords = _useState8[1];
+  var _useState9 = useState({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    tableConfig = _useState10[0],
+    setTableConfig = _useState10[1];
   var _useMergedState = useMergedState(function () {
       return props.size || props.defaultSize || 'middle';
     }, {
@@ -113,7 +161,7 @@ function useContainer() {
     tableSize = _useMergedState2[0],
     setTableSize = _useMergedState2[1];
   var _useMergedState3 = useMergedState(function () {
-      return props.tableStyles || ['striped', 'header-background', 'border'];
+      return props.tableStyles || props.defaultTableStyles || ['striped', 'header-background', 'border'];
     }, {
       value: props.tableStyles,
       onChange: props.onChangeTableStyles
@@ -122,7 +170,7 @@ function useContainer() {
     tableStyles = _useMergedState4[0],
     setTableStyles = _useMergedState4[1];
   var _useMergedState5 = useMergedState(function () {
-      return props.visibleColumnKeys || undefined;
+      return props.visibleColumnKeys || props.defaultVisibleColumnKeys || undefined;
     }, {
       value: props.visibleColumnKeys,
       onChange: props.onVisibleColumnsChange
@@ -131,7 +179,7 @@ function useContainer() {
     visibleColumnKeys = _useMergedState6[0],
     setVisibleColumnKeys = _useMergedState6[1];
   var _useMergedState7 = useMergedState(function () {
-      return props.uniqueKey || undefined;
+      return props.uniqueKey || props.defaultUniqueKey || undefined;
     }, {
       value: props.uniqueKey,
       onChange: props.onChangesUniqueKey
@@ -170,16 +218,24 @@ function useContainer() {
         key: newColumn.key || newColumn.dataIndex,
         disable: disabledColumnKeys === null || disabledColumnKeys === void 0 ? void 0 : disabledColumnKeys.includes(column.dataIndex || column.key),
         render: isFunction(column.renderButtons) ? function (text, record, index) {
-          return renderColumnButtons({
-            renderButtons: column.renderButtons,
-            visible: column.renderButtonsVisibleNum,
-            text: text,
-            record: record,
-            index: index,
-            TextEnum: TextEnum
+          return /*#__PURE__*/_jsx("div", {
+            style: {
+              whiteSpace: 'nowrap'
+            },
+            children: renderColumnButtons({
+              renderButtons: column.renderButtons,
+              visible: column.renderButtonsVisibleNum,
+              text: text,
+              record: record,
+              index: index,
+              TextEnum: TextEnum
+            })
           });
         } : 'render' in column ? column.render : function (text) {
-          return ['', null, undefined].includes(text) ? '-' : text;
+          return ['', null, undefined].includes(text) ? '-' : column.ellipse && typeof text === 'string' ? /*#__PURE__*/_jsx(VtxEllipsisText, {
+            text: text,
+            lineClamp: 2
+          }) : text;
         }
       });
     });
@@ -188,121 +244,34 @@ function useContainer() {
 
   // 默认值 可以从接口里获取
   var defaultColumnKeyMap = useMemo(function () {
-    var columnKeyMap = {};
     if (tableConfig.columnsMap && tableConfig.sortKeyColumns) {
       setColumnsMap(tableConfig.columnsMap);
       sortKeyColumns.current = tableConfig.sortKeyColumns;
       return tableConfig.columnsMap;
-    } else if (Array.isArray(props.defaultVisibleColumnKeys)) {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref2, index) {
-        var _ref3;
-        var key = _ref2.key,
-          dataIndex = _ref2.dataIndex,
-          fixed = _ref2.fixed,
-          disable = _ref2.disable,
-          width = _ref2.width;
-        var columnKey = genColumnKey(key !== null && key !== void 0 ? key : dataIndex, index);
-        columnKeyMap[columnKey] = {
-          show: indexColumn && indexColumnKey == columnKey ? true : (_ref3 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref3 === void 0 ? void 0 : _ref3.includes(columnKey),
-          fixed: fixed,
-          disable: disable,
-          width: width
-        };
-      });
-    } else {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref4, index) {
-        var key = _ref4.key,
-          dataIndex = _ref4.dataIndex,
-          fixed = _ref4.fixed,
-          disable = _ref4.disable,
-          width = _ref4.width;
-        var columnKey = genColumnKey(key !== null && key !== void 0 ? key : dataIndex, index);
-        columnKeyMap[columnKey] = {
-          show: true,
-          fixed: fixed,
-          disable: disable,
-          width: width
-        };
-      });
     }
-    return columnKeyMap;
+    return buildColumnKeyMap(tableColumn, {
+      defaultVisibleColumnKeys: props.defaultVisibleColumnKeys,
+      indexColumn: indexColumn
+    });
   }, [tableColumn, props.defaultVisibleColumnKeys, tableConfig, uniqueKey]);
 
   // 深度比较 + 防抖 + 忽略这render函数引用变化
   useDeepCompareEffectDebounce(function () {
-    var columnKeyMap = {};
-    if (Array.isArray(visibleColumnKeys)) {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref5, index) {
-        var _ref6;
-        var key = _ref5.key,
-          dataIndex = _ref5.dataIndex,
-          fixed = _ref5.fixed,
-          disable = _ref5.disable,
-          width = _ref5.width;
-        var columnKey = genColumnKey(key !== null && key !== void 0 ? key : dataIndex, index);
-        columnKeyMap[columnKey] = {
-          show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref6 = _toConsumableArray(visibleColumnKeys)) === null || _ref6 === void 0 ? void 0 : _ref6.includes(columnKey),
-          fixed: fixed,
-          disable: disable,
-          width: width
-        };
-      });
-    } else if (Array.isArray(props.defaultVisibleColumnKeys)) {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref7, index) {
-        var _ref8;
-        var key = _ref7.key,
-          dataIndex = _ref7.dataIndex,
-          fixed = _ref7.fixed,
-          disable = _ref7.disable,
-          width = _ref7.width;
-        var columnKey = genColumnKey(key !== null && key !== void 0 ? key : dataIndex, index);
-        columnKeyMap[columnKey] = {
-          show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref8 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref8 === void 0 ? void 0 : _ref8.includes(columnKey),
-          fixed: fixed,
-          disable: disable,
-          width: width
-        };
-      });
-    } else {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref9, index) {
-        var key = _ref9.key,
-          dataIndex = _ref9.dataIndex,
-          fixed = _ref9.fixed,
-          disable = _ref9.disable,
-          width = _ref9.width;
-        var columnKey = genColumnKey(key !== null && key !== void 0 ? key : dataIndex, index);
-        columnKeyMap[columnKey] = {
-          show: true,
-          fixed: fixed,
-          disable: disable,
-          width: width
-        };
-      });
-    }
-    var sortKeys = visibleColumnKeys || props.defaultVisibleColumnKeys || [];
-    sortKeyColumns.current = Object.entries(columnKeyMap).map(function (_ref10) {
-      var _ref11 = _slicedToArray(_ref10, 1),
-        key = _ref11[0];
-      return key;
+    var columnKeyMap = buildColumnKeyMap(tableColumn, {
+      visibleColumnKeys: visibleColumnKeys,
+      defaultVisibleColumnKeys: props.defaultVisibleColumnKeys,
+      previousColumnsMap: columnsMapRef.current,
+      indexColumn: indexColumn
     });
-    if ((sortKeys === null || sortKeys === void 0 ? void 0 : sortKeys.length) > 0) {
-      sortKeyColumns.current = sortByGivenOrder(sortKeyColumns.current, sortKeys);
-    }
+    sortKeyColumns.current = buildSortKeyColumns(columnKeyMap, visibleColumnKeys, props.defaultVisibleColumnKeys);
     setColumnsMap(columnKeyMap);
     if (isFirst.current) {
       isFirst.current = false;
     }
-  }, [visibleColumnKeys], ['render'], 100);
+  }, [visibleColumnKeys, props.defaultVisibleColumnKeys, tableColumn], ['render'], 100);
   useDeepCompareEffectDebounce(function () {
-    var _sortKeyColumns$curre, _props$onVisibleColum;
-    var visibleColumnKeys = [];
-    (_sortKeyColumns$curre = sortKeyColumns.current) === null || _sortKeyColumns$curre === void 0 || _sortKeyColumns$curre.map(function (columnKey) {
-      var config = columnsMap[columnKey];
-      if (config !== null && config !== void 0 && config.show) {
-        visibleColumnKeys.push(columnKey);
-      }
-    });
-    (_props$onVisibleColum = props.onVisibleColumnsChange) === null || _props$onVisibleColum === void 0 || _props$onVisibleColum.call(props, visibleColumnKeys);
+    var _props$onVisibleColum;
+    (_props$onVisibleColum = props.onVisibleColumnsChange) === null || _props$onVisibleColum === void 0 || _props$onVisibleColum.call(props, getVisibleColumnKeysFromMap(columnsMap, sortKeyColumns.current));
   }, [JSON.stringify(columnsMap), sortKeyColumns.current], ['render'], 200);
   var show = function show() {
     setTimeout(function () {

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";
+import { getVisibleColumnKeysFromMap } from "../../../columnState";
 // omit 用于从对象中排除指定的属性，返回一个新对象
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -244,7 +245,6 @@ var CheckboxList = function CheckboxList(_ref3) {
       var dropPosition = info.dropPosition,
         dropToGap = info.dropToGap;
       var position = dropPosition === -1 || !dropToGap ? dropPosition + 1 : dropPosition;
-      console.log('newMap info', dragKey, dropKey, position);
       move(dragKey, dropKey, position);
     },
     treeIcon: false,
@@ -367,6 +367,7 @@ export default function ColumnSetting(props) {
     setColumnsMap = _useContext8.setColumnsMap,
     defaultColumnKeyMap = _useContext8.defaultColumnKeyMap,
     setSortKeyColumns = _useContext8.setSortKeyColumns,
+    sortKeyColumns = _useContext8.sortKeyColumns,
     saveColumns = _useContext8.saveColumns,
     TextEnum = _useContext8.TextEnum,
     tableColumn = _useContext8.tableColumn;
@@ -430,7 +431,7 @@ export default function ColumnSetting(props) {
 
   // 保存按钮
   var onSaveChange = function onSaveChange() {
-    onColumnsSave(checkedColumnKeys);
+    onColumnsSave(Array.isArray(checkedColumnKeys) ? checkedColumnKeys : getVisibleColumnKeysFromMap(columnsMap, sortKeyColumns));
   };
   // 未选中的 key 列表
   var unCheckedKeys = Object.values(columnsMap).filter(function (value) {
@@ -501,7 +502,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/ColumnSetting/style.js

@@ -21,7 +21,8 @@ var genVtxStyle = function genVtxStyle(token) {
     padding: 0,
     marginBottom: 10
   }), '.ant-popover-content', _defineProperty(_defineProperty(_defineProperty(_defineProperty({
-    padding: '0 16px 16px 16px'
+    padding: '0 16px 16px 16px',
+    width: 196
   }, "".concat(token.antCls, "-tree-node-content-wrapper:hover"), {
     backgroundColor: 'transparent'
   }), ".ant-tree-switcher", {
@@ -29,7 +30,9 @@ var genVtxStyle = function genVtxStyle(token) {
   }), "".concat(token.antCls, "-tree-draggable-icon"), {
     cursor: 'grab'
   }), "".concat(token.antCls, "-tree-treenode"), _defineProperty(_defineProperty({
-    alignItems: 'center'
+    alignItems: 'center',
+    paddingRight: 12,
+    boxSizing: 'border-box'
   }, "".concat(token.antCls, "-tree-checkbox"), {
     marginInlineEnd: 4
   }), "".concat(token.antCls, "-tree-title"), {

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, {