shineout 3.3.3-beta.6 → 3.3.3-beta.8

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.3.3-beta.6'
+  version: '3.3.3-beta.8'
 };

package/dist/shineout.js

@@ -11968,7 +11968,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.3.3-beta.6');
+/* harmony default export */ var version = ('3.3.3-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -36002,6 +36002,14 @@ var result_Input = function Input(props) {
     _useState2 = slicedToArray_default()(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var updateValue = function updateValue() {
+    setValue(props.value);
+  };
+  if (props.inputRef) {
+    props.inputRef.current = {
+      updateValue: updateValue
+    };
+  }
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     setValue(props.value);
   }, [props.value, props.open]);
@@ -36040,6 +36048,7 @@ var Result = function Result(props) {
     range = props.range,
     placeholder = props.placeholder,
     _onChange = props.onChange,
+    _onRef = props.onRef,
     disabledLeft = props.disabledLeft,
     disabledRight = props.disabledRight,
     _props$activeIndex = props.activeIndex,
@@ -36053,6 +36062,7 @@ var Result = function Result(props) {
       clickIndex: 0
     }),
     context = _useRef.current;
+  var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (open) {
       if (context.inputRefs[activeIndex]) {
@@ -36105,10 +36115,12 @@ var Result = function Result(props) {
         className: styles === null || styles === void 0 ? void 0 : styles.resultTextPadding,
         children: info.inputable ? /*#__PURE__*/(0,jsx_runtime.jsx)(result_Input, {
           onRef: function onRef(el) {
+            _onRef.current.inputRef = el;
             context.inputRefs[info.index] = el;
           },
           disabled: dis,
           open: !!open,
+          inputRef: inputRef,
           value: info.target || info.value || '',
           placeholder: info.place,
           onChange: function onChange(s) {
@@ -36118,10 +36130,11 @@ var Result = function Result(props) {
             context.clickIndex = info.index;
           },
           onBlur: function onBlur(e) {
-            var _props$onBlur;
+            var _props$onBlur, _inputRef$current$upd, _inputRef$current;
             e.stopPropagation();
             if (e.relatedTarget === context.inputRefs[1 - info.index]) return;
             (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+            if (inputRef.current) (_inputRef$current$upd = (_inputRef$current = inputRef.current).updateValue) === null || _inputRef$current$upd === void 0 || _inputRef$current$upd.call(_inputRef$current);
             context.clickIndex = 0;
           },
           onFocus: function onFocus(e) {
@@ -36729,7 +36742,7 @@ var result_Result = function Result(props) {
     onRemove = props.onRemove,
     onResultItemClick = props.onResultItemClick,
     data = props.data;
-  var value = result_isArray(valueProp) ? valueProp : [valueProp];
+  var value = [null, undefined].includes(valueProp) ? [] : Array.isArray(valueProp) ? valueProp : [valueProp];
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(-1),
     _useState2 = slicedToArray_default()(_useState, 2),
     more = _useState2[0],
@@ -36886,7 +36899,9 @@ var result_Result = function Result(props) {
     }, 'single');
   };
   var getValueArr = function getValueArr(v) {
-    return result_isArray(v) ? v : [v];
+    return (result_isArray(v) ? v : [v]).filter(function (v) {
+      return v !== undefined && v !== null;
+    });
   };
   var renderMultipleResult = function renderMultipleResult() {
     if (isEmptyResult()) return renderNbsp();
@@ -42441,6 +42456,9 @@ var DatePicker = function DatePicker(props0) {
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     activeIndex = _React$useState2[0],
     setActiveIndex = _React$useState2[1];
+  var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+    inputRef: null
+  });
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
   var isRTL = direction === 'rtl';
   var dfp = isRTL ? 'bottom-right' : 'bottom-left';
@@ -42539,6 +42557,11 @@ var DatePicker = function DatePicker(props0) {
     setFocused(false);
     (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
   });
+  var handleClose = function handleClose() {
+    var _inputRef$current$inp;
+    closePop();
+    (_inputRef$current$inp = inputRef.current.inputRef) === null || _inputRef$current$inp === void 0 || _inputRef$current$inp.blur();
+  };
   var handleResultClick = usePersistFn(function () {
     if (disabledStatus === 'all') return;
     openPop();
@@ -42551,6 +42574,7 @@ var DatePicker = function DatePicker(props0) {
         activeIndex: activeIndex,
         type: type,
         range: range,
+        onRef: inputRef,
         inputable: props.inputable && !props.formatResult,
         disabledLeft: disabledStatus === 'left',
         disabledRight: disabledStatus === 'right',
@@ -42579,7 +42603,7 @@ var DatePicker = function DatePicker(props0) {
       onKeyDown: function onKeyDown(e) {
         if (e.key === 'Enter') {
           if (open) {
-            closePop();
+            handleClose();
           } else {
             openPop();
           }
@@ -42636,7 +42660,7 @@ var DatePicker = function DatePicker(props0) {
           options: options,
           disabled: disabled,
           jssStyle: jssStyle,
-          closePop: closePop,
+          closePop: handleClose,
           defaultTime: props.defaultTime,
           min: props.min,
           max: props.max,
@@ -43687,7 +43711,7 @@ DrawerComp.Submit = src_modal_0.Submit;
 
 
 var Item_excluded = ["className"],
-  Item_excluded2 = ["className"];
+  Item_excluded2 = ["className", "onClick"];
 
 
 
@@ -43749,10 +43773,15 @@ var Item_Item = /*#__PURE__*/function (_React$PureComponent) {
         var _ref2 = content.props,
           _ref2$className = _ref2.className,
           contentPropsClassName = _ref2$className === void 0 ? '' : _ref2$className,
+          contentPropsOnClick = _ref2.onClick,
           otherContentProps = objectWithoutProperties_default()(_ref2, Item_excluded2);
         var className = classnames_default()(propsClassName, contentPropsClassName);
         return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(content, Object.assign(otherProps, otherContentProps, {
-          className: className
+          className: className,
+          onClick: function onClick(e) {
+            if (contentPropsOnClick) contentPropsOnClick(e);
+            if (props.onClick) props.onClick(e);
+          }
         }));
       }
       return /*#__PURE__*/(0,jsx_runtime.jsx)("a", objectSpread2_default()(objectSpread2_default()({}, props), {}, {
@@ -57842,10 +57871,11 @@ var useTransform = function useTransform(props) {
 
 
 
+
 var Tab = function Tab(props, ref) {
   var _jssStyle$tabs;
   var jssStyle = props.jssStyle,
-    tab = props.tab,
+    propTab = props.tab,
     disabled = props.disabled,
     id = props.id,
     color = props.color;
@@ -57871,13 +57901,11 @@ var Tab = function Tab(props, ref) {
   };
   var handleClick = function handleClick() {
     if (disabled) return;
-    if (isLink(tab)) {
-      if (tab.props.onClick && typeof tab.props.onClick === 'function') {
-        tab.props.onClick();
-      }
-    }
     onChange === null || onChange === void 0 || onChange(id);
   };
+  var tab = isLink(propTab) ?
+  // 直接返回a标签的内容，不要a标签
+  propTab.props.children : propTab;
   var renderCardTab = function renderCardTab() {
     return tab;
   };
@@ -57909,27 +57937,35 @@ var Tab = function Tab(props, ref) {
   if (shape === 'card') {
     style.color = color;
   }
-  if (shape === 'button') return /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_button_button, objectSpread2_default()(objectSpread2_default()({
-    className: tabClass,
-    jssStyle: {
-      button: buttonStyle
-    }
-  }, getStateProps()), {}, {
-    style: style,
-    disabled: disabled,
-    type: isActive ? 'primary' : 'secondary',
-    onClick: handleClick,
-    dir: config.direction,
-    children: tab
-  }));
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
-    dir: config.direction,
+  var containerProps = objectSpread2_default()(objectSpread2_default()({
     className: tabClass
   }, getStateProps()), {}, {
     style: style,
     onClick: handleClick,
     ref: ref,
+    dir: config.direction
+  });
+  if (shape === 'button') {
+    return /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_button_button, objectSpread2_default()(objectSpread2_default()({
+      jssStyle: {
+        button: buttonStyle
+      },
+      disabled: disabled,
+      type: isActive ? 'primary' : 'secondary'
+    }, containerProps), {}, {
+      children: tab
+    }));
+  }
+  var $children = /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [shape === 'card' && renderCardTab(), shape === 'line' && renderLineTab(), shape === 'dash' && renderDashTab(), shape === 'fill' && renderFillTab()]
+  });
+  if (isLink(propTab)) {
+    return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(propTab, objectSpread2_default()({
+      children: $children
+    }, containerProps));
+  }
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, containerProps), {}, {
+    children: $children
   }));
 };
 /* harmony default export */ var tabs_tab = (/*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef(Tab));
@@ -63672,7 +63708,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.3-beta.6'
+  version: '3.3.3-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;