shineout 1.12.3 → 1.12.4-beta.2

package/css/Cascader/Result.js

@@ -306,7 +306,7 @@ function (_PureComponent) {
     });
   };
 
-  _proto.renderPlaceholder = function renderPlaceholder() {
+  _proto.renderPlaceholder = function renderPlaceholder(empty) {
     var _this$props5 = this.props,
         focus = _this$props5.focus,
         onFilter = _this$props5.onFilter,
@@ -318,6 +318,9 @@ function (_PureComponent) {
 
     return _react.default.createElement("span", {
       key: "placeholder",
+      style: !empty ? {
+        display: 'none'
+      } : undefined,
       className: (0, _classnames.default)((0, _styles.inputClass)('placeholder'), (0, _styles2.selectClass)('ellipsis'), innerTitle && (0, _styles4.inputTitleClass)('hidable'))
     }, this.props.placeholder, "\xA0");
   };
@@ -343,9 +346,7 @@ function (_PureComponent) {
         value = _this$props7.value,
         renderItem = _this$props7.renderItem,
         renderResult = _this$props7.renderResult,
-        compressed = _this$props7.compressed,
-        focus = _this$props7.focus,
-        onFilter = _this$props7.onFilter;
+        compressed = _this$props7.compressed;
     var nodes = value.map(function (v) {
       return datum.getDataById(v);
     });
@@ -365,12 +366,7 @@ function (_PureComponent) {
       items = this.renderMore(items);
     }
 
-    if (items.length === 0) {
-      items.push(this.renderPlaceholder());
-    } else if (focus && onFilter) {
-      items.push(this.renderInput());
-    }
-
+    items.push(this.renderPlaceholder(items.length === 0));
     return items;
   };
 
@@ -384,7 +380,7 @@ function (_PureComponent) {
         onFilter = _this$props8.onFilter,
         focus = _this$props8.focus;
     var empty = value.length === 0;
-    var result = empty ? this.renderPlaceholder() : this.renderResult();
+    var result = this.renderResult();
     var clearEl = this.renderClear();
     var shouldCompressed = multiple && compressed;
     return _react.default.createElement(_InputTitle.default, {

package/css/Checkbox/CheckItem.js

@@ -13,6 +13,8 @@ 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"));
@@ -47,6 +49,11 @@ function _default(type) {
       var _this;
 
       _this = _PureComponent.call(this, props) || this;
+      (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "onClick", function (e) {
+        e.stopPropagation();
+        var onClick = _this.props.onClick;
+        if ((0, _is.isFunc)(onClick)) onClick();
+      });
       _this.state = {
         checked: props.checked
       };
@@ -149,8 +156,7 @@ function _default(type) {
           content = _this$props5.content,
           size = _this$props5.size,
           children = _this$props5.children,
-          inputable = _this$props5.inputable,
-          onClick = _this$props5.onClick;
+          inputable = _this$props5.inputable;
       var rtl = (0, _config.isRTL)();
       var checked = this.getChecked();
       var isSwitch = type === 'switch';
@@ -177,7 +183,7 @@ function _default(type) {
         disabled: disabled,
         tabIndex: -1,
         type: isSwitch ? 'checkbox' : type,
-        onClick: onClick,
+        onClick: this.onClick,
         onChange: this.handleChange,
         checked: checked
       }), _react.default.createElement("i", {

package/css/DatePicker/Container.js

@@ -25,8 +25,6 @@ var _component = require("../component");
 
 var _styles = require("./styles");
 
-var _styles2 = require("../Input/styles");
-
 var _Icon = _interopRequireDefault(require("./Icon"));
 
 var _utils = _interopRequireDefault(require("./utils"));
@@ -57,7 +55,7 @@ var _config = require("../config");
 
 var _InputTitle = _interopRequireDefault(require("../InputTitle"));
 
-var _styles3 = require("../InputTitle/styles");
+var _styles2 = require("../InputTitle/styles");
 
 var _classname = require("../utils/classname");
 
@@ -491,7 +489,7 @@ function (_PureComponent) {
         formatResult = _this$props4.formatResult,
         disabled = _this$props4.disabled;
     var date = this.parseDate(value);
-    var className = (0, _classnames.default)((0, _styles.datepickerClass)('txt', this.state["picker" + key] && 'text-focus'), _utils.default.isInvalid(date) && (0, _styles2.inputClass)('placeholder'));
+    var className = (0, _classnames.default)((0, _styles.datepickerClass)('txt', this.state["picker" + key] && 'text-focus'));
     var resultFormat = formatResult || this.getFormat();
     return _react.default.createElement(_Text.default, {
       key: key || 'single',
@@ -534,7 +532,7 @@ function (_PureComponent) {
       className: (0, _styles.datepickerClass)('result')
     }, _react.default.createElement(_InputTitle.default, {
       className: (0, _styles.datepickerClass)('title-box'),
-      contentClass: (0, _styles3.inputTitleClass)('hidable'),
+      contentClass: (0, _styles2.inputTitleClass)('hidable'),
       innerTitle: innerTitle,
       open: !isEmpty || inputable && this.state.focus
     }, range ? [this.renderText(value[0], placeholder[0], 0), _react.default.createElement("span", {

package/css/DatePicker/Text.js

@@ -15,11 +15,15 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _styles = require("shineout/Input/styles");
+
 var _element = require("../utils/dom/element");
 
 var _utils = _interopRequireDefault(require("./utils"));
 
-var _styles = require("./styles");
+var _styles2 = require("./styles");
 
 var _locale = require("../locale");
 
@@ -41,6 +45,7 @@ function (_PureComponent) {
     _this.handleBlur = _this.handleBlur.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleInput = _this.handleInput.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleFocus = _this.handleFocus.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleSpanClick = _this.handleSpanClick.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.bindElement = _this.bindElement.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     return _this;
   }
@@ -74,7 +79,7 @@ function (_PureComponent) {
         onChange = _this$props.onChange,
         value = _this$props.value;
     var txt = e.target.innerText;
-    if ((0, _element.getParent)(target, "." + (0, _styles.datepickerClass)('picker'))) return;
+    if ((0, _element.getParent)(target, "." + (0, _styles2.datepickerClass)('picker'))) return;
     if (txt === value) return;
 
     if (txt.trim().length === 0) {
@@ -96,6 +101,11 @@ function (_PureComponent) {
     if (onTextSpanRef) onTextSpanRef(e.target);
   };
 
+  _proto.handleSpanClick = function handleSpanClick() {
+    var onTextSpanRef = this.props.onTextSpanRef;
+    if (onTextSpanRef && this.element) onTextSpanRef(this.element);
+  };
+
   _proto.handleInput = function handleInput(e) {
     if (e.keyCode === 13) {
       e.preventDefault();
@@ -119,16 +129,14 @@ function (_PureComponent) {
         placeholder = _this$props2.placeholder,
         disabled = _this$props2.disabled,
         focus = _this$props2.focus;
-
-    if (!inputable || disabled || !focus) {
-      return _react.default.createElement("span", {
-        onClick: this.handleFocus,
-        className: className
-      }, value || placeholder);
-    }
-
-    return _react.default.createElement("span", {
+    var showInput = inputable && !disabled && focus;
+    var hideStyle = {
+      display: 'none'
+    };
+    return _react.default.createElement(_react.default.Fragment, null, inputable ? _react.default.createElement("span", {
+      style: !showInput ? hideStyle : undefined,
       ref: this.bindElement,
+      key: "edit",
       contentEditable: inputable,
       onBlur: this.handleBlur,
       onFocus: this.handleFocus,
@@ -137,7 +145,12 @@ function (_PureComponent) {
       dangerouslySetInnerHTML: {
         __html: value
       }
-    });
+    }) : null, _react.default.createElement("span", {
+      style: showInput ? hideStyle : undefined,
+      key: "placeholder",
+      onClick: this.handleSpanClick,
+      className: (0, _classnames.default)(!value && (0, _styles.inputClass)('placeholder'), className)
+    }, value || placeholder));
   };
 
   return Text;

package/css/DatePicker/Time.js

@@ -80,9 +80,23 @@ function (_PureComponent) {
         min = _this$props2.min,
         max = _this$props2.max,
         range = _this$props2.range,
-        disabledTime = _this$props2.disabledTime;
-
-    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange(val, value, mode, min, max, range, disabled, disabledTime, this.getOptions()),
+        disabledTime = _this$props2.disabledTime,
+        index = _this$props2.index,
+        rangeDate = _this$props2.rangeDate;
+
+    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange({
+      target: val,
+      value: value,
+      mode: mode,
+      min: min,
+      max: max,
+      range: range,
+      disabled: disabled,
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate,
+      options: this.getOptions()
+    }),
         isDisabled = _paramUtils$judgeTime[0],
         date = _paramUtils$judgeTime[1];
 
@@ -121,7 +135,9 @@ function (_PureComponent) {
         secondStep = _this$props4.secondStep,
         range = _this$props4.range,
         disabled = _this$props4.disabled,
-        disabledTime = _this$props4.disabledTime;
+        disabledTime = _this$props4.disabledTime,
+        index = _this$props4.index,
+        rangeDate = _this$props4.rangeDate;
     var rtl = (0, _config.isRTL)();
     var res = [format.indexOf('H') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "HH",
@@ -135,7 +151,9 @@ function (_PureComponent) {
       total: 24,
       step: hourStep,
       onChange: this.handleHourChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), format.indexOf('h') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "hh",
       current: value,
@@ -148,7 +166,9 @@ function (_PureComponent) {
       total: 12,
       step: hourStep,
       onChange: this.handleHourChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), format.indexOf('m') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "mm",
       current: value,
@@ -160,7 +180,9 @@ function (_PureComponent) {
       value: _utils.default.getDateInfo(value, 'minute', this.getOptions()),
       step: minuteStep,
       onChange: this.handleMinuteChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), format.indexOf('s') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "ss",
       current: value,
@@ -172,7 +194,9 @@ function (_PureComponent) {
       value: _utils.default.getDateInfo(value, 'second', this.getOptions()),
       step: secondStep,
       onChange: this.handleSecondChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), /a|A/.test(format) && _react.default.createElement(_TimeScroll.default, {
       key: "ampm",
       current: value,
@@ -185,7 +209,9 @@ function (_PureComponent) {
       total: 2,
       ampm: true,
       onChange: this.handleAMPMChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     })];
 
     if (rtl) {
@@ -236,7 +262,8 @@ Time.propTypes = {
   secondStep: _propTypes.default.number,
   disabledTime: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
   disabledRegister: _propTypes.default.func,
-  timeZone: _propTypes.default.string
+  timeZone: _propTypes.default.string,
+  rangeDate: _propTypes.default.array
 };
 var _default = Time;
 exports.default = _default;

package/css/DatePicker/TimeScroll.js

@@ -148,13 +148,27 @@ function (_PureComponent) {
         ra = _this$props3.range,
         current = _this$props3.current,
         disabled = _this$props3.disabled,
-        disabledTime = _this$props3.disabledTime;
+        disabledTime = _this$props3.disabledTime,
+        index = _this$props3.index,
+        rangeDate = _this$props3.rangeDate;
     if (typeof step === 'number' && step <= 0) return null;
     if (!ampm && typeof step === 'number' && num % step !== 0) return null;
     var text = num;
     if (ampm) text = ['am', 'pm'][num];else if (total === 12 && num === 0) text = '12';else if (num < 10) text = "0" + num;
 
-    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange(num, current, mode, min, max, ra, disabled, disabledTime, this.getOptions()),
+    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange({
+      target: num,
+      value: current,
+      mode: mode,
+      min: min,
+      max: max,
+      range: ra,
+      disabled: disabled,
+      disabledTime: disabledTime,
+      options: this.getOptions(),
+      index: index,
+      rangeDate: rangeDate
+    }),
         isDisabled = _paramUtils$judgeTime[0];
 
     var className = (0, _styles.datepickerClass)(!isDisabled && value === num && 'time-active');
@@ -200,7 +214,9 @@ TimeScroll.propTypes = {
   current: _propTypes.default.object,
   mode: _propTypes.default.string,
   disabledTime: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
-  timeZone: _propTypes.default.string
+  timeZone: _propTypes.default.string,
+  index: _propTypes.default.number,
+  rangeDate: _propTypes.default.array
 };
 TimeScroll.defaultProps = {
   total: 60

package/css/DatePicker/paramUtils.js

@@ -7,11 +7,8 @@ exports.default = void 0;
 
 var _utils = _interopRequireDefault(require("./utils"));
 
-var _is = require("../utils/is");
-
 var TIME_FORMAT = _utils.default.TIME_FORMAT,
     compareAsc = _utils.default.compareAsc,
-    addSeconds = _utils.default.addSeconds,
     format = _utils.default.format;
 
 var handleOnChangeParams = function handleOnChangeParams(type) {
@@ -46,18 +43,16 @@ function handleTimeDisabled(date, disabledTime, options) {
   return undefined;
 }
 
-function handleDisabled() {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
-  }
-
-  var date = args[0],
-      min = args[1],
-      max = args[2],
-      range = args[3],
-      disabled = args[4],
-      disabledTime = args[5],
-      options = args[6];
+function handleDisabled(params) {
+  var date = params.date,
+      min = params.min,
+      max = params.max,
+      range = params.range,
+      disabled = params.disabled,
+      disabledTime = params.disabledTime,
+      options = params.options,
+      index = params.index,
+      rangeDate = params.rangeDate;
   var isDisabled;
   if (disabled) isDisabled = disabled(date);
   if (disabledTime) isDisabled = isDisabled || handleTimeDisabled(date, disabledTime);
@@ -65,31 +60,33 @@ function handleDisabled() {
 
   if (!isDisabled && min) {
     if (compareAsc(date, min) < 0) return true;
-    if (range && (0, _is.isNumber)(range) && compareAsc(date, addSeconds(min, range, options)) > 0) return true;
   }
 
   if (!isDisabled && max) {
     if (compareAsc(date, max) > 0) return true;
-    if (range && (0, _is.isNumber)(range) && compareAsc(date, addSeconds(max, -range, options)) < 0) return true;
+  }
+
+  if (!isDisabled && index === 1 && rangeDate && rangeDate[0]) {
+    if (typeof range === 'number' && _utils.default.compareAsc(date, _utils.default.addSeconds(rangeDate[0], range, options)) > 0) {
+      return true;
+    }
   }
 
   return false;
 }
 
-function judgeTimeByRange() {
-  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-    args[_key2] = arguments[_key2];
-  }
-
-  var target = args[0],
-      value = args[1],
-      mode = args[2],
-      min = args[3],
-      max = args[4],
-      range = args[5],
-      disabled = args[6],
-      disabledTime = args[7],
-      options = args[8];
+function judgeTimeByRange(params) {
+  var target = params.target,
+      value = params.value,
+      mode = params.mode,
+      min = params.min,
+      max = params.max,
+      range = params.range,
+      disabled = params.disabled,
+      disabledTime = params.disabledTime,
+      index = params.index,
+      rangeDate = params.rangeDate,
+      options = params.options;
   var date = new Date(value.getTime());
 
   switch (mode) {
@@ -132,7 +129,17 @@ function judgeTimeByRange() {
       break;
   }
 
-  var isDisabled = handleDisabled(date, min, max, range, disabled, disabledTime, options);
+  var isDisabled = handleDisabled({
+    date: date,
+    min: min,
+    max: max,
+    range: range,
+    disabled: disabled,
+    disabledTime: disabledTime,
+    options: options,
+    index: index,
+    rangeDate: rangeDate
+  });
   return [isDisabled, date];
 }
 

package/css/Select/Result.js

@@ -341,7 +341,7 @@ function (_PureComponent) {
     });
   };
 
-  _proto.renderPlaceholder = function renderPlaceholder() {
+  _proto.renderPlaceholder = function renderPlaceholder(empty) {
     var _this$props7 = this.props,
         focus = _this$props7.focus,
         onFilter = _this$props7.onFilter,
@@ -349,12 +349,15 @@ function (_PureComponent) {
         multiple = _this$props7.multiple,
         innerTitle = _this$props7.innerTitle;
 
-    if (focus && onFilter) {
+    if (focus && onFilter && empty) {
       return this.renderInput(multiple ? filterText : '');
     }
 
     return _react.default.createElement("span", {
       key: "placeholder",
+      style: !empty ? {
+        display: 'none'
+      } : undefined,
       className: (0, _classnames.default)((0, _styles2.inputClass)('placeholder'), (0, _styles.selectClass)('ellipsis'), innerTitle && (0, _styles3.inputTitleClass)('hidable'))
     }, _react.default.createElement("span", null, this.props.placeholder), "\xA0");
   };
@@ -426,11 +429,12 @@ function (_PureComponent) {
         focus = _this$props10.focus,
         onFilter = _this$props10.onFilter;
     var showPlaceholder = this.isEmptyResult();
-    var result = showPlaceholder ? this.renderPlaceholder() : this.renderResult();
+    var placeholder = this.renderPlaceholder(showPlaceholder);
+    var result = showPlaceholder ? null : this.renderResult();
     var rtl = (0, _config.isRTL)();
     var clearEl = this.renderClear();
     var indicator = this.renderIndicator();
-    var inner = [result, indicator, clearEl];
+    var inner = [result, placeholder, indicator, clearEl];
     var open = onFilter && focus || !showPlaceholder;
     return _react.default.createElement(_InputTitle.default, {
       innerTitle: innerTitle,

package/css/TreeSelect/Result.js

@@ -279,17 +279,20 @@ function (_PureComponent) {
     })];
   };
 
-  _proto.renderPlaceholder = function renderPlaceholder() {
+  _proto.renderPlaceholder = function renderPlaceholder(showPlaceholder) {
     var _this$props5 = this.props,
         focus = _this$props5.focus,
         onFilter = _this$props5.onFilter,
         innerTitle = _this$props5.innerTitle;
 
-    if (focus && onFilter) {
+    if (focus && onFilter && showPlaceholder) {
       return this.renderInput(' ');
     }
 
     return _react.default.createElement("span", {
+      style: showPlaceholder ? undefined : {
+        display: 'none'
+      },
       className: (0, _classnames.default)((0, _styles2.inputClass)('placeholder'), (0, _styles.treeSelectClass)('ellipsis'), innerTitle && (0, _styles3.inputTitleClass)('hidable'))
     }, this.props.placeholder, "\xA0");
   };
@@ -336,7 +339,8 @@ function (_PureComponent) {
 
   _proto.render = function render() {
     var showPlaceholder = this.props.result.length === 0;
-    var result = showPlaceholder ? this.renderPlaceholder() : this.renderResult();
+    var placeholder = this.renderPlaceholder(showPlaceholder);
+    var result = showPlaceholder ? null : this.renderResult();
     var _this$props7 = this.props,
         compressed = _this$props7.compressed,
         innerTitle = _this$props7.innerTitle,
@@ -351,7 +355,7 @@ function (_PureComponent) {
     }, _react.default.createElement("div", {
       ref: this.bindResult,
       className: (0, _classnames.default)((0, _styles.treeSelectClass)((0, _classname.getDirectionClass)('result'), compressed && 'compressed', showPlaceholder && 'empty'), innerTitle && (0, _styles3.inputTitleClass)('item-scroll'))
-    }, result, !this.props.multiple && // eslint-disable-next-line
+    }, result, placeholder, !this.props.multiple && // eslint-disable-next-line
     _react.default.createElement("a", {
       tabIndex: -1,
       className: (0, _styles.treeSelectClass)('indicator', 'caret')

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.3'
+  version: '1.12.4-beta.2'
 }
 
 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.12.3'
+  version: '1.12.4-beta.2'
 };
 exports.default = _default;