shineout 1.10.8-beta.3 → 1.10.10

package/css/Button/Button.js

@@ -31,7 +31,7 @@ var _styles = require("./styles");
 
 var _config = require("../config");
 
-var _classname = _interopRequireDefault(require("../utils/classname"));
+var _classname = require("../utils/classname");
 
 var Button =
 /*#__PURE__*/
@@ -104,7 +104,7 @@ function (_PureComponent) {
         type: htmlType,
         className: className
       }), loading && _react.default.createElement("span", {
-        className: (0, _styles.buttonClass)((0, _classname.default)('spin'))
+        className: (0, _styles.buttonClass)((0, _classname.getDirectionClass)('spin'))
       }, _react.default.createElement(_Spin.default, {
         size: 12,
         name: "ring",

package/css/Datum/Form.js

@@ -51,6 +51,7 @@ function () {
     this.$events = {}; // handle global errors
 
     this.$errors = {};
+    this.updateLock = false;
     this.deepSetOptions = {
       removeUndefined: removeUndefined,
       forceSet: true
@@ -73,6 +74,10 @@ function () {
     this.dispatch(_types.RESET_TOPIC);
   };
 
+  _proto.setLock = function setLock(lock) {
+    this.updateLock = lock;
+  };
+
   _proto.get = function get(name) {
     var _this = this;
 
@@ -243,13 +248,20 @@ function () {
     return (0, _clone.deepClone)(this.$values);
   };
 
-  _proto.setValue = function setValue(values, type, forceSet) {
+  _proto.setValue = function setValue(v, type, forceSet) {
     var _this6 = this;
 
-    if (values === void 0) {
-      values = {};
+    if (v === void 0) {
+      v = {};
     }
 
+    var values = (0, _is.isObject)(v) ? v : {};
+
+    if (values !== v) {
+      console.warn('Form value must be an Object');
+    } // 兼容 value 传入 null 等错误等值
+
+
     if (!forceSet && (0, _deepEql.default)(values, this.$values)) return;
     this.$values = (0, _clone.deepClone)(values); // wait render end.
 
@@ -299,7 +311,9 @@ function () {
     delete this.$inputNames[name];
     delete this.$validator[name];
     delete this.$errors[name];
-    delete this.$defaultValues[name];
+    delete this.$defaultValues[name]; // when  setData due to unmount not delete value
+
+    if (this.updateLock) return;
     if (!(0, _objects.deepHas)(this.$values, name)) return;
     (0, _objects.deepRemove)(this.$values, name);
 

package/css/Datum/List.js

@@ -124,6 +124,10 @@ function () {
     return flatten;
   };
 
+  _proto.setLock = function setLock(lock) {
+    this.updateLock = lock;
+  };
+
   _proto.add = function add(data, _, childrenKey, unshift) {
     var _this2 = this;
 

package/css/Datum/Tree.js

@@ -69,6 +69,12 @@ function () {
 
   var _proto = _default.prototype;
 
+  _proto.updateDisabled = function updateDisabled(dis) {
+    this.disabled = dis || function () {
+      return false;
+    };
+  };
+
   _proto.bind = function bind(id, update) {
     this.events[id] = update;
   };

package/css/Datum/hoc.js

@@ -97,11 +97,14 @@ var _default = (0, _func.curry)(function (options, Origin) {
     var _proto = _class.prototype;
 
     _proto.componentDidMount = function componentDidMount() {
+      this.datum.setLock(false);
       this.prevValues = this.props[key];
     };
 
     _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
       // update datum.onchange
+      this.datum.setLock(false);
+
       if (prevProps.onChange !== this.props.onChange) {
         this.datum.onChange = this.props.onChange;
       }
@@ -126,7 +129,9 @@ var _default = (0, _func.curry)(function (options, Origin) {
       var values = this.props[key];
 
       if (type === 'form' && values !== this.prevValues) {
+        debugger;
         this.setValue(this.props.initValidate ? undefined : _types.IGNORE_VALIDATE);
+        this.datum.setLock(true);
         this.prevValues = values;
       }
 

package/css/Form/index.d.ts

@@ -388,7 +388,7 @@ export interface FormFieldSetProps<Value> {
    *
    * default:
    */
-  empty?: (onInsert: Value) => ReactNode;
+   empty?: (onInsert: (value: Value) => void) => ReactNode;
 
   /**
    * Validation rules

package/css/Form/styles/form.css

@@ -58,6 +58,7 @@
       -ms-flex: 1;
           flex: 1;
   padding: 0 6px;
+  min-width: 0;
 }
 .so-form-item .so-form-control:first-child {
   padding-left: 0;

package/css/Select/Result.js

@@ -211,7 +211,7 @@ function (_PureComponent) {
     var res = result.reduce(function (acc, cur) {
       var r = getResultContent(cur, renderResult, renderUnmatched);
 
-      if (r !== undefined && r !== '') {
+      if (!(0, _is.isEmpty)(r)) {
         acc.push(cur);
       }
 

package/css/Select/Select.js

@@ -123,6 +123,14 @@ function (_PureComponent) {
     return this.props.text[key] || (0, _locale.getLocale)(key);
   };
 
+  _proto.getDisabledStatus = function getDisabledStatus() {
+    if (typeof this.props.disabled == 'function') {
+      return this.props.disabled;
+    } else {
+      return !!this.props.disabled;
+    }
+  };
+
   _proto.getFocusSelected = function getFocusSelected() {
     var _this$props = this.props,
         reFocus = _this$props.reFocus,
@@ -204,7 +212,7 @@ function (_PureComponent) {
   };
 
   _proto.handleState = function handleState(focus, e) {
-    if (this.props.disabled === true) return;
+    if (this.getDisabledStatus() === true) return;
     if (focus === this.state.focus) return; // click close icon
 
     if (focus && e && e.target.classList.contains((0, _styles.selectClass)('close'))) return;
@@ -239,13 +247,12 @@ function (_PureComponent) {
     var _this$props4 = this.props,
         datum = _this$props4.datum,
         multiple = _this$props4.multiple,
-        disabled = _this$props4.disabled,
         emptyAfterSelect = _this$props4.emptyAfterSelect,
         onFilter = _this$props4.onFilter,
         filterText = _this$props4.filterText,
         onCreate = _this$props4.onCreate,
         reFocus = _this$props4.reFocus;
-    if (disabled === true) return; // if click option, ignore blur event
+    if (this.getDisabledStatus() === true) return; // if click option, ignore blur event
 
     if (this.inputBlurTimer) {
       this.lastChangeIsOptionClick = true;
@@ -591,7 +598,6 @@ function (_PureComponent) {
         placeholder = _this$props12.placeholder,
         multiple = _this$props12.multiple,
         clearable = _this$props12.clearable,
-        disabled = _this$props12.disabled,
         size = _this$props12.size,
         onFilter = _this$props12.onFilter,
         datum = _this$props12.datum,
@@ -608,6 +614,7 @@ function (_PureComponent) {
         innerTitle = _this$props12.innerTitle,
         keygen = _this$props12.keygen,
         data = _this$props12.data;
+    var disabled = this.getDisabledStatus();
     var className = (0, _styles.selectClass)('inner', size, this.state.focus && 'focus', this.state.position, multiple && 'multiple', disabled === true && (0, _classname.getDirectionClass)('disabled'), !trim && 'pre');
     return _react.default.createElement("div", {
       // eslint-disable-next-line

package/css/Table/SimpleTable.js

@@ -70,7 +70,11 @@ function (_PureComponent) {
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
     this.scrollCheck();
-    var resize = prevProps.data.length === 0 && this.props.data.length;
+    var resize = prevProps.data.length === 0 && this.props.data.length; // when resize
+
+    if (resize && this.body) this.handleScroll({
+      currentTarget: this.body
+    });
     var shouldResetColgroup = this.props.dataChangeResize && this.props.data !== prevProps.data;
 
     if (resize || shouldResetColgroup || !(0, _shallowEqual.compareColumns)(prevProps.columns, this.props.columns)) {

package/css/Tree/Content.js

@@ -27,6 +27,8 @@ var _Spin = _interopRequireDefault(require("../Spin"));
 
 var _Checkbox = _interopRequireDefault(require("./Checkbox"));
 
+var _types = require("../Datum/types");
+
 var loading = _react.default.createElement("span", {
   className: (0, _styles.treeClass)('icon-loading')
 }, _react.default.createElement(_Spin.default, {
@@ -46,11 +48,26 @@ function (_PureComponent) {
     _this.handleNodeClick = _this.handleNodeClick.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleNodeExpand = _this.handleNodeExpand.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleIndicatorClick = _this.handleIndicatorClick.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleUpdate = _this.handleUpdate.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     return _this;
   }
 
   var _proto = Content.prototype;
 
+  _proto.componentDidMount = function componentDidMount() {
+    _PureComponent.prototype.componentDidMount.call(this);
+
+    var datum = this.props.datum;
+    datum.subscribe(_types.CHANGE_TOPIC, this.handleUpdate);
+  };
+
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    _PureComponent.prototype.componentWillUnmount.call(this);
+
+    var datum = this.props.datum;
+    datum.unsubscribe(_types.CHANGE_TOPIC, this.handleUpdate);
+  };
+
   _proto.handleNodeClick = function handleNodeClick() {
     var _this$props = this.props,
         data = _this$props.data,
@@ -67,6 +84,10 @@ function (_PureComponent) {
     }
   };
 
+  _proto.handleUpdate = function handleUpdate() {
+    this.forceUpdate();
+  };
+
   _proto.handleNodeExpand = function handleNodeExpand() {
     var _this$props2 = this.props,
         data = _this$props2.data,
@@ -176,7 +197,8 @@ Content.propTypes = {
   setFetching: _propTypes.default.func,
   fetching: _propTypes.default.bool,
   doubleClickExpand: _propTypes.default.bool,
-  iconClass: _propTypes.default.string
+  iconClass: _propTypes.default.string,
+  datum: _propTypes.default.object
 };
 var _default = Content;
 exports.default = _default;

package/css/TreeSelect/Result.js

@@ -252,7 +252,7 @@ function (_PureComponent) {
       key: "more",
       className: (0, _styles.treeSelectClass)((0, _classname.getDirectionClass)('item'), 'item-compressed'),
       popoverClassName: (0, _styles.treeSelectClass)('popover'),
-      contentClassName: (0, _classname.getDirectionClass)('result'),
+      contentClassName: (0, _styles.treeSelectClass)((0, _classname.getDirectionClass)('result')),
       compressed: compressed,
       data: items,
       cls: _styles.treeSelectClass,

package/css/TreeSelect/datum.js

@@ -55,7 +55,8 @@ function datum(Origin) {
 
     _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
       if (!(0, _shallowEqual.default)(prevProps.data, this.props.data)) {
-        this.datum.setData(this.props.data);
+        this.datum.updateDisabled(this.props.disabled);
+        this.datum.setData(this.props.data, true);
         this.forceUpdate();
       }
     };

package/css/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.10.8-beta.3' }
+export default { utils, version: '1.10.10' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

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