shineout 3.6.0-beta.2 → 3.6.0-beta.3

package/dist/shineout.js

@@ -12040,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.6.0-beta.2');
+/* harmony default export */ var version = ('3.6.0-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -21777,7 +21777,7 @@ var popoverStyle = {
       },
       '&::after': {
         // left: arrowGap * -1,
-        left: "calc(".concat(hideArrowGap, " * -1)"),
+        right: "calc(".concat(hideArrowGap, " * -1)"),
         top: '0',
         bottom: '0',
         content: '" "',
@@ -23529,10 +23529,9 @@ var scale_circle_loop = function loop() {
   boxSizing: 'border-box',
   position: 'relative',
   borderStyle: 'solid',
-  borderColor: src.spinColor,
+  borderColor: "transparent ".concat(src.spinColor, " ").concat(src.spinColor, " ").concat(src.spinColor),
   borderRadius: '50%',
-  animation: '$ring 1s linear infinite',
-  borderTopColor: 'transparent'
+  animation: '$ring 1s linear infinite'
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/tree-bounce.ts
 
@@ -23959,16 +23958,66 @@ var stepsStyle = {
   small: {
     fontSize: src.stepsIconFontSize,
     '&$arrow': {
+      '& $step[dir=rtl]:after': {
+        left: -12
+      },
       '& $step:not(:last-child)': {
+        '&$widthDescription': {
+          '&:after': {
+            borderLeftWidth: 22,
+            borderTopWidth: 28,
+            borderBottomWidth: 28
+          },
+          '&:before': {
+            borderLeftWidth: 22,
+            borderTopWidth: 28,
+            borderBottomWidth: 28
+          },
+          '&[dir=ltr]:after': {
+            right: -22
+          },
+          '&[dir=rtl]:after': {
+            left: -22
+          }
+        },
+        '&[dir=rtl]:after': {
+          left: -12,
+          right: 'auto'
+        },
         '&:after': {
-          top: "calc(100% - 28px)",
-          width: 56,
-          height: 56
+          top: 0,
+          right: -12,
+          width: 12,
+          height: 32,
+          borderLeftWidth: 12,
+          borderTopWidth: 16,
+          borderBottomWidth: 16
+        },
+        '&:before': {
+          top: 0,
+          width: 12,
+          height: 32,
+          borderLeftWidth: 12,
+          borderTopWidth: 16,
+          borderBottomWidth: 16,
+          right: -12
+        },
+        '&[dir=rtl]:before': {
+          right: 0
+        }
+      },
+      '& $step:last-child': {
+        '&$widthDescription': {
+          '&:before': {
+            borderLeftWidth: 22,
+            borderTopWidth: 28,
+            borderBottomWidth: 28
+          }
         },
         '&:before': {
-          top: "calc(100% - 28px)",
-          width: 56,
-          height: 56
+          borderLeftWidth: 12,
+          borderTopWidth: 16,
+          borderBottomWidth: 16
         }
       },
       '& $content': {
@@ -24057,9 +24106,67 @@ var stepsStyle = {
   },
   large: {
     '&$arrow': {
-      '& $step': {
-        '&:after': {},
-        '&:before': {}
+      '& $step:not(:last-child)': {
+        '&$widthDescription': {
+          '&:after': {
+            top: 0,
+            width: 30,
+            height: 72,
+            borderLeftWidth: 30,
+            borderTopWidth: 36,
+            borderBottomWidth: 36
+          },
+          '&:before': {
+            borderLeftWidth: 30,
+            borderTopWidth: 36,
+            borderBottomWidth: 36
+          },
+          '&[dir=ltr]:after': {
+            right: -30
+          },
+          '&[dir=rtl]:after': {
+            left: -30
+          }
+        },
+        '&[dir=rtl]:after': {
+          left: -20,
+          right: 'auto'
+        },
+        '&[dir=rtl]:before': {
+          right: 0
+        },
+        '&:after': {
+          top: 0,
+          width: 20,
+          height: 48,
+          borderLeftWidth: 20,
+          borderTopWidth: 24,
+          borderBottomWidth: 24,
+          right: -20
+        },
+        '&:before': {
+          top: 0,
+          width: 20,
+          height: 48,
+          borderLeftWidth: 20,
+          borderTopWidth: 24,
+          borderBottomWidth: 24,
+          right: -20
+        }
+      },
+      '& $step:last-child': {
+        '&$widthDescription': {
+          '&:before': {
+            borderLeftWidth: 30,
+            borderTopWidth: 36,
+            borderBottomWidth: 36
+          }
+        },
+        '&:before': {
+          borderLeftWidth: 20,
+          borderTopWidth: 24,
+          borderBottomWidth: 24
+        }
       },
       '& $content': {
         padding: "".concat(src.stepsLargeArrowPaddingY, " ").concat(src.stepsLargeArrowPaddingX),
@@ -32476,7 +32583,13 @@ var FormFooterProvider = function FormFooterProvider(props) {
     if (!context.hasSubmit) {
       context.submit = info.submit;
       context.hasSubmit = true;
+      return true;
     }
+    return false;
+  });
+  var deleteFormInfo = usePersistFn(function () {
+    context.hasSubmit = false;
+    context.submit = function () {};
   });
   var setFormStats = usePersistFn(function (disabled) {
     if (disabled !== formStats) {
@@ -32487,6 +32600,7 @@ var FormFooterProvider = function FormFooterProvider(props) {
     return {
       setFormStats: setFormStats,
       setFormInfo: setFormInfo,
+      deleteFormInfo: deleteFormInfo,
       formStats: formStats,
       func: context
     };
@@ -34201,6 +34315,34 @@ var getAllKeyPaths = function getAllKeyPaths(obj) {
     return keys.concat(obj[key] !== null && typeof_default()(obj[key]) === 'object' ? getAllKeyPaths(obj[key], newKey) : newKey);
   }, []);
 };
+
+/**
+ * 获取完整的字段key
+ * @param fields 字段key
+ * @param allFields 所有字段key
+ * @returns 完整的字段key
+ * @example
+ * const fields = ['user']
+ * const allFields = ['user', 'user.name', 'user.age', 'user[0].name', 'user[0].age', 'user[1].name', 'user[1].age']
+ * const completeFields = getCompleteFieldKeys(fields, allFields)
+ * console.log(completeFields) // ['user', 'user.name', 'user.age', 'user[0].name', 'user[0].age', 'user[1].name', 'user[1].age']
+ */
+var getCompleteFieldKeys = function getCompleteFieldKeys(fields, allFields) {
+  var fieldsArray = isArray(fields) ? fields : [fields];
+  var completeFields = [];
+  fieldsArray.forEach(function (field) {
+    var na = "".concat(field, "[");
+    var no = "".concat(field, ".");
+    completeFields.push(field);
+    var childFields = allFields.filter(function (f) {
+      return f.startsWith(na) || f.startsWith(no);
+    });
+    if (childFields.length) {
+      completeFields.push.apply(completeFields, toConsumableArray_default()(childFields));
+    }
+  });
+  return completeFields;
+};
 ;// CONCATENATED MODULE: ../base/src/common/use-clear.ts
 
 var useClear = function useClear(props) {
@@ -34860,6 +35002,9 @@ var checkbox_Checkbox = function Checkbox(props) {
     if ('value' in props && props.checked === undefined) {
       onInputableCheckboxChange(checked);
     }
+    if (props.onRawChange) {
+      props.onRawChange(checked ? htmlValue : undefined, checked, htmlValue);
+    }
     onChange === null || onChange === void 0 || onChange(checked ? htmlValue : undefined, checked, htmlValue);
   });
   var getChecked = function getChecked() {
@@ -34900,7 +35045,10 @@ var checkbox_Checkbox = function Checkbox(props) {
 var CheckboxWithContext = function CheckboxWithContext(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(group_context.Consumer, {
     children: function children(value) {
-      return /*#__PURE__*/(0,jsx_runtime.jsx)(checkbox_Checkbox, objectSpread2_default()(objectSpread2_default()({}, props), value));
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(checkbox_Checkbox, objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, props), value), {}, {
+        onRawChange: props.onChange,
+        checked: 'checked' in props ? props.checked : value.checked
+      }));
     }
   });
 };
@@ -37910,7 +38058,7 @@ var FilterNode = function FilterNode(props) {
     onChange = props.onChange,
     onPathChange = props.onPathChange;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$cascader = jssStyle.cascader) === null || _jssStyle$cascader === void 0 ? void 0 : _jssStyle$cascader.call(jssStyle);
-  var handleSelectItem = function handleSelectItem(index, e) {
+  var handleSelectItem = function handleSelectItem(index, d, e) {
     var isFinal = data && index === data.length - 1;
     if (shouldFinal && !isFinal) return;
     if (e) e.stopPropagation();
@@ -37920,13 +38068,13 @@ var FilterNode = function FilterNode(props) {
     var keys = data.slice(0, index + 1).map(function (i) {
       return datum.getKey(i);
     });
-    if (onChange) onChange(keys);
+    if (onChange) onChange(keys, d);
     onPathChange(datum.getKey(item), item, keys.slice(0, keys.length - 1), true);
     setInputText('');
     setFilterText('');
   };
   var handleSelect = function handleSelect() {
-    handleSelectItem(data.length - 1);
+    handleSelectItem(data.length - 1, data === null || data === void 0 ? void 0 : data[data.length - 1]);
   };
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: classnames_default()(styles.option, styles.filterOption),
@@ -37935,7 +38083,7 @@ var FilterNode = function FilterNode(props) {
       className: classnames_default()(styles.optionInner),
       children: data.map(function (item, index) {
         var handleClick = function handleClick(e) {
-          handleSelectItem(index, e);
+          handleSelectItem(index, item, e);
         };
         var isDisabled = datum.isDisabled(datum.getKey(item));
         var content = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -39154,6 +39302,13 @@ var result_Result = function Result(props) {
     }
     mounted.current = true;
   }, [focus, placeholder, multiple]);
+
+  // Select多选模式下，且开启了onFilter，自动聚焦
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    if (multiple && focus && inputRef !== null && inputRef !== void 0 && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [focus, multiple]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     handleResetMore();
   }, [valueProp, data]);
@@ -39557,12 +39712,13 @@ var Cascader = function Cascader(props0) {
       onClick: handleResultClick,
       children: defaultIcon
     });
+    var close = /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      className: styles.clearIcon,
+      onClick: handleClear,
+      children: icons_config.cascader.Close
+    });
     return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-      children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-        className: styles.clearIcon,
-        onClick: handleClear,
-        children: icons_config.cascader.Close
-      }), !open && !isEmpty && arrow]
+      children: [close, !open && !isEmpty && !focused && arrow]
     });
   };
   var renderIcon = function renderIcon() {
@@ -45076,11 +45232,23 @@ var DatePicker = function DatePicker(props0) {
         }
       } else {
         func.finishEdit();
+
+        // 如果是通过 props.open 控制的，那么需要在关闭时，将组件再次进入编辑状态
+        if (props.open === true) {
+          func.startEdit();
+        }
       }
       setIsCloseFromConfirm(false);
     }
     (_props$onCollapse = props.onCollapse) === null || _props$onCollapse === void 0 || _props$onCollapse.call(props, isOpen);
   });
+
+  // 如果一开始就打开了板子，那么需要初始化让组件进入编辑状态
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (props.open) {
+      func.startEdit();
+    }
+  }, []);
   var _usePopup = use_popup({
       open: props.open,
       onCollapse: onCollapse,
@@ -47658,6 +47826,7 @@ var useForm = function useForm(props) {
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef({
       defaultValues: {},
       validateMap: {},
+      ignoreValidateFields: [],
       updateMap: {},
       flowMap: {},
       removeArr: new Set(),
@@ -47690,10 +47859,21 @@ var useForm = function useForm(props) {
     } else {
       var names = isArray(name) ? name : [name];
       names.forEach(function (key) {
-        var _context$updateMap$ke2, _context$flowMap$key;
-        (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
-          update(context.value, context.errors, context.serverErrors);
-        });
+        var _context$flowMap$key;
+        // 外部直接设置user.name这种格式的，但是又没有显性的声明user.name绑定的表单元素；
+        // 这里需要手动触发，否则会导致Input输入过程中光标跳到末尾的异常
+        if (!context.updateMap[key]) {
+          var _context$updateMap$pa;
+          var parentKey = key.split('.')[0];
+          (_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (update) {
+            update(context.value, context.errors, context.serverErrors);
+          });
+        } else {
+          var _context$updateMap$ke2;
+          (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
+            update(context.value, context.errors, context.serverErrors);
+          });
+        }
         (_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
           update();
         });
@@ -47750,9 +47930,25 @@ var useForm = function useForm(props) {
   var validateFields = use_persist_fn(function (fields) {
     var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return new Promise(function (resolve, reject) {
-      var finalFields = fields ? (isArray(fields) ? fields : [fields]).filter(function (key) {
-        return context.validateMap[key];
-      }) : Object.keys(context.validateMap);
+      var finalFields = Object.keys(context.validateMap);
+      if (fields) {
+        if (config.ignoreChildren) {
+          // 旧行为：仅校验当前字段
+          finalFields = (isArray(fields) ? fields : [fields]).filter(function (key) {
+            return context.validateMap[key];
+          });
+        } else {
+          // 新行为：校验当前字段及其所有子字段
+          // 假设进去的是['user']，那么最终的finalFields是['user', 'user.name', 'user.age']
+          // 假设进去的是['users']，那么最终的finalFields是['users', 'users[0].name', 'users[0].age', 'users[1].name', 'users[1].age']
+          finalFields = getCompleteFieldKeys(fields, finalFields);
+        }
+      }
+      if (context.ignoreValidateFields.length > 0) {
+        finalFields = finalFields.filter(function (key) {
+          return !context.ignoreValidateFields.includes(key);
+        });
+      }
       var validates = finalFields.map(function (key) {
         var validateField = context.validateMap[key];
         return Array.from(validateField).map(function (validate) {
@@ -47987,7 +48183,7 @@ var useForm = function useForm(props) {
       }, 10);
     };
   };
-  var validateFieldset = function validateFieldset(name) {
+  var validateFieldset = function validateFieldset(name, config) {
     var na = "".concat(name, "[");
     var no = "".concat(name, ".");
     var fields = [];
@@ -47996,6 +48192,15 @@ var useForm = function useForm(props) {
         fields.push(key);
       }
     });
+
+    // 用户声明了跳过校验子字段
+    if (config !== null && config !== void 0 && config.ignoreChildren) {
+      var parentName = name.split('[')[0];
+      context.ignoreValidateFields = getCompleteFieldKeys(parentName, Array.from(context.names));
+      setTimeout(function () {
+        context.ignoreValidateFields = [];
+      });
+    }
     validateFields(fields).catch(function () {});
   };
   var getDefaultValue = function getDefaultValue() {
@@ -48284,6 +48489,10 @@ var Form = function Form(props) {
       props.setForm(formRefObj);
     }
   }, [formRefObj]);
+  var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
+      bindindModalFormContextSuccess: false
+    }),
+    context = _React$useRef.current;
   var handleFormModalInfo = function handleFormModalInfo() {
     var status = undefined;
     if (props.disabled) {
@@ -48296,11 +48505,17 @@ var Form = function Form(props) {
       modalFormContext === null || modalFormContext === void 0 || modalFormContext.setFormStats(status);
     }
     if (props.onSubmit) {
-      modalFormContext === null || modalFormContext === void 0 || modalFormContext.setFormInfo(formRefObj);
+      var ok = modalFormContext === null || modalFormContext === void 0 ? void 0 : modalFormContext.setFormInfo(formRefObj);
+      context.bindindModalFormContextSuccess = !!ok;
     }
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     handleFormModalInfo();
+    return function () {
+      if (context.bindindModalFormContextSuccess) {
+        modalFormContext === null || modalFormContext === void 0 || modalFormContext.deleteFormInfo();
+      }
+    };
   }, [props.disabled, props.pending]);
   var rootClass = classnames_default()([formClasses === null || formClasses === void 0 ? void 0 : formClasses.rootClass, formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapper, className, props.inline && (formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapperInline)]);
   var formProps = getFormProps({
@@ -48706,13 +48921,13 @@ 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: []
-    }),
-    context = _React$useRef.current;
+  // const { current: context } = React.useRef<{ ids: string[] }>({ ids: [] });
+
   var formFunc = useFormFunc();
   var validateFieldSet = function validateFieldSet() {
-    formFunc === null || formFunc === void 0 || formFunc.validateFields(props.name).catch(function (e) {
+    formFunc === null || formFunc === void 0 || formFunc.validateFields(props.name, {
+      ignoreChildren: true
+    }).catch(function (e) {
       return e;
     });
   };
@@ -48749,19 +48964,17 @@ var FormFieldSet = function FormFieldSet(props) {
           draft.push(val);
         });
         _onChange(newValue);
-        context.ids.push(generateUUID());
+        // context.ids.push(util.generateUUID());
         formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
       })
     }, 'empty');
   }
   var errorList = (Array.isArray(error) ? error : [error]).filter(Boolean);
-  if (context.ids.length !== valueArr.length) {
-    context.ids = valueArr.map(function () {
-      return generateUUID();
-    });
-  }
+  // if (context.ids.length !== valueArr.length) {
+  //   context.ids = valueArr.map(() => util.generateUUID());
+  // }
+
   return valueArr.map(function (v, i) {
-    var _context$ids$i;
     return /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
       value: {
         path: "".concat(ProviderValue.path, "[").concat(i, "]"),
@@ -48772,13 +48985,15 @@ var FormFieldSet = function FormFieldSet(props) {
         value: v,
         index: i,
         error: errorList,
-        onChange: function onChange(val) {
+        onChange: function onChange(val, options) {
           var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
           var newValue = form_fieldset_produce(oldValue, function (draft) {
             draft[i] = val;
           });
           _onChange(newValue);
-          formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
+          formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"), {
+            ignoreChildren: (options === null || options === void 0 ? void 0 : options.validate) === false
+          });
         },
         onInsert: function onInsert(val) {
           var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
@@ -48786,7 +49001,7 @@ var FormFieldSet = function FormFieldSet(props) {
             draft.splice(i, 0, val);
           });
           _onChange(newValue);
-          context.ids.splice(i, 0, generateUUID());
+          // context.ids.splice(i, 0, util.generateUUID());
           formFunc === null || formFunc === void 0 || formFunc.insertError(name, i);
         },
         onAppend: function onAppend(val) {
@@ -48795,7 +49010,7 @@ var FormFieldSet = function FormFieldSet(props) {
             draft.splice(i + 1, 0, val);
           });
           _onChange(newValue);
-          context.ids.splice(i + 1, 0, generateUUID());
+          // context.ids.splice(i + 1, 0, util.generateUUID());
           formFunc === null || formFunc === void 0 || formFunc.insertError(name, i + 1);
         },
         onRemove: function onRemove() {
@@ -48804,11 +49019,11 @@ var FormFieldSet = function FormFieldSet(props) {
             draft.splice(i, 1);
           });
           _onChange(newValue);
-          context.ids.splice(i, 1);
+          // context.ids.splice(i, 1);
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i);
+    }, i);
   });
 };
 /* harmony default export */ var form_fieldset = (FormFieldSet);
@@ -53136,7 +53351,7 @@ function Select(props0) {
   });
   var rootClass = classnames_default()(className, styles === null || styles === void 0 ? void 0 : styles.rootClass, styles === null || styles === void 0 ? void 0 : styles.wrapper, isEmpty && styles.wrapperEmpty, open && (styles === null || styles === void 0 ? void 0 : styles.wrapperOpen), open && trigger === 'hover' && (styles === null || styles === void 0 ? void 0 : styles.triggerHover), disabled === true && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), disabled !== true && focused && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), clearable && (styles === null || styles === void 0 ? void 0 : styles.clearable), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline), defineProperty_default()({}, styles === null || styles === void 0 ? void 0 : styles.multiple, multiple));
   var getRenderItem = function getRenderItem(data, index) {
-    return typeof renderItemProp === 'function' ? renderItemProp(data, index) : data[renderItemProp];
+    return typeof renderItemProp === 'function' ? renderItemProp(data, index) : (data === null || data === void 0 ? void 0 : data[renderItemProp]) || '';
   };
   var renderItem = getRenderItem;
   var handleFocus = usePersistFn(function (e) {
@@ -53277,7 +53492,8 @@ function Select(props0) {
   };
   var getRenderResult = function getRenderResult(data, index) {
     if (!renderResultProp) return renderItem(data, index);
-    return typeof renderResultProp === 'function' ? renderResultProp(data, index) : data[renderResultProp];
+    var result = typeof renderResultProp === 'function' ? renderResultProp(data, index) : data[renderResultProp];
+    return result !== null && result !== void 0 ? result : null;
   };
   var getDataByValues = function getDataByValues(values) {
     return datum.getDataByValues(values, {
@@ -56332,6 +56548,7 @@ var radio_group_Group = function Group(props0) {
         checked: datum.check(d),
         disabled: datum.disabledCheck(d),
         htmlValue: i,
+        size: size,
         onChange: handleIndexChange,
         renderRadio: renderRadio,
         children: getContent(d, i)
@@ -58623,6 +58840,9 @@ var useTableSort = function useTableSort(props) {
       }
     }
   });
+  var sortByColumn = use_persist_fn(function (params) {
+    onSorterChange(params.columnKey, params.direction, true, params.columnSorter);
+  });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (context.mounted) return;
     var hasSingleDefaultOrder = false;
@@ -58644,7 +58864,8 @@ var useTableSort = function useTableSort(props) {
   return {
     sortInfo: sortInfo,
     onSorterChange: onSorterChange,
-    sortedData: sortedData
+    sortedData: sortedData,
+    sortByColumn: sortByColumn
   };
 };
 /* harmony default export */ var use_table_sort = (useTableSort);
@@ -60616,7 +60837,8 @@ var emptyRef = {
     }),
     sortedData = _useTableSort.sortedData,
     sortInfo = _useTableSort.sortInfo,
-    onSorterChange = _useTableSort.onSorterChange;
+    onSorterChange = _useTableSort.onSorterChange,
+    sortByColumn = _useTableSort.sortByColumn;
   var _usePaginationList = usePaginationList({
       data: sortedData,
       shouldPage: !!props.pagination,
@@ -60977,6 +61199,7 @@ var emptyRef = {
     return index;
   };
   var tableFunc = useLatestObj({
+    sortByColumn: sortByColumn,
     scrollToIndex: virtualInfo.scrollToIndex,
     getRenderIndexByData: getRenderIndexByData,
     scrollColumnIntoView: virtualInfo.scrollColumnIntoView,
@@ -61119,6 +61342,7 @@ var TabsPanel = function TabsPanel(props) {
   var _jssStyle$tabs;
   var children = props.children,
     id = props.id,
+    indexInTabs = props.index,
     tab = props.tab,
     className = props.className,
     style = props.style,
@@ -61140,16 +61364,22 @@ var TabsPanel = function TabsPanel(props) {
       color: props.color || (active === id ? color : undefined)
     };
     setTabs(function (prev) {
-      var prevTab = prev.find(function (item) {
+      var oldTab = prev.find(function (item) {
         return item.id === id;
       });
-      if (prevTab) {
+      if (oldTab) {
         return prev.map(function (item) {
           if (item.id !== id) return item;
           return objectSpread2_default()(objectSpread2_default()({}, item), tabData);
         });
       }
-      return [].concat(toConsumableArray_default()(prev), [tabData]);
+      if (indexInTabs === undefined) {
+        return [].concat(toConsumableArray_default()(prev), [tabData]);
+      }
+
+      // 向indexInTabs位置插入tabData
+      var newTabs = [].concat(toConsumableArray_default()(prev.slice(0, indexInTabs)), [tabData], toConsumableArray_default()(prev.slice(indexInTabs)));
+      return newTabs;
     });
     return function () {
       // Panel卸载了通知父组件，去销毁相应的TabsHeader
@@ -61159,7 +61389,7 @@ var TabsPanel = function TabsPanel(props) {
         });
       });
     };
-  }, [id, tab, color].concat(toConsumableArray_default()(color ? [active] : []), [props.disabled, props.jssStyle]));
+  }, [id, tab, color, active, props.disabled, props.jssStyle]);
   if (!isActive && lazy && !keekAlive.current) {
     return null;
   }
@@ -61495,8 +61725,7 @@ var TabsHeader = function TabsHeader(props) {
     extra = props.extra,
     splitColor = props.splitColor,
     tabBarStyle = props.tabBarStyle,
-    getPosition = props.getPosition,
-    sticky = props.sticky;
+    getPosition = props.getPosition;
   var headerRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var scrollRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var tabRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
@@ -61874,7 +62103,8 @@ var Tabs = function Tabs(props) {
         var Child = child;
         if (tabs_isNamedComponent(Child.type) && Child.type.displayName === 'ShineoutTabsPanel') {
           return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(Child, {
-            id: Child.props.id !== undefined ? Child.props.id : index
+            id: Child.props.id !== undefined ? Child.props.id : index,
+            index: index
           });
         }
         if (allowNonPanel) {
@@ -67192,7 +67422,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.2'
+  version: '3.6.0-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;