shineout 2.0.0-rc.6 → 2.0.0-rc.7

package/css/Checkbox/CheckItem.js

@@ -31,6 +31,8 @@ var _is = require("../utils/is");
 
 var _Input = _interopRequireDefault(require("../Input"));
 
+var _Spin = _interopRequireDefault(require("../Spin"));
+
 var _styles = require("./styles");
 
 var _config = require("../config");
@@ -154,11 +156,13 @@ function checkItem(type) {
           size = _this$props5.size,
           children = _this$props5.children,
           inputable = _this$props5.inputable,
-          onClick = _this$props5.onClick;
+          onClick = _this$props5.onClick,
+          loading = _this$props5.loading;
       var rtl = (0, _config.isRTL)();
       var checked = this.getChecked();
       var isSwitch = type === 'switch';
-      var className = (0, _classnames.default)((0, _styles.checkinputClass)('_', disabled && 'disabled', checked === true && 'checked', checked === 'indeterminate' && 'indeterminate', isSwitch && 'switch', type + "-container", rtl && 'rtl', {
+      var ban = disabled || isSwitch && loading;
+      var className = (0, _classnames.default)((0, _styles.checkinputClass)('_', ban && 'disabled', checked === true && 'checked', checked === 'indeterminate' && 'indeterminate', isSwitch && 'switch', loading && 'loading', type + "-container", rtl && 'rtl', {
         large: size === 'large',
         small: size === 'small'
       }), this.props.className);
@@ -180,10 +184,10 @@ function checkItem(type) {
         ref: this.bindRef
         /* @ts-ignore */
         ,
-        disabled: disabled
+        disabled: ban
       }, (0, _getDataset.default)(this.props)), switchChildren, _react.default.createElement("input", {
         id: this.id,
-        disabled: disabled,
+        disabled: ban,
         tabIndex: -1,
         type: isSwitch ? 'checkbox' : type,
         onClick: onClick,
@@ -199,7 +203,11 @@ function checkItem(type) {
         value: value
       }), isSwitch && _react.default.createElement("span", {
         className: (0, _styles.checkinputClass)((0, _classname.getDirectionClass)('switch-indicator'))
-      }));
+      }, loading ? _react.default.createElement(_Spin.default, {
+        size: "auto",
+        color: "none",
+        name: "ring"
+      }) : null));
     };
 
     return CheckItem;

package/css/Checkbox/Props.d.ts

@@ -15,6 +15,15 @@ export interface CheckItemProps extends StandardProps {
      * default: false
      */
     disabled?: boolean;
+    /**
+     *
+     *  loading
+     *
+     * 加载中
+     *
+     * default: false
+     */
+    loading?: boolean;
     /**
      * if not set, use (value === htmlValue).
      *
@@ -61,10 +70,10 @@ export interface CheckItemProps extends StandardProps {
     size?: 'small' | 'default' | 'large';
     content?: [ReactNode, ReactNode] | [];
 }
-export declare type SimpleCheckProps = Omit<CheckItemProps, 'content' | 'onChange'> & {
+export declare type SimpleCheckProps = Omit<CheckItemProps, 'content' | 'onChange' | 'loading'> & {
     onChange?: ((value: any, checked: CheckValueType, index?: number) => void);
 };
-export declare type SimpleRadioProps = Omit<CheckItemProps, 'content' | 'onChange' | 'onRawChange' | 'inputable' | 'value'> & {
+export declare type SimpleRadioProps = Omit<CheckItemProps, 'content' | 'onChange' | 'onRawChange' | 'inputable' | 'value' | 'loading'> & {
     checked?: boolean | ((htmlValue: any) => boolean);
     onChange?: ((value: any, checked: CheckValueType, index?: number) => void);
 };

package/css/Checkbox/styles/checkinput.css

@@ -393,11 +393,22 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   border-radius: 50%;
   -webkit-box-shadow: 0 1px 4px var(--gray-500, #adb5bd);
           box-shadow: 0 1px 4px var(--gray-500, #adb5bd);
+  font-size: var(--switch-indicator-size, 24px);
+  color: var(--switch-unchecked-bg, #ced4da);
 }
 .so-checkinput-rtl .so-checkinput-switch-indicator {
   left: auto;
   right: var(--switch-indicator-padding-horizontal, 0px);
 }
+.so-checkinput-loading .so-checkinput-switch-indicator .so-spin-ring {
+  position: absolute;
+  top: 12%;
+  left: 12%;
+  right: 12%;
+  bottom: 12%;
+  border-width: 0.12em;
+  border-top-color: currentColor;
+}
 .so-checkinput-switch-children {
   font-size: 12px;
   color: #fff;
@@ -416,6 +427,7 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   -webkit-box-shadow: var(--switch-checked-box-shadow, 0 1px 4px var(--primary-color-fade-50, rgba(51, 153, 255, 0.5)));
           box-shadow: var(--switch-checked-box-shadow, 0 1px 4px var(--primary-color-fade-50, rgba(51, 153, 255, 0.5)));
   background: var(--switch-indicator-checked-bg, var(--primary-color, #3399ff));
+  color: var(--switch-checked-bg, var(--primary-color-fade-50, rgba(51, 153, 255, 0.5)));
 }
 .so-checkinput-checked.so-checkinput-switch .so-checkinput-switch-indicator-ltr {
   left: 100%;
@@ -465,6 +477,7 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   top: var(--switch-small-indicator-top, -3px);
   padding-left: 8px;
   padding-right: 8px;
+  font-size: var(--switch-small-indicator-size, 16px);
 }
 .so-checkinput-large.so-checkinput-switch {
   min-width: 60px;
@@ -482,6 +495,7 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   width: var(--switch-large-indicator-size, 32px);
   height: var(--switch-large-indicator-size, 32px);
   top: var(--switch-large-indicator-top, -5px);
+  font-size: var(--switch-large-indicator-size, 32px);
 }
 .so-checkinput-disabled.so-checkinput-switch {
   opacity: 0.4;

package/css/index.js

@@ -220,6 +220,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '2.0.0-rc.6'
+  version: '2.0.0-rc.7'
 };
 exports.default = _default;

package/css/utils/clone.js

@@ -18,6 +18,20 @@ var cloneObject = function cloneObject(source, specialKeys) {
   }
 
   var target = Object.create(Object.getPrototypeOf(source));
+  /* File or Response (non-serializable data) will throw error */
+
+  try {
+    // eslint-disable-next-line guard-for-in
+    for (var key in target) {
+      target[key] = target[key];
+    }
+  } catch (e) {
+    console.error('should not pass non-serializable data', source);
+    console.error(e);
+    target = {};
+  }
+
+  ;
   [].concat(specialKeys, Object.keys(source)).forEach(function (k) {
     // eslint-disable-next-line
     target[k] = deepClone(source[k]);