shineout 3.4.3-beta.9 → 3.4.4-beta.1

package/cjs/index.js

@@ -492,5 +492,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.4.3-beta.9'
+  version: '3.4.4-beta.1'
 };

package/dist/shineout.js

@@ -11984,7 +11984,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.4.3-beta.9');
+/* harmony default export */ var version = ('3.4.4-beta.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -12460,10 +12460,7 @@ var Token = {
   'Size-25': '50px',
   'Size-26': '52px',
   'Size-27': '54px',
-  'Size-28': '56px',
-  'Animation-duration-1': '0.1s',
-  'Animation-duration-2': '0.2s',
-  'Animation-duration-3': '0.3s'
+  'Size-28': '56px'
 };
 
 // @ts-ignore
@@ -14167,6 +14164,7 @@ var spinTokens = {
   spinTipFontColor: 'Brand-6',
   spinVerticalMargin: 'Spacing-4',
   spinHorizontalMargin: 'Spacing-4',
+  spinColor: 'Brand-6',
   spinBackgroundColor: 'Neutral-fill-1'
 };
 /* harmony default export */ var spin = (spinTokens);
@@ -22993,6 +22991,7 @@ var useSliderStyle = styled(slider_slider, 'slider');
 /* harmony default export */ var shineout_style_src_slider = ((/* unused pure expression or super */ null && (useSliderStyle)));
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/default.ts
 
+
 var Default = function Default() {
   var count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 12;
   var animationDelay = {};
@@ -23020,7 +23019,7 @@ var Default = function Default() {
       '& div': {
         height: '55%',
         margin: '0 auto',
-        background: '#197AFA',
+        background: src.spinColor,
         borderRadius: 5,
         animation: '$keyframesFade 1s infinite ease-in-out both'
       }
@@ -23030,6 +23029,7 @@ var Default = function Default() {
 };
 /* harmony default export */ var spin_default = (Default);
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/chasing-dots.ts
+
 var duration = 2;
 /* harmony default export */ var chasing_dots = ({
   position: 'relative',
@@ -23045,7 +23045,7 @@ var duration = 2;
     height: '60%',
     borderRadius: '100%',
     animation: "$chasing-dots-2 ".concat(duration, "s ease-in-out infinite "),
-    fill: '#197AFA',
+    fill: src.spinColor,
     '&:last-child': {
       top: 'auto',
       bottom: 0,
@@ -23054,6 +23054,7 @@ var duration = 2;
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/cube-grid.ts
+
 var delayRange = 0.4;
 /* harmony default export */ var cube_grid = ({
   // margin: 'auto',
@@ -23062,7 +23063,7 @@ var delayRange = 0.4;
     height: '33.3333%',
     float: 'left',
     animation: '$cube-grid 1.3s infinite ease-in-out',
-    background: '#197AFA',
+    background: src.spinColor,
     boxSizing: 'border-box',
     '&:nth-child(1)': {
       animationDelay: "".concat(delayRange * 0.5, "s")
@@ -23094,6 +23095,7 @@ var delayRange = 0.4;
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/double-bounce.ts
+
 /* harmony default export */ var double_bounce = ({
   position: 'relative',
   // margin: 'auto',
@@ -23107,7 +23109,7 @@ var delayRange = 0.4;
     borderRadius: '50%',
     opacity: 0.6,
     animation: '$double-bounce 2s ease-in-out infinite',
-    background: '#197AFA',
+    background: src.spinColor,
     '&:last-child': {
       animationDelay: '-1s'
     }
@@ -23115,6 +23117,7 @@ var delayRange = 0.4;
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/fading-circle.ts
 
+
 var circleCount = 12;
 var loop = function loop() {
   var keyframes = {};
@@ -23146,12 +23149,13 @@ var loop = function loop() {
     }
   }, loop()),
   '& svg': {
-    fill: '#197AFA',
+    fill: src.spinColor,
     animation: '$fading-circle 1.2s infinite ease-in-out both'
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/scale-circle.ts
 
+
 var scale_circle_circleCount = 12;
 var scale_circle_loop = function loop() {
   var keyframes = {};
@@ -23183,11 +23187,12 @@ var scale_circle_loop = function loop() {
     }
   }, scale_circle_loop()),
   '& svg': {
-    fill: '#197AFA',
+    fill: src.spinColor,
     animation: '$scale-circle 1.2s infinite ease-in-out both'
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/four-dots.ts
+
 /* harmony default export */ var four_dots = ({
   // margin: 'auto',
   position: 'relative',
@@ -23204,7 +23209,7 @@ var scale_circle_loop = function loop() {
       borderRadius: '100%'
     },
     '& svg': {
-      fill: '#197AFA'
+      fill: src.spinColor
     },
     '&:nth-child(1)': {
       top: '10%',
@@ -23228,32 +23233,36 @@ var scale_circle_loop = function loop() {
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/plane.ts
+
 /* harmony default export */ var plane = ({
   // margin: 'auto',
   boxSizing: 'border-box',
   animation: '$plane 1s linear infinite',
-  background: '#197AFA'
+  background: src.spinColor
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/pulse.ts
+
 /* harmony default export */ var pulse = ({
   // margin: 'auto',
   boxSizing: 'border-box',
   borderRadius: '100%',
   animation: '$pulse 1s linear infinite',
-  background: '#197AFA'
+  background: src.spinColor
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/ring.ts
+
 /* harmony default export */ var ring = ({
   // margin: 'auto',
   boxSizing: 'border-box',
   position: 'relative',
   borderStyle: 'solid',
-  borderColor: '#197AFA',
+  borderColor: src.spinColor,
   borderRadius: '50%',
   animation: '$ring 1s linear infinite',
   borderTopColor: 'transparent'
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/tree-bounce.ts
+
 /* harmony default export */ var tree_bounce = ({
   // margin: 'auto',
   textAlign: 'center',
@@ -23265,7 +23274,7 @@ var scale_circle_loop = function loop() {
     },
     animation: '$three-bounce 1.4s ease-in-out 0s infinite both',
     '& svg': {
-      fill: '#197AFA'
+      fill: src.spinColor
     },
     '&:nth-child(1)': {
       animationDelay: '-0.32s'
@@ -23277,6 +23286,7 @@ var scale_circle_loop = function loop() {
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/wave.ts
 
+
 var wave_loop = function loop() {
   var count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 5;
   var animationDelay = {};
@@ -23296,7 +23306,7 @@ var wave_loop = function loop() {
     display: 'inline-block',
     height: '100%',
     marginRight: '2px',
-    background: '#197AFA',
+    background: src.spinColor,
     animation: '$wave 1.2s infinite ease-in-out',
     ':last-child': {
       marginRight: 0
@@ -23304,6 +23314,7 @@ var wave_loop = function loop() {
   }, wave_loop())
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/chasing-ring.ts
+
 /* harmony default export */ var chasing_ring = ({
   position: 'relative',
   // margin: 'auto',
@@ -23318,7 +23329,7 @@ var wave_loop = function loop() {
     border: '1px solid transparent',
     borderRadius: '100%',
     transformOrigin: '50% 50%',
-    borderTopColor: '#197AFA',
+    borderTopColor: src.spinColor,
     '&:nth-child(1)': {
       animation: '$chasing-ring-1 2s infinite'
     },
@@ -25655,7 +25666,7 @@ var tabsStyle = {
   headerScrollBar: {
     position: 'absolute',
     background: src.tabsActiveFontColor,
-    transition: "left ".concat(CommonToken['Animation-duration-2'], " ease-in-out, top ").concat(CommonToken['Animation-duration-2'], " ease-in-out, width ").concat(CommonToken['Animation-duration-2'], " ease-in-out, height ").concat(CommonToken['Animation-duration-2'], " ease-in-out")
+    transition: "left .2s ease-in-out, top .2s ease-in-out, width .2s ease-in-out, height .2s ease-in-out"
   },
   header: {
     flex: 1,
@@ -30725,23 +30736,45 @@ function sub(num1, num2) {
   var maxPrediction = Math.max(getNumberPrecision(num1), getNumberPrecision(num2));
   return Number(number.toFixed(maxPrediction));
 }
+function toNum(v) {
+  if (v === undefined || v === null) {
+    return 0;
+  }
+  if (typeof v === 'number') {
+    return isNaN(v) ? 0 : v;
+  }
+  if (typeof v === 'string') {
+    var parsedValue = parseFloat(v);
+    return isNaN(parsedValue) ? 0 : parsedValue;
+  }
+  return 0;
+}
 ;// CONCATENATED MODULE: ../base/src/spin/base.tsx
 
 
 
 
 
+
+
 var base_range = range;
 var Spin = function Spin(props) {
-  var _jssStyle$spin;
+  var _jssStyle$spin, _ref;
   var _props$count = props.count,
     count = _props$count === void 0 ? 0 : _props$count,
     render = props.render,
-    _props$size = props.size,
-    size = _props$size === void 0 ? 40 : _props$size,
+    sizeProps = props.size,
     className = props.className,
     jssStyle = props.jssStyle;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$spin = jssStyle.spin) === null || _jssStyle$spin === void 0 ? void 0 : _jssStyle$spin.call(jssStyle);
+  var config = useConfig();
+  var getSpinSize = function getSpinSize() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var size = spin.size;
+    return size;
+  };
+  var size = (_ref = sizeProps !== null && sizeProps !== void 0 ? sizeProps : getSpinSize()) !== null && _ref !== void 0 ? _ref : 40;
   var style = Object.assign({
     width: size,
     height: size
@@ -31075,8 +31108,9 @@ var ChasingRing = function ChasingRing(props) {
 
 
 
+
 var spin_Spin = function Spin() {
-  var _ref, _jssStyle$spin;
+  var _ref, _ref2, _jssStyle$spin;
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var jssStyle = props.jssStyle,
     className = props.className,
@@ -31084,13 +31118,45 @@ var spin_Spin = function Spin() {
     style = props.style,
     loading = props.loading,
     nameProps = props.name,
-    tip = props.tip,
+    tipProps = props.tip,
     tipClassName = props.tipClassName,
-    color = props.color,
-    _props$mode = props.mode,
-    mode = _props$mode === void 0 ? 'vertical' : _props$mode;
+    colorProps = props.color,
+    modeProps = props.mode;
   var config = useConfig();
-  var name = (_ref = nameProps !== null && nameProps !== void 0 ? nameProps : config.spin) !== null && _ref !== void 0 ? _ref : 'default';
+  var getSpinName = function getSpinName() {
+    var spin = config.spin;
+    if (!spin) return;
+    if (typeof spin === 'string') {
+      return spin;
+    }
+    if (typeof_default()(spin) === 'object') {
+      var _name = spin.name;
+      return _name;
+    }
+    return;
+  };
+  var getSpinTip = function getSpinTip() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var tip = spin.tip;
+    return tip;
+  };
+  var getSpinColor = function getSpinColor() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var color = spin.color;
+    return color;
+  };
+  var getSpinMode = function getSpinMode() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var mode = spin.mode;
+    return mode;
+  };
+  var name = (_ref = nameProps !== null && nameProps !== void 0 ? nameProps : getSpinName()) !== null && _ref !== void 0 ? _ref : 'default';
+  var tip = tipProps !== null && tipProps !== void 0 ? tipProps : getSpinTip();
+  var color = colorProps !== null && colorProps !== void 0 ? colorProps : getSpinColor();
+  var mode = (_ref2 = modeProps !== null && modeProps !== void 0 ? modeProps : getSpinMode()) !== null && _ref2 !== void 0 ? _ref2 : 'vertical';
   var spinStyle = (jssStyle === null || jssStyle === void 0 || (_jssStyle$spin = jssStyle.spin) === null || _jssStyle$spin === void 0 ? void 0 : _jssStyle$spin.call(jssStyle)) || {};
   var contentClass = classnames_default()(className, spinStyle.content, defineProperty_default()(defineProperty_default()({}, spinStyle.vertical, mode === 'vertical'), spinStyle.horizontal, mode === 'horizontal'));
   var renderSpin = function renderSpin() {
@@ -31098,6 +31164,7 @@ var spin_Spin = function Spin() {
     if (spins[n]) {
       var Comp = spins[n];
       return /*#__PURE__*/(0,jsx_runtime.jsx)(Comp, objectSpread2_default()(objectSpread2_default()({}, props), {}, {
+        color: color,
         style: style
       }));
     }
@@ -31115,7 +31182,7 @@ var spin_Spin = function Spin() {
     });
   };
   var renderContent = function renderContent() {
-    if ('tip' in props) {
+    if (tip) {
       return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: contentClass,
         children: [renderSpin(), tip && renderTip()]
@@ -32545,23 +32612,25 @@ var groupContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_
 
 
 var useCheckboxInputable = function useCheckboxInputable(props) {
-  var inputable = props.inputable;
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+  var _props$checked;
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(undefined),
     _useState2 = slicedToArray_default()(_useState, 2),
     checkedState = _useState2[0],
     setCheckedState = _useState2[1];
-  var checked = inputable ? checkedState : props.checked;
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    setCheckedState(!!props.value);
+  }, [props.value]);
   var onInputableCheckboxChange = function onInputableCheckboxChange(c) {
     var _props$onChange;
     setCheckedState(c);
     props === null || props === void 0 || (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, undefined, c, undefined);
   };
-  var onInputChange = function onInputChange(value) {
+  var onInputChange = function onInputChange(_value) {
     var _props$onChange2;
-    props === null || props === void 0 || (_props$onChange2 = props.onChange) === null || _props$onChange2 === void 0 || _props$onChange2.call(props, value, true, undefined);
+    props === null || props === void 0 || (_props$onChange2 = props.onChange) === null || _props$onChange2 === void 0 || _props$onChange2.call(props, _value, true, undefined);
   };
   return {
-    checked: checked,
+    checked: (_props$checked = props.checked) !== null && _props$checked !== void 0 ? _props$checked : checkedState,
     onInputableCheckboxChange: onInputableCheckboxChange,
     onInputChange: onInputChange
   };
@@ -32945,6 +33014,7 @@ var useInputFormat = function useInputFormat(props) {
 
 
 
+
 function insertPoint(name) {
   var reg = /(\[\d+\])/gi;
   return name.replace(reg, function (s, m, i) {
@@ -33198,6 +33268,16 @@ var removeProps = function removeProps(target, remove) {
   }
   return 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);
+    }
+    return keys.concat(obj[key] !== null && typeof_default()(obj[key]) === 'object' ? getAllKeyPaths(obj[key], newKey) : newKey);
+  }, []);
+};
 ;// CONCATENATED MODULE: ../base/src/common/use-clear.ts
 
 var useClear = function useClear(props) {
@@ -33994,6 +34074,11 @@ var checkbox_Checkbox = function Checkbox(props) {
       onInputableCheckboxChange(checked);
       return;
     }
+
+    // 兼容Checkbox在createPortal中使用时，无法改变勾选状态的问题
+    if ('value' in props && props.checked === undefined) {
+      onInputableCheckboxChange(checked);
+    }
     onChange === null || onChange === void 0 || onChange(checked ? htmlValue : undefined, checked, htmlValue);
   });
   var getChecked = function getChecked() {
@@ -37020,6 +37105,7 @@ var useTag = function useTag(props) {
     setDismiss(Done);
   };
   var handleClose = function handleClose(e) {
+    e.stopPropagation();
     if (disabled || dismiss !== Finish) {
       return;
     }
@@ -46097,11 +46183,13 @@ var useForm = function useForm(props) {
         }
       });
     });
-    var keys = Object.keys(vals);
-    keys.forEach(function (key) {
+
+    // 获取vals的所有key,包括嵌套对象的key
+    var fullKeyPaths = getAllKeyPaths(vals);
+    fullKeyPaths.forEach(function (key) {
       delete context.serverErrors[key];
     });
-    update(keys);
+    update(fullKeyPaths);
   });
   var getErrors = use_persist_fn(function () {
     return context.errors;
@@ -56396,6 +56484,7 @@ var useColumns = function useColumns(props) {
 
 
 
+
 var MIN_RESIZABLE_WIDTH = 20;
 function compareColumnWidth(curCols, preCols) {
   if (curCols.length !== preCols.length) return false;
@@ -56528,7 +56617,7 @@ var useTableLayout = function useTableLayout(props) {
   var resizeCol = use_persist_fn(function (index) {
     if (!props.columnResizable) return;
     if (!colgroup) return;
-    var deltaX = context.dragWidth - colgroup[index];
+    var deltaX = context.dragWidth - toNum(colgroup[index]);
     var newColgroup = toConsumableArray_default()(colgroup);
     newColgroup[index] = context.dragWidth;
     if (isFunc(props.onColumnResize)) {
@@ -56589,20 +56678,20 @@ var useTableLayout = function useTableLayout(props) {
       } else if (emptyNum === 0) {
         // 都有宽度按照比例分
         var all = dfWidth.reduce(function (a, b) {
-          return a + b;
+          return toNum(a) + toNum(b);
         }, 0);
         tempcols = dfWidth.map(function (v) {
-          return v / all * width;
+          return toNum(v) / toNum(all) * width;
         });
       } else {
         // 多余的平分
         var _all = dfWidth.reduce(function (a, b) {
-          return (a || 0) + (b || 0);
+          return toNum(a) + toNum(b);
         }, 0);
         var rest = width - _all;
         var agv = rest > 0 ? rest / emptyNum : 0;
         tempcols = dfWidth.map(function (v) {
-          return v ? v : agv;
+          return v ? toNum(v) : agv;
         });
       }
       index += colspanNum;
@@ -57630,6 +57719,7 @@ var useTableGroup = function useTableGroup(props) {
 
 
 
+var thead_toNum = toNum;
 /* harmony default export */ var thead = (function (props) {
   var _props$jssStyle, _props$jssStyle$table;
   var _props$colgroup = props.colgroup,
@@ -57730,7 +57820,7 @@ var useTableGroup = function useTableGroup(props) {
         };
       }
       var left = colgroup.slice(0, index).reduce(function (a, b) {
-        return (a || 0) + (b || 0);
+        return thead_toNum(a) + thead_toNum(b);
       }, 0);
       return {
         left: left,
@@ -57744,7 +57834,7 @@ var useTableGroup = function useTableGroup(props) {
         };
       }
       var right = colgroup.slice(index + colSpan).reduce(function (a, b) {
-        return (a || 0) + (b || 0);
+        return thead_toNum(a) + thead_toNum(b);
       }, 0);
       return {
         right: right,
@@ -58023,6 +58113,7 @@ var useTableRow = function useTableRow(props) {
 
 
 
+var tr_toNum = toNum;
 var Tr = function Tr(props) {
   var _props$jssStyle, _props$jssStyle$table, _props$rowClassName;
   var treeFunc = props.treeFunc;
@@ -58040,7 +58131,7 @@ var Tr = function Tr(props) {
         };
       }
       var left = props.colgroup.slice(0, index).reduce(function (a, b) {
-        return (a || 0) + (b || 0);
+        return tr_toNum(a) + tr_toNum(b);
       }, 0);
       return {
         position: 'sticky',
@@ -58054,7 +58145,7 @@ var Tr = function Tr(props) {
         };
       }
       var right = props.colgroup.slice(index + colSpan).reduce(function (a, b) {
-        return (a || 0) + (b || 0);
+        return tr_toNum(a) + tr_toNum(b);
       }, 0);
       return {
         position: 'sticky',
@@ -58378,7 +58469,8 @@ var Tr = function Tr(props) {
 
 
 
-var tfoot_isArray = isArray;
+var tfoot_isArray = isArray,
+  tfoot_toNum = toNum;
 /* harmony default export */ var tfoot = (function (props) {
   var _props$jssStyle, _props$jssStyle$table;
   var tableClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$table = _props$jssStyle.table) === null || _props$jssStyle$table === void 0 ? void 0 : _props$jssStyle$table.call(_props$jssStyle);
@@ -58392,7 +58484,7 @@ var tfoot_isArray = isArray;
         };
       }
       var left = colgroup.slice(0, index).reduce(function (a, b) {
-        return (a || 0) + (b || 0);
+        return tfoot_toNum(a) + tfoot_toNum(b);
       }, 0);
       return {
         left: left,
@@ -58406,7 +58498,7 @@ var tfoot_isArray = isArray;
         };
       }
       var right = colgroup.slice(index + colSpan).reduce(function (a, b) {
-        return (a || 0) + (b || 0);
+        return tfoot_toNum(a) + tfoot_toNum(b);
       }, 0);
       return {
         right: right,
@@ -65186,7 +65278,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.3-beta.9'
+  version: '3.4.4-beta.1'
 });
 }();
 /******/ 	return __webpack_exports__;