shineout 3.1.26 → 3.1.28

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.26'
+  version: '3.1.28'
 };

package/dist/shineout.js

@@ -7096,9 +7096,12 @@ var Alert = function Alert(props) {
       onClick: handleClose
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      className: alertStyle.close,
-      onClick: handleClose,
-      children: closeItem || icons_config.alert.Close
+      className: alertStyle.closeWrapper,
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: alertStyle.close,
+        onClick: handleClose,
+        children: closeItem || icons_config.alert.Close
+      })
     });
   };
   if (dismiss === HIDE) {
@@ -11949,7 +11952,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.26');
+/* harmony default export */ var version = ('3.1.28');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -12111,7 +12114,7 @@ function replaceNonAlphanumeric(str) {
   return result;
 }
 function camelCaseToDash(str) {
-  return str.replace(/(?<=.)([A-Z])/g, '-$1').toLowerCase();
+  return str.replace(/([A-Z])/g, '-$1').toLowerCase();
 }
 var cssvar = function cssvar(str, value, key, _size) {
   var _getConfig = getConfig(),
@@ -14819,7 +14822,7 @@ var alertStyle = {
     width: src.alertFontSize,
     color: src.alertCloseFontColor,
     fontSize: src.alertFontSize,
-    height: src.lineHeightDynamic,
+    height: src.alertFontSize,
     flex: '0 0 auto',
     display: 'flex',
     alignItems: 'center',
@@ -14829,6 +14832,12 @@ var alertStyle = {
       color: src.alertCloseHoverColor
     }
   },
+  closeWrapper: {
+    width: src.alertFontSize,
+    height: src.lineHeightDynamic,
+    display: 'flex',
+    alignItems: 'center'
+  },
   content: {
     flex: '1 1 0',
     wordBreak: 'break-all'
@@ -21715,7 +21724,7 @@ var sliderStyle = {
       bottom: '100%',
       '&[dir=ltr]': {
         left: 0,
-        transform: 'translate(-50%, 10px)'
+        transform: 'translate(-50%, -10px)'
       },
       '&[dir=rtl]': {
         right: 0,
@@ -28339,7 +28348,10 @@ function useClickAway(params) {
     }
     return function () {
       // @ts-ignore
-      document.removeEventListener(event, handleClickAway);
+      document.removeEventListener(event, handleClickAway, {
+        // 解决 点击后立刻删除dom导致获取不到元素; contains(target) 为 false 的问题
+        capture: true
+      });
     };
   }, [effect]);
 }
@@ -35335,6 +35347,7 @@ var ResultInput = function ResultInput(props) {
       onChange: onChange,
       onBlur: handleBlur,
       open: focus,
+      disabled: props.disabled,
       onPaste: handlePaste
     }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
       className: styles.inputMirror,
@@ -35723,6 +35736,27 @@ var More = function More(props) {
     });
     itemsLength = after.length;
   }
+  if (showNum < 0 || showNum >= data.length) {
+    return /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
+      children: [data, /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_tag_tag, {
+        className: styles.tag,
+        jssStyle: jssStyle,
+        size: size,
+        style: {
+          position: 'absolute',
+          zIndex: -100,
+          userSelect: 'none',
+          msUserSelect: 'none',
+          contain: 'layout'
+        },
+        mode: visible ? 'fill' : 'bright',
+        color: visible ? 'info' : 'default',
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: "+"
+        })
+      }, 'hidden')]
+    });
+  }
   return /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
     children: [shouldShowMore ? data : before, /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
       style: {
@@ -35876,7 +35910,8 @@ var result_Result = function Result(props) {
         convertBr: convertBr,
         onInputBlur: onInputBlur,
         onClearCreatedData: onClearCreatedData,
-        placeholder: placeholder2
+        placeholder: placeholder2,
+        disabled: isFunc(disabled) ? false : !!disabled
       })
     }, 'input');
   };
@@ -39982,7 +40017,8 @@ var TimeScroll = function TimeScroll(props) {
   var elRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       timer: null,
-      changeTimer: null
+      changeTimer: null,
+      controlScroll: false
     }),
     context = _useRef.current;
   var _useResize = useResize({
@@ -39995,11 +40031,12 @@ var TimeScroll = function TimeScroll(props) {
       var el = elRef.current;
       if (!el) return;
       var lineHeight = el.childNodes[0].clientHeight;
+      context.controlScroll = true;
       el.scrollTop = lineHeight * index;
     }, immudiate ? 0 : 30);
   };
   var changeToIndex = function changeToIndex(index) {
-    if (!times[index] || times[index].disabled || index === currentIndex) {
+    if (!times[index] || times[index].disabled || index === currentIndex && !props.isEmpty) {
       return;
     }
     onChange(times[index].date);
@@ -40007,6 +40044,10 @@ var TimeScroll = function TimeScroll(props) {
   var handleScroll = function handleScroll(e) {
     if (context.changeTimer) clearTimeout(context.changeTimer);
     var el = e.currentTarget;
+    if (context.controlScroll) {
+      context.controlScroll = false;
+      return;
+    }
     context.changeTimer = setTimeout(function () {
       if (!el) return;
       var lineHeight = el.childNodes[0].clientHeight;
@@ -40107,6 +40148,7 @@ var Time = function Time(props) {
           jssStyle: props.jssStyle,
           times: item.times,
           currentIndex: item.currentIndex,
+          isEmpty: props.value === null || props.value === undefined,
           onChange: func.handleChange
         }, item.mode);
       })
@@ -44234,6 +44276,13 @@ var useForm = function useForm(props) {
       size: size
     };
   }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size]);
+  var updateValue = function updateValue() {
+    if (props.value !== context.lastValue && props.value !== context.value) {
+      context.value = deepClone(props.value) || emptyObj;
+      context.lastValue = props.value;
+    }
+  };
+  updateValue();
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
     // 服务端错误更新
     if (!props.error) context.serverErrors = {};else {
@@ -44250,8 +44299,8 @@ var useForm = function useForm(props) {
   // 默认值更新
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
     context.removeLock = false;
-    if (props.value === context.lastValue) return;
-    context.value = deepClone(props.value) || emptyObj;
+    // 内部 onChange 改的 value, 不需要更新
+    if (props.value === context.value) return;
     if (initValidate && !context.resetTime) {
       var keys = Object.keys(context.validateMap).filter(function (key) {
         var oldValue = deepGet(context.lastValue || emptyObj, key);
@@ -44478,9 +44527,9 @@ var form_item_excluded = ["children", "jssStyle", "className", "style", "label",
     style: style,
     children: [label !== undefined ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: classnames_default()(formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.label, labelAlign === 'left' && (formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.labelLeft)),
-      style: {
+      style: labelAlign !== 'top' || inline ? {
         width: labelWidth
-      },
+      } : undefined,
       children: label
     }) : null, /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
       className: formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.control
@@ -46749,11 +46798,15 @@ var Scroll = function Scroll(props) {
     height: '100%',
     width: '100%',
     display: 'inline-flex',
+    overflow: 'hidden',
     position: 'sticky'
   }, isRtl ? 'right' : 'left', 0), "top", 0);
-  var placeStyle = defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({
-    marginTop: height > 0 && scrollHeight > 0 ? Math.max(0, Math.floor(scrollHeight - height)) : 0
-  }, "margin".concat(isRtl ? 'Left' : 'Right'), scrollWidth), "height", 0), "width", 0), "overflow", 'hidden');
+  var placeStyle = {
+    marginTop: (height > 0 && scrollHeight > 0 ? Math.max(0, Math.floor(scrollHeight - height)) : 0) - 1,
+    width: scrollWidth,
+    height: 1,
+    overflow: 'hidden'
+  };
   var handleScroll = usePersistFn(function (e) {
     var target = e.currentTarget;
     var scrollLeft = target.scrollLeft,
@@ -51262,9 +51315,11 @@ var message_Message = /*#__PURE__*/function (_React$PureComponent) {
     _this = _super.call(this, props);
     defineProperty_default()(assertThisInitialized_default()(_this), "cachedHeight", void 0);
     defineProperty_default()(assertThisInitialized_default()(_this), "timeoutMap", void 0);
+    defineProperty_default()(assertThisInitialized_default()(_this), "messages", void 0);
     _this.state = {
       messages: []
     };
+    _this.messages = [];
     _this.cachedHeight = {};
     _this.timeoutMap = {};
     _this.removeMessage = _this.removeMessage.bind(assertThisInitialized_default()(_this));
@@ -51272,16 +51327,24 @@ var message_Message = /*#__PURE__*/function (_React$PureComponent) {
     return _this;
   }
   createClass_default()(Message, [{
+    key: "setMessages",
+    value: function setMessages(messages) {
+      this.messages = messages;
+      this.setState({
+        messages: messages
+      });
+    }
+  }, {
     key: "addMessage",
     value: function addMessage(msg) {
       var _this2 = this;
       var id = message_getUidStr();
-      var newState = message_produce(this.state, function (state) {
-        state.messages.push(Object.assign({
+      var newMessages = message_produce(this.messages, function (messages) {
+        messages.push(Object.assign({
           id: id
         }, msg));
       });
-      this.setState(newState);
+      this.setMessages(newMessages);
       if (msg.duration > 0) {
         var closeTimeDelay = setTimeout(function () {
           _this2.closeMessageForAnimation(id, dismissDuration, _this2.cachedHeight[id]);
@@ -51294,7 +51357,7 @@ var message_Message = /*#__PURE__*/function (_React$PureComponent) {
     key: "removeMessage",
     value: function removeMessage(id) {
       var callback;
-      var messages = this.state.messages.filter(function (m) {
+      var messages = this.messages.filter(function (m) {
         if (m.id !== id) return true;
         if (m.onClose) {
           callback = m.onClose;
@@ -51305,9 +51368,7 @@ var message_Message = /*#__PURE__*/function (_React$PureComponent) {
         var _this$props$onDestroy, _this$props;
         (_this$props$onDestroy = (_this$props = this.props).onDestroy) === null || _this$props$onDestroy === void 0 || _this$props$onDestroy.call(_this$props);
       } else {
-        this.setState({
-          messages: messages
-        });
+        this.setMessages(messages);
       }
       if (callback) callback();
     }
@@ -51316,16 +51377,15 @@ var message_Message = /*#__PURE__*/function (_React$PureComponent) {
     value: function closeMessageForAnimation(id, duration, msgHeight) {
       var _this3 = this;
       // duration animation duration time
-      this.setState(function (preState) {
-        return message_produce(preState, function (state) {
-          state.messages.forEach(function (m) {
-            if (m.id === id) {
-              m.dismiss = true;
-              m.h = msgHeight || 0;
-            }
-          });
+      var newMessages = message_produce(this.messages, function (messages) {
+        messages.forEach(function (m) {
+          if (m.id === id) {
+            m.dismiss = true;
+            m.h = msgHeight || 0;
+          }
         });
       });
+      this.setMessages(newMessages);
       setTimeout(function () {
         _this3.removeMessage(id);
       }, duration);
@@ -62363,7 +62423,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.1.26'
+  version: '3.1.28'
 });
 }();
 /******/ 	return __webpack_exports__;