shineout 3.8.0-beta.4 → 3.8.0-beta.6

package/cjs/index.js

@@ -522,5 +522,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.8.0-beta.4'
+  version: '3.8.0-beta.6'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.8.0-beta.4');
+/* harmony default export */ var version = ('3.8.0-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -20660,54 +20660,10 @@ var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_
     '&:hover svg': {
       color: src.inputHoverToggleColor
     }
-    // marginRight: token.inputPaddingX,
   },
   info: {
-    position: 'absolute',
-    '&[dir=ltr]': {
-      right: '0'
-    },
-    '&[dir=rtl]': {
-      left: '0'
-    },
-    top: '100%',
-    zIndex: 1000,
-    transformOrigin: '100% 0',
-    marginTop: '10px',
-    animation: 'so-input-fade .16s ease-in',
-    maxWidth: '400px',
-    padding: '5px 8px',
     background: src.inputInfoBackgroundColor,
-    borderRadius: src.inputBorderRadius,
-    boxShadow: "0 0 0 1px ".concat(src.inputBorderColor),
-    fontSize: '12px',
-    color: src.inputInfoFontColor,
-    '&::before': {
-      display: 'block',
-      position: 'absolute',
-      bottom: '100%',
-      transform: 'rotate(45deg) translateY(3px)',
-      width: '6px',
-      height: '6px',
-      borderTop: "1px solid ".concat(src.inputBorderColor),
-      borderLeft: "1px solid ".concat(src.inputBorderColor),
-      background: 'inherit',
-      content: "'  '"
-    },
-    '&[dir=ltr]::before': {
-      right: '4px'
-    },
-    '&[dir=rtl]::before': {
-      left: '8px'
-    }
-  },
-  infoError: {
-    boxShadow: "0 0 0 1px ".concat(src.inputInfoErrorBorderColor),
-    color: src.inputInfoErrorFontColor,
-    background: src.inputInfoErrorBackgroundColor,
-    '&::before': {
-      borderColor: src.inputInfoErrorBorderColor
-    }
+    color: src.inputInfoFontColor
   }
 });
 /* harmony default export */ var src_input_input = (input_input);
@@ -26718,6 +26674,12 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
       display: 'none'
     }
   },
+  cellSortable: {
+    cursor: 'pointer',
+    '&:hover': {
+      background: src.tableTbodyHoverBackgroundColor
+    }
+  },
   sticky: {},
   expandIcon: {
     position: 'relative',
@@ -36409,7 +36371,7 @@ var useTip = function useTip(props) {
   if (tip && focused || popover && errorMessage) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(src_popover_popover, objectSpread2_default()(objectSpread2_default()({
       jssStyle: jssStyle,
-      getPopupContainer: function getPopupContainer() {
+      getPopupContainer: (popoverProps === null || popoverProps === void 0 ? void 0 : popoverProps.getPopupContainer) || function () {
         return rootRef.current;
       },
       useTextStyle: true
@@ -36454,6 +36416,7 @@ var useWithFormConfig = function useWithFormConfig(props) {
 
 
 
+
 var use_input_common_excluded = ["forwardRef", "forwardedRef", "htmlName", "value", "onChange", "defaultValue", "beforeChange", "clearable", "clearToUndefined", "style", "suffix", "info", "innerTitle", "placeTitle", "width", "delay", "onBlur", "tip", "error", "popover", "popoverProps", "status", "disabled", "size"];
 
 
@@ -36472,7 +36435,7 @@ var defaultInfo = function defaultInfo(num, msg) {
   return new Error(text);
 };
 var useInputCommon = function useInputCommon(props0) {
-  var _ref, _props$jssStyle, _props$jssStyle$input;
+  var _ref, _props$jssStyle, _props$jssStyle$input, _infoState$error;
   var config = useConfig();
   var props = use_with_form_config(props0);
   var forwardRef = props.forwardRef,
@@ -36501,7 +36464,7 @@ var useInputCommon = function useInputCommon(props0) {
     size = props.size,
     rest = objectWithoutProperties_default()(props, use_input_common_excluded);
   var delay = (_ref = delayProps !== null && delayProps !== void 0 ? delayProps : config.delay) !== null && _ref !== void 0 ? _ref : 0;
-  var inputStyle = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$input = _props$jssStyle.input) === null || _props$jssStyle$input === void 0 ? void 0 : _props$jssStyle$input.call(_props$jssStyle);
+  var inputClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$input = _props$jssStyle.input) === null || _props$jssStyle$input === void 0 ? void 0 : _props$jssStyle$input.call(_props$jssStyle);
   var rootRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef(null);
   var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(false),
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
@@ -36543,27 +36506,50 @@ var useInputCommon = function useInputCommon(props0) {
     value: inputAbleProps.value,
     onChange: inputAbleProps.onChange
   });
-  var getInfo = function getInfo() {
+  var getInfoState = function getInfoState() {
     var notNumber = typeof info !== 'number';
-    if (typeof info !== 'function' && notNumber) return null;
-    var textInfo = notNumber ? info : defaultInfo.bind(null, info);
-    var res = textInfo(inputAbleProps.value);
-    // empty
-    if (!res) return null;
-    var isError = res instanceof Error;
-    var text = isError ? res.message : res;
+    if (typeof info !== 'function' && typeof_default()(info) !== 'object' && notNumber) return null;
+    var infoContent;
+    if (typeof_default()(info) === 'object') {
+      infoContent = info.content;
+    } else {
+      infoContent = info;
+    }
+    var notContentNumber = typeof infoContent !== 'number';
+    var textInfo = notContentNumber ? infoContent : defaultInfo.bind(null, infoContent);
+    var error = textInfo(inputAbleProps.value);
+    if (!error) return null;
+    var isError = error instanceof Error;
+    var text = isError ? error.message : error;
     if (!isError && !focused) return null;
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    return {
+      text: text,
+      error: error
+    };
+  };
+  var infoState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(getInfoState, [info, inputAbleProps.value, focused]);
+  var infoPopoverProps = {
+    popover: props.popover || (typeof_default()(info) === 'object' ? info.position : 'bottom-right'),
+    popoverProps: Object.assign({
       style: {
-        minWidth: 'auto'
+        width: 'auto',
+        fontSize: 12
       },
-      className: classnames_default()(inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.info, !!isError && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.infoError)),
-      dir: config.direction,
-      children: text
-    }, 'info');
+      adjust: true
+    }, props.popoverProps),
+    error: infoState !== null && infoState !== void 0 && infoState.error && (infoState === null || infoState === void 0 ? void 0 : infoState.error) instanceof Error ? infoState === null || infoState === void 0 || (_infoState$error = infoState.error) === null || _infoState$error === void 0 ? void 0 : _infoState$error.message : undefined,
+    tip: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: inputClasses === null || inputClasses === void 0 ? void 0 : inputClasses.info,
+      children: infoState === null || infoState === void 0 ? void 0 : infoState.text
+    })
   };
+  var infoPopoverNode = use_tip(objectSpread2_default()(objectSpread2_default()({}, infoPopoverProps), {}, {
+    focused: focused,
+    rootRef: rootRef,
+    jssStyle: props.jssStyle
+  }));
   var mergeSuffix = /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
-    children: [suffix, getInfo(), tipNode]
+    children: [suffix, (infoState === null || infoState === void 0 ? void 0 : infoState.text) && infoPopoverNode, tipNode]
   });
   var onFocusedChange = usePersistFn(function (focused) {
     setFocused(!!focused);
@@ -36579,7 +36565,7 @@ var useInputCommon = function useInputCommon(props0) {
   });
   return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, rest), {}, {
     value: inputAbleProps.value,
-    className: classnames_default()(props.className, innerTitle && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperInnerTitle)),
+    className: classnames_default()(props.className, innerTitle && (inputClasses === null || inputClasses === void 0 ? void 0 : inputClasses.wrapperInnerTitle)),
     onChange: inputAbleProps.onChange,
     onBlur: handleBlur
   }, clearProps), {}, {
@@ -49677,7 +49663,8 @@ var textarea_Textarea = function Textarea(props0) {
       style: {
         width: 'auto',
         fontSize: 12
-      }
+      },
+      adjust: true
     }, resetProps.popoverProps),
     error: infoState !== null && infoState !== void 0 && infoState.error && (infoState === null || infoState === void 0 ? void 0 : infoState.error) instanceof Error ? infoState === null || infoState === void 0 || (_infoState$error = infoState.error) === null || _infoState$error === void 0 ? void 0 : _infoState$error.message : undefined,
     tip: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -63591,7 +63578,7 @@ var thead_toNum = toNum;
     var colTemp = col;
     var colTemp2 = col;
     var fixedStyle = getFixedStyle(col.fixed, col.index, colTemp2.colSpan || 1, level);
-    var cellClassName = classnames_default()(colTemp.className, colTemp.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), colTemp.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), colTemp.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), colTemp.align !== 'right' && colTemp.align !== 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignLeft), (col.lastFixed || col.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder));
+    var cellClassName = classnames_default()(colTemp.className, colTemp.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), colTemp.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), colTemp.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), colTemp.align !== 'right' && colTemp.align !== 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignLeft), (col.lastFixed || col.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), colTemp.sorter && props.cellSortable && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellSortable));
     var isExpand = colTemp.type === 'expand' || colTemp.type === 'row-expand';
     if (colTemp.title || isExpand) {
       var sorter = renderSort(colTemp);
@@ -63601,6 +63588,22 @@ var thead_toNum = toNum;
         rowSpan: columnLevel - level + 1,
         style: fixedStyle,
         dir: config.direction,
+        onClick: function onClick(e) {
+          e.stopPropagation();
+          if (props.cellSortable && colTemp.sorter) {
+            var _sortInfo$get2;
+            var currentOrder = (_sortInfo$get2 = sortInfo.get(colTemp.key)) === null || _sortInfo$get2 === void 0 ? void 0 : _sortInfo$get2.order;
+            var order = null;
+            if (!currentOrder) {
+              order = 'asc';
+            } else if (currentOrder === 'asc') {
+              order = 'desc';
+            } else if (currentOrder === 'desc') {
+              order = null;
+            }
+            onSorterChange === null || onSorterChange === void 0 || onSorterChange(colTemp.key, order, true, colTemp.sorter);
+          }
+        },
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: classnames_default()(sorter && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.hasSorter), filter && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.hasFilter)),
           children: [renderTitle(colTemp.title), sorter, filter, colTemp.columnResizable !== false && renderDrag(colTemp.index)]
@@ -64846,6 +64849,7 @@ var emptyRef = {
       onFilterChange: onFilterChange,
       sortInfo: sortInfo,
       sortDirections: props.sortDirections,
+      cellSortable: props.cellSortable,
       onSorterChange: onSorterChange,
       dragCol: layoutFunc.dragCol,
       resizeCol: layoutFunc.resizeCol,
@@ -71602,7 +71606,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.4'
+  version: '3.8.0-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;