@hw-component/table 1.10.16 → 1.10.17

package/lib/HTableBody/Options/hooks.js

@@ -1,46 +1,73 @@
 'use strict';
 
+var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
+var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/splice');
+var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var utils = require('./utils.js');
 var index = require('../../hooks/index.js');
 
-var useCheckKeys = function useCheckKeys(_ref) {
+var useTreeValue = function useTreeValue(_ref) {
   var columns = _ref.columns,
     colStatusValue = _ref.colStatusValue;
   return React.useMemo(function () {
-    var keys = [];
-    _forEachInstanceProperty(columns).call(columns, function (value) {
-      var dataIndex = value.dataIndex,
-        hideInTable = value.hideInTable;
-      if (hideInTable || !dataIndex) {
-        return;
-      }
+    var _context2;
+    var checkKeys = [];
+    var newCols = _filterInstanceProperty(columns).call(columns, function (_ref2) {
+      var dataIndex = _ref2.dataIndex,
+        hideInTable = _ref2.hideInTable;
+      return !hideInTable && dataIndex;
+    });
+    var sortCols = [];
+    var tmpCols = [];
+    var tmpLen = 0;
+    _forEachInstanceProperty(newCols).call(newCols, function (value) {
+      var dataIndex = value.dataIndex;
       var dataIndexStr = dataIndex.toString();
-      var _ref2 = colStatusValue[dataIndexStr] || {},
-        _ref2$show = _ref2.show,
-        show = _ref2$show === void 0 ? true : _ref2$show;
-      if (!show) {
-        return;
+      var _ref3 = colStatusValue[dataIndexStr] || {},
+        order = _ref3.order,
+        _ref3$show = _ref3.show,
+        show = _ref3$show === void 0 ? true : _ref3$show;
+      var orderStr = order === null || order === void 0 ? void 0 : order.toString();
+      if (!orderStr) {
+        tmpCols.push(value);
+      }
+      if (orderStr) {
+        var cuOrder = order + tmpLen;
+        sortCols[cuOrder] = value;
+      }
+      if (order === 0) {
+        var _context;
+        _spliceInstanceProperty(sortCols).apply(sortCols, _concatInstanceProperty(_context = [0, 0]).call(_context, _toConsumableArray(tmpCols)));
+        tmpLen = tmpCols.length;
+        tmpCols = [];
+      }
+      if (show) {
+        checkKeys.push(dataIndexStr);
       }
-      keys.push(dataIndexStr);
     });
-    return keys;
+    _spliceInstanceProperty(sortCols).apply(sortCols, _concatInstanceProperty(_context2 = [tmpLen + 1, 0]).call(_context2, _toConsumableArray(tmpCols)));
+    return {
+      checkKeys: checkKeys,
+      cols: sortCols
+    };
   }, [colStatusValue, columns]);
 };
-var useContentTree = function useContentTree(_ref3) {
-  var columns = _ref3.columns,
-    matchKey = _ref3.matchKey;
+var useContentTree = function useContentTree(_ref4) {
+  var columns = _ref4.columns,
+    matchKey = _ref4.matchKey;
   var titleClass = index.useClassName("hw-table-body-option-setting-content-title");
   return React.useMemo(function () {
     var treeData = [];
-    _forEachInstanceProperty(columns).call(columns, function (_ref4) {
-      var dataIndex = _ref4.dataIndex,
-        title = _ref4.title,
-        titleStr = _ref4.titleStr,
-        fixed = _ref4.fixed;
+    _forEachInstanceProperty(columns).call(columns, function (_ref5) {
+      var dataIndex = _ref5.dataIndex,
+        title = _ref5.title,
+        titleStr = _ref5.titleStr,
+        fixed = _ref5.fixed;
       if (!dataIndex) {
         return;
       }
@@ -63,13 +90,13 @@ var useContentTree = function useContentTree(_ref3) {
     return treeData;
   }, [columns]);
 };
-var useTreeKeys = function useTreeKeys(_ref5) {
-  var treeData = _ref5.treeData,
-    checkKeys = _ref5.checkKeys;
+var useTreeKeys = function useTreeKeys(_ref6) {
+  var treeData = _ref6.treeData,
+    checkKeys = _ref6.checkKeys;
   return React.useMemo(function () {
     var newKeys = [];
-    _forEachInstanceProperty(treeData).call(treeData, function (_ref6) {
-      var key = _ref6.key;
+    _forEachInstanceProperty(treeData).call(treeData, function (_ref7) {
+      var key = _ref7.key;
       var index = _indexOfInstanceProperty(checkKeys).call(checkKeys, key);
       if (index !== -1) {
         newKeys.push(key);
@@ -79,7 +106,7 @@ var useTreeKeys = function useTreeKeys(_ref5) {
   }, [treeData, checkKeys]);
 };
 
-exports.useCheckKeys = useCheckKeys;
 exports.useContentTree = useContentTree;
 exports.useTreeKeys = useTreeKeys;
+exports.useTreeValue = useTreeValue;
 // powered by h

package/lib/HTableBody/Options/index.js

@@ -26,10 +26,12 @@ var Options = (function (_ref) {
     onDrop = _ref.onDrop;
   var pointer = index.useClassName(["hw-table-pointer", "hw-table-body-option-icon"]);
   var ref = React.useRef(null);
-  var checkKeys = hooks.useCheckKeys({
-    columns: columns,
-    colStatusValue: colStatusValue
-  });
+  var _useTreeValue = hooks.useTreeValue({
+      columns: columns,
+      colStatusValue: colStatusValue
+    }),
+    checkKeys = _useTreeValue.checkKeys,
+    cols = _useTreeValue.cols;
   var SizeItem = function SizeItem() {
     var MenuComponent = antd.Menu;
     var MenuItem = antd.Menu.Item;
@@ -86,7 +88,7 @@ var Options = (function (_ref) {
         })
       }), jsxRuntime.jsx(antd.Popover, {
         content: jsxRuntime.jsx(Content.ColsSettingContent, {
-          columns: columns,
+          columns: cols,
           checkKeys: checkKeys,
           onCheck: onChange,
           onDrop: onDrop

package/lib/HTableBody/Options/utils.d.ts

@@ -5,7 +5,7 @@ export declare const getItemValue: (data: ConfigItemModal) => {
     labelAlign?: import("@hw-component/form/es/Form/modal").LabelAlignModal | undefined;
     label?: React.ReactNode | import("@hw-component/form/es/Form/modal").HelperModal;
     hidden?: boolean | import("@hw-component/form/es/Form/modal").HideModal | undefined;
-    children?: React.ReactNode | ((form: import("rc-field-form").FormInstance<any>) => React.ReactNode);
+    children?: ((string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | ((form: import("rc-field-form").FormInstance<any>) => React.ReactNode) | null) & ConfigItemModal[]) | undefined;
     dependencies?: import("rc-field-form/lib/interface").NamePath[] | undefined;
     getValueFromEvent?: ((...args: import("rc-field-form/lib/interface").EventArgs) => any) | undefined;
     normalize?: ((value: any, prevValue: any, allValues: import("rc-field-form/lib/interface").Store) => any) | undefined;
@@ -802,7 +802,7 @@ export declare const getItemValue: (data: ConfigItemModal) => {
         width?: number | undefined;
     } | undefined) | undefined;
     fieldProps?: any;
-    childrenDataIndex?: string[] | ConfigItemModal[] | undefined;
+    childrenDataIndex?: ConfigItemModal[] | string[] | undefined;
     title: any;
     dataIndex: ((string | number | (string | number)[]) & import("rc-table/lib/interface").DataIndex) | undefined;
 };

package/lib/HTableBody/hooks/useColData.d.ts

@@ -1,12 +1,6 @@
-/// <reference types="react" />
-import type { ConfigDataModal, HTableProps } from "../../modal";
+import type { ConfigDataModal } from "../../modal";
 import type { ColumnsState } from "@ant-design/pro-table/es/container";
 import type { ColumnsStateType } from "@ant-design/pro-table/es/typing";
-export declare const useCols: ({ configData, rowSelection, table, bordered, configItemRender, }: HTableProps) => {
-    cols: ConfigDataModal;
-    setCols: import("react").Dispatch<import("react").SetStateAction<ConfigDataModal>>;
-    resetCols: () => void;
-};
 interface useColumnsStateTypeModal {
     columnsState?: ColumnsStateType;
     columns: ConfigDataModal;
@@ -16,6 +10,7 @@ export declare const useColumnsStateType: ({ columnsState, columns, }: useColumn
     persistenceKey: string | undefined;
     value: Record<string, ColumnsState> | undefined;
     onChange: (keys: string[], notCheck: string[]) => void;
-    resetCheckCol: () => void;
+    resetCol: () => void;
+    dropChange: (list: ConfigDataModal) => void;
 };
 export {};

package/lib/HTableBody/hooks/useColData.js

@@ -2,133 +2,35 @@
 
 var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
-var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
-var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
-var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
-var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/splice');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
 var context = require('../../context.js');
 var React = require('react');
-var index = require('../../hooks/index.js');
-var TableConfig = require('../../TableConfig.js');
-var config = require('../../render/config.js');
-var index$1 = require('../../render/index.js');
 var utils = require('../utils.js');
-var colsMk = require('./colsMk.js');
 
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
-var checkBoxMk = function checkBoxMk(rowSelection) {
-  var type = rowSelection.type;
-  if (type === "radio") {
-    return colsMk.radioSelectionCol(rowSelection);
-  }
-  return colsMk.checkBoxSelectionCol(rowSelection);
-};
-var useCols = function useCols(_ref) {
-  var configData = _ref.configData,
-    rowSelection = _ref.rowSelection,
-    table = _ref.table,
-    bordered = _ref.bordered,
-    configItemRender = _ref.configItemRender;
-  var trClassname = index.useClassName("hw-table-col-hr");
-  var _useState = React.useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    cols = _useState2[0],
-    setCols = _useState2[1];
-  var _useHTableConfigConte = TableConfig.useHTableConfigContext({}),
-    valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
-  var itemClassNameMk = function itemClassNameMk(children, lastChildren) {
-    var lastChildLen = lastChildren.length;
-    var childLen = children.length;
-    return !childLen && !!lastChildLen ? trClassname : "";
-  };
-  var colChild = function colChild(children) {
-    if (!children) {
-      return children;
-    }
-    return _mapInstanceProperty(children).call(children, function (item) {
-      return itemProvider(item);
-    });
-  };
-  function itemProvider(item, lastItem) {
-    var _context2;
-    var _ref2 = lastItem || {},
-      _ref2$children = _ref2.children,
-      lastChildren = _ref2$children === void 0 ? [] : _ref2$children;
-    var _item$valueType = item.valueType,
-      valueType = _item$valueType === void 0 ? "" : _item$valueType,
-      _item$valueTypeProps = item.valueTypeProps,
-      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps,
-      _item$className = item.className,
-      className = _item$className === void 0 ? "" : _item$className,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children;
-    var trClassName = bordered ? "" : itemClassNameMk(children, lastChildren);
-    var itemType = valueType;
-    if (_indexOfInstanceProperty(config.textTypes).call(config.textTypes, itemType) !== -1) {
-      var _context;
-      var ellipsis = valueTypeProps.ellipsis;
-      return _objectSpread(_objectSpread({}, item), {}, {
-        ellipsis: ellipsis,
-        className: _concatInstanceProperty(_context = "".concat(className, " ")).call(_context, trClassName),
-        render: index$1.default(item, table, valueTypeConfig),
-        children: colChild(children)
-      });
-    }
-    return _objectSpread(_objectSpread({}, item), {}, {
-      className: _concatInstanceProperty(_context2 = "".concat(className, " ")).call(_context2, trClassName),
-      render: index$1.default(item, table, valueTypeConfig),
-      children: colChild(children)
-    });
-  }
-  var changeConfigData = function changeConfigData(data) {
-    var colsArray = _filterInstanceProperty(data).call(data, function (item) {
-      return !item.hideInTable;
-    });
-    if (rowSelection !== false) {
-      _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, checkBoxMk(rowSelection || {}));
-    }
-    return _mapInstanceProperty(colsArray).call(colsArray, function (item, index) {
-      var lastItem = colsArray[index - 1];
-      var resultItem = itemProvider(item, lastItem);
-      return configItemRender ? configItemRender(resultItem) : resultItem;
-    });
-  };
-  React.useEffect(function () {
-    setCols(changeConfigData(configData));
-  }, [configData, table, rowSelection]);
-  var resetCols = function resetCols() {
-    setCols(changeConfigData(configData));
-  };
-  return {
-    cols: cols,
-    setCols: setCols,
-    resetCols: resetCols
-  };
-};
-var useColumnsStateType = function useColumnsStateType(_ref3) {
-  var columnsState = _ref3.columnsState,
-    columns = _ref3.columns;
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var useColumnsStateType = function useColumnsStateType(_ref) {
+  var columnsState = _ref.columnsState,
+    columns = _ref.columns;
   var _useHTableContext = context.useHTableContext(),
     tableInstance = _useHTableContext.tableInstance;
-  var _ref4 = columnsState || {},
-    persistenceType = _ref4.persistenceType,
-    persistenceKey = _ref4.persistenceKey,
-    value = _ref4.value,
-    defaultValue = _ref4.defaultValue,
-    onChange = _ref4.onChange;
-  var _useState3 = React.useState(defaultValue),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selfValue = _useState4[0],
-    setSelfValue = _useState4[1];
+  var _ref2 = columnsState || {},
+    persistenceType = _ref2.persistenceType,
+    persistenceKey = _ref2.persistenceKey,
+    value = _ref2.value,
+    defaultValue = _ref2.defaultValue,
+    onChange = _ref2.onChange;
+  var _useState = React.useState(defaultValue),
+    _useState2 = _slicedToArray(_useState, 2),
+    selfValue = _useState2[0],
+    setSelfValue = _useState2[1];
   var initTableColsVal = React.useMemo(function () {
     return selfValue || {};
   }, []);
@@ -140,17 +42,46 @@ var useColumnsStateType = function useColumnsStateType(_ref3) {
   React.useEffect(function () {
     setSelfValue(utils.mkChangeValue(columnsState));
   }, [value]);
+  var dropChange = function dropChange(list) {
+    setSelfValue(function (oldVal) {
+      var newValue = _objectSpread({}, oldVal);
+      var notMatchNum = 0;
+      console.log(list, "li");
+      _forEachInstanceProperty(list).call(list, function (item, index) {
+        var dataIndex = item.dataIndex;
+        if (!dataIndex) {
+          notMatchNum += 1;
+        }
+        if (dataIndex) {
+          var key = dataIndex;
+          var oldItemObj = newValue[key];
+          newValue[key] = _objectSpread(_objectSpread({}, oldItemObj), {}, {
+            order: index - notMatchNum
+          });
+        }
+      });
+      return newValue;
+    });
+  };
   var change = function change(keys, notCheck) {
     var newObj = {};
+    var newValue = _objectSpread({}, selfValue);
+    _forEachInstanceProperty(keys).call(keys, function (key) {
+      var oldItem = newValue[key];
+      newObj[key] = _objectSpread(_objectSpread({}, oldItem), {}, {
+        show: true
+      });
+    });
     _forEachInstanceProperty(notCheck).call(notCheck, function (key) {
-      newObj[key] = {
+      var oldItem = newValue[key];
+      newObj[key] = _objectSpread(_objectSpread({}, oldItem), {}, {
         show: false
-      };
+      });
     });
     setSelfValue(newObj);
     onChange === null || onChange === void 0 || onChange(newObj);
   };
-  var resetCheckCol = function resetCheckCol() {
+  var resetCol = function resetCol() {
     setSelfValue(initTableColsVal);
   };
   return {
@@ -158,10 +89,10 @@ var useColumnsStateType = function useColumnsStateType(_ref3) {
     persistenceKey: persistenceKey,
     value: selfValue,
     onChange: change,
-    resetCheckCol: resetCheckCol
+    resetCol: resetCol,
+    dropChange: dropChange
   };
 };
 
-exports.useCols = useCols;
 exports.useColumnsStateType = useColumnsStateType;
 // powered by h

package/lib/HTableBody/hooks/useColMk.d.ts

@@ -0,0 +1,3 @@
+import type { HTableProps } from "../../modal";
+declare const _default: ({ configData, rowSelection, table, bordered, configItemRender, }: HTableProps) => any[];
+export default _default;

package/lib/HTableBody/hooks/useColMk.js

@@ -0,0 +1,103 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
+var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
+var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
+var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
+var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
+var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
+var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
+var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
+var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/splice');
+var index = require('../../hooks/index.js');
+var TableConfig = require('../../TableConfig.js');
+var config = require('../../render/config.js');
+var index$1 = require('../../render/index.js');
+var React = require('react');
+var colsMk = require('./colsMk.js');
+
+function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var checkBoxMk = function checkBoxMk(rowSelection) {
+  var type = rowSelection.type;
+  if (type === "radio") {
+    return colsMk.radioSelectionCol(rowSelection);
+  }
+  return colsMk.checkBoxSelectionCol(rowSelection);
+};
+var useColMk = (function (_ref) {
+  var configData = _ref.configData,
+    rowSelection = _ref.rowSelection,
+    table = _ref.table,
+    bordered = _ref.bordered,
+    configItemRender = _ref.configItemRender;
+  var trClassname = index.useClassName("hw-table-col-hr");
+  var _useHTableConfigConte = TableConfig.useHTableConfigContext({}),
+    valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
+  var itemClassNameMk = function itemClassNameMk(children, lastChildren) {
+    var lastChildLen = lastChildren.length;
+    var childLen = children.length;
+    return !childLen && !!lastChildLen ? trClassname : "";
+  };
+  var colChild = function colChild(children) {
+    if (!children) {
+      return children;
+    }
+    return _mapInstanceProperty(children).call(children, function (item) {
+      return itemProvider(item);
+    });
+  };
+  function itemProvider(item, lastItem) {
+    var _context2;
+    var _ref2 = lastItem || {},
+      _ref2$children = _ref2.children,
+      lastChildren = _ref2$children === void 0 ? [] : _ref2$children;
+    var _item$valueType = item.valueType,
+      valueType = _item$valueType === void 0 ? "" : _item$valueType,
+      _item$valueTypeProps = item.valueTypeProps,
+      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps,
+      _item$className = item.className,
+      className = _item$className === void 0 ? "" : _item$className,
+      _item$children = item.children,
+      children = _item$children === void 0 ? [] : _item$children;
+    var trClassName = bordered ? "" : itemClassNameMk(children, lastChildren);
+    var itemType = valueType;
+    if (_indexOfInstanceProperty(config.textTypes).call(config.textTypes, itemType) !== -1) {
+      var _context;
+      var ellipsis = valueTypeProps.ellipsis;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        ellipsis: ellipsis,
+        className: _concatInstanceProperty(_context = "".concat(className, " ")).call(_context, trClassName),
+        render: index$1.default(item, table, valueTypeConfig),
+        children: colChild(children)
+      });
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      className: _concatInstanceProperty(_context2 = "".concat(className, " ")).call(_context2, trClassName),
+      render: index$1.default(item, table, valueTypeConfig),
+      children: colChild(children)
+    });
+  }
+  return React.useMemo(function () {
+    var colsArray = _filterInstanceProperty(configData).call(configData, function (item) {
+      return !item.hideInTable;
+    });
+    if (rowSelection !== false) {
+      _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, checkBoxMk(rowSelection || {}));
+    }
+    return _mapInstanceProperty(colsArray).call(colsArray, function (item, index) {
+      var lastItem = colsArray[index - 1];
+      var resultItem = itemProvider(item, lastItem);
+      return configItemRender ? configItemRender(resultItem) : resultItem;
+    });
+  }, [configData, table, rowSelection]);
+});
+
+exports.default = useColMk;
+// powered by h

package/lib/HTableBody/index.js

@@ -26,9 +26,10 @@ var index = require('./Options/index.js');
 var index$2 = require('./HeaderTitle/index.js');
 var defaultRender = require('./defaultRender.js');
 var useRowClassName = require('./hooks/useRowClassName.js');
+var useColMk = require('./hooks/useColMk.js');
 
 var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender", "paginationActionRender", "localSorter", "columnsState", "tableExtraRender", "table", "onChange", "bordered", "rowClassName", "configItemRender"],
-  _excluded2 = ["value", "onChange", "resetCheckCol"];
+  _excluded2 = ["value", "onChange", "resetCol", "dropChange"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Body = (function (bodyProps) {
@@ -91,23 +92,21 @@ var Body = (function (bodyProps) {
   var _ref2 = data || {},
     records = _ref2.records;
   var tableInstance = table || contextTableInstance;
-  var _useCols = useColData.useCols({
-      configData: bodyConfigData,
-      table: tableInstance,
-      rowSelection: rowSelection,
-      bordered: bordered,
-      configItemRender: tableConfigItemRender
-    }),
-    cols = _useCols.cols,
-    setCols = _useCols.setCols,
-    resetCols = _useCols.resetCols;
+  var cols = useColMk.default({
+    configData: bodyConfigData,
+    table: tableInstance,
+    rowSelection: rowSelection,
+    bordered: bordered,
+    configItemRender: tableConfigItemRender
+  });
   var _useColumnsStateType = useColData.useColumnsStateType({
       columnsState: columnsState,
       columns: cols
     }),
     value = _useColumnsStateType.value,
     onChange = _useColumnsStateType.onChange,
-    resetCheckCol = _useColumnsStateType.resetCheckCol,
+    resetCol = _useColumnsStateType.resetCol,
+    dropChange = _useColumnsStateType.dropChange,
     selfColStatus = _objectWithoutProperties(_useColumnsStateType, _excluded2);
   useControl.useSynchronousKeys({
     selectedRowKeys: selectedRowKeys,
@@ -124,11 +123,8 @@ var Body = (function (bodyProps) {
     setSizeChange: setCuSize,
     colStatusValue: value || {},
     onChange: onChange,
-    reset: function reset() {
-      resetCheckCol();
-      resetCols();
-    },
-    onDrop: setCols
+    reset: resetCol,
+    onDrop: dropChange
   }));
   var defaultOptionsNode = optionsRender ? optionsRender(optionsNode) : optionsNode;
   var alwaysShowAlert = useControl.useAlwaysShowAlert(selectedRowData, configAlwaysShowAlert);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.10.16",
+  "version": "1.10.17",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/Options/hooks.tsx

@@ -1,30 +1,48 @@
-import React, { useEffect, useMemo, useState } from "react";
-import type { IProps, ItemProps } from "@/components/HTableBody/Options/modal";
-import type { ConfigDataModal } from "@/components/modal";
-import { getItemValue } from "@/components/HTableBody/Options/utils";
-import { useClassName } from "@/components/hooks";
+import React, {  useMemo } from "react";
+import type { IProps } from "../Options/modal";
+import type { ConfigDataModal } from "../../modal";
+import { getItemValue } from "../Options/utils";
+import { useClassName } from "../../hooks";
+
+export const useTreeValue=({ columns, colStatusValue}:Pick<IProps, "colStatusValue" | "columns">)=>{
 
-export const useCheckKeys = ({
-  columns,
-  colStatusValue,
-}: Pick<IProps, "colStatusValue" | "columns">) => {
   return useMemo(() => {
-    const keys: string[] = [];
-    columns.forEach((value) => {
-      const { dataIndex, hideInTable } = value;
-      if (hideInTable || !dataIndex) {
-        return;
+    const checkKeys: string[] = [];
+    const newCols=columns.filter(({ dataIndex, hideInTable })=>{
+      return !hideInTable && dataIndex;
+    });
+    const sortCols:ConfigDataModal=[];
+    let tmpCols:ConfigDataModal=[];
+    let tmpLen=0
+    newCols.forEach((value) => {
+      const { dataIndex } = value;
+      const dataIndexStr = dataIndex!.toString();
+      const {order,show = true }=colStatusValue[dataIndexStr]||{};
+      const orderStr=order?.toString();
+      if (!orderStr){
+         tmpCols.push(value);
       }
-      const dataIndexStr = dataIndex.toString();
-      const { show = true } = colStatusValue[dataIndexStr] || {};
-      if (!show) {
-        return;
+      if (orderStr){
+        const cuOrder=(order) as number+tmpLen;
+        sortCols[cuOrder]=value;
+      }
+      if (order===0){
+        sortCols.splice(0,0,...tmpCols);
+        tmpLen=tmpCols.length;
+        tmpCols=[];
+      }
+      if (show) {
+        checkKeys.push(dataIndexStr);
       }
-      keys.push(dataIndexStr);
     });
-    return keys;
+    sortCols.splice(tmpLen+1,0,...tmpCols);
+    return {
+      checkKeys,
+      cols:sortCols
+    };
   }, [colStatusValue, columns]);
-};
+}
+
 
 interface UseContentTreeModal {
   columns: ConfigDataModal;