easy3wui 1.5.85-beta.1 → 1.5.85-beta.3

package/lib/Easy3wFormPage/indexPC.js

@@ -129,11 +129,11 @@ var _inputNumber2 = _interopRequireDefault(_inputNumber);
 
 require('antd/lib/input-number/style');
 
-var _mentions = require('antd/lib/mentions');
+var _mention = require('antd/lib/mention');
 
-var _mentions2 = _interopRequireDefault(_mentions);
+var _mention2 = _interopRequireDefault(_mention);
 
-require('antd/lib/mentions/style');
+require('antd/lib/mention/style');
 
 var _rate = require('antd/lib/rate');
 
@@ -909,11 +909,6 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           rules: [(0, _extends3['default'])({ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7' + strRMsg + label }, objValidator)].concat(addRules)
         });
       }
-      if (fieldType === 'switch') {
-        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
-          valuePropName: 'checked' // 关键：告诉 Form 取 checked 属性
-        });
-      }
       if (itemValue || itemValue === 0) {
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
           initialValue: itemValue
@@ -2119,20 +2114,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
     }, _this.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      var _ref6 = cmptPros || {},
-          options = _ref6.options;
-
-      return _react2['default'].createElement(
-        _mentions2['default'],
-        cmptPros,
-        options && options instanceof Array ? options.map(function (option) {
-          return option ? _react2['default'].createElement(
-            _mentions2['default'].Option,
-            { value: option },
-            option
-          ) : '';
-        }) : ''
-      );
+      return _react2['default'].createElement(_mention2['default'], cmptPros);
     }, _this.rateHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -2212,11 +2194,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
     }, _this.descHandler = function (item) {
       var value = item.value;
 
-      return _react2['default'].createElement(
-        'span',
-        null,
-        value
-      );
+      return value;
     }, _this.btnHandler = function (obj) {
       var func = obj.func,
           cName = obj.cName,
@@ -3017,18 +2995,18 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
 
       var threeRowItemFlag = false;
       for (var _iterator2 = rowItems, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref7;
+        var _ref6;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref7 = _iterator2[_i3++];
+          _ref6 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref7 = _i3.value;
+          _ref6 = _i3.value;
         }
 
-        var rItem = _ref7;
+        var rItem = _ref6;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -3928,22 +3906,7 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
     }, _this2.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      var _ref8 = cmptPros || {},
-          options = _ref8.options;
-
-      return _react2['default'].createElement(
-        _mentions2['default'],
-        (0, _extends3['default'])({}, cmptPros, {
-          size: 'small'
-        }),
-        options && options instanceof Array ? options.map(function (option) {
-          return option ? _react2['default'].createElement(
-            _mentions2['default'].Option,
-            { value: option },
-            option
-          ) : '';
-        }) : ''
-      );
+      return _react2['default'].createElement(_mention2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this2.rateHandler = function (item) {
       var cmptPros = item.cmptPros;
 

package/lib/Easy3wSkeleton/index.js

@@ -0,0 +1,63 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _skeleton = require('antd/lib/skeleton');
+
+var _skeleton2 = _interopRequireDefault(_skeleton);
+
+require('antd/lib/skeleton/style');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wSkeleton = function (_Component) {
+  (0, _inherits3['default'])(Easy3wSkeleton, _Component);
+
+  function Easy3wSkeleton() {
+    (0, _classCallCheck3['default'])(this, Easy3wSkeleton);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wSkeleton.prototype.render = function render() {
+    var _props = this.props,
+        loading = _props.loading,
+        children = _props.children;
+
+    return _react2['default'].createElement(
+      _skeleton2['default'],
+      {
+        loading: loading
+      },
+      children
+    );
+  };
+
+  return Easy3wSkeleton;
+}(_react.Component);
+
+Easy3wSkeleton.propTypes = {
+  loading: _propTypes2['default'].bool.isRequired, // 是否骨架屏
+  children: _propTypes2['default'].element.isRequired // 正文内容
+};
+exports['default'] = Easy3wSkeleton;
+module.exports = exports['default'];

package/lib/Easy3wSpin/index.js

@@ -41,13 +41,14 @@ var Easy3wSpin = function (_Component) {
   Easy3wSpin.prototype.render = function render() {
     var _props = this.props,
         spinLoading = _props.spinLoading,
+        noStyle = _props.noStyle,
         children = _props.children;
 
     return _react2['default'].createElement(
       _spin2['default'],
       {
         spinning: spinLoading,
-        style: {
+        style: noStyle ? {} : {
           position: 'fixed',
           left: '50%',
           top: '50%',

package/lib/Easy3wTree/index.js

@@ -38,6 +38,10 @@ var _tree2 = _interopRequireDefault(_tree);
 
 require('antd/lib/tree/style');
 
+var _Easy3wSpin = require('../Easy3wSpin');
+
+var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Search = _input2['default'].Search;
@@ -58,6 +62,7 @@ var TreeNode = _tree2['default'].TreeNode;
  *       onSearchCallback: 搜索回调函数 非必须 Function  返回值：(arrDataVisible, searchValue, expandedKeys)
  * bidPureComponent: 绑定组件方法 非必须 Function
  * intUpdateCount: 数据更新次数 必须 Number
+ * selectedKeys: 选中节点key 非必须 Array
 */
 
 var Easy3wTree = function (_Component) {
@@ -79,10 +84,8 @@ var Easy3wTree = function (_Component) {
     var arrDefaultExpandedKeys = _this.touchGetDEK(arrData);
     _this.searchRef = _react2['default'].createRef();
     _this.state = {
-      // 两数量值，用于彻底更新树，树数据更新，重新渲染，使defaultExpandedKeys生效
-      treevisible: true, // 显示树
-      arrDefaultExpandedKeys: arrDefaultExpandedKeys, // 树默认展开节点
-      arrSearchExpandedKeys: [], // 查询时，树默认展开节点
+      // 两数量值，用于彻底更新树，树数据更新
+      expandedKeys: arrDefaultExpandedKeys, // 展开的节点
       arrDataVisible: arrData || [], // 树数据源-显示数据
       selectedKeys: [] // 选中节点key
     };
@@ -102,7 +105,9 @@ var Easy3wTree = function (_Component) {
   // 递归过滤树结构，并设置展开节点的 keys
 
   // #endregion
-  // 节点点击事件
+  // 节点点击事件--选择
+
+  // 节点点击事件--展开
 
   // 处理树组织
 
@@ -113,16 +118,12 @@ var Easy3wTree = function (_Component) {
     var _state = this.state,
         arrDataVisible = _state.arrDataVisible,
         selectedKeys = _state.selectedKeys,
-        treevisible = _state.treevisible,
-        arrDefaultExpandedKeys = _state.arrDefaultExpandedKeys,
-        arrSearchExpandedKeys = _state.arrSearchExpandedKeys;
+        expandedKeys = _state.expandedKeys;
     var _props = this.props,
-        _props$objTreeProps = _props.objTreeProps,
-        objTreeProps = _props$objTreeProps === undefined ? {} : _props$objTreeProps,
-        _props$objSearchProps = _props.objSearchProps,
-        objSearchProps = _props$objSearchProps === undefined ? {} : _props$objSearchProps;
-    var _objSearchProps$searc = objSearchProps.searchFlag,
-        searchFlag = _objSearchProps$searc === undefined ? true : _objSearchProps$searc;
+        objTreeProps = _props.objTreeProps,
+        objSearchProps = _props.objSearchProps,
+        arrData = _props.arrData;
+    var searchFlag = objSearchProps.searchFlag;
 
     return _react2['default'].createElement(
       'div',
@@ -136,24 +137,46 @@ var Easy3wTree = function (_Component) {
         , ref: this.searchRef,
         className: (0, _classnames2['default'])('easy3wTreeSearch')
       }) : '',
-      treevisible ? _react2['default'].createElement(
-        _tree2['default'],
-        (0, _extends3['default'])({
-          defaultExpandedKeys: arrSearchExpandedKeys && arrSearchExpandedKeys.length > 0 ? arrSearchExpandedKeys : arrDefaultExpandedKeys // 树默认展开节点key Array
-          , selectedKeys: selectedKeys // 选中节点key Array
-          , showLine: true,
-          showIcon: true
-          // multiple 多选
-          , onSelect: this.touchSelect
-        }, objTreeProps),
-        this.touchRenderTreeNodes(arrDataVisible)
-      ) : ''
+      _react2['default'].createElement(
+        _Easy3wSpin2['default'],
+        {
+          spinLoading: !(arrData && arrData.length),
+          noStyle: true
+        },
+        _react2['default'].createElement(
+          _tree2['default'],
+          (0, _extends3['default'])({
+            expandedKeys: expandedKeys,
+            selectedKeys: selectedKeys // 选中节点key Array
+            , showLine: true,
+            showIcon: true
+            // multiple 多选
+            , onSelect: this.touchSelect,
+            onExpand: function onExpand(keys) {
+              return _this2.tuochExpand(keys);
+            } // 更新展开的keys
+          }, objTreeProps),
+          this.touchRenderTreeNodes(arrDataVisible)
+        )
+      )
     );
   };
 
   return Easy3wTree;
 }(_react.Component);
 
+Easy3wTree.defaultProps = {
+  objTreeProps: {
+    titleField: 'title',
+    countField: 'count',
+    keyField: 'key'
+  },
+  objSearchProps: {
+    searchFlag: true
+  },
+  selectedKeys: []
+};
+
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
@@ -163,16 +186,13 @@ var _initialiseProps = function _initialiseProps() {
         arrData = _props2.arrData;
 
     if (intUpdateCount !== prevProps.intUpdateCount) {
+      var expandedKeys = _this3.state.expandedKeys;
+
       var arrDefaultExpandedKeys = _this3.touchGetDEK(arrData);
       // eslint-disable-next-line react/no-did-update-set-state
       _this3.setState({
         arrDataVisible: arrData || [], // 树数据源-显示数据
-        arrDefaultExpandedKeys: arrDefaultExpandedKeys, // 树默认展开节点
-        treevisible: false // 隐藏树
-      }, function () {
-        _this3.setState({
-          treevisible: true // 显示树
-        });
+        expandedKeys: expandedKeys && expandedKeys.length ? expandedKeys : arrDefaultExpandedKeys // 展开的节点
       });
     }
   };
@@ -181,8 +201,7 @@ var _initialiseProps = function _initialiseProps() {
     var arrDefaultExpandedKeys = [];
     if (arrData && arrData.length > 0) {
       var item = arrData[0];
-      var _props$objTreeProps2 = _this3.props.objTreeProps,
-          objTreeProps = _props$objTreeProps2 === undefined ? {} : _props$objTreeProps2;
+      var objTreeProps = _this3.props.objTreeProps;
       var _objTreeProps$keyFiel = objTreeProps.keyField,
           keyField = _objTreeProps$keyFiel === undefined ? 'key' : _objTreeProps$keyFiel;
 
@@ -231,18 +250,12 @@ var _initialiseProps = function _initialiseProps() {
     }
     _this3.setState({
       arrDataVisible: arrDataVisible, // 树数据源-显示数据
-      arrSearchExpandedKeys: arrSearchExpandedKeys, // 查询时，树默认展开节点
-      treevisible: false // 隐藏树
-    }, function () {
-      _this3.setState({
-        treevisible: true // 显示树
-      });
+      expandedKeys: arrSearchExpandedKeys // 查询时，树默认展开节点
     });
   };
 
-  this.touchFilterTreeData = function (arrAllData, searchValue, expandedKeys) {
-    var _props$objTreeProps3 = _this3.props.objTreeProps,
-        objTreeProps = _props$objTreeProps3 === undefined ? {} : _props$objTreeProps3;
+  this.touchFilterTreeData = function (arrAllData, searchValue, searchExpandedKeys) {
+    var objTreeProps = _this3.props.objTreeProps;
     var _objTreeProps$titleFi = objTreeProps.titleField,
         titleField = _objTreeProps$titleFi === undefined ? 'title' : _objTreeProps$titleFi,
         _objTreeProps$keyFiel2 = objTreeProps.keyField,
@@ -250,10 +263,10 @@ var _initialiseProps = function _initialiseProps() {
 
     var filteredData = arrAllData.map(function (item) {
       // 递归过滤子节点
-      var children = item.children ? _this3.touchFilterTreeData(item.children, searchValue, expandedKeys) : [];
+      var children = item.children ? _this3.touchFilterTreeData(item.children, searchValue, searchExpandedKeys) : [];
       // 如果节点名字匹配，或者子节点匹配
       if (item[titleField].includes(searchValue) || children.length > 0) {
-        expandedKeys.push(item[keyField]); // 记录展开的节点 key
+        searchExpandedKeys.push(item[keyField]); // 记录展开的节点 key
         return (0, _extends3['default'])({}, item, {
           children: children // 返回匹配的子节点
         });
@@ -266,8 +279,8 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.touchSelect = function (selectedKeys, info) {
-    var _props$objTreeProps4 = _this3.props.objTreeProps,
-        objTreeProps = _props$objTreeProps4 === undefined ? {} : _props$objTreeProps4;
+    var _props$objTreeProps = _this3.props.objTreeProps,
+        objTreeProps = _props$objTreeProps === undefined ? {} : _props$objTreeProps;
     var onSelectCallback = objTreeProps.onSelectCallback;
 
     if (onSelectCallback && typeof onSelectCallback === 'function') {
@@ -278,9 +291,22 @@ var _initialiseProps = function _initialiseProps() {
     });
   };
 
+  this.tuochExpand = function (expandedKeys) {
+    var _props$objTreeProps2 = _this3.props.objTreeProps,
+        objTreeProps = _props$objTreeProps2 === undefined ? {} : _props$objTreeProps2;
+    var onExpandCallback = objTreeProps.onExpandCallback;
+
+    if (onExpandCallback && typeof onExpandCallback === 'function') {
+      onExpandCallback(expandedKeys);
+    }
+    _this3.setState({
+      expandedKeys: expandedKeys // 选中节点key Array
+    });
+  };
+
   this.touchRenderTreeNodes = function (arrDataVisible) {
-    var _props$objTreeProps5 = _this3.props.objTreeProps,
-        objTreeProps = _props$objTreeProps5 === undefined ? {} : _props$objTreeProps5;
+    var _props$objTreeProps3 = _this3.props.objTreeProps,
+        objTreeProps = _props$objTreeProps3 === undefined ? {} : _props$objTreeProps3;
     var touchRenderNode = objTreeProps.touchRenderNode,
         _objTreeProps$titleFi2 = objTreeProps.titleField,
         titleField = _objTreeProps$titleFi2 === undefined ? 'title' : _objTreeProps$titleFi2,

package/lib/Easy3wUpload/index.js

@@ -420,7 +420,8 @@ var Easy3wUpload = function (_Component) {
         urlDownloadFile: urlDownloadFile,
         downloadArr: initialValue,
         propsAFlag: propsAFlag,
-        fileViewFlag: fileViewFlag
+        fileViewFlag: fileViewFlag,
+        objPreviewFile: objPreviewFileNew
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(

package/lib/Easy3wUploadB/index.js

@@ -402,7 +402,8 @@ var BigFileUpload = function (_Component) {
         urlDownloadFile: urlDownloadFile,
         downloadArr: initialValue,
         propsAFlag: propsAFlag,
-        fileViewFlag: fileViewFlag
+        fileViewFlag: fileViewFlag,
+        objPreviewFile: objPreviewFileNew
       }))
     ) : _react2['default'].createElement(
       _form2['default'].Item,

package/lib/Easy3wUploadM/index.js

@@ -446,7 +446,8 @@ var Easy3wUploadM = function (_Component) {
         urlDownloadFile: urlDownloadFile,
         downloadArr: initialValue,
         propsAFlag: propsAFlag,
-        fileViewFlag: fileViewFlag
+        fileViewFlag: fileViewFlag,
+        objPreviewFile: objPreviewFileNew
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(

package/lib/index.js

@@ -20,6 +20,15 @@ Object.defineProperty(exports, 'Easy3wSpin', {
   }
 });
 
+var _Easy3wSkeleton = require('./Easy3wSkeleton');
+
+Object.defineProperty(exports, 'Easy3wSkeleton', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wSkeleton)['default'];
+  }
+});
+
 var _Easy3wA = require('./Easy3wA');
 
 Object.defineProperty(exports, 'Easy3wA', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.85-beta.1",
+  "version": "1.5.85-beta.3",
   "description": "easy3wui components for react",
   "keywords": [
     "react",