fmui-base 2.1.12 → 2.1.14

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.1.14：增加分页组件
+- 2.1.13：表单选人组件全部类型可选时选不到用户处理
 - 2.1.12：上传组件增加后台类型校验的参数，预算跳转流程表单路径特殊处理
 - 2.1.11：弹出选择组件双击选项后返回到列表页面
 - 2.1.10：表单关联字段bug处理

package/lib/ScrollList/BottomTip.js

@@ -0,0 +1,60 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _class, _temp;
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var BottomTip = (_temp = _class = function (_React$Component) {
+  _inherits(BottomTip, _React$Component);
+
+  function BottomTip() {
+    _classCallCheck(this, BottomTip);
+
+    return _possibleConstructorReturn(this, (BottomTip.__proto__ || Object.getPrototypeOf(BottomTip)).apply(this, arguments));
+  }
+
+  _createClass(BottomTip, [{
+    key: 'render',
+    value: function render() {
+      return _react2.default.createElement(
+        'div',
+        { className: 'bottom-tip' },
+        this.props.icon,
+        _react2.default.createElement(
+          'div',
+          { className: 'text' },
+          this.props.text
+        )
+      );
+    }
+  }]);
+
+  return BottomTip;
+}(_react2.default.Component), _class.displayName = 'BottomTip', _class.defaultProps = {
+  text: '',
+  icon: null
+}, _class.propTypes = {
+  icon: _propTypes2.default.element,
+  text: _propTypes2.default.string
+}, _temp);
+exports.default = BottomTip;

package/lib/ScrollList/EmptyContent.js

@@ -0,0 +1,38 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var EmptyContent = function EmptyContent(props) {
+  return _react2.default.createElement(
+    'div',
+    { key: 'empty-content', className: 'empty-content' },
+    props.image ? _react2.default.createElement('div', { className: 'icon', style: { backgroundImage: 'url(' + props.image + ')' } }) : null,
+    props.text ? _react2.default.createElement(
+      'div',
+      { className: 'text' },
+      props.text
+    ) : null
+  );
+};
+EmptyContent.defaultProps = {
+  image: undefined,
+  text: undefined
+};
+EmptyContent.propTypes = {
+  image: _propTypes2.default.string,
+  text: _propTypes2.default.string
+};
+
+exports.default = EmptyContent;

package/lib/ScrollList/Item.js

@@ -0,0 +1,213 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _class, _temp;
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _classnames3 = require('classnames');
+
+var _classnames4 = _interopRequireDefault(_classnames3);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _Badge = require('saltui/lib/Badge');
+
+var _Badge2 = _interopRequireDefault(_Badge);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var Item = (_temp = _class = function (_React$Component) {
+  _inherits(Item, _React$Component);
+
+  function Item() {
+    _classCallCheck(this, Item);
+
+    return _possibleConstructorReturn(this, (Item.__proto__ || Object.getPrototypeOf(Item)).apply(this, arguments));
+  }
+
+  _createClass(Item, [{
+    key: 'renderImg',
+    value: function renderImg() {
+      var _props = this.props,
+          img = _props.img,
+          prefixCls = _props.prefixCls;
+
+      if (typeof img === 'string') {
+        return _react2.default.createElement('img', { alt: '', className: prefixCls + '-img', src: img });
+      }
+      return img;
+    }
+  }, {
+    key: 'renderAvatar',
+    value: function renderAvatar() {
+      var _props2 = this.props,
+          avatar = _props2.avatar,
+          prefixCls = _props2.prefixCls;
+
+      if (typeof avatar === 'string') {
+        return _react2.default.createElement('img', { alt: '', className: prefixCls + '-avatar', src: avatar });
+      }
+      return avatar;
+    }
+  }, {
+    key: 'renderTitle',
+    value: function renderTitle() {
+      var _props3 = this.props,
+          title = _props3.title,
+          prefixCls = _props3.prefixCls,
+          badgePosition = _props3.badgePosition;
+
+      if (!title) return null;
+      return _react2.default.createElement(
+        'div',
+        { className: (0, _classnames4.default)(prefixCls + '-title', _defineProperty({}, badgePosition, true))
+        },
+        title,
+        badgePosition === 'indicator' ? null : this.renderBadge()
+      );
+    }
+  }, {
+    key: 'renderBadge',
+    value: function renderBadge() {
+      var _props4 = this.props,
+          badge = _props4.badge,
+          prefixCls = _props4.prefixCls;
+
+      var className = prefixCls + '-badge';
+      if (typeof badge === 'string') {
+        return _react2.default.createElement(_Badge2.default, { text: badge, className: className });
+      } else if (typeof badge === 'number') {
+        return _react2.default.createElement(_Badge2.default, { count: badge, className: className });
+      } else if (typeof badge === 'boolean') {
+        return _react2.default.createElement(_Badge2.default, { dot: true, className: className });
+      }
+      return badge;
+    }
+  }, {
+    key: 'renderDes',
+    value: function renderDes() {
+      var _props5 = this.props,
+          description = _props5.description,
+          prefixCls = _props5.prefixCls,
+          desMaxLine = _props5.desMaxLine;
+
+      if (description) {
+        return _react2.default.createElement(
+          'div',
+          { className: prefixCls + '-des' },
+          _react2.default.createElement(
+            'div',
+            {
+              className: prefixCls + '-des-inner',
+              style: {
+                WebkitLineClamp: desMaxLine
+              }
+            },
+            description
+          )
+        );
+      }
+      return null;
+    }
+  }, {
+    key: 'renderExtra',
+    value: function renderExtra() {
+      var _props6 = this.props,
+          extra = _props6.extra,
+          prefixCls = _props6.prefixCls;
+
+      if (extra) {
+        return _react2.default.createElement(
+          'div',
+          { className: prefixCls + '-extra' },
+          _react2.default.createElement(
+            'div',
+            { className: prefixCls + '-extra-inner' },
+            extra
+          )
+        );
+      }
+      return null;
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _classnames2,
+          _this2 = this;
+
+      var _props7 = this.props,
+          prefixCls = _props7.prefixCls,
+          className = _props7.className,
+          borderType = _props7.borderType,
+          badgePosition = _props7.badgePosition,
+          _onClick = _props7.onClick;
+
+      return _react2.default.createElement(
+        'div',
+        {
+          className: (0, _classnames4.default)((_classnames2 = {}, _defineProperty(_classnames2, prefixCls, true), _defineProperty(_classnames2, className, !!className), _defineProperty(_classnames2, borderType, !!borderType), _classnames2)),
+          onClick: function onClick() {
+            _onClick(_this2.props);
+          }
+        },
+        this.renderImg(),
+        this.renderAvatar(),
+        _react2.default.createElement(
+          'div',
+          { className: prefixCls + '-content' },
+          this.renderTitle(),
+          this.renderDes()
+        ),
+        badgePosition === 'indicator' ? this.renderBadge() : null,
+        this.renderExtra()
+      );
+    }
+  }]);
+
+  return Item;
+}(_react2.default.Component), _class.propTypes = {
+  prefixCls: _propTypes2.default.string,
+  className: _propTypes2.default.string,
+  img: _propTypes2.default.string,
+  avatar: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
+  title: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
+  description: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
+  badge: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element, _propTypes2.default.number, _propTypes2.default.bool]),
+  badgePosition: _propTypes2.default.string,
+  desMaxLine: _propTypes2.default.number,
+  extra: _propTypes2.default.any,
+  borderType: _propTypes2.default.string,
+  onClick: _propTypes2.default.func
+}, _class.defaultProps = {
+  prefixCls: 't-scroll-list-item',
+  desMaxLine: 2,
+  className: undefined,
+  img: undefined,
+  avatar: undefined,
+  title: undefined,
+  description: undefined,
+  badge: undefined,
+  badgePosition: 'followTitle', // indicator/followTitle/titleRight
+  extra: undefined,
+  borderType: '',
+  onClick: function onClick() {}
+}, _temp);
+exports.default = Item;

package/lib/ScrollList/ScrollList.js

@@ -0,0 +1,498 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _class, _temp; /**
+                    * ScrollList Component for SaltUI
+                    * @author xiaohe.wp
+                    *
+                    * Copyright 2018-2019, SaltUI Team.
+                    * All rights reserved.
+                    */
+
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _reactLifecyclesCompat = require('react-lifecycles-compat');
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _reactDom = require('react-dom');
+
+var _reactDom2 = _interopRequireDefault(_reactDom);
+
+var _nattyFetch = require('natty-fetch');
+
+var _nattyFetch2 = _interopRequireDefault(_nattyFetch);
+
+var _isEmpty2 = require('lodash/isEmpty');
+
+var _isEmpty3 = _interopRequireDefault(_isEmpty2);
+
+var _cloneDeep = require('lodash/cloneDeep');
+
+var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
+
+var _assign = require('lodash/assign');
+
+var _assign2 = _interopRequireDefault(_assign);
+
+var _classnames2 = require('classnames');
+
+var _classnames3 = _interopRequireDefault(_classnames2);
+
+var _Context = require('saltui/lib/Context');
+
+var _Context2 = _interopRequireDefault(_Context);
+
+var _ScrollView = require('saltui/lib/ScrollView');
+
+var _ScrollView2 = _interopRequireDefault(_ScrollView);
+
+var _BottomTip = require('./BottomTip');
+
+var _BottomTip2 = _interopRequireDefault(_BottomTip);
+
+var _EmptyContent = require('./EmptyContent');
+
+var _EmptyContent2 = _interopRequireDefault(_EmptyContent);
+
+var _Item = require('./Item');
+
+var _Item2 = _interopRequireDefault(_Item);
+
+var _TagList = require('./TagList');
+
+var _TagList2 = _interopRequireDefault(_TagList);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+function odd(i) {
+  return !!((i + 1) % 2);
+}
+
+var ScrollList = (_temp = _class = function (_React$Component) {
+  _inherits(ScrollList, _React$Component);
+
+  function ScrollList(props) {
+    _classCallCheck(this, ScrollList);
+
+    var _this = _possibleConstructorReturn(this, (ScrollList.__proto__ || Object.getPrototypeOf(ScrollList)).call(this, props));
+
+    _this.state = {
+      dataGetted: props.dataGetted,
+      data: props.data,
+      hasError: props.hasError,
+      refreshing: props.refreshing,
+      loading: props.loading,
+      noMore: props.noMore,
+      currentPage: 1,
+      fetchData: props.fetchDataOnOpen,
+      prevProps: {
+        dataGetted: props.dataGetted,
+        hasError: props.hasError,
+        refreshing: props.refreshing,
+        loading: props.loading,
+        noMore: props.noMore,
+        data: props.data
+      }
+    };
+    return _this;
+  }
+
+  _createClass(ScrollList, [{
+    key: 'onFetch',
+    value: function onFetch(refresh, from) {
+      var _this2 = this;
+
+      if (this.state.loading) return;
+      this.setState(refresh ? { refreshing: true } : { loading: true });
+
+      this.fetchFrom = this.fetchFrom || from;
+      var pageOption = _defineProperty({
+        pageSize: this.props.pageSize
+      }, this.props.currentPageKey, refresh ? 1 : this.state.currentPage);
+      var data = this.props.beforeFetch((0, _cloneDeep2.default)(pageOption), this.fetchFrom) || pageOption;
+      this.fetchFrom = '';
+
+      var numKey = data[this.props.currentPageKey];
+      delete data[this.props.currentPageKey];
+      var queryData = JSON.stringify(data);
+      data[this.props.currentPageKey] = numKey;
+      var fetchOption = (0, _assign2.default)({
+        url: this.props.url,
+        data: data,
+        withCredentials: false,
+        header: {
+          'Authorization': 'Bearer ' + getLoginUserInfo().token
+          // 其他自定义请求头  
+        }
+      }, this.props.fetchOption);
+
+      if (this.props.dataType) {
+        fetchOption.jsonp = this.props.dataType === 'jsonp';
+      } else {
+        fetchOption.jsonp = /\.jsonp/.test(this.props.url);
+      }
+
+      _nattyFetch2.default.create(fetchOption)().then(function (con) {
+        var content = (0, _cloneDeep2.default)(_this2.props.processData(con));
+        var state = _this2.state;
+
+        var nextState = {
+          refreshing: false,
+          loading: false,
+          dataGetted: true,
+          hasError: false
+        };
+
+        nextState.noMore = content.data.length < _this2.props.pageSize;
+
+        if (refresh) {
+          nextState.data = content.data;
+          nextState.currentPage = 2;
+          _this2.scrollTop();
+        } else {
+          if (state.lastQueryData && queryData !== state.lastQueryData || content.currentPage !== state.currentPage) {
+            nextState.currentPage = 1;
+            nextState.data = [];
+            _this2.scrollTop();
+          } else {
+            nextState.data = state.data;
+            nextState.currentPage = state.currentPage + 1;
+          }
+          nextState.data = nextState.data.concat(content.data);
+        }
+        nextState.lastQueryData = queryData;
+        nextState.showRefreshing = true;
+        _this2.setState(nextState, function () {
+          if (refresh) {
+            if (_this2.scrollViewRef) {
+              _this2.scrollViewRef.tryEmitScrollEvent();
+            }
+          }
+        });
+      }).catch(function (error) {
+        _this2.setState({
+          refreshing: false,
+          loading: false,
+          dataGetted: true,
+          noMore: false,
+          hasError: true
+        });
+        console.error(error);
+      });
+    }
+  }, {
+    key: 'fetchData',
+    value: function fetchData(from) {
+      this.fetchFrom = from;
+
+      if (this.state.fetchData) {
+        this.scrollTop();
+        if (this.props.url) {
+          this.setState({
+            showRefreshing: false
+          });
+          this.onFetch(true, from);
+        } else if (this.props.onRefresh) {
+          this.props.onRefresh();
+        }
+      } else {
+        this.setState({
+          fetchData: true,
+          showRefreshing: !this.props.url
+        });
+      }
+    }
+  }, {
+    key: 'scrollTop',
+    value: function scrollTop() {
+      /* eslint-disable react/no-find-dom-node */
+      /* TODO: need scrollView support getDomNode method */
+      this.scrollView = this.scrollView || _reactDom2.default.findDOMNode(this.scrollViewRef);
+      /* eslint-enable react/no-find-dom-node */
+      if (this.scrollView) {
+        this.scrollView.scrollTop = 0;
+      }
+    }
+  }, {
+    key: 'refreshOptions',
+    value: function refreshOptions() {
+      var onRefresh = this.props.url ? this.onFetch.bind(this, true, 'top') : this.props.onRefresh;
+      return {
+        refreshControl: this.props.scrollRefresh,
+        refreshControlOptions: {
+          showRefreshing: this.state.showRefreshing,
+          refreshing: this.state.refreshing,
+          beforePullLoadText: this.props.pullLoadTip,
+          afterPullLoadText: this.props.loadDataTip,
+          refreshingText: this.props.loadingTip,
+          onRefresh: onRefresh
+        }
+      };
+    }
+  }, {
+    key: 'infiniteScrollOptions',
+    value: function infiniteScrollOptions() {
+      var onLoad = this.props.url ? this.onFetch.bind(this, false, 'bottom') : this.props.onLoad;
+      var _state = this.state,
+          fetchData = _state.fetchData,
+          noMore = _state.noMore,
+          hasError = _state.hasError,
+          refreshing = _state.refreshing;
+
+      return {
+        infiniteScroll: !refreshing && fetchData && !noMore && !hasError && this.props.scrollLoad,
+        infiniteScrollOptions: {
+          loading: this.state.loading,
+          loadingText: this.props.loadingTip,
+          onLoad: onLoad
+        }
+      };
+    }
+  }, {
+    key: 'isEmpty',
+    value: function isEmpty() {
+      return this.state.dataGetted && (0, _isEmpty3.default)(this.state.data);
+    }
+  }, {
+    key: 'renderPrevSiblings',
+    value: function renderPrevSiblings() {
+      var children = this.props.children;
+
+      if (!Array.isArray(children)) {
+        return null;
+      }
+      var prevs = children.slice(0, children.length - 1);
+      var prevSiblings = [];
+      prevs.forEach(function (element, i) {
+        if (_react2.default.isValidElement(element)) {
+          prevSiblings.push(_react2.default.cloneElement(element, {
+            /* eslint-disable react/no-array-index-key */
+            key: 'prev-sibling-' + i,
+            /* eslint-enable react/no-array-index-key */
+            index: i
+          }));
+        }
+      });
+      return prevSiblings;
+    }
+  }, {
+    key: 'renderList',
+    value: function renderList() {
+      var data = this.state.data;
+      var children = this.props.children;
+
+      var len = data.length;
+      if (!children) {
+        return null;
+      }
+      var lastChild = !Array.isArray(children) ? children : children[children.length - 1];
+      var isLastChildFunc = typeof lastChild === 'function';
+      if (!isLastChildFunc) {
+        return data.map(function (item, i) {
+          return _react2.default.cloneElement(lastChild, _extends({
+            /* eslint-disable react/no-array-index-key */
+            key: 'child-' + i,
+            /* selint-enable react/no-array-index-key */
+            index: i,
+            first: i === 0,
+            last: i === len,
+            odd: odd(i),
+            data: item
+          }, item));
+        });
+      }
+      return data.map(function (item, i) {
+        return lastChild(item, i);
+      });
+    }
+  }, {
+    key: 'renderBottomTip',
+    value: function renderBottomTip() {
+      var noMore = this.state.dataGetted && this.state.noMore;
+      var hasError = this.state.dataGetted && this.state.hasError;
+
+      if (hasError) {
+        return _react2.default.createElement(_BottomTip2.default, { key: 'bottom-tip', text: this.props.errorTip });
+      }
+
+      if (noMore) {
+        return _react2.default.createElement(_BottomTip2.default, { key: 'bottom-tip', text: this.props.noMoreDataTip });
+      }
+
+      return null;
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this3 = this,
+          _classnames;
+
+      if (this.isEmpty()) {
+        return _react2.default.createElement(
+          'div',
+          { className: (0, _classnames3.default)(_Context2.default.prefixClass('scroll-list'), this.props.className) },
+          _react2.default.createElement(_EmptyContent2.default, { text: this.props.noDataTip, image: this.props.noDataImage })
+        );
+      }
+
+      return _react2.default.createElement(
+        _ScrollView2.default,
+        _extends({
+          ref: function ref(_ref) {
+            _this3.scrollViewRef = _ref;
+          },
+          className: (0, _classnames3.default)(this.props.prefixCls, (_classnames = {}, _defineProperty(_classnames, this.props.className, !!this.props.className), _defineProperty(_classnames, this.props.listBorderType, !!this.props.listBorderType), _classnames))
+        }, this.refreshOptions(), this.infiniteScrollOptions()),
+        this.renderPrevSiblings(),
+        this.renderList(),
+        this.renderBottomTip()
+      );
+    }
+  }], [{
+    key: 'getDerivedStateFromProps',
+    value: function getDerivedStateFromProps(props, _ref2) {
+      var prevProps = _ref2.prevProps;
+
+      if (!props.url) {
+        var dataGetted = props.dataGetted,
+            hasError = props.hasError,
+            refreshing = props.refreshing,
+            loading = props.loading,
+            noMore = props.noMore,
+            data = props.data;
+        var prevDataGetted = prevProps.dataGetted,
+            prevHasError = prevProps.hasError,
+            prevRefreshing = prevProps.refreshing,
+            prevLoading = prevProps.loading,
+            prevNoMore = prevProps.noMore,
+            prevData = prevProps.data;
+
+        var changes = {};
+        if (dataGetted !== prevDataGetted) {
+          changes.dataGetted = dataGetted;
+        }
+        if (hasError !== prevHasError) {
+          changes.hasError = hasError;
+        }
+        if (refreshing !== prevRefreshing) {
+          changes.refreshing = refreshing;
+        }
+        if (loading !== prevLoading) {
+          changes.loading = loading;
+        }
+        if (noMore !== prevNoMore) {
+          changes.noMore = noMore;
+        }
+        if (data !== prevData) {
+          changes.data = data;
+        }
+        changes.prevProps = _extends({}, changes);
+        return changes;
+      }
+      return null;
+    }
+  }]);
+
+  return ScrollList;
+}(_react2.default.Component), _class.displayName = 'ScrollList', _class.propTypes = {
+  prefixCls: _propTypes2.default.string,
+  className: _propTypes2.default.string,
+  listBorderType: _propTypes2.default.string,
+  children: _propTypes2.default.any,
+  scrollLoad: _propTypes2.default.bool,
+  scrollRefresh: _propTypes2.default.bool,
+
+  // 数据是否已就位标识符
+  dataGetted: _propTypes2.default.bool,
+  data: _propTypes2.default.array,
+  // 下拉配置
+  refreshing: _propTypes2.default.bool,
+  pullLoadTip: _propTypes2.default.string,
+  loadDataTip: _propTypes2.default.string,
+  onRefresh: _propTypes2.default.func,
+  // 触底加载配置
+  loading: _propTypes2.default.bool,
+  loadingTip: _propTypes2.default.string,
+  onLoad: _propTypes2.default.func,
+  // 无更多数据提示文案
+  noMore: _propTypes2.default.bool,
+  noMoreDataTip: _propTypes2.default.string,
+  // 加载错误文案
+  hasError: _propTypes2.default.bool,
+  errorTip: _propTypes2.default.string,
+  // 无数据提示文案
+  noDataTip: _propTypes2.default.string,
+  noDataImage: _propTypes2.default.string,
+  //
+  url: _propTypes2.default.string,
+  pageSize: _propTypes2.default.number,
+  beforeFetch: _propTypes2.default.func,
+  processData: _propTypes2.default.func,
+  currentPageKey: _propTypes2.default.string,
+  dataType: _propTypes2.default.oneOf(['json', 'jsonp']),
+  fetchOption: _propTypes2.default.object,
+  fetchDataOnOpen: _propTypes2.default.bool
+}, _class.defaultProps = {
+  scrollLoad: true, // 是否支持滚动,来自设计器配置
+  scrollRefresh: true,
+  dataGetted: false,
+  data: [],
+  refreshing: false,
+  prefixCls: 't-scroll-list',
+  pullLoadTip: '下拉显示更多',
+  loadDataTip: '释放加载数据',
+  onRefresh: null,
+  loading: false, // 触底加载
+  loadingTip: '加载中...',
+  onLoad: null,
+  beforeFetch: function beforeFetch(data) {
+    return data;
+  },
+  processData: function processData(data) {
+    return data;
+  },
+  currentPageKey: 'currentPage',
+  noMore: false, // 没有更多内容提示
+  noMoreDataTip: '没有更多了',
+  hasError: false,
+  errorTip: '获取数据失败',
+  noDataTip: '暂无数据',
+  noDataImage: 'https://img.alicdn.com/tps/TB1K6mHNpXXXXXiXpXXXXXXXXXX-1000-1000.svg',
+  fetchDataOnOpen: true,
+  className: undefined,
+  listBorderType: 'scroll-list-no-border', // scroll-list-no-border, scroll-list-cut-border, scroll-list-full-border
+  children: undefined,
+  url: undefined,
+  pageSize: undefined,
+  dataType: undefined,
+  fetchOption: undefined
+}, _temp);
+
+
+ScrollList.Item = _Item2.default;
+ScrollList.TagList = _TagList2.default;
+
+(0, _reactLifecyclesCompat.polyfill)(ScrollList);
+
+exports.default = ScrollList;

package/lib/ScrollList/ScrollList.styl

@@ -0,0 +1,232 @@
+/**
+ * ScrollList Component Style for SaltUI
+ * @author zhouquan.yezq
+ * 
+ * Copyright 2018-2019, SaltUI Team.
+ * All rights reserved.
+ */
+$scrollListPrefixCls = t-scroll-list;
+
+.scroll-list-no-border {
+  .{$scrollListPrefixCls}-item {
+    border-bottom: 0px solid transparent;    
+  }
+}
+
+.scroll-list-full-border {
+  .{$scrollListPrefixCls}-item {
+    border-bottom: 1px solid $normal-alpha-7;    
+  }
+}
+
+.scroll-list-cut-border {
+  .{$scrollListPrefixCls}-item {
+    &:after {
+      position: absolute;
+      content: '';
+      height: 1px;
+      width: calc(100% - 16px);
+      bottom: 0;
+      right: 0;
+      background: $normal-alpha-7;
+    }
+  }
+}
+
+.{$scrollListPrefixCls} {
+  overflow: hidden;
+  margin: 0;
+  width: 100%;
+  height: 100%;
+  flex: 1;
+  -webkit-overflow-scrolling: touch;
+  overflow-scrolling: touch;
+
+  .empty-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+    .icon {
+      width: 160px;
+      height: 160px;  
+      margin-bottom: 20px;
+    }
+    .text {
+      color: $normal-alpha-2;
+    }
+  }
+
+  .bottom-tip {
+    width: 100%;
+    color: #999;
+    font-size: 12px;
+    height: 44px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .icon {
+      width: 30px;
+      height: 27px;
+      background: url('https://img.alicdn.com/tps/TB1fPYRMXXXXXcdXFXXXXXXXXXX-480-238.svg') center no-repeat; // img.alicdn.com/tps/TB1fPYRMXXXXXcdXFXXXXXXXXXX-480-238.svg) center no-repeat;
+      background-size: contain;
+      display: inline-block;
+      margin-right: 4px;
+      vertical-align: middle;
+
+      svg {
+        margin-top: -4px;
+      }
+    }
+
+    .text {
+      display: inline-block;
+      line-height: 27px;
+      height: 27px;
+      vertical-align: top;
+      padding-left: 0;
+    }
+  }
+}
+
+.{$scrollListPrefixCls}-item {
+  padding: 16px;
+  background: white;
+  display: flex;
+  line-height: 1.5;
+  align-items: center;
+  position: relative;
+  overflow: hidden;
+  box-sizing: border-box;
+  &:active {
+    background: $normal-alpha-7;
+  }
+  &.no-border {
+    border-bottom: 0px solid transparent;
+    &:after { 
+      display: none;  
+    }
+  }
+  &.full-border {
+    border-bottom: 1px solid $normal-alpha-7;
+    &:after { 
+      display: none;  
+    }
+  }
+  &.cut-border {
+    border-bottom: 0px solid transparent;
+    &:after {
+      position: absolute;
+      content: '';
+      height: 1px;
+      width: calc(100% - 16px);
+      bottom: 0;
+      right: 0;
+      background: $normal-alpha-7;
+    }
+  }
+  &:last-child  {
+    border-bottom: 0px solid transparent;
+    &:after { 
+      display: none;  
+    }
+  }
+}
+
+.{$scrollListPrefixCls}-item-img {
+  width: 40px;
+  height: 40px;
+  border-radius: $global-border-radius;
+  align-self: baseline;
+  margin-right: 16px;
+}
+
+.{$scrollListPrefixCls}-item-avatar {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  align-self: baseline;
+  margin-right: 16px;
+}
+
+.{$scrollListPrefixCls}-item .t-avatar {
+    margin-right: 16px;
+    align-self: baseline;
+}
+
+.{$scrollListPrefixCls}-item-badge {
+  margin-bottom: 3px;
+  .badge-inner {
+    background: $function-red;
+    margin: 1px 0 0 8px;
+  }
+}
+
+.{$scrollListPrefixCls}-item-content {
+  flex: 1;
+  // very important, make ellipsis in flexbox work
+  // https://css-tricks.com/flexbox-truncated-text/
+  min-width: 0;
+}
+
+.{$scrollListPrefixCls}-item-extra {
+  margin-left: 10px;
+  svg {
+    fill: $normal-alpha-4;
+    width: 20px;
+    height: 20px;
+  }
+}
+.{$scrollListPrefixCls}-item-extra-inner {
+  display: flex;
+  align-items: center;
+}
+
+.{$scrollListPrefixCls}-item-title {
+  font-size: 16px;
+  color: $dark-alpha-2;
+  &.titleRight {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+  }
+}
+
+.{$scrollListPrefixCls}-item-des-inner {
+  font-size: 12px;
+  color: $dark-alpha-3;
+  padding-top: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  display: -webkit-box;
+  text-align: justify;
+}
+
+.hairline {
+  .{$scrollListPrefixCls}-item {
+    &:after {
+      border-width: 0.5px;
+    }
+  }
+}
+
+
+.{$scrollListPrefixCls}-taglist {
+  padding: 12px 4px 0 16px;
+  .{$scrollListPrefixCls}-taglist-item {
+    display: inline-block;
+    padding: 0 8px;
+    font-size: 12px;
+    margin: 0 12px 12px 0;
+    height: 18px;
+    line-height: 18px;
+    color: $dark-alpha-3;
+    border: 1px solid $dark-alpha-5;
+    border-radius: 16px;
+  }
+}

package/lib/ScrollList/TagList.js

@@ -0,0 +1,96 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _class, _temp;
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _classnames3 = require('classnames');
+
+var _classnames4 = _interopRequireDefault(_classnames3);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var Item = (_temp = _class = function (_React$Component) {
+  _inherits(Item, _React$Component);
+
+  function Item() {
+    _classCallCheck(this, Item);
+
+    return _possibleConstructorReturn(this, (Item.__proto__ || Object.getPrototypeOf(Item)).apply(this, arguments));
+  }
+
+  _createClass(Item, [{
+    key: 'renderTagItem',
+    value: function renderTagItem(item, index, className) {
+      var _props = this.props,
+          _onClick = _props.onClick,
+          prefixCls = _props.prefixCls;
+
+      return _react2.default.createElement(
+        'span',
+        {
+          key: prefixCls + '-item-' + index,
+          onClick: function onClick() {
+            return _onClick(item, index);
+          },
+          className: (0, _classnames4.default)(prefixCls + '-item', _defineProperty({}, className + '-item', !!className)) },
+        item.value || item || ''
+      );
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _classnames2,
+          _this2 = this;
+
+      var _props2 = this.props,
+          prefixCls = _props2.prefixCls,
+          className = _props2.className,
+          _props2$data = _props2.data,
+          data = _props2$data === undefined ? [] : _props2$data;
+
+      return _react2.default.createElement(
+        'div',
+        {
+          className: (0, _classnames4.default)((_classnames2 = {}, _defineProperty(_classnames2, prefixCls, true), _defineProperty(_classnames2, className, !!className), _classnames2))
+        },
+        data.map(function (item, index) {
+          return _this2.renderTagItem(item, index, className);
+        })
+      );
+    }
+  }]);
+
+  return Item;
+}(_react2.default.Component), _class.propTypes = {
+  prefixCls: _propTypes2.default.string,
+  className: _propTypes2.default.string,
+  data: _propTypes2.default.array,
+  onClick: _propTypes2.default.func
+}, _class.defaultProps = {
+  prefixCls: 't-scroll-list-taglist',
+  className: undefined,
+  data: [],
+  onClick: function onClick() {}
+}, _temp);
+exports.default = Item;

package/lib/ScrollList/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _ScrollList = require('./ScrollList');
+
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_ScrollList).default;
+  }
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/ScrollList/style.js

@@ -0,0 +1,7 @@
+'use strict';
+
+require('saltui/lib/Badge/Badge.styl');
+
+require('saltui/lib/ScrollView/Scrollview.styl');
+
+require('./ScrollList.styl');

package/lib/db/variables.js

@@ -28,24 +28,24 @@ exports.default = {
     isDev: isDev,
     // 这里放置全局的调用的URL
     URLS: {
-        userInfo: urlPrefix + 'currenUserInfo' + '?token=' + getLoginUserInfo().token, // 获取个人信息
+        userInfo: urlPrefix + 'currenUserInfo', // 获取个人信息
         transaction: {
-            undo: isDev ? "/mock/query/queryProcessPage.json?type=0" : urlPrefix + 'queryProcessPage?type=0' + '&token=' + getLoginUserInfo().token,
+            undo: isDev ? "/mock/query/queryProcessPage.json?type=0" : urlPrefix + 'queryProcessPage?type=0',
             // undo: urlPrefix_a + 'getTransactionList_Undo.json',
-            unread: urlPrefix + 'queryProcessPage?type=1' + '&token=' + getLoginUserInfo().token,
-            done: urlPrefix + 'queryProcessPage?type=2' + '&token=' + getLoginUserInfo().token,
-            read: urlPrefix + 'queryProcessPage?type=3' + '&token=' + getLoginUserInfo().token,
-            myself: urlPrefix + 'queryProcessPage?type=4' + '&token=' + getLoginUserInfo().token,
-            undo1: urlPrefixUmc + 'message/msgList?msgType=2&status=2' + '&token=' + getLoginUserInfo().token,
-            unread1: urlPrefixUmc + 'message/msgList?msgType=3&status=0' + '&token=' + getLoginUserInfo().token,
-            done1: urlPrefixUmc + 'message/msgList?msgType=2&status=3' + '&token=' + getLoginUserInfo().token,
-            read1: urlPrefixUmc + 'message/msgList?msgType=3&status=1' + '&token=' + getLoginUserInfo().token,
-            myself1: urlPrefix + 'queryProcessPage?type=4' + '&token=' + getLoginUserInfo().token,
-            undo2: urlPrefix + 'queryProcessPage?type=0&module=' + '&token=' + getLoginUserInfo().token,
-            unread2: urlPrefix + 'queryProcessPage?type=1&module=' + '&token=' + getLoginUserInfo().token,
-            done2: urlPrefix + 'queryProcessPage?type=2&module=' + '&token=' + getLoginUserInfo().token,
-            read2: urlPrefix + 'queryProcessPage?type=3&module=' + '&token=' + getLoginUserInfo().token,
-            myself2: urlPrefix + 'queryProcessPage?type=4&module=' + '&token=' + getLoginUserInfo().token
+            unread: urlPrefix + 'queryProcessPage?type=1',
+            done: urlPrefix + 'queryProcessPage?type=2',
+            read: urlPrefix + 'queryProcessPage?type=3',
+            myself: urlPrefix + 'queryProcessPage?type=4',
+            undo1: urlPrefixUmc + 'message/msgList?msgType=2&status=2',
+            unread1: urlPrefixUmc + 'message/msgList?msgType=3&status=0',
+            done1: urlPrefixUmc + 'message/msgList?msgType=2&status=3',
+            read1: urlPrefixUmc + 'message/msgList?msgType=3&status=1',
+            myself1: urlPrefix + 'queryProcessPage?type=4',
+            undo2: urlPrefix + 'queryProcessPage?type=0&module=',
+            unread2: urlPrefix + 'queryProcessPage?type=1&module=',
+            done2: urlPrefix + 'queryProcessPage?type=2&module=',
+            read2: urlPrefix + 'queryProcessPage?type=3&module=',
+            myself2: urlPrefix + 'queryProcessPage?type=4&module='
         },
         queryProcessInfo: urlPrefix + 'queryProcessInfo' + '?', //获取流程详情
         getFlowRecord: urlPrefix + 'getFlowRecord' + '?', //获取流程详情

package/lib/process_list/processList.js

@@ -21,7 +21,7 @@ var _SearchBar = require('saltui/lib/SearchBar');
 
 var _SearchBar2 = _interopRequireDefault(_SearchBar);
 
-var _ScrollList = require('saltui/lib/ScrollList');
+var _ScrollList = require('../ScrollList/ScrollList');
 
 var _ScrollList2 = _interopRequireDefault(_ScrollList);
 

package/lib/selectMember/select.js

@@ -620,6 +620,8 @@ var Page = function (_React$Component) {
           // code = this.props.chooseObj;
           if (chooseObj.indexOf("userAndOrg") >= 0 && chooseObj.indexOf("org") >= 0) {
             chooseType = "userAndOrg";
+          } else if (chooseObj.indexOf("userNotOrg") >= 0 && chooseObj.indexOf("org") >= 0) {
+            chooseType = "userAndOrg";
           } else if (chooseObj.indexOf("userNotOrg") >= 0 && chooseObj.indexOf("org") < 0) {
             chooseType = "userNotOrg";
           } else if (chooseObj.indexOf("org") >= 0 || chooseObj.indexOf("dept") >= 0 || chooseObj.indexOf("inst") >= 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.1.12",
+  "version": "2.1.14",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",
@@ -71,6 +71,11 @@
     "echarts-for-react": "3.0.2",
     "h5-imageviewer": "^0.7.8",
     "react-grid-layout": "0.16.0",
-    "saltui": "^4.13.1"
+    "saltui": "^4.13.1",
+
+    "natty-fetch": "^2.5.2",
+    "object-assign": "^4.1.1",
+    "prop-types": "15.x",
+    "classnames": "^2.2.6"
   }
 }