shineout 1.11.4-beta.5 → 1.11.4

package/css/Datum/types.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.IGNORE_BIND = exports.WITH_OUT_DISPATCH = exports.REMOVE_ERROR = exports.ERROR_TYPE = exports.IGNORE_VALIDATE = exports.FORCE_PASS = exports.RESET_TOPIC = exports.VALIDATE_TOPIC = exports.CHANGE_TOPIC = exports.updateSubscribe = exports.errorSubscribe = exports.changeSubscribe = void 0;
+exports.SUBMIT_TOPIC = exports.IGNORE_BIND = exports.WITH_OUT_DISPATCH = exports.REMOVE_ERROR = exports.ERROR_TYPE = exports.IGNORE_VALIDATE = exports.FORCE_PASS = exports.RESET_TOPIC = exports.VALIDATE_TOPIC = exports.CHANGE_TOPIC = exports.updateSubscribe = exports.errorSubscribe = exports.changeSubscribe = void 0;
 
 // FLow chagne
 var changeSubscribe = function changeSubscribe(name) {
@@ -40,4 +40,6 @@ exports.REMOVE_ERROR = REMOVE_ERROR;
 var WITH_OUT_DISPATCH = '__WITH_OUT_DISPATCH__';
 exports.WITH_OUT_DISPATCH = WITH_OUT_DISPATCH;
 var IGNORE_BIND = '__IGNORE_BIND__';
-exports.IGNORE_BIND = IGNORE_BIND;
+exports.IGNORE_BIND = IGNORE_BIND;
+var SUBMIT_TOPIC = '__SUBMIT_TOPIC__';
+exports.SUBMIT_TOPIC = SUBMIT_TOPIC;

package/css/Form/Form.js

@@ -180,6 +180,7 @@ function (_Component) {
     var _document2 = document,
         activeElement = _document2.activeElement;
     if (activeElement) activeElement.blur();
+    datum.dispatch(_types.SUBMIT_TOPIC);
     setTimeout(function () {
       datum.validate(_types.IGNORE_BIND).then(function () {
         _this2.validating = false;

package/css/Input/Input.js

@@ -102,7 +102,6 @@ function (_PureComponent) {
         type = _this$props2.type,
         digits = _this$props2.digits,
         autoFix = _this$props2.autoFix,
-        cancelChange = _this$props2.cancelChange,
         numType = _this$props2.numType;
     if (type !== 'number' || val === '') return val;
     if (/^[.-]+$/.test(val)) return '';
@@ -115,8 +114,6 @@ function (_PureComponent) {
       } else {
         fixVal = parseInt(fixVal, 10).toString();
       }
-
-      if (cancelChange) cancelChange();
     }
 
     return fixVal;
@@ -150,7 +147,8 @@ function (_PureComponent) {
   _proto.handleChange = function handleChange(e, clearClick) {
     var _this$props4 = this.props,
         type = _this$props4.type,
-        clearable = _this$props4.clearable;
+        clearable = _this$props4.clearable,
+        coin = _this$props4.coin;
 
     if (clearClick) {
       this.ref.focus();
@@ -167,6 +165,10 @@ function (_PureComponent) {
     if (type === 'number') {
       if (typeof value !== 'number') {
         value = String(value).replace(/。/g, '.');
+
+        if (coin) {
+          value = value.replaceAll(',', '');
+        }
       }
 
       if (!this.isValidNumber(value)) {
@@ -207,8 +209,8 @@ function (_PureComponent) {
         cancelChange = _this$props6.cancelChange;
     if (cancelChange) cancelChange();
     var newVal = this.fixValue(value);
-    var canForceChange = !(clearToUndefined && newVal === '' && this.props.value === undefined);
-    if (canForceChange && forceChange && !this.invalidNumber(newVal)) forceChange(newVal);
+    var isChange = !(clearToUndefined && newVal === '' && this.props.value === undefined);
+    if (isChange && forceChange && !this.invalidNumber(newVal)) forceChange(newVal);
     if (onBlur) onBlur(e);
   };
 
@@ -259,7 +261,8 @@ function (_PureComponent) {
         inputFocus = _this$props7.inputFocus,
         clearToUndefined = _this$props7.clearToUndefined,
         placeholder = _this$props7.placeholder,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["type", "defaultValue", "digits", "className", "clearable", "htmlName", "forceChange", "onEnterPress", "forwardedRef", "innerTitle", "inputFocus", "clearToUndefined", "placeholder"]);
+        coin = _this$props7.coin,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["type", "defaultValue", "digits", "className", "clearable", "htmlName", "forceChange", "onEnterPress", "forwardedRef", "innerTitle", "inputFocus", "clearToUndefined", "placeholder", "coin"]);
     var value = this.props.value == null || this.props.value === undefined ? '' : this.props.value;
     var needClearUndefined = clearToUndefined && this.props.value !== undefined;
     var showClear = !other.disabled && clearable && (value !== '' || needClearUndefined);
@@ -318,7 +321,8 @@ Input.propTypes = {
   innerTitle: _propTypes.default.node,
   inputFocus: _propTypes.default.bool,
   clearToUndefined: _propTypes.default.bool,
-  placeholder: _propTypes.default.string
+  placeholder: _propTypes.default.string,
+  coin: _propTypes.default.bool
 };
 Input.defaultProps = {
   type: 'text'

package/css/Pagination/Jumper.js

@@ -92,7 +92,7 @@ function (_PureComponent) {
 
     return _react.default.createElement("div", {
       className: (0, _styles.paginationClass)((0, _classname.getDirectionClass)('section'))
-    }, txt[0], _react.default.createElement(_Input.default, {
+    }, txt[0] ? _react.default.createElement("span", null, txt[0]) : undefined, _react.default.createElement(_Input.default, {
       key: this.renderRequire,
       value: current,
       onChange: nofunc,
@@ -104,7 +104,7 @@ function (_PureComponent) {
       size: size,
       className: (0, _styles.paginationClass)(isSimple && 'simple-input'),
       delay: 400
-    }), txt[1]);
+    }), txt[1] ? _react.default.createElement("span", null, txt[1]) : undefined);
   };
 
   return Jumper;

package/css/Select/Select.js

@@ -13,10 +13,14 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
 
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _types = require("shineout/Datum/types");
+
 var _component = require("../component");
 
 var _proptypes = require("../utils/proptypes");
@@ -62,6 +66,13 @@ function (_PureComponent) {
     var _this;
 
     _this = _PureComponent.call(this, props) || this;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "forceChange", function () {
+      if (_this.inputBlurTimer && _this.blurHandler) {
+        clearTimeout(_this.inputBlurTimer);
+
+        _this.blurHandler();
+      }
+    });
     _this.state = {
       control: 'mouse',
       focus: false,
@@ -102,6 +113,16 @@ function (_PureComponent) {
 
   var _proto = Select.prototype;
 
+  _proto.componentDidMount = function componentDidMount() {
+    _PureComponent.prototype.componentDidMount.call(this);
+
+    var formDatum = this.props.formDatum;
+
+    if (formDatum) {
+      formDatum.subscribe(_types.SUBMIT_TOPIC, this.forceChange);
+    }
+  };
+
   _proto.componentDidUpdate = function componentDidUpdate(prevProps, prevState) {
     var onFilter = this.props.onFilter; // clear filter
 
@@ -115,6 +136,12 @@ function (_PureComponent) {
   _proto.componentWillUnmount = function componentWillUnmount() {
     _PureComponent.prototype.componentWillUnmount.call(this);
 
+    var formDatum = this.props.formDatum;
+
+    if (formDatum) {
+      formDatum.unsubscribe(_types.SUBMIT_TOPIC, this.forceChange);
+    }
+
     this.clearClickAway();
   };
 
@@ -252,6 +279,7 @@ function (_PureComponent) {
     if (this.inputBlurTimer) {
       this.lastChangeIsOptionClick = true;
       clearTimeout(this.inputBlurTimer);
+      this.inputBlurTimer = null;
     }
 
     if (multiple) {
@@ -331,12 +359,19 @@ function (_PureComponent) {
 
     if (!onCreate) return;
     if (multiple && !text) return;
-    if (this.lastChangeIsOptionClick) return; // if click option, ignore input blur
+    if (this.lastChangeIsOptionClick) return;
 
-    this.inputBlurTimer = setTimeout(function () {
+    this.blurHandler = function () {
       var retData = onCreate(text);
 
       _this3.handleChange(null, retData, true);
+    }; // if click option, ignore input blur
+
+
+    this.inputBlurTimer = setTimeout(function () {
+      _this3.blurHandler();
+
+      _this3.blurHandler = null;
     }, 200);
   };
 

package/css/Upload/index.d.ts

@@ -285,7 +285,7 @@ export interface UploadProps<T> extends StandardProps, OmitFormProps<T[]> {
    *
    * default: none
    */
-  filesFilter?: (fileList: any[]) => boolean;
+  filesFilter?: (fileList: any[]) => any[];
 
   /**
    * remove update failed callback

package/css/hoc/coin.js

@@ -120,7 +120,8 @@ var _default = function _default(coinType) {
           onMouseUp: this.handleMouseUp,
           value: this.getValue(),
           onFocus: this.handleFocus,
-          onBlur: this.handleBlur
+          onBlur: this.handleBlur,
+          coin: true
         }));
       };
 

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.11.4-beta.5'
+  version: '1.11.4'
 }
 
 export default __default

package/css/index.js

@@ -224,6 +224,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.11.4-beta.5'
+  version: '1.11.4'
 };
 exports.default = _default;

package/css/styles/normalize.css

@@ -19,11 +19,6 @@ html {
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
 }
-@at-root {
-  @-ms-viewport {
-    width: device-width;
-  }
-}
 article,
 aside,
 dialog,