shineout 3.1.4 → 3.1.6

package/cjs/index.js

@@ -476,5 +476,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.1.4'
+  version: '3.1.6'
 };

package/dist/shineout.js

@@ -11949,7 +11949,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.1.4');
+/* harmony default export */ var version = ('3.1.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -18120,6 +18120,9 @@ var formItemStyle = {
   },
   wrapperTip: {},
   label: {
+    '$wrapperInline &': {
+      width: 'auto'
+    },
     wordWrap: 'break-word',
     width: src.formItemLabelWidth,
     padding: "".concat(src.formItemLabelPaddingY, " 0"),
@@ -34039,26 +34042,22 @@ var useFilter = function useFilter(props) {
     onAdvancedFilter = props.onAdvancedFilter,
     _props$filterDelay = props.filterDelay,
     filterDelay = _props$filterDelay === void 0 ? 400 : _props$filterDelay;
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(data),
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
     _useState2 = slicedToArray_default()(_useState, 2),
-    filterData = _useState2[0],
-    setFilterData = _useState2[1];
-  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
+    filterText = _useState2[0],
+    setFilterText = _useState2[1];
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(undefined),
     _useState4 = slicedToArray_default()(_useState3, 2),
-    filterText = _useState4[0],
-    setFilterText = _useState4[1];
-  var _useState5 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(undefined),
+    filterFunc = _useState4[0],
+    setFilterFunc = _useState4[1];
+  var _useState5 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
     _useState6 = slicedToArray_default()(_useState5, 2),
-    filterFunc = _useState6[0],
-    setFilterFunc = _useState6[1];
-  var _useState7 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
+    inputText = _useState6[0],
+    setInputText = _useState6[1];
+  var _useState7 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(),
     _useState8 = slicedToArray_default()(_useState7, 2),
-    inputText = _useState8[0],
-    setInputText = _useState8[1];
-  var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(),
-    _useState10 = slicedToArray_default()(_useState9, 2),
-    createdData = _useState10[0],
-    setCreatedData = _useState10[1];
+    createdData = _useState8[0],
+    setCreatedData = _useState8[1];
   var firstMatchNode = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       filterTimer: null
@@ -34067,36 +34066,6 @@ var useFilter = function useFilter(props) {
   var filterFn = onFilterWidthCreate || function (item, createdData, key) {
     return getKey(keygen, item) === key;
   };
-  var getData = function getData() {
-    var newData = filterData || [];
-    if (createdData && !hideCreateOption) {
-      var newKey = getKey(keygen, createdData);
-      var sameItem = newData.find(function (item) {
-        return filterFn(item, createdData, newKey);
-      });
-      if (!sameItem) return [createdData].concat(toConsumableArray_default()(newData));
-    }
-    return newData;
-  };
-  var getFirstMatchNode = function getFirstMatchNode(node) {
-    if (firstMatchNode.current) return;
-    firstMatchNode.current = node;
-  };
-  var getTreeData = function getTreeData() {
-    var filterExpandedKeys = expandedProp || [];
-    var newData = treeData;
-    if (filterText) {
-      newData = getFilterTree(treeData, onFilter === null || onFilter === void 0 ? void 0 : onFilter(filterText), filterExpandedKeys, function (node) {
-        return getKey(keygen, node);
-      }, childrenKey, !!showHitDescendants, firstMatch ? getFirstMatchNode : undefined, {
-        advanced: !!onAdvancedFilter
-      });
-    }
-    return {
-      newData: newData,
-      filterExpandedKeys: filterExpandedKeys
-    };
-  };
   var handleClearCreatedData = function handleClearCreatedData() {
     setCreatedData(undefined);
   };
@@ -34108,17 +34077,11 @@ var useFilter = function useFilter(props) {
   };
   var handleFilter = function handleFilter(text) {
     var from = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
+    if (context.filterTimer) clearTimeout(context.filterTimer);
     setInputText(text);
     setFilterText(text);
     firstMatchNode.current = null;
-    if (context.filterTimer) clearTimeout(context.filterTimer);
     if (!text) {
-      if (data) {
-        setFilterData(data);
-      }
-      if (treeData) {
-        setFilterData(treeData);
-      }
       setFilterFunc(undefined);
       handleClearCreatedData();
       // 没有 text 时触发一次 onFilter 以便外部重置数据
@@ -34136,32 +34099,61 @@ var useFilter = function useFilter(props) {
       setFilterFunc(function () {
         return next;
       });
-      var nextData = data === null || data === void 0 ? void 0 : data.filter(function (item) {
-        if (!groupKey) return next(item);
-        // 剔除分组项
-        if (item[groupKey]) return item;
-        return next(item);
-      });
-      setFilterData(nextData);
     }, filterDelay);
   };
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (data) setFilterData(data);
-  }, [data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (context.filterTimer) clearTimeout(context.filterTimer);
   }, []);
-  var nextData;
-  var nextExpanded;
-  if (treeData) {
-    var _getTreeData = getTreeData(),
-      newData = _getTreeData.newData,
-      filterExpandedKeys = _getTreeData.filterExpandedKeys;
-    nextData = newData;
-    nextExpanded = filterExpandedKeys;
-  } else if (data) {
-    nextData = getData();
-  }
+  var _useMemo = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+      if (treeData) {
+        var getTreeData = function getTreeData() {
+          var getFirstMatchNode = function getFirstMatchNode(node) {
+            if (firstMatchNode.current) return;
+            firstMatchNode.current = node;
+          };
+          var filterExpandedKeys = expandedProp || [];
+          var newData = treeData;
+          if (filterFunc) {
+            newData = getFilterTree(treeData, filterFunc, filterExpandedKeys, function (node) {
+              return getKey(keygen, node);
+            }, childrenKey, !!showHitDescendants, firstMatch ? getFirstMatchNode : undefined, {
+              advanced: !!onAdvancedFilter
+            });
+          }
+          return {
+            newData: newData,
+            filterExpandedKeys: filterExpandedKeys
+          };
+        };
+        var _getTreeData = getTreeData(),
+          newData = _getTreeData.newData,
+          filterExpandedKeys = _getTreeData.filterExpandedKeys;
+        return [newData, filterExpandedKeys];
+      } else if (data) {
+        var getData = function getData() {
+          var newData = (filterFunc ? data === null || data === void 0 ? void 0 : data.filter(function (item) {
+            if (!groupKey) return filterFunc(item);
+            // 剔除分组项
+            if (item[groupKey]) return item;
+            return filterFunc(item);
+          }) : data) || [];
+          if (createdData && !hideCreateOption) {
+            var newKey = getKey(keygen, createdData);
+            var sameItem = newData.find(function (item) {
+              return filterFn(item, createdData, newKey);
+            });
+            if (!sameItem) return [createdData].concat(toConsumableArray_default()(newData));
+          }
+          return newData;
+        };
+        return [getData(), undefined];
+      } else {
+        return [undefined, undefined];
+      }
+    }, [data, treeData, filterFunc, createdData, expandedProp]),
+    _useMemo2 = slicedToArray_default()(_useMemo, 2),
+    nextData = _useMemo2[0],
+    nextExpanded = _useMemo2[1];
   return {
     inputText: inputText,
     filterText: filterText,
@@ -46668,7 +46660,6 @@ var Scroll = function Scroll(props) {
         ref: containerRef,
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           style: {
-            flexShrink: 0,
             flexGrow: 1
           },
           children: props.children
@@ -53743,9 +53734,9 @@ var useTableLayout = function useTableLayout(props) {
     var newColgroup = toConsumableArray_default()(colgroup);
     newColgroup[index] = context.dragWidth;
     if (isFunc(props.onColumnResize)) {
-      var newColumns = props.columns.map(function (item) {
+      var newColumns = props.columns.map(function (item, i) {
         return objectSpread2_default()(objectSpread2_default()({}, item), {}, {
-          width: newColgroup[index]
+          width: newColgroup[i]
         });
       });
       props.onColumnResize(newColumns);
@@ -53779,13 +53770,15 @@ var useTableLayout = function useTableLayout(props) {
     if (!tr) return;
     var items = tr.children;
     var newCols = [];
+    var index = 0;
     var sum = 0;
     var _loop = function _loop() {
       var _items$i$getBoundingC = items[i].getBoundingClientRect(),
         width = _items$i$getBoundingC.width;
       sum += width;
       var colspan = items[i].getAttribute('colspan');
-      var dfWidth = props.columns.slice(i, i + (colspan ? parseInt(colspan, 10) : 1)).map(function (v) {
+      var colspanNum = parseInt(colspan || '1', 10);
+      var dfWidth = props.columns.slice(index, index + colspanNum).map(function (v) {
         return v.width;
       });
       var tempcols = [];
@@ -53814,6 +53807,7 @@ var useTableLayout = function useTableLayout(props) {
           return v ? v : agv;
         });
       }
+      index += colspanNum;
       newCols = [].concat(toConsumableArray_default()(newCols), toConsumableArray_default()(tempcols));
     };
     for (var i = 0, count = items.length; i < count; i++) {
@@ -53889,8 +53883,8 @@ var useTableLayout = function useTableLayout(props) {
     var hasNoWith = props.columns.find(function (v) {
       return v.width === undefined;
     });
-    if (hasNoWith && preData && props.data && props.data.length !== preData.length) {
-      if (preData.length === 0 || props.dataChangeResize) resetColGroup();
+    if (preData && props.data && props.data.length !== preData.length) {
+      if (preData.length === 0 || props.dataChangeResize || hasNoWith) resetColGroup();
     }
   }, [props.columns, props.data, props.dataChangeResize]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
@@ -62045,7 +62039,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.1.4'
+  version: '3.1.6'
 });
 }();
 /******/ 	return __webpack_exports__;