easy3wui 1.5.84 → 1.5.85-beta.2

package/lib/Easy3wTagSelect/index.less

@@ -1,120 +1,120 @@
-@import '~antd/lib/style/themes/default.less';
-
-.tagSelect {
-  user-select: none;
-  margin-left: -8px;
-  position: relative;
-  overflow: hidden;
-  max-height: 32px;
-  // line-height: 32px;
-  transition: all 0.3s;
-  :global {
-    .ant-tag {
-      padding: 0 8px;
-      margin-right: 24px;
-      font-size: @font-size-base;
-    }
-  }
-  &.expanded {
-    transition: all 0.3s;
-    max-height: 800px;
-  }
-  .trigger {
-    position: absolute;
-    top: 0;
-    right: 0;
-    i {
-      font-size: 12px;
-    }
-  }
-  &.hasExpandTag {
-    padding-right: 50px;
-  }
-}
-
-.standardFormRow {
-  border-bottom: 1px dashed @border-color-split;
-  // padding-bottom: 8px;
-  // margin-bottom: 8px;
-  display: flex;
-  :global {
-    .ant-form-item {
-      margin-right: 24px;
-    }
-    .ant-form-item-label label {
-      color: @text-color;
-      margin-right: 0;
-    }
-    .ant-form-item-label,
-    .ant-form-item-control {
-      padding: 0;
-      line-height: 32px;
-    }
-  }
-  .label {
-    // color: @heading-color;
-    // color: rgb(173,124,89);
-    font-size: @font-size-base;
-    padding-right: 12px;
-    margin-right: 12px;
-    // margin-right: 24px;
-    background:#F8F8FF;
-    // background: rgb(84, 104, 178);
-    // opacity: 0.5;
-    flex: 0 0 auto;
-    text-align: right;
-    & > span {
-      display: inline-block;
-      height: 32px;
-      line-height: 32px;
-      &:after {
-        content: '|';
-      }
-    }
-    // border-radius: 2px;
-    & > a {
-      color: @heading-color;
-      // color: rgb(255, 255, 255);
-      display: inline-block;
-      height: 32px;
-      line-height: 32px;
-      // width: 100%;
-      cursor: pointer;
-    }
-  }
-  .content {
-    flex: 1 1 0;
-    :global {
-      .ant-form-item:last-child {
-        margin-right: 0;
-      }
-    }
-  }
-}
-
-.standardFormRowLast {
-  border: none;
-  padding-bottom: 0;
-  margin-bottom: 0;
-}
-
-.standardFormRowBlock {
-  :global {
-    .ant-form-item,
-    div.ant-form-item-control-wrapper {
-      display: block;
-    }
-  }
-}
-
-.standardFormRowGrid {
-  :global {
-    .ant-form-item,
-    div.ant-form-item-control-wrapper {
-      display: block;
-    }
-    .ant-form-item-label {
-      float: left;
-    }
-  }
-}
+@import '~antd/lib/style/themes/default.less';
+
+.tagSelect {
+  user-select: none;
+  margin-left: -8px;
+  position: relative;
+  overflow: hidden;
+  max-height: 32px;
+  // line-height: 32px;
+  transition: all 0.3s;
+  :global {
+    .ant-tag {
+      padding: 0 8px;
+      margin-right: 24px;
+      font-size: @font-size-base;
+    }
+  }
+  &.expanded {
+    transition: all 0.3s;
+    max-height: 800px;
+  }
+  .trigger {
+    position: absolute;
+    top: 0;
+    right: 0;
+    i {
+      font-size: 12px;
+    }
+  }
+  &.hasExpandTag {
+    padding-right: 50px;
+  }
+}
+
+.standardFormRow {
+  border-bottom: 1px dashed @border-color-split;
+  // padding-bottom: 8px;
+  // margin-bottom: 8px;
+  display: flex;
+  :global {
+    .ant-form-item {
+      margin-right: 24px;
+    }
+    .ant-form-item-label label {
+      color: @text-color;
+      margin-right: 0;
+    }
+    .ant-form-item-label,
+    .ant-form-item-control {
+      padding: 0;
+      line-height: 32px;
+    }
+  }
+  .label {
+    // color: @heading-color;
+    // color: rgb(173,124,89);
+    font-size: @font-size-base;
+    padding-right: 12px;
+    margin-right: 12px;
+    // margin-right: 24px;
+    background:#F8F8FF;
+    // background: rgb(84, 104, 178);
+    // opacity: 0.5;
+    flex: 0 0 auto;
+    text-align: right;
+    & > span {
+      display: inline-block;
+      height: 32px;
+      line-height: 32px;
+      &:after {
+        content: '|';
+      }
+    }
+    // border-radius: 2px;
+    & > a {
+      color: @heading-color;
+      // color: rgb(255, 255, 255);
+      display: inline-block;
+      height: 32px;
+      line-height: 32px;
+      // width: 100%;
+      cursor: pointer;
+    }
+  }
+  .content {
+    flex: 1 1 0;
+    :global {
+      .ant-form-item:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+}
+
+.standardFormRowLast {
+  border: none;
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
+.standardFormRowBlock {
+  :global {
+    .ant-form-item,
+    div.ant-form-item-control-wrapper {
+      display: block;
+    }
+  }
+}
+
+.standardFormRowGrid {
+  :global {
+    .ant-form-item,
+    div.ant-form-item-control-wrapper {
+      display: block;
+    }
+    .ant-form-item-label {
+      float: left;
+    }
+  }
+}

package/lib/Easy3wTree/index.js

@@ -38,26 +38,30 @@ 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;
 var TreeNode = _tree2['default'].TreeNode;
 
-/**
- * props参数
- * arrData: 树数据源 必须  Array
- * objTreeProps: 树配置参数 非必须  Object
- *   另加属性：touchRenderNode, titleField = 'title', countField = 'count', keyField = 'key'
- *       touchRenderNode: 自定义渲染节点 非必须 Function  返回值：{ title, count, key, isLeaf, expanded, selected, loading }
- *       titleField: 节点标题字段 非必须 String  默认值：'title'
- *       countField: 节点计数字段 非必须 String  默认值：'count'
- *       keyField: 节点key字段 非必须 String  默认值：'key'
- * objSearchProps: 搜索配置参数 非必须 Object
- *   另加属性：searchFlag = true, onSearchCallback
- *       searchFlag: 是否开启搜索功能 非必须 Boolean  默认值：true
- *       onSearchCallback: 搜索回调函数 非必须 Function  返回值：(arrDataVisible, searchValue, expandedKeys)
- * bidPureComponent: 绑定组件方法 非必须 Function
- * intUpdateCount: 数据更新次数 必须 Number
+/**
+ * props参数
+ * arrData: 树数据源 必须  Array
+ * objTreeProps: 树配置参数 非必须  Object
+ *   另加属性：touchRenderNode, titleField = 'title', countField = 'count', keyField = 'key'
+ *       touchRenderNode: 自定义渲染节点 非必须 Function  返回值：{ title, count, key, isLeaf, expanded, selected, loading }
+ *       titleField: 节点标题字段 非必须 String  默认值：'title'
+ *       countField: 节点计数字段 非必须 String  默认值：'count'
+ *       keyField: 节点key字段 非必须 String  默认值：'key'
+ * objSearchProps: 搜索配置参数 非必须 Object
+ *   另加属性：searchFlag = true, onSearchCallback
+ *       searchFlag: 是否开启搜索功能 非必须 Boolean  默认值：true
+ *       onSearchCallback: 搜索回调函数 非必须 Function  返回值：(arrDataVisible, searchValue, expandedKeys)
+ * bidPureComponent: 绑定组件方法 非必须 Function
+ * intUpdateCount: 数据更新次数 必须 Number
 */
 
 var Easy3wTree = function (_Component) {
@@ -117,12 +121,10 @@ var Easy3wTree = function (_Component) {
         arrDefaultExpandedKeys = _state.arrDefaultExpandedKeys,
         arrSearchExpandedKeys = _state.arrSearchExpandedKeys;
     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,38 +138,57 @@ 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
+        },
+        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)
+        ) : ''
+      )
     );
   };
 
   return Easy3wTree;
 }(_react.Component);
 
+Easy3wTree.defaultProps = {
+  objTreeProps: {
+    titleField: 'title',
+    countField: 'count',
+    keyField: 'key'
+  },
+  objSearchProps: {
+    searchFlag: true
+  }
+};
+
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
   this.componentDidUpdate = function (prevProps) {
+    var arrDefaultExpandedKeys = _this3.state.arrDefaultExpandedKeys;
     var _props2 = _this3.props,
         intUpdateCount = _props2.intUpdateCount,
         arrData = _props2.arrData;
 
     if (intUpdateCount !== prevProps.intUpdateCount) {
-      var arrDefaultExpandedKeys = _this3.touchGetDEK(arrData);
+      var arrDEKeys = _this3.touchGetDEK(arrData);
       // eslint-disable-next-line react/no-did-update-set-state
       _this3.setState({
         arrDataVisible: arrData || [], // 树数据源-显示数据
-        arrDefaultExpandedKeys: arrDefaultExpandedKeys, // 树默认展开节点
+        arrDefaultExpandedKeys: arrDefaultExpandedKeys && arrDefaultExpandedKeys.length ? arrDefaultExpandedKeys : arrDEKeys, // 树默认展开节点
         treevisible: false // 隐藏树
       }, function () {
         _this3.setState({
@@ -181,10 +202,8 @@ 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$keyFiel = objTreeProps.keyField,
-          keyField = _objTreeProps$keyFiel === undefined ? 'key' : _objTreeProps$keyFiel;
+      var objTreeProps = _this3.props.objTreeProps;
+      var keyField = objTreeProps.keyField;
 
       arrDefaultExpandedKeys = item[keyField] ? [item[keyField]] : [];
     }
@@ -241,12 +260,10 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.touchFilterTreeData = function (arrAllData, searchValue, expandedKeys) {
-    var _props$objTreeProps3 = _this3.props.objTreeProps,
-        objTreeProps = _props$objTreeProps3 === undefined ? {} : _props$objTreeProps3;
-    var _objTreeProps$titleFi = objTreeProps.titleField,
-        titleField = _objTreeProps$titleFi === undefined ? 'title' : _objTreeProps$titleFi,
-        _objTreeProps$keyFiel2 = objTreeProps.keyField,
-        keyField = _objTreeProps$keyFiel2 === undefined ? 'key' : _objTreeProps$keyFiel2;
+    var _props$objTreeProps = _this3.props.objTreeProps,
+        objTreeProps = _props$objTreeProps === undefined ? {} : _props$objTreeProps;
+    var titleField = objTreeProps.titleField,
+        keyField = objTreeProps.keyField;
 
     var filteredData = arrAllData.map(function (item) {
       // 递归过滤子节点
@@ -266,8 +283,8 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.touchSelect = function (selectedKeys, info) {
-    var _props$objTreeProps4 = _this3.props.objTreeProps,
-        objTreeProps = _props$objTreeProps4 === undefined ? {} : _props$objTreeProps4;
+    var _props$objTreeProps2 = _this3.props.objTreeProps,
+        objTreeProps = _props$objTreeProps2 === undefined ? {} : _props$objTreeProps2;
     var onSelectCallback = objTreeProps.onSelectCallback;
 
     if (onSelectCallback && typeof onSelectCallback === 'function') {
@@ -279,15 +296,12 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   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,
-        _objTreeProps$countFi = objTreeProps.countField,
-        countField = _objTreeProps$countFi === undefined ? 'count' : _objTreeProps$countFi,
-        _objTreeProps$keyFiel3 = objTreeProps.keyField,
-        keyField = _objTreeProps$keyFiel3 === undefined ? 'key' : _objTreeProps$keyFiel3;
+        titleField = objTreeProps.titleField,
+        countField = objTreeProps.countField,
+        keyField = objTreeProps.keyField;
 
     return arrDataVisible.map(function (item) {
       var children = item.children;

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', {