shineout 3.5.0-beta.10 → 3.5.0-beta.11

package/cjs/index.js

@@ -500,5 +500,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.5.0-beta.10'
+  version: '3.5.0-beta.11'
 };

package/dist/shineout.js

@@ -11993,7 +11993,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.5.0-beta.10');
+/* harmony default export */ var version = ('3.5.0-beta.11');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -57722,35 +57722,47 @@ var useTableSort = function useTableSort(props) {
 
 
 
-var getExpandData = function getExpandData(data, keys, keygen, treeColumnsName) {
+var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
-  var expandLevel = new Map();
+  var unmatchExpandKeys = [];
+  var treeExpandLevel = new Map();
   if (expandSet.size === 0 || !treeColumnsName) {
-    return [data, expandLevel];
+    return {
+      treeData: _treeData,
+      treeExpandLevel: treeExpandLevel,
+      unmatchExpandKeys: unmatchExpandKeys
+    };
   }
-  var newData = toConsumableArray_default()(data || []);
+  var treeData = toConsumableArray_default()(_treeData || []);
   var _loop = function _loop() {
     if (expandSet.size === 0) return 1; // break
-    var item = newData[i];
+    var item = treeData[i];
     var key = getKey(keygen, item, i);
-    var parentLevel = expandLevel.get(key) || 0;
+    var parentLevel = treeExpandLevel.get(key) || 0;
     var children = is_isObject(item) && item[treeColumnsName];
-    if (expandSet.has(key) && children) {
-      children.forEach(function (child) {
-        expandLevel.set(getKey(keygen, child), parentLevel + 1);
-      });
-      newData.splice.apply(newData, [i + 1, 0].concat(toConsumableArray_default()(children)));
-      expandSet.delete(key);
+    if (expandSet.has(key)) {
+      if (children && children.length > 0) {
+        children.forEach(function (child) {
+          treeExpandLevel.set(getKey(keygen, child), parentLevel + 1);
+        });
+        treeData.splice.apply(treeData, [i + 1, 0].concat(toConsumableArray_default()(children)));
+        expandSet.delete(key);
+      } else {
+        unmatchExpandKeys.push(key);
+      }
     }
   };
-  for (var i = 0; i < newData.length; i++) {
+  for (var i = 0; i < treeData.length; i++) {
     if (_loop()) break;
   }
-  return [newData, expandLevel];
+  return {
+    treeData: treeData,
+    treeExpandLevel: treeExpandLevel,
+    unmatchExpandKeys: unmatchExpandKeys
+  };
 };
 var useTableTree = function useTableTree(props) {
-  var _props$data$filter;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.defaultTreeExpandKeys || []),
     _useState2 = slicedToArray_default()(_useState, 2),
     expandKeysState = _useState2[0],
@@ -57791,13 +57803,27 @@ var useTableTree = function useTableTree(props) {
   var _useMemo = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
       return getExpandData(props.data, expandKeys, props.keygen, props.treeColumnsName);
     }, [props.data, expandKeys, props.treeColumnsName]),
-    _useMemo2 = slicedToArray_default()(_useMemo, 2),
-    treeData = _useMemo2[0],
-    treeExpandLevel = _useMemo2[1];
-  var isEmptyTree = ((_props$data$filter = props.data.filter(function (item) {
-    var _item;
-    return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
-  })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+    treeData = _useMemo.treeData,
+    treeExpandLevel = _useMemo.treeExpandLevel,
+    unmatchExpandKeys = _useMemo.unmatchExpandKeys;
+  var isEmptyTree = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var _props$data$filter;
+    return ((_props$data$filter = props.data.filter(function (item) {
+      var _item;
+      return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
+    })) === null || _props$data$filter === void 0 ? void 0 : _props$data$filter.length) === 0;
+  }, [props.data, props.treeColumnsName]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!unmatchExpandKeys.length || !expandKeysState.length) {
+      return;
+    }
+
+    // 检查treeData中的每一项，对比expandKeysState，如果expandKeysState有但是children是空的，则需要修正expandKeysState
+    var newExpandKeys = expandKeysState.filter(function (key) {
+      return !unmatchExpandKeys.includes(key);
+    });
+    setExpandKeysState(newExpandKeys);
+  }, [unmatchExpandKeys, expandKeysState]);
   return {
     data: treeData,
     treeExpandLevel: treeExpandLevel,
@@ -58563,6 +58589,7 @@ var thead_toNum = toNum;
     };
     var isCustomRender = props.renderSorter && typeof props.renderSorter === 'function';
     var renderedSortDirections = (_ref = (_column$sortDirection = column.sortDirections) !== null && _column$sortDirection !== void 0 ? _column$sortDirection : props.sortDirections) !== null && _ref !== void 0 ? _ref : ['asc', 'desc'];
+    var onlyOneDirection = renderedSortDirections.length === 1;
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.sorterContainer,
       dir: config.direction,
@@ -58580,12 +58607,18 @@ var thead_toNum = toNum;
           onClick: function onClick() {
             handleChange(currentOrder === 'asc' ? null : 'asc');
           },
+          style: onlyOneDirection ? {
+            marginBottom: 0
+          } : {},
           children: icons_config.table.SortUp
         }), renderedSortDirections.includes('desc') && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.sorterDesc, currentOrder === 'desc' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.sorterActive)),
           onClick: function onClick() {
             handleChange(currentOrder === 'desc' ? null : 'desc');
           },
+          style: onlyOneDirection ? {
+            marginTop: 0
+          } : {},
           children: icons_config.table.SortDown
         })]
       })
@@ -59002,7 +59035,7 @@ var Tr = function Tr(props) {
       return regeneratorRuntime_default()().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(showLoader && props.loader)) {
+            if (!(showLoader && props.loader && typeof props.loader === 'function')) {
               _context.next = 11;
               break;
             }
@@ -59058,7 +59091,9 @@ var Tr = function Tr(props) {
     if (isExpandLoading) {
       $expandIcon = /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
         size: 12,
-        jssStyle: props.jssStyle
+        jssStyle: props.jssStyle,
+        name: "ring",
+        ignoreConfig: true
       });
     }
     var $expandIconWrapper;
@@ -66195,7 +66230,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.0-beta.10'
+  version: '3.5.0-beta.11'
 });
 }();
 /******/ 	return __webpack_exports__;