shineout 3.2.5-beta.1 → 3.2.5

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.2.5-beta.1'
+  version: '3.2.5'
 };

package/dist/shineout.js

@@ -11960,7 +11960,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.2.5-beta.1');
+/* harmony default export */ var version = ('3.2.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -14945,6 +14945,9 @@ var alertStyle = {
     marginLeft: src.alertNearlyMargin,
     '&:hover': {
       color: src.alertCloseHoverColor
+    },
+    '& svg': {
+      width: '100%'
     }
   },
   closeWrapper: {
@@ -15012,7 +15015,10 @@ var alertStyle = {
     height: src.lineHeightDynamic,
     flex: '0 0 auto',
     alignItems: 'center',
-    marginRight: src.alertNearlyMargin
+    marginRight: src.alertNearlyMargin,
+    '& svg': {
+      width: '100%'
+    }
   }
 };
 /* harmony default export */ var shineout_style_src_alert_alert = (alertStyle);
@@ -16606,6 +16612,12 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
       borderRight: "1px solid ".concat(src.cascaderListBorderColor)
     }
   },
+  filterList: {
+    display: 'block',
+    '& $list': {
+      width: '100%'
+    }
+  },
   hideTag: {},
   list: {
     paddingTop: 3,
@@ -23324,7 +23336,10 @@ var stepsStyle = {
   iconWrapper: {
     display: 'inline-block',
     textAlign: 'center',
-    borderRadius: '50%'
+    borderRadius: '50%',
+    '& svg': {
+      width: "calc(100% - 12px)"
+    }
   },
   dot: {
     '&$vertical': {
@@ -28088,7 +28103,7 @@ var usePositionStyle = function usePositionStyle(config) {
       setStyle(newStyle);
     }
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth]);
   return style;
 };
 /* harmony default export */ var use_position_style = ((/* unused pure expression or super */ null && (usePositionStyle)));
@@ -36624,12 +36639,14 @@ var preventDefault = function preventDefault(e) {
 var Cascader = function Cascader(props0) {
   var _jssStyle$cascader;
   var props = use_with_form_config(props0);
+  var defaultHeight = 232;
   var jssStyle = props.jssStyle,
     style = props.style,
     _props$adjust = props.adjust,
     adjust = _props$adjust === void 0 ? true : _props$adjust,
     width = props.width,
-    height = props.height,
+    _props$height = props.height,
+    height = _props$height === void 0 ? defaultHeight : _props$height,
     className = props.className,
     _props$hideTag = props.hideTag,
     hideTag = _props$hideTag === void 0 ? false : _props$hideTag,
@@ -36725,6 +36742,7 @@ var Cascader = function Cascader(props0) {
     filterFunc = _useFilter.filterFunc,
     onFilter = _useFilter.onFilter;
   var isDataEmpty = !filterData || filterData.length === 0;
+  var isMultiple = multiple === true || mode !== undefined;
   var _useCascader = use_cascader({
       data: data,
       control: 'value' in props,
@@ -37033,7 +37051,6 @@ var Cascader = function Cascader(props0) {
   };
   var renderList = function renderList() {
     var tempData = filterData;
-    var isMultiple = multiple === true || mode !== undefined;
     var cascaderList = [/*#__PURE__*/(0,jsx_runtime.jsx)(cascader_list, {
       jssStyle: jssStyle,
       datum: datum,
@@ -37084,11 +37101,10 @@ var Cascader = function Cascader(props0) {
     }
     var listStyle = data && data.length === 0 ? {
       height: 'auto',
-      minHeight: 232,
+      minHeight: height,
       width: '100%'
     } : {
-      height: height,
-      minHeight: height || 232
+      height: height
     };
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: classnames_default()(styles.listContent),
@@ -37108,13 +37124,12 @@ var Cascader = function Cascader(props0) {
   };
   var renderFilterList = function renderFilterList() {
     var listStyle = data && data.length === 0 ? {
-      height: 'auto',
-      width: '100%'
+      maxHeight: height
     } : {
-      height: height
+      maxHeight: height
     };
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      className: classnames_default()(styles.listContent),
+      className: classnames_default()(styles.listContent, styles.filterList),
       style: listStyle,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(filter_list, {
         jssStyle: jssStyle,
@@ -37198,8 +37213,17 @@ var Cascader = function Cascader(props0) {
   }, []);
   var shouldFullWidth = props.loading || isDataEmpty;
   var pickerWrapperStyle = shouldFullWidth ? {
-    minWidth: '100%'
+    minWidth: absolute && isDataEmpty ? '' : '100%'
   } : {};
+  var getFixedWidth = function getFixedWidth() {
+    if (absolute && isDataEmpty) {
+      return true;
+    }
+    if (filterText && !isMultiple) {
+      return 'min';
+    }
+    return false;
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
     tabIndex: disabled === true || showInput ? undefined : 0
   }, getDataAttribute(defineProperty_default()({}, 'input-border', 'true'))), {}, {
@@ -37217,7 +37241,7 @@ var Cascader = function Cascader(props0) {
     children: [tipNode, renderResult(), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
       adjust: adjust,
       focus: open,
-      fixedWidth: false,
+      fixedWidth: getFixedWidth(),
       absolute: absolute,
       zIndex: zIndex,
       position: position,
@@ -55179,6 +55203,7 @@ var useTableTree = function useTableTree(props) {
 
 
 
+
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -55196,6 +55221,7 @@ var useTableVirtual = function useTableVirtual(props) {
     _useState8 = slicedToArray_default()(_useState7, 2),
     startIndex = _useState8[0],
     setStartIndex = _useState8[1];
+  var preIndex = usePrevious(startIndex);
   var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState10 = slicedToArray_default()(_useState9, 2),
     offsetY = _useState10[0],
@@ -55208,8 +55234,7 @@ var useTableVirtual = function useTableVirtual(props) {
       rateTimer: null,
       topTimer: null,
       controlScrollRate: null,
-      heightCallback: null,
-      preIndex: null
+      heightCallback: null
     }),
     context = _useRef.current;
   var getTranslate = usePersistFn(function (left, top) {
@@ -55242,8 +55267,6 @@ var useTableVirtual = function useTableVirtual(props) {
     if (context.shouldUpdateHeight) {
       setHeight(getContentHeight(props.data.length - 1));
     }
-    var preIndex = context.preIndex;
-    // 解决: 从下往上滚 由于高度变化会导致滚动条跳动
     if (preIndex && preIndex > startIndex && startIndex === index) {
       // 发生在顶部
       if (context.heightCallback) return;
@@ -55348,16 +55371,6 @@ var useTableVirtual = function useTableVirtual(props) {
       props.scrollRef.current.scrollTop = beforeHeight;
     }
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    // 记录preIndex
-    context.preIndex = startIndex;
-  }, [startIndex]);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
-    return function () {
-      context.preIndex = null;
-    };
-  }, [props.data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.disabled) return;
     if (offsetY) {
@@ -63100,7 +63113,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.2.5-beta.1'
+  version: '3.2.5'
 });
 }();
 /******/ 	return __webpack_exports__;