shineout 3.5.8-beta.6 → 3.5.8-beta.8

package/cjs/index.js

@@ -507,5 +507,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.8-beta.6'
+  version: '3.5.8-beta.8'
 };

package/dist/shineout.js

@@ -7130,7 +7130,7 @@ var devUseWarning = {
 
 
 
-var _excluded = ["jssStyle", "type", "className", "children", "icon", "title", "iconSize", "closable", "hideClose", "bordered", "closeItem", "onClose"];
+var _excluded = ["jssStyle", "type", "className", "children", "icon", "title", "titleStyle", "iconSize", "closable", "hideClose", "bordered", "closeItem", "onClose"];
 
 
 
@@ -7151,6 +7151,7 @@ var Alert = function Alert(props) {
     children = props.children,
     icon = props.icon,
     title = props.title,
+    titleStyle = props.titleStyle,
     iconSize = props.iconSize,
     closable = props.closable,
     hideClose = props.hideClose,
@@ -7197,7 +7198,7 @@ var Alert = function Alert(props) {
     }, 300);
   };
   var renderIcon = function renderIcon() {
-    var style = {};
+    var style = titleStyle || {};
     if (iconSize) {
       style.width = iconSize;
     }
@@ -7217,6 +7218,7 @@ var Alert = function Alert(props) {
   var renderTitle = function renderTitle() {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: alertStyle.title,
+      style: titleStyle,
       children: title
     });
   };
@@ -12081,7 +12083,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.8-beta.6');
+/* harmony default export */ var version = ('3.5.8-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -12630,8 +12632,8 @@ var alertTokens = {
   alertNearlyMargin: 'Spacing-8',
   alertTitleFontSize: 'Font-16',
   alertTitleFontWeight: 'Weight-medium',
-  alertTitleMarginY: 'Spacing-4',
-  alertTitleIconWidth: 'Size-10',
+  alertTitleMarginY: 'Spacing-8',
+  alertTitleIconWidth: 'Size-8',
   alertTitleIconHeight: 'Size-12',
   alertCloseFontColor: 'Neutral-text-4',
   alertCloseHoverColor: 'Neutral-text-5',
@@ -13482,7 +13484,7 @@ var datePickerTokens = {
 var descriptionsTokens = {
   descriptionsTitlePaddingBottom: 'Spacing-12',
   descriptionsLabelPaddingBottom: 'Spacing-12',
-  descriptionsLabelPaddingRight: 'Spacing-8',
+  descriptionsLabelPaddingRight: 'Spacing-24',
   descriptionsValuePaddingBottom: 'Spacing-12',
   descriptionsTitleSmallSize: 'Font-14',
   descriptionsTitleDefaultSize: 'Font-16',
@@ -15277,16 +15279,16 @@ var alertStyle = {
   },
   widthTitle: {
     '& $icon': {
+      fontSize: src.alertTitleFontSize,
       // marginBottom: Token.alertNearlyMargin,
       width: src.alertTitleIconWidth,
-      height: src.alertTitleIconHeight
+      height: src.lineHeightDynamic
     },
     '& $title': {
       lineHeight: src.lineHeightDynamic
     },
-    '& $close': {
-      // marginBottom: Token.alertNearlyMargin,
-      // marginTop: 2,
+    '& $closeWrapper': {
+      fontSize: src.alertTitleFontSize
     }
   },
   title: {
@@ -15320,8 +15322,9 @@ var alertStyle = {
     }
   },
   closeWrapper: {
+    fontSize: src.alertFontSize,
     width: src.alertFontSize,
-    height: "calc(".concat(src.lineHeightDynamic, " + 2px)"),
+    height: src.lineHeightDynamic,
     display: 'flex',
     alignItems: 'center',
     marginLeft: src.alertNearlyMargin
@@ -18567,6 +18570,11 @@ var descriptionsStyle = {
     },
     '& $item': {
       paddingBottom: 0
+    },
+    '& $row': {
+      '& td:last-child': {
+        borderRight: 'none'
+      }
     }
   }
 };
@@ -28832,6 +28840,9 @@ function isDomElement(element) {
   return (typeof HTMLElement === "undefined" ? "undefined" : typeof_default()(HTMLElement)) === 'object' ? element instanceof HTMLElement // DOM2
   : element && typeof_default()(element) === 'object' && element !== null && element.nodeType === 1 && typeof element.nodeName === 'string';
 }
+var isOptionalDisabled = function isOptionalDisabled(disabled) {
+  return is_isObject(disabled) && disabled.hasOwnProperty('isRealtime');
+};
 ;// CONCATENATED MODULE: ../hooks/src/utils/document.ts
 
 var docSize = {
@@ -37081,10 +37092,11 @@ var useTree = function useTree(props) {
     _props$defaultExpande = props.defaultExpanded,
     defaultExpanded = _props$defaultExpande === void 0 ? [] : _props$defaultExpande,
     defaultExpandAll = props.defaultExpandAll,
-    disabledProps = props.disabled,
     unmatch = props.unmatch,
     isControlled = props.isControlled,
     onExpandProp = props.onExpand;
+  var disabledProps = isOptionalDisabled(props.disabled) ? props.disabled.disabled : props.disabled;
+  var isRealtime = isOptionalDisabled(props.disabled) ? props.disabled.isRealtime : false;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
     _useState2 = slicedToArray_default()(_useState, 2),
     inited = _useState2[0],
@@ -37344,7 +37356,15 @@ var useTree = function useTree(props) {
   var isDisabled = function isDisabled(id) {
     if (isFunc(disabledProps)) {
       var node = context.pathMap.get(id);
-      if (node) return node.isDisabled;
+      if (node) {
+        if (isRealtime) {
+          var item = context.dataMap.get(id);
+          if (!item) return false;
+          return getDisabled()(item);
+        } else {
+          return node.isDisabled;
+        }
+      }
       return false;
     }
     return !!disabledProps;
@@ -39532,7 +39552,7 @@ var Cascader = function Cascader(props0) {
     mode = props.mode,
     innerTitle = props.innerTitle,
     multiple = props.multiple,
-    disabled = props.disabled,
+    disabledProp = props.disabled,
     clearable = props.clearable,
     underline = props.underline,
     loading = props.loading,
@@ -39573,6 +39593,7 @@ var Cascader = function Cascader(props0) {
     virtual = props.virtual,
     filterSameChange = props.filterSameChange;
   var showInput = isFunc(onFilterProp);
+  var disabled = isOptionalDisabled(disabledProp) ? disabledProp.disabled : disabledProp;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$cascader = jssStyle.cascader) === null || _jssStyle$cascader === void 0 ? void 0 : _jssStyle$cascader.call(jssStyle);
   var rootStyle = Object.assign({
     width: width
@@ -39619,7 +39640,7 @@ var Cascader = function Cascader(props0) {
       control: 'value' in props,
       keygen: keygen,
       unmatch: unmatch,
-      disabled: disabled,
+      disabled: disabledProp,
       mode: mode,
       defaultValue: defaultValue,
       childrenKey: childrenKey,
@@ -56144,6 +56165,9 @@ var confirm_Confirm = function Confirm(props) {
           jssStyle: jssStyle,
           type: type,
           title: title,
+          titleStyle: {
+            fontSize: 14
+          },
           icon: icon,
           children: _children
         }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -59280,7 +59304,7 @@ var useTableVirtual = function useTableVirtual(props) {
       });
     }
   });
-  var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop) {
+  var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop, fromDrag) {
     var _props$scrollRef$curr;
     if (props.disabled) return;
     var sum = 0;
@@ -59320,7 +59344,7 @@ var useTableVirtual = function useTableVirtual(props) {
       setStartIndex(currentIndex);
 
       // startIndex处于上方某个合并行的中间一行时，可能引起translate闪烁
-      if (startIndex < currentIndex) {
+      if (!fromDrag && startIndex < currentIndex) {
         context.autoAddRows = currentIndex - startIndex;
         setTimeout(function () {
           context.autoAddRows = 0;
@@ -59380,7 +59404,7 @@ var useTableVirtual = function useTableVirtual(props) {
     // 拖动滚动条
     if (fromDrag) {
       var top = y * max;
-      updateIndexAndTopFromTop(top);
+      updateIndexAndTopFromTop(top, fromDrag);
       if (context.rateTimer) clearTimeout(context.rateTimer);
       context.rateTimer = setTimeout(function () {
         updateRateScroll(y);
@@ -67542,7 +67566,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.8-beta.6'
+  version: '3.5.8-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;