shineout 3.8.0-beta.8 → 3.8.0-beta.9

package/cjs/form/form.type.d.ts

@@ -1,9 +1,14 @@
-import { FormFieldProps as UiFormFieldProps, FormFieldSetProps as UiFormFieldSetProps, FormItemProps as UiFormItemProps, FormProps as UiFormProps, ObjectType, FormFlowProps as UiFormFlowProps, FormRef as UiFormRef } from '@sheinx/base';
+import { FormFieldProps as UiFormFieldProps, FormFieldSetProps as UiFormFieldSetProps, FormItemProps as UiFormItemProps, FormProps as UiFormProps, ObjectType, FormFlowProps as UiFormFlowProps, FormRef as UiFormRef, FormDatum as UiFormDatum } from '@sheinx/base';
 /**
  * @title FormRef
  * @sort 6
  */
 export type FormRef<T> = UiFormRef<T>;
+/**
+ * @title FormDatum
+ * @sort 7
+ */
+export type FormDatum = UiFormDatum;
 /**
  * @title Form
  * @sort 1

package/cjs/form/interface.d.ts

@@ -1,3 +1,3 @@
 export type { FormRef as Ref, FormFieldChildrenFunc as FieldChildrenFunc, FormFieldSetChildrenFunc as FieldSetChildrenFunc, } from '@sheinx/base';
-export type { FormProps as Props, FormItemProps as ItemProps, FormFieldProps as FieldProps, FormFieldSetProps as FieldSetProps, } from './form.type';
+export type { FormProps as Props, FormItemProps as ItemProps, FormFieldProps as FieldProps, FormFieldSetProps as FieldSetProps, FormFlowProps as FlowProps, FormDatum as Datum, } from './form.type';
 export type { ButtonProps as SubmitProps, ButtonProps as ResetProps } from '../button/button.type';

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.8'
+  version: '3.8.0-beta.9'
 };

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.8');
+/* harmony default export */ var version = ('3.8.0-beta.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -19625,6 +19625,11 @@ var formItemStyle = objectSpread2_default()(objectSpread2_default()({
       top: '2px'
     }
   },
+  wrapperHideRequired: {
+    '& $label::before': {
+      display: 'none'
+    }
+  },
   wrapperKeepHeight: {
     marginBottom: src.formItemTipMinHeight,
     '&$wrapperTip': {
@@ -22169,7 +22174,9 @@ var setToken = function setToken(options) {
     attributes = _ref.attributes,
     onlyExtra = _ref.onlyExtra,
     update = _ref.update,
-    customExtraToken = _ref.extraToken;
+    customExtraToken = _ref.extraToken,
+    _ref$ignoreExtra = _ref.ignoreExtra,
+    ignoreExtra = _ref$ignoreExtra === void 0 ? false : _ref$ignoreExtra;
   var _getConfig = getConfig(),
     prefix = _getConfig.prefix;
   if (typeof window === 'undefined') return;
@@ -22208,7 +22215,7 @@ var setToken = function setToken(options) {
   tag.setAttribute('data-token', tokenName || '');
   tag.setAttribute('data-token-id', id);
   tag.setAttribute('data-token-selector', selector);
-  tag.innerHTML = "".concat(selector, " {").concat(tokens.concat(extraToken).join(';'), "}");
+  tag.innerHTML = ignoreExtra ? "".concat(selector, " {").concat(tokens.join(';'), "}") : "".concat(selector, " {").concat(tokens.concat(extraToken).join(';'), "}");
   if (!target) {
     document.head.appendChild(tag);
     return;
@@ -30832,14 +30839,14 @@ var useCheckElementBorderWidth = function useCheckElementBorderWidth(elementRef)
 
   // 获取指定方向上的border宽度之和
   var getBorderWidth = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function () {
-    if (elementRef.current) {
+    if (elementRef.current && options.enable) {
       var _options$direction = options.direction,
         direction = _options$direction === void 0 ? 'horizontal' : _options$direction;
       var style = window.getComputedStyle(elementRef.current);
       var _borderWidth = direction === 'horizontal' ? parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth) : parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
       setBorderWidth(_borderWidth);
     }
-  }, [elementRef]);
+  }, [elementRef, options.enable]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     getBorderWidth();
   }, [getBorderWidth]);
@@ -31100,7 +31107,8 @@ var usePositionStyle = function usePositionStyle(config) {
     enable: show && adjust
   });
   var parentElBorderWidth = useCheckElementBorderWidth(parentElRef, {
-    direction: 'horizontal'
+    direction: 'horizontal',
+    enable: show
   });
   var popupElSize = useCheckElementSize(popupElRef, {
     enable: show
@@ -31279,16 +31287,18 @@ var usePositionStyle = function usePositionStyle(config) {
     };
   };
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
-    var _scrollElRef$current;
+    var _scrollElRef$current, _scrollElRef$current2, _scrollElRef$current3;
     if (!parentElRef.current) return {
       style: hideStyle
     };
     var rect = context.parentRect;
     var needCheck = !show || !shallow_equal(context.prevParentPosition, parentElNewPosition);
-    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
-      var _scrollElRef$current2;
-      var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
-      if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom || rect.right < visibleRect.left || rect.left > visibleRect.right) {
+    var scrollTop = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.scrollTop) || 0;
+    var scrollLeft = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.scrollLeft) || 0;
+    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current3 = scrollElRef.current) !== null && _scrollElRef$current3 !== void 0 && _scrollElRef$current3.contains(parentElRef.current)) {
+      var _scrollElRef$current4;
+      var visibleRect = ((_scrollElRef$current4 = scrollElRef.current) === null || _scrollElRef$current4 === void 0 ? void 0 : _scrollElRef$current4.getBoundingClientRect()) || {};
+      if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom + scrollTop || rect.right < visibleRect.left || rect.left > visibleRect.right + scrollLeft) {
         return {
           style: hideStyle
         };
@@ -32043,12 +32053,12 @@ var AbsoluteList = function AbsoluteList(props) {
     return scrollElRefProp || scrollElRefContext || closestScrollContainerRef;
   }, [scrollElRefProp, scrollElRefContext]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (scrollElRefProp || scrollElRefContext) return;
+    if (scrollElRefProp || scrollElRefContext || !focus) return;
     var closestScrollContainer = getClosestScrollContainer(parentElRef.current);
     if (closestScrollContainer) {
       closestScrollContainerRef.current = closestScrollContainer;
     }
-  }, [parentElRef, scrollElRefProp, scrollElRefContext]);
+  }, [parentElRef, scrollElRefProp, scrollElRefContext, focus]);
   var _usePositionStyle = usePositionStyle({
       getContainer: getRoot,
       position: position,
@@ -47751,7 +47761,7 @@ var DatePicker = function DatePicker(props0) {
     setFocused(false);
     (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e, index);
     if (props.needConfirm) return;
-    if (props.inputable && index !== undefined) {
+    if (props.inputable && !props.quickSelect && index !== undefined) {
       func.handleInputBlur(e.target.value, index);
     }
 
@@ -51001,13 +51011,14 @@ var useForm = function useForm(props) {
 /* harmony default export */ var use_form = (useForm);
 ;// CONCATENATED MODULE: ../hooks/src/components/use-form/use-form-context.ts
 
+
 var FormContext = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createContext({});
 function useFormRef() {
-  var ref = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({});
-  var setFormRef = function setFormRef(formRef) {
-    ref.current = formRef;
-  };
-  return [ref.current, setFormRef];
+  var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState({}),
+    _React$useState2 = slicedToArray_default()(_React$useState, 2),
+    formRef = _React$useState2[0],
+    setFormRef = _React$useState2[1];
+  return [formRef, setFormRef];
 }
 function useFormInstance() {
   var formCtx = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useContext(FormContext);
@@ -51448,7 +51459,7 @@ var FormItem = function FormItem(props) {
     });
   };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
-    className: classnames_default()(className, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapper, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelTop, labelAlign === 'top'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalMiddle, labelAlign !== 'top' && labelVerticalAlign === 'middle'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalBottom, labelAlign !== 'top' && labelVerticalAlign === 'bottom'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperInline, inline), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperKeepHeight, keepErrorHeight), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperRequired, required), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperTip, showError || tip))
+    className: classnames_default()(className, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapper, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelTop, labelAlign === 'top'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalMiddle, labelAlign !== 'top' && labelVerticalAlign === 'middle'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalBottom, labelAlign !== 'top' && labelVerticalAlign === 'bottom'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperInline, inline), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperKeepHeight, keepErrorHeight), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperRequired, required), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperHideRequired, required === false), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperTip, showError || tip))
   }, attributes), {}, {
     style: style,
     children: [label !== undefined ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -56334,7 +56345,9 @@ function Select(props0) {
     noCache = props.noCache,
     highlight = props.highlight,
     _props$trigger = props.trigger,
-    trigger = _props$trigger === void 0 ? 'click' : _props$trigger;
+    trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
+    _props$preventEnterSe = props.preventEnterSelect,
+    preventEnterSelect = _props$preventEnterSe === void 0 ? false : _props$preventEnterSe;
   var hasFilter = isFunc(props.onAdvancedFilter || onFilterProp);
   var showInput = hasFilter || isFunc(onCreateProp) || onCreateProp === true;
   var positionProp = props.position || (direction === 'rtl' ? 'bottom-right' : 'bottom-left');
@@ -56558,6 +56571,11 @@ function Select(props0) {
         return;
       }
     }
+
+    // 当开启 preventEnterSelect 且存在 onCreate 功能时，阻止选中已有选项
+    if (preventEnterSelect && onCreate && !createdData) {
+      return;
+    }
     var currentDataItem = filterData === null || filterData === void 0 ? void 0 : filterData[hoverIndex];
     if (currentDataItem && !currentDataItem[groupKey]) {
       handleChange(currentDataItem);
@@ -63968,19 +63986,8 @@ function useComponentMemo(getValue, condition, shouldUpdate) {
 
 
 
-
 function Td(props) {
-  var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(),
-    _React$useState2 = slicedToArray_default()(_React$useState, 2),
-    style = _React$useState2[0],
-    setStyle = _React$useState2[1];
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!props.style) return;
-    if (shallowEqual(props.style, style)) {
-      return;
-    }
-    setStyle(props.style);
-  }, [props.style]);
+  var _props$style, _props$style2;
   var col = props.col,
     colSpan = props.colSpan,
     rowSpan = props.rowSpan,
@@ -64000,13 +64007,13 @@ function Td(props) {
       onMouseEnter: onMouseEnter,
       onMouseLeave: onMouseLeave,
       className: className,
-      style: style,
+      style: props.style,
       dir: direction,
       "data-role": role,
       onClick: onClick,
       children: content
     }, col.key);
-  }, [data, className, style, col.type, col.treeColumnsName], props.virtual === 'lazy' ? function (prev, next) {
+  }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], props.virtual === 'lazy' ? function (prev, next) {
     if (col.type || col.treeColumnsName) {
       return true;
     }
@@ -64909,6 +64916,10 @@ var emptyRef = {
     return null;
   };
   var $empty = renderEmpty();
+  var tableStyle = {
+    width: width,
+    borderSpacing: 0
+  };
   var renderTable = function renderTable() {
     var _props$summary, _sticky$top, _props$data2;
     var Group = /*#__PURE__*/(0,jsx_runtime.jsx)(table_colgroup, {
@@ -65079,9 +65090,7 @@ var emptyRef = {
       role: theadIdRef.current
     })), {}, {
       children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
-        style: {
-          width: width
-        },
+        style: tableStyle,
         ref: theadRef,
         children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(thead, objectSpread2_default()({}, headCommonProps))]
       })
@@ -65110,10 +65119,9 @@ var emptyRef = {
           tableRef: tableRef,
           setFakeVirtual: setFakeVirtual,
           children: [!props.hideHeader && !props.sticky && $headTable, !!((_props$data3 = props.data) !== null && _props$data3 !== void 0 && _props$data3.length) && /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
-            style: {
-              width: width,
+            style: objectSpread2_default()(objectSpread2_default()({}, tableStyle), {}, {
               transform: virtualInfo.translateStyle
-            },
+            }),
             ref: tbodyRef,
             children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(tbody, objectSpread2_default()(objectSpread2_default()({}, bodyCommonProps), {}, {
               currentIndex: virtualInfo.startIndex,
@@ -65124,9 +65132,7 @@ var emptyRef = {
           }), showFoot ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: footWrapperClass,
             children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
-              style: {
-                width: width
-              },
+              style: tableStyle,
               ref: tfootRef,
               children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(tfoot, objectSpread2_default()({}, footCommonProps))]
             })
@@ -65140,9 +65146,7 @@ var emptyRef = {
         className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.bodyWrapper,
         onScroll: handleBodyScroll,
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
-          style: {
-            width: width
-          },
+          style: tableStyle,
           ref: tbodyRef,
           children: [Group, !props.hideHeader && /*#__PURE__*/(0,jsx_runtime.jsx)(thead, objectSpread2_default()({}, headCommonProps)), bodyCommonProps.data.length === 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)(TbodyEmpty, {
             children: renderEmpty()
@@ -65231,9 +65235,7 @@ var emptyRef = {
     }, props.style),
     dir: config.direction,
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("table", {
-      style: {
-        width: width
-      },
+      style: tableStyle,
       children: props.children
     })
   });
@@ -71715,7 +71717,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.8'
+  version: '3.8.0-beta.9'
 });
 }();
 /******/ 	return __webpack_exports__;