shineout 3.5.4-beta.9 → 3.5.4-fix.1

package/cjs/index.d.ts

@@ -51,7 +51,7 @@ export { default as Upload } from './upload';
 export { setConfig, config, setLocale, setIcons } from '@sheinx/base';
 export type { ConfigOption } from '@sheinx/base';
 export { setToken, useToken } from '@sheinx/theme';
-export { JssProvider, SheetsRegistry, setJssConfig } from '@sheinx/shineout-style';
+export { JssProvider, SheetsRegistry, setJssConfig, scopeNormalizeStyle, } from '@sheinx/shineout-style';
 export * as utls from './utils';
 export * from './deprecated';
 export * as TYPE from './type';

package/cjs/index.js

@@ -65,6 +65,7 @@ var _exportNames = {
   JssProvider: true,
   SheetsRegistry: true,
   setJssConfig: true,
+  scopeNormalizeStyle: true,
   utls: true,
   TYPE: true
 };
@@ -388,6 +389,12 @@ Object.defineProperty(exports, "config", {
   }
 });
 exports.default = void 0;
+Object.defineProperty(exports, "scopeNormalizeStyle", {
+  enumerable: true,
+  get: function get() {
+    return _shineoutStyle.scopeNormalizeStyle;
+  }
+});
 Object.defineProperty(exports, "setConfig", {
   enumerable: true,
   get: function get() {
@@ -500,5 +507,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.5.4-beta.9'
+  version: '3.5.4-fix.1'
 };

package/dist/shineout.js

@@ -6378,6 +6378,7 @@ __webpack_require__.d(__webpack_exports__, {
   color: function() { return /* reexport */ color; },
   config: function() { return /* reexport */ src_config_config; },
   "default": function() { return /* binding */ src_0; },
+  scopeNormalizeStyle: function() { return /* reexport */ scopeNormalizeStyle; },
   setConfig: function() { return /* reexport */ config_setConfig; },
   setIcons: function() { return /* reexport */ setIcons; },
   setJssConfig: function() { return /* reexport */ setJssConfig; },
@@ -7052,20 +7053,29 @@ var AlertIcon = function AlertIcon(props) {
 var AlertIconMap = alert_icon_icons;
 /* harmony default export */ var alert_icon = (AlertIcon);
 ;// CONCATENATED MODULE: ../hooks/src/utils/warning.ts
+var shownMessages = new Set();
+var shouldShowMessage = function shouldShowMessage(message) {
+  if (shownMessages.has(message)) {
+    return false;
+  }
+  shownMessages.add(message);
+  return true;
+};
 var deprecated = function deprecated(prop, newProp, component, extraMessage) {
-  if (false) {}
+  if (false) { var msg; }
 };
 var breakingChange = function breakingChange(message) {
-  if (false) {}
+  if (false) { var msg; }
 };
 var devWarn = function devWarn(message) {
   if (false) {}
 };
 var conflictWarning = function conflictWarning(component, prop1, prop2) {
-  if (false) {}
+  if (false) { var msg; }
 };
 var error = function error(message) {
-  console.error(new Error("[shineout] ".concat(message)));
+  var msg = new Error("[shineout] ".concat(message));
+  shouldShowMessage(msg.message) && console.error(msg);
 };
 var devUseWarning = {
   error: error,
@@ -12030,7 +12040,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.5.4-beta.9');
+/* harmony default export */ var version = ('3.5.4-fix.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -33436,19 +33446,18 @@ function useInputAble(props) {
   var render = useRender(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (context.timer) {
-      clearTimeout(context.timer);
-      context.timer = null;
-    }
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
+    } else if (context.timer) {
+      clearTimeout(context.timer);
+      context.timer = null;
     }
   }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }
@@ -33909,6 +33918,7 @@ var useInputFormat = function useInputFormat(props) {
 
 
 
+
 function insertPoint(name) {
   var reg = /(\[\d+\])/gi;
   return name.replace(reg, function (s, m, i) {
@@ -34162,12 +34172,31 @@ var removeProps = function removeProps(target, remove) {
   }
   return a;
 };
+
+/**
+ * 获取数据对象的全量key路径
+ * @param obj 数据对象
+ * @param parentKey 父级key
+ * @returns 全量key路径
+ * @example
+ * const obj = { a: { b: { c: 1 } } };
+ * const keys = getAllKeyPaths(obj);
+ * console.log(keys); // ['a.b.c', 'a.b', 'a']
+ */
 var getAllKeyPaths = function getAllKeyPaths(obj) {
   var parentKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   return Object.keys(obj).reduce(function (keys, key) {
     var newKey = parentKey ? "".concat(parentKey, ".").concat(key) : key;
     if (Array.isArray(obj[key])) {
-      return keys.concat(newKey);
+      var childrenKeys = obj[key].map(function (item, index) {
+        if (item !== null && typeof_default()(item) === 'object') {
+          return getAllKeyPaths(item, "".concat(newKey, "[").concat(index, "]"));
+        }
+        return null;
+      }).filter(function (item) {
+        return item !== null;
+      });
+      return keys.concat.apply(keys, toConsumableArray_default()(childrenKeys)).concat(newKey);
     }
     return keys.concat(obj[key] !== null && typeof_default()(obj[key]) === 'object' ? getAllKeyPaths(obj[key], newKey) : newKey);
   }, []);
@@ -37276,7 +37305,7 @@ var Scroll = function Scroll(props) {
     defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
   var _useResize = useResize({
       targetRef: containerRef,
-      timer: 0
+      timer: 100
     }),
     width = _useResize.width,
     h = _useResize.height;
@@ -37562,10 +37591,10 @@ var VirtualList = function VirtualList(props) {
       height: height,
       scrollWidth: 0,
       scrollHeight: scrollHeight,
-      wrapperRef: wrapperRef,
       childrenStyle: {
         width: '100%'
       },
+      wrapperRef: wrapperRef,
       onScroll: handleScroll,
       onMouseMove: handleMouseMove,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(Tag, {
@@ -48174,14 +48203,12 @@ function useFormInstance() {
 ;// CONCATENATED MODULE: ../base/src/form/form.tsx
 
 
-
 var form_excluded = ["jssStyle", "className", "style", "children", "formRef"];
 
 
 
 
 
-
 var Form = function Form(props) {
   var _jssStyle$form;
   var jssStyle = props.jssStyle,
@@ -48222,16 +48249,6 @@ var Form = function Form(props) {
       type: 'withValue'
     });
   });
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
-    _useState2 = slicedToArray_default()(_useState, 2),
-    renderKey = _useState2[0],
-    setRenderKey = _useState2[1];
-  var handleOuterSet = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function (vals) {
-    formFunc.setValue(vals);
-    setRenderKey(function (prev) {
-      return prev + 1;
-    });
-  }, [formFunc]);
   var formRefObj = useLatestObj({
     clearValidate: formFunc.clearValidate,
     getValue: formFunc.getValue,
@@ -48241,7 +48258,7 @@ var Form = function Form(props) {
     validateFields: validateFields,
     validateFieldsWithValue: validateFieldsWithValue,
     validateFieldsWithError: formFunc.validateFields,
-    set: handleOuterSet,
+    set: formFunc.setValue,
     scrollToField: formFunc.scrollToField
   });
   external_root_React_commonjs2_react_commonjs_react_amd_react_default().useEffect(function () {
@@ -48290,17 +48307,17 @@ var Form = function Form(props) {
       }
     };
   }, [formProps.onSubmit]);
-  return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
     onSubmit: true
   })), {}, {
     ref: formElRef,
-    key: renderKey
-  }), /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
-      value: formRefObj,
-      children: children
-    })
-  })));
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
+        value: formRefObj,
+        children: children
+      })
+    }))
+  }));
 };
 /* harmony default export */ var base_src_form_form = (Form);
 ;// CONCATENATED MODULE: ./src/form/form.tsx
@@ -48670,14 +48687,12 @@ var useFormFieldSet = function useFormFieldSet(props) {
 
 
 
-
 var form_fieldset_produce = utils_immer_produce;
 var FormFieldSet = function FormFieldSet(props) {
   var children = props.children,
     empty = props.empty;
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
-      ids: [],
-      lastValues: []
+      ids: []
     }),
     context = _React$useRef.current;
   var formFunc = useFormFunc();
@@ -48712,9 +48727,8 @@ var FormFieldSet = function FormFieldSet(props) {
   }
   var valueArr = (formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name)) || [];
   valueArr = Array.isArray(valueArr) ? valueArr : [valueArr];
-  var result = [];
   if (valueArr.length === 0 && valueArr && empty) {
-    result.push( /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
+    return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
       children: empty(function (val) {
         var newValue = form_fieldset_produce(valueArr, function (draft) {
           draft.push(val);
@@ -48723,7 +48737,7 @@ var FormFieldSet = function FormFieldSet(props) {
         context.ids.push(generateUUID());
         formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
       })
-    }, 'empty'));
+    }, 'empty');
   }
   var errorList = (Array.isArray(error) ? error : [error]).filter(Boolean);
   if (context.ids.length !== valueArr.length) {
@@ -48731,11 +48745,9 @@ var FormFieldSet = function FormFieldSet(props) {
       return generateUUID();
     });
   }
-  valueArr.forEach(function (v, i) {
-    if (context.lastValues.length !== valueArr.length) {
-      context.ids[i] = generateUUID();
-    }
-    result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
+  return valueArr.map(function (v, i) {
+    var _context$ids$i;
+    return /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
       value: {
         path: "".concat(ProviderValue.path, "[").concat(i, "]"),
         validateFieldSet: validateFieldSet
@@ -48781,13 +48793,7 @@ var FormFieldSet = function FormFieldSet(props) {
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, context.ids[i]));
-  });
-
-  // 更新 lastValues
-  context.lastValues = valueArr;
-  return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
-    children: result
+    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i);
   });
 };
 /* harmony default export */ var form_fieldset = (FormFieldSet);
@@ -57303,6 +57309,7 @@ var Step = function Step(props) {
     onChange = props.onChange;
   var config = useConfig();
   var styles = (jssStyle === null || jssStyle === void 0 || (_jssStyle$steps = jssStyle.steps) === null || _jssStyle$steps === void 0 ? void 0 : _jssStyle$steps.call(jssStyle)) || {};
+  var isDisabled = typeof disabled === 'function' ? disabled(index, id) : disabled;
   var getLabelPlacement = function getLabelPlacement() {
     // dot 类型只支持 vertical labelPlacement
     if (type === 'dot') {
@@ -57321,9 +57328,9 @@ var Step = function Step(props) {
   };
   var status = getStatus();
   var labelPlacement = getLabelPlacement();
-  var rootClass = classnames_default()(styles.step, className, styles[status], defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, styles.disabled, disabled), styles.finish, current > index), styles.horizontalLabel, labelPlacement === 'horizontal'), styles.verticalLabel, labelPlacement === 'vertical'), styles.widthDescription, !!description));
+  var rootClass = classnames_default()(styles.step, className, styles[status], defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, styles.disabled, isDisabled), styles.finish, current > index), styles.horizontalLabel, labelPlacement === 'horizontal'), styles.verticalLabel, labelPlacement === 'vertical'), styles.widthDescription, !!description));
   var handleChange = function handleChange(e) {
-    if (disabled) return;
+    if (isDisabled) return;
     onClick === null || onClick === void 0 || onClick(e, index, id);
     onChange === null || onChange === void 0 || onChange(index);
   };
@@ -57364,7 +57371,10 @@ var Step = function Step(props) {
 var StepWidthContext = function StepWidthContext(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(steps_context.Consumer, {
     children: function children(value) {
-      return /*#__PURE__*/(0,jsx_runtime.jsx)(Step, objectSpread2_default()(objectSpread2_default()({}, props), value));
+      var disabled = 'disabled' in props ? props.disabled : value.disabled;
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(Step, objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, props), value), {}, {
+        disabled: disabled
+      }));
     }
   });
 };
@@ -57385,6 +57395,7 @@ var Steps = function Steps(props) {
     _props$type = props.type,
     type = _props$type === void 0 ? 'default' : _props$type,
     size = props.size,
+    disabled = props.disabled,
     status = props.status,
     _props$direction = props.direction,
     directionProp = _props$direction === void 0 ? 'horizontal' : _props$direction,
@@ -57430,6 +57441,7 @@ var Steps = function Steps(props) {
         labelPlacement: labelPlacement,
         size: size,
         type: type,
+        disabled: disabled,
         onChange: onChange
       },
       children: renderStep()
@@ -58918,7 +58930,8 @@ var useTableVirtual = function useTableVirtual(props) {
     var scrollContainerHeight = Math.max(((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientHeight) || 0, 200);
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
-      sum += context.cachedHeight[i] || props.rowHeight;
+      var currentRowHeight = context.cachedHeight[i] || props.rowHeight;
+      sum += currentRowHeight;
       var rowSpanHeight = 0;
       if (rowSpanInfo) {
         var siblingsIndexs = [];
@@ -58945,6 +58958,14 @@ var useTableVirtual = function useTableVirtual(props) {
     }
     if (currentIndex !== startIndex) {
       setStartIndex(currentIndex);
+
+      // startIndex处于上方某个合并行的中间一行时，可能引起translate闪烁
+      if (startIndex < currentIndex) {
+        context.autoAddRows = currentIndex - startIndex;
+        setTimeout(function () {
+          context.autoAddRows = 0;
+        }, 300);
+      }
     }
     setTop(top);
   };
@@ -60071,7 +60092,7 @@ var Tr = function Tr(props) {
       var clickEvent = col.type === 'expand' ? function () {
         props.handleExpandClick(col, props.rawData, props.rowIndex);
       } : undefined;
-      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      var expandInstance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandIconWrapper),
         onClick: clickEvent,
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
@@ -60080,6 +60101,11 @@ var Tr = function Tr(props) {
           children: props.expanded ? icons_config.table.Expand : icons_config.table.Collapse
         })
       });
+      if (props.expandIcon && typeof props.expandIcon === 'function') {
+        var result = props.expandIcon(props.rawData, props.rowIndex, props.expanded, expandInstance, clickEvent);
+        return result;
+      }
+      return expandInstance;
     }
     if (col.type === 'checkbox') {
       var instance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -60159,12 +60185,7 @@ var Tr = function Tr(props) {
           onClick: props.onCellClick ? function () {
             return handleCellClick(data[i].data, i);
           } : undefined,
-          children: isRowSpanTd ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-            style: {
-              height: 0
-            },
-            children: $tdContent
-          }) : $tdContent
+          children: $tdContent
         }, col.key);
         tds.push(td);
         if (data[i].colSpan) skip = data[i].colSpan - 1;
@@ -60303,6 +60324,7 @@ var Tr = function Tr(props) {
       treeFunc: props.treeFunc,
       treeExpandLevel: props.treeExpandLevel,
       treeEmptyExpand: props.treeEmptyExpand,
+      expandIcon: props.expandIcon,
       treeExpandIcon: props.treeExpandIcon,
       loader: props.loader,
       isEmptyTree: props.isEmptyTree,
@@ -60730,6 +60752,7 @@ var emptyRef = {
       expandKeys: props.expandKeys,
       datum: datum,
       treeEmptyExpand: props.treeEmptyExpand,
+      expandIcon: props.expandIcon,
       treeExpandIcon: props.treeExpandIcon,
       loader: props.loader,
       isEmptyTree: isEmptyTree,
@@ -67144,7 +67167,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.9'
+  version: '3.5.4-fix.1'
 });
 }();
 /******/ 	return __webpack_exports__;