@vtx/components 4.0.0-beta.9 → 4.0.0-beta.90

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

@@ -1,43 +1,92 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.indexColumnKey = exports.TableContext = exports.Container = void 0;
 var _util = require("@rc-component/util");
-var _utils = require("@vtx/utils");
 var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
-var _react = require("react");
-var _vtxProvider = require("../../vtx-provider");
+var _request = _interopRequireDefault(require("@vtx/utils/lib/request"));
+var _vtxEllipsisText = _interopRequireDefault(require("../../vtx-ellipsis-text"));
+var _utils = require("@vtx/utils");
 var _antd = require("antd");
+var _react = require("react");
 var _utils2 = require("../../utils");
+var _vtxProvider = require("../../vtx-provider");
+var _columnState = require("../columnState");
 var _renderColumnButtons = _interopRequireDefault(require("../renderColumnButtons"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 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); }
 var indexColumnKey = exports.indexColumnKey = '_serialNum';
+function useMergedState1(defaultValue, option) {
+  var _ref = option || {},
+    controlledValue = _ref.value,
+    onChange = _ref.onChange,
+    id = _ref.id;
+
+  // 1. 初始化内部非受控状态
+  var _useState = (0, _react.useState)(defaultValue),
+    _useState2 = _slicedToArray(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  // 记录上一次的值，用于 onChange 回调传参
+  var prevValueRef = (0, _react.useRef)(controlledValue !== null && controlledValue !== void 0 ? controlledValue : innerValue);
+  // 2. 受控模式下，同步更新 prevValueRef
+  (0, _react.useEffect)(function () {
+    if (controlledValue !== undefined) {
+      prevValueRef.current = controlledValue;
+    }
+  }, [controlledValue]);
+  // 3. 统一的取值逻辑：优先用受控值，否则用内部值
+  var mergedValue = controlledValue !== undefined ? controlledValue : innerValue;
+  // 4. 统一的更新方法
+  var setValue = (0, _react.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 = (0, _react.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 = (0, _utils.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 = (0, _utils.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 = (0, _vtxProvider.useIntl)();
   var _props$indexColumn = props.indexColumn,
     indexColumn = _props$indexColumn === void 0 ? true : _props$indexColumn,
@@ -93,24 +142,24 @@ function useContainer() {
   var columnsMapRef = (0, _react.useRef)({});
   // 是否可拖拽， 除非columns 至少需要一项不设置 width 让其自适应。
   var isDragRef = (0, _react.useRef)(false);
-  var _useState = (0, _react.useState)({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    columnsMap = _useState2[0],
-    setColumnsMap = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)({}),
     _useState4 = _slicedToArray(_useState3, 2),
-    showTable = _useState4[0],
-    setShowTable = _useState4[1];
-  var _useState5 = (0, _react.useState)(''),
+    columnsMap = _useState4[0],
+    setColumnsMap = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    keyWords = _useState6[0],
-    _setKeyWords = _useState6[1];
-  var _useState7 = (0, _react.useState)({}),
+    showTable = _useState6[0],
+    setShowTable = _useState6[1];
+  var _useState7 = (0, _react.useState)(''),
     _useState8 = _slicedToArray(_useState7, 2),
-    tableConfig = _useState8[0],
-    setTableConfig = _useState8[1];
+    keyWords = _useState8[0],
+    _setKeyWords = _useState8[1];
+  var _useState9 = (0, _react.useState)({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    tableConfig = _useState10[0],
+    setTableConfig = _useState10[1];
   var _useMergedState = (0, _util.useMergedState)(function () {
-      return props.size || props.defaultSize || 'middle';
+      return props.size || props.defaultSize || 'small';
     }, {
       value: props.size,
       onChange: props.onSizeChange
@@ -119,7 +168,7 @@ function useContainer() {
     tableSize = _useMergedState2[0],
     setTableSize = _useMergedState2[1];
   var _useMergedState3 = (0, _util.useMergedState)(function () {
-      return props.tableStyles || ['striped', 'header-background', 'border'];
+      return props.tableStyles || props.defaultTableStyles || ['striped', 'header-background', 'border'];
     }, {
       value: props.tableStyles,
       onChange: props.onChangeTableStyles
@@ -128,7 +177,7 @@ function useContainer() {
     tableStyles = _useMergedState4[0],
     setTableStyles = _useMergedState4[1];
   var _useMergedState5 = (0, _util.useMergedState)(function () {
-      return props.visibleColumnKeys || undefined;
+      return props.visibleColumnKeys || props.defaultVisibleColumnKeys || undefined;
     }, {
       value: props.visibleColumnKeys,
       onChange: props.onVisibleColumnsChange
@@ -137,7 +186,7 @@ function useContainer() {
     visibleColumnKeys = _useMergedState6[0],
     setVisibleColumnKeys = _useMergedState6[1];
   var _useMergedState7 = (0, _util.useMergedState)(function () {
-      return props.uniqueKey || undefined;
+      return props.uniqueKey || props.defaultUniqueKey || undefined;
     }, {
       value: props.uniqueKey,
       onChange: props.onChangesUniqueKey
@@ -176,16 +225,24 @@ function useContainer() {
         key: newColumn.key || newColumn.dataIndex,
         disable: disabledColumnKeys === null || disabledColumnKeys === void 0 ? void 0 : disabledColumnKeys.includes(column.dataIndex || column.key),
         render: (0, _utils2.isFunction)(column.renderButtons) ? function (text, record, index) {
-          return (0, _renderColumnButtons.default)({
-            renderButtons: column.renderButtons,
-            visible: column.renderButtonsVisibleNum,
-            text: text,
-            record: record,
-            index: index,
-            TextEnum: TextEnum
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            style: {
+              whiteSpace: 'nowrap'
+            },
+            children: (0, _renderColumnButtons.default)({
+              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__*/(0, _jsxRuntime.jsx)(_vtxEllipsisText.default, {
+            text: text,
+            lineClamp: 2
+          }) : text;
         }
       });
     });
@@ -194,121 +251,34 @@ function useContainer() {
 
   // 默认值 可以从接口里获取
   var defaultColumnKeyMap = (0, _react.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 = (0, _utils2.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 = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
-        columnKeyMap[columnKey] = {
-          show: true,
-          fixed: fixed,
-          disable: disable,
-          width: width
-        };
-      });
     }
-    return columnKeyMap;
+    return (0, _columnState.buildColumnKeyMap)(tableColumn, {
+      defaultVisibleColumnKeys: props.defaultVisibleColumnKeys,
+      indexColumn: indexColumn
+    });
   }, [tableColumn, props.defaultVisibleColumnKeys, tableConfig, uniqueKey]);
 
   // 深度比较 + 防抖 + 忽略这render函数引用变化
   (0, _utils2.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 = (0, _utils2.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 = (0, _utils2.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 = (0, _utils2.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 = (0, _columnState.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 = (0, _utils2.sortByGivenOrder)(sortKeyColumns.current, sortKeys);
-    }
+    sortKeyColumns.current = (0, _columnState.buildSortKeyColumns)(columnKeyMap, visibleColumnKeys, props.defaultVisibleColumnKeys);
     setColumnsMap(columnKeyMap);
     if (isFirst.current) {
       isFirst.current = false;
     }
-  }, [visibleColumnKeys], ['render'], 100);
+  }, [visibleColumnKeys, props.defaultVisibleColumnKeys, tableColumn], ['render'], 100);
   (0, _utils2.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, (0, _columnState.getVisibleColumnKeysFromMap)(columnsMap, sortKeyColumns.current));
   }, [JSON.stringify(columnsMap), sortKeyColumns.current], ['render'], 200);
   var show = function show() {
     setTimeout(function () {
@@ -319,7 +289,7 @@ function useContainer() {
     var params = {
       tableCode: uniqueKey
     };
-    _utils.request.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
+    _request.default.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
       body: params
     }).then(function (res) {
       var _res$data;
@@ -346,7 +316,7 @@ function useContainer() {
   var getUniqueKey = function getUniqueKey() {
     var route = location.href.match(/#\/(\S*)\?/);
     if (route) {
-      _utils.request.get("".concat(location.pathname, "resources/json/menu.json"), {
+      _request.default.get("".concat(location.pathname, "resources/json/menu.json"), {
         headers: _objectSpread({}, (0, _getSignature.default)({}))
       }).then(function (res) {
         var _res$data2;
@@ -358,7 +328,7 @@ function useContainer() {
     // setUniqueKey('test_demo_7')
   };
   var saveColumns = function saveColumns() {
-    _utils.request.post("/cloud/management/api/v101/user/config/table/save", {
+    _request.default.post("/cloud/management/api/v101/user/config/table/save", {
       body: JSON.stringify({
         showColumns: "".concat(sortKeyColumns.current.join(','), ";").concat(JSON.stringify(columnsMap)),
         tableCode: uniqueKey,

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

@@ -15,6 +15,7 @@ var _vtxProvider = require("../../../../vtx-provider");
 var _Provide = require("../../../Store/Provide");
 var _vtxIcon = _interopRequireDefault(require("../../../../vtx-icon"));
 var _style = require("./style");
+var _columnState = require("../../../columnState");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["key", "dataIndex", "children"],
   _excluded2 = ["disabled"];
@@ -248,7 +249,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,
@@ -371,6 +371,7 @@ function ColumnSetting(props) {
     setColumnsMap = _useContext8.setColumnsMap,
     defaultColumnKeyMap = _useContext8.defaultColumnKeyMap,
     setSortKeyColumns = _useContext8.setSortKeyColumns,
+    sortKeyColumns = _useContext8.sortKeyColumns,
     saveColumns = _useContext8.saveColumns,
     TextEnum = _useContext8.TextEnum,
     tableColumn = _useContext8.tableColumn;
@@ -378,10 +379,10 @@ function ColumnSetting(props) {
   var checkedColumnKeys = props.checkedColumnKeys,
     onColumnsSave = props.onColumnsSave;
 
-  /**
-   * 设置全部选中，或全部未选中
-   *
-   * @param show
+  /**
+   * 设置全部选中，或全部未选中
+   *
+   * @param show
    */
   var setAllSelectAction = (0, _utils.useRefFunction)(function () {
     var show = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
@@ -434,7 +435,7 @@ function ColumnSetting(props) {
 
   // 保存按钮
   var onSaveChange = function onSaveChange() {
-    onColumnsSave(checkedColumnKeys);
+    onColumnsSave(Array.isArray(checkedColumnKeys) ? checkedColumnKeys : (0, _columnState.getVisibleColumnKeysFromMap)(columnsMap, sortKeyColumns));
   };
   // 未选中的 key 列表
   var unCheckedKeys = Object.values(columnsMap).filter(function (value) {

package/lib/vtx-datagrid/ToolBar/components/ColumnSetting/style.js

@@ -27,7 +27,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", {
@@ -35,7 +36,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/lib/vtx-datagrid/ToolBar/index.js

@@ -26,6 +26,7 @@ function ToolBar(props) {
     toolbarTilte = props.toolbarTilte,
     buttonGroup = props.buttonGroup,
     refreshIconVisible = props.refreshIconVisible,
+    fullScreenVisible = props.fullScreenVisible,
     onRefresh = props.onRefresh,
     hideColumnHeight = props.hideColumnHeight,
     hideColumnSetting = props.hideColumnSetting,
@@ -71,7 +72,7 @@ function ToolBar(props) {
           }), !hideColumnHeight && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             className: "".concat(prefix, "-toolbar-setting-item"),
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Density.default, {})
-          }), !hideColumnHeight && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          }), fullScreenVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             className: "".concat(prefix, "-toolbar-setting-item"),
             onClick: (_fullScreenRef$curren = fullScreenRef.current) === null || _fullScreenRef$curren === void 0 ? void 0 : _fullScreenRef$curren.fullScreen,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Fullscreen.default, {

package/lib/vtx-datagrid/ToolBar/style.js

@@ -23,7 +23,8 @@ var genVtxStyle = function genVtxStyle(token) {
     verticalAlign: 'middle'
   }), "&-left", {
     color: token.colorText,
-    fontSize: '16px'
+    fontSize: '16px',
+    fontWeight: 600
   }), "&-right", {
     float: 'right',
     display: 'flex',
@@ -40,14 +41,16 @@ var genVtxStyle = function genVtxStyle(token) {
   }), "&-setting-item", _defineProperty(_defineProperty({
     width: '32px',
     height: '32px',
-    background: token.colorFillContent,
+    // background: token.colorFillContent,
+    background: '#F0F2F5',
     borderRadius: '6px',
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'center',
     marginLeft: '6px',
     cursor: 'pointer',
-    color: token.colorIcon
+    // color: token.colorIcon,
+    color: '#595959'
   }, '&:nth-child(1)', {
     marginLeft: '8px'
   }), "&:hover", {

package/lib/vtx-datagrid/columnState.js

@@ -0,0 +1,100 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildColumnKeyMap = buildColumnKeyMap;
+exports.buildSortKeyColumns = buildSortKeyColumns;
+exports.getVisibleColumnKeysFromMap = getVisibleColumnKeysFromMap;
+exports.indexColumnKey = void 0;
+var _genColumnKey = require("../utils/genColumnKey");
+var _sortByGivenOrder = require("../utils/sortByGivenOrder");
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+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 _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 _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 _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; }
+var indexColumnKey = exports.indexColumnKey = '_serialNum';
+function buildColumnKeyMap() {
+  var tableColumn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    visibleColumnKeys = _ref.visibleColumnKeys,
+    defaultVisibleColumnKeys = _ref.defaultVisibleColumnKeys,
+    _ref$previousColumnsM = _ref.previousColumnsMap,
+    previousColumnsMap = _ref$previousColumnsM === void 0 ? {} : _ref$previousColumnsM,
+    _ref$indexColumn = _ref.indexColumn,
+    indexColumn = _ref$indexColumn === void 0 ? true : _ref$indexColumn;
+  var hasVisibleColumnKeys = Array.isArray(visibleColumnKeys);
+  var hasDefaultVisibleColumnKeys = Array.isArray(defaultVisibleColumnKeys);
+  return (tableColumn || []).reduce(function (columnKeyMap, _ref2, index) {
+    var _previousConfig$fixed, _previousConfig$width;
+    var key = _ref2.key,
+      dataIndex = _ref2.dataIndex,
+      fixed = _ref2.fixed,
+      disable = _ref2.disable,
+      width = _ref2.width;
+    var columnKey = (0, _genColumnKey.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+    var previousConfig = previousColumnsMap[columnKey] || {};
+    var show = previousConfig.show;
+    if (indexColumn && indexColumnKey === columnKey) {
+      show = true;
+    } else if (hasVisibleColumnKeys) {
+      show = visibleColumnKeys.includes(columnKey);
+    } else if (show === undefined && hasDefaultVisibleColumnKeys) {
+      show = defaultVisibleColumnKeys.includes(columnKey);
+    } else if (show === undefined) {
+      show = true;
+    }
+    columnKeyMap[columnKey] = {
+      show: show,
+      fixed: (_previousConfig$fixed = previousConfig.fixed) !== null && _previousConfig$fixed !== void 0 ? _previousConfig$fixed : fixed,
+      disable: disable,
+      width: (_previousConfig$width = previousConfig.width) !== null && _previousConfig$width !== void 0 ? _previousConfig$width : width
+    };
+    if (previousConfig.order !== undefined) {
+      columnKeyMap[columnKey].order = previousConfig.order;
+    }
+    return columnKeyMap;
+  }, {});
+}
+function buildSortKeyColumns() {
+  var columnsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var visibleColumnKeys = arguments.length > 1 ? arguments[1] : undefined;
+  var defaultVisibleColumnKeys = arguments.length > 2 ? arguments[2] : undefined;
+  var columnKeys = Object.keys(columnsMap);
+  var sortKeys = visibleColumnKeys || defaultVisibleColumnKeys || [];
+  if (sortKeys.length > 0) {
+    return (0, _sortByGivenOrder.sortByGivenOrder)(columnKeys, sortKeys);
+  }
+  return columnKeys;
+}
+function getVisibleColumnKeysFromMap() {
+  var columnsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var sortKeyColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var allColumnKeys = Array.from(new Set([].concat(_toConsumableArray(sortKeyColumns), _toConsumableArray(Object.keys(columnsMap)))));
+  var sortIndexMap = new Map(sortKeyColumns.map(function (columnKey, index) {
+    return [columnKey, index];
+  }));
+  return allColumnKeys.filter(function (columnKey) {
+    var _columnsMap$columnKey;
+    return (_columnsMap$columnKey = columnsMap[columnKey]) === null || _columnsMap$columnKey === void 0 ? void 0 : _columnsMap$columnKey.show;
+  }).sort(function (leftKey, rightKey) {
+    var leftConfig = columnsMap[leftKey] || {};
+    var rightConfig = columnsMap[rightKey] || {};
+    var leftFixed = leftConfig.fixed,
+      leftOrder = leftConfig.order;
+    var rightFixed = rightConfig.fixed,
+      rightOrder = rightConfig.order;
+    if (leftFixed === 'left' && rightFixed !== 'left' || rightFixed === 'right' && leftFixed !== 'right') {
+      return -2;
+    }
+    if (rightFixed === 'left' && leftFixed !== 'left' || leftFixed === 'right' && rightFixed !== 'right') {
+      return 2;
+    }
+    if (leftOrder !== undefined || rightOrder !== undefined) {
+      return (leftOrder !== null && leftOrder !== void 0 ? leftOrder : 0) - (rightOrder !== null && rightOrder !== void 0 ? rightOrder : 0);
+    }
+    return (sortIndexMap.has(leftKey) ? sortIndexMap.get(leftKey) : Number.MAX_SAFE_INTEGER) - (sortIndexMap.has(rightKey) ? sortIndexMap.get(rightKey) : Number.MAX_SAFE_INTEGER);
+  });
+}