shineout 3.3.3-beta.5 → 3.3.3-beta.7

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

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.5');
+/* harmony default export */ var version = ('3.3.3-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -36729,7 +36729,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 +36886,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();
@@ -43687,7 +43689,7 @@ DrawerComp.Submit = src_modal_0.Submit;
 
 
 var Item_excluded = ["className"],
-  Item_excluded2 = ["className"];
+  Item_excluded2 = ["className", "onClick"];
 
 
 
@@ -43749,10 +43751,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), {}, {
@@ -56657,6 +56664,7 @@ var useTableRow = function useTableRow(props) {
 
 
 
+
 var Tr = function Tr(props) {
   var _props$jssStyle, _props$jssStyle$table, _props$rowClassName;
   var treeFunc = props.treeFunc;
@@ -56710,12 +56718,22 @@ var Tr = function Tr(props) {
       columnKey: props.columns[colIndex].key
     });
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+  var setVirtualRowHeight = usePersistFn(function () {
     if (props.setRowHeight && trRef.current) {
       var expandHeight = expandRef.current ? expandRef.current.getBoundingClientRect().height : 0;
       props.setRowHeight(props.rowIndex, trRef.current.getBoundingClientRect().height + expandHeight);
     }
-  }, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
+  });
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(setVirtualRowHeight, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!trRef.current) return;
+    var cancelObserver = addResizeObserver(trRef.current, setVirtualRowHeight, {
+      direction: 'y'
+    });
+    return function () {
+      cancelObserver();
+    };
+  }, []);
   var renderTreeExpand = function renderTreeExpand(content) {
     var treeIndent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 22;
     var level = props.treeExpandLevel.get(props.originKey) || 0;
@@ -57831,10 +57849,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;
@@ -57860,13 +57879,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;
   };
@@ -57898,27 +57915,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));
@@ -63661,7 +63686,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.3-beta.5'
+  version: '3.3.3-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;