easy3wui 1.5.70-beta4 → 1.5.70-beta6

package/lib/Easy3wCol/index.js

@@ -0,0 +1,53 @@
+'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 _col = require('antd/lib/col');
+
+var _col2 = _interopRequireDefault(_col);
+
+require('antd/lib/col/style');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wCol = function (_Component) {
+  (0, _inherits3['default'])(Easy3wCol, _Component);
+
+  function Easy3wCol() {
+    (0, _classCallCheck3['default'])(this, Easy3wCol);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wCol.prototype.render = function render() {
+    var _props = this.props,
+        objColProps = _props.objColProps,
+        children = _props.children;
+
+    return _react2['default'].createElement(
+      _col2['default'],
+      objColProps,
+      children
+    );
+  };
+
+  return Easy3wCol;
+}(_react.Component);
+
+exports['default'] = Easy3wCol;
+module.exports = exports['default'];

package/lib/Easy3wDownLoad/index.js

@@ -70,9 +70,13 @@ var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
+var _Easy3wUIConfig = require('../Easy3wUIConfig');
+
+var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
+var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
 
 var Easy3wDownLoad = function (_Component) {
   (0, _inherits3['default'])(Easy3wDownLoad, _Component);
@@ -83,7 +87,7 @@ var Easy3wDownLoad = function (_Component) {
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
     _this.onPreview = function (file, url) {
-      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
+      var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
       var uid = file.uid,
@@ -198,7 +202,7 @@ var Easy3wDownLoad = function (_Component) {
         fileViewURL = _props.fileViewURL,
         fileCallURL = _props.fileCallURL;
 
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag,
         downloadFileFlag = objPreviewFileNew.downloadFileFlag,
         previewFileType = objPreviewFileNew.previewFileType;

package/lib/Easy3wFormPage/index.js

@@ -404,10 +404,8 @@ var Easy3wFormPage = function (_Component) {
         //   return this.inputNumberFormatHandler(itemNew);
         case 'numberInput':
           return _this.numberInputHandler(itemNew);
-        // case 'inputAmount':
-        //   return this.inputAmountHandler(itemNew);
-        // case 'inputDigit':
-        //   return this.inputDigitHandler(itemNew);
+        case 'email':
+          return _this.inputEmailHandler(itemNew);
         case 'mention':
           return _this.mentionHandler(itemNew);
         case 'rate':
@@ -706,6 +704,8 @@ var Easy3wFormPage = function (_Component) {
       } else if (fieldType === 'mobile') {
         var e3wMobileNation = form.getFieldValue(fieldId + 'AddonBefore');
         addRules = [{ pattern: _comonConfig.objMobileRegular ? _comonConfig.objMobileRegular[e3wMobileNation] : objMobileRegularDefault[e3wMobileNation], message: '手机格式错误！' }].concat(addRules);
+      } else if (fieldType === 'email') {
+        addRules = [{ type: 'email', message: '邮箱地址格式错误！' }].concat(addRules);
       }
       var decoratorObj = {
         rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7' + strRMsg + label }].concat(addRules)
@@ -1345,12 +1345,17 @@ var Easy3wFormPage = function (_Component) {
       var _item$cmptPros = item.cmptPros,
           cmptPros = _item$cmptPros === undefined ? {} : _item$cmptPros;
 
+      return _react2['default'].createElement(_input2['default'], cmptPros);
+    }, _this.inputEmailHandler = function (item) {
+      var _item$cmptPros2 = item.cmptPros,
+          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
+
       return _react2['default'].createElement(_input2['default'], cmptPros);
     }, _this.mobileHandler = function (item) {
       var fieldId = item.fieldId,
           required = item.required,
-          _item$cmptPros2 = item.cmptPros,
-          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
+          _item$cmptPros3 = item.cmptPros,
+          cmptPros = _item$cmptPros3 === undefined ? {} : _item$cmptPros3;
 
       var addonBeforeCmptPros = item.addonBeforeCmptPros || {};
       addonBeforeCmptPros = (0, _extends3['default'])({ allowClear: false, style: { minWidth: '90px' } }, addonBeforeCmptPros);
@@ -1545,8 +1550,8 @@ var Easy3wFormPage = function (_Component) {
         _message3['default'].info('\u8F93\u5165\u5B57\u6570\u4E0D\u80FD\u8D85\u8FC7' + maxLength);
       }
     }, _this.textareaHandler = function (item) {
-      var _item$cmptPros3 = item.cmptPros,
-          cmptPros = _item$cmptPros3 === undefined ? {} : _item$cmptPros3;
+      var _item$cmptPros4 = item.cmptPros,
+          cmptPros = _item$cmptPros4 === undefined ? {} : _item$cmptPros4;
 
       var maxlength = void 0;
       if (cmptPros.maxLength || cmptPros.maxlength) {
@@ -2090,6 +2095,9 @@ var Easy3wFormPage = function (_Component) {
   /** upload end */
   /** input start */
 
+  /** input end */
+  // #region inputEmail
+
   /** input end */
   /** mobile start */
 
@@ -3580,8 +3588,8 @@ var Easy3wFormPageTight = function (_Component2) {
           form = _this2$props7.form,
           allReadFlag = _this2$props7.allReadFlag;
       var getFieldDecorator = form.getFieldDecorator;
-      var _item$cmptPros4 = item.cmptPros,
-          cmptPros = _item$cmptPros4 === undefined ? {} : _item$cmptPros4,
+      var _item$cmptPros5 = item.cmptPros,
+          cmptPros = _item$cmptPros5 === undefined ? {} : _item$cmptPros5,
           label = item.label,
           fieldId = item.fieldId,
           required = item.required,

package/lib/Easy3wGridInputEmail/index.js

@@ -0,0 +1,73 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+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 _form = require('antd/lib/form');
+
+var _form2 = _interopRequireDefault(_form);
+
+require('antd/lib/form/style');
+
+var _input = require('antd/lib/input');
+
+var _input2 = _interopRequireDefault(_input);
+
+require('antd/lib/input/style');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wGridInputEmail = function (_Component) {
+  (0, _inherits3['default'])(Easy3wGridInputEmail, _Component);
+
+  function Easy3wGridInputEmail() {
+    (0, _classCallCheck3['default'])(this, Easy3wGridInputEmail);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wGridInputEmail.prototype.render = function render() {
+    var _props = this.props,
+        fieldId = _props.fieldId,
+        value = _props.value,
+        form = _props.form,
+        cmptPros = _props.cmptPros,
+        required = _props.required,
+        requiredMessage = _props.requiredMessage,
+        label = _props.label;
+    var getFieldDecorator = form.getFieldDecorator;
+
+    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { pattern: 'email', message: '邮箱地址格式错误！' }];
+    return _react2['default'].createElement(
+      _form2['default'].Item,
+      { style: { marginBottom: 0 } },
+      getFieldDecorator(fieldId, {
+        rules: rules,
+        initialValue: value
+      })(_react2['default'].createElement(_input2['default'], (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
+    );
+  };
+
+  return Easy3wGridInputEmail;
+}(_react.Component);
+
+exports['default'] = Easy3wGridInputEmail;
+module.exports = exports['default'];

package/lib/Easy3wGridPage/index.js

@@ -129,7 +129,8 @@ var Easy3wGridPage = function (_Component) {
         chooseFlag = _props.chooseFlag,
         scroll = _props.scroll,
         className = _props.className,
-        paginationInfo = _props.paginationInfo;
+        paginationInfo = _props.paginationInfo,
+        handleSearchNew = _props.handleSearchNew;
     var _state = this.state,
         selectedRowKeysState = _state.selectedRowKeysState,
         selectedRowsState = _state.selectedRowsState,
@@ -231,7 +232,7 @@ var Easy3wGridPage = function (_Component) {
     }
     var myColumns = columns;
     // 处理分页 start
-    if (needPaginationFlag) {
+    if (needPaginationFlag || handleSearchNew) {
       var defaultCurrent = paginationInfo ? paginationInfo.offset : 1;
       var defaultPageSize = paginationInfo ? paginationInfo.limit : 10;
       var current = paginationInfo ? paginationInfo.offset : this.state.pagination.offset;
@@ -624,15 +625,21 @@ var _initialiseProps = function _initialiseProps() {
     var _props7 = _this3.props,
         selfDealPageChangeFunc = _props7.selfDealPageChangeFunc,
         getSearchCondition = _props7.getSearchCondition,
-        handleSearch = _props7.handleSearch;
+        handleSearch = _props7.handleSearch,
+        handleSearchNew = _props7.handleSearchNew;
 
-    var formVal = getSearchCondition();
+    var formVal = {};
+    if (getSearchCondition && typeof getSearchCondition === 'function') {
+      formVal = getSearchCondition();
+    }
     var paginationInfo = { offset: pagination.current, limit: pagination.pageSize };
     _this3.setState({ pagination: paginationInfo });
-    if (selfDealPageChangeFunc) {
+    if (selfDealPageChangeFunc && typeof selfDealPageChangeFunc === 'function') {
       selfDealPageChangeFunc(paginationInfo, formVal);
-    } else {
+    } else if (handleSearch && typeof handleSearch === 'function') {
       handleSearch(paginationInfo, formVal);
+    } else if (handleSearchNew && typeof handleSearchNew === 'function') {
+      handleSearchNew(paginationInfo, formVal);
     }
   };
 };

package/lib/Easy3wRow/index.js

@@ -0,0 +1,53 @@
+'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 _row = require('antd/lib/row');
+
+var _row2 = _interopRequireDefault(_row);
+
+require('antd/lib/row/style');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wRow = function (_Component) {
+  (0, _inherits3['default'])(Easy3wRow, _Component);
+
+  function Easy3wRow() {
+    (0, _classCallCheck3['default'])(this, Easy3wRow);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wRow.prototype.render = function render() {
+    var _props = this.props,
+        objRowProps = _props.objRowProps,
+        children = _props.children;
+
+    return _react2['default'].createElement(
+      _row2['default'],
+      objRowProps,
+      children
+    );
+  };
+
+  return Easy3wRow;
+}(_react.Component);
+
+exports['default'] = Easy3wRow;
+module.exports = exports['default'];

package/lib/Easy3wTree/index.js

@@ -77,6 +77,7 @@ var Easy3wTree = function (_Component) {
       bidPureComponent(_this);
     }
     var arrDefaultExpandedKeys = _this.touchGetDEK(arrData);
+    _this.searchRef = _react2['default'].createRef();
     _this.state = {
       // 两数量值，用于彻底更新树，树数据更新，重新渲染，使defaultExpandedKeys生效
       treevisible: true, // 显示树
@@ -87,8 +88,6 @@ var Easy3wTree = function (_Component) {
     };
     return _this;
   }
-  // eslint-disable-next-line react/sort-comp
-
   // 获取默认展开节点
 
   // 更新state
@@ -131,7 +130,7 @@ var Easy3wTree = function (_Component) {
       searchFlag ? _react2['default'].createElement(Search, {
         placeholder: '\u8BF7\u8F93\u5165\u67E5\u8BE2\u5185\u5BB9',
         onChange: function onChange(e) {
-          return _this2.onSearch(e.target.value);
+          return _this2.touchSearch(e.target.value);
         }
         // style={{ width: 'calc(100% - 12px)', margin: '0 6px' }}
         , ref: this.searchRef,
@@ -142,12 +141,12 @@ var Easy3wTree = function (_Component) {
         (0, _extends3['default'])({
           defaultExpandedKeys: arrSearchExpandedKeys && arrSearchExpandedKeys.length > 0 ? arrSearchExpandedKeys : arrDefaultExpandedKeys // 树默认展开节点key Array
           , selectedKeys: selectedKeys // 选中节点key Array
-          , showLine: true // 是否展示连接线
-          , showIcon: true // 是否展示 TreeNode title 前的图标，叶子节点图标：书页；非叶子节点图标：加减
+          , showLine: true,
+          showIcon: true
           // multiple 多选
-          , onSelect: this.onSelect // 节点点击事件
+          , onSelect: this.touchSelect
         }, objTreeProps),
-        this.renderTreeNodes(arrDataVisible)
+        this.touchRenderTreeNodes(arrDataVisible)
       ) : ''
     );
   };
@@ -158,8 +157,6 @@ var Easy3wTree = function (_Component) {
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
-  this.searchRef = _react2['default'].createRef();
-
   this.componentDidUpdate = function (prevProps) {
     var _props2 = _this3.props,
         intUpdateCount = _props2.intUpdateCount,
@@ -203,7 +200,7 @@ var _initialiseProps = function _initialiseProps() {
       // 或者使用 antd 的方法
       // this.searchRef.current.input.input.value = '';
       _this3.searchRef.current.input.state.value = '';
-      _this3.onSearch('');
+      _this3.touchSearch('');
     }
   };
 
@@ -216,10 +213,11 @@ var _initialiseProps = function _initialiseProps() {
     return '';
   };
 
-  this.onSearch = function (value) {
+  this.touchSearch = function (value) {
     var _props3 = _this3.props,
         arrData = _props3.arrData,
-        onSearchCallback = _props3.onSearchCallback;
+        objSearchProps = _props3.objSearchProps;
+    var onSearchCallback = objSearchProps.onSearchCallback;
 
     var arrSearchExpandedKeys = [];
     var arrDataVisible = [];
@@ -267,7 +265,7 @@ var _initialiseProps = function _initialiseProps() {
     return filteredData;
   };
 
-  this.onSelect = function (selectedKeys, info) {
+  this.touchSelect = function (selectedKeys, info) {
     var _props$objTreeProps4 = _this3.props.objTreeProps,
         objTreeProps = _props$objTreeProps4 === undefined ? {} : _props$objTreeProps4;
     var onSelectCallback = objTreeProps.onSelectCallback;
@@ -280,7 +278,7 @@ var _initialiseProps = function _initialiseProps() {
     });
   };
 
-  this.renderTreeNodes = function (arrDataVisible) {
+  this.touchRenderTreeNodes = function (arrDataVisible) {
     var _props$objTreeProps5 = _this3.props.objTreeProps,
         objTreeProps = _props$objTreeProps5 === undefined ? {} : _props$objTreeProps5;
     var touchRenderNode = objTreeProps.touchRenderNode,
@@ -306,8 +304,11 @@ var _initialiseProps = function _initialiseProps() {
         (0, _extends3['default'])({
           title: count ? title + '(' + count + ')' : title,
           key: key
-        }, objItemNew),
-        children ? _this3.renderTreeNodes(children) : null
+        }, objItemNew, {
+          objNode: item // 节点信息-原
+          , objNodeNew: objItemNew // 节点信息-新-处理后的数据
+        }),
+        children ? _this3.touchRenderTreeNodes(children) : null
       );
     });
   };

package/lib/Easy3wUIConfig/index.js

@@ -0,0 +1,30 @@
+'use strict';
+
+exports.__esModule = true;
+exports['default'] = {
+  objPreviewFileDefault: { // web预览文件默认配置
+    previewFileFlag: true, // 是否文件预览标志 true:是  false:否
+    // previewFileUrl: 'easy3w4fExample/download?view=true&fileId=',
+    previewFileUrl: '#/blank/EQ/route/Easy3wTranfer?fileId=', // 文件预览地址 downloadFileFlag: '1', // 显示下载按钮 '1':显示 '0':隐藏
+    previewFileType: 'pdf,doc,docx' // 可预览文件格式（以逗号隔开）
+  },
+  objReg: { // 正则表达式
+    numberRegex: /^-?(0|[1-9]\d*)(\.\d+)?([eE][-+]?\d+)?$|^Infinity$|^NaN$/i, // 匹配广义数字,包括整数、浮点数、科学计数法, 以及特殊值Infinity和NaN
+    // const testCases = [
+    //     '0',        // ✅ 合法
+    //     '123',      // ✅ 合法
+    //     '-123',     // ✅ 合法
+    //     '0.123',    // ✅ 合法
+    //     '-0.123',   // ✅ 合法
+    //     '1e3',      // ✅ 合法
+    //     '-2.5e-4',  // ✅ 合法
+    //     '0324',     // ❌ 非法（前导零）
+    //     '00.123',   // ❌ 非法（前导零）
+    //     'Infinity', // ✅ 合法
+    //     'NaN',      // ✅ 合法
+    //     'abc',      // ❌ 非法
+    // ];
+    strictNumberRegex: /^-?(0|[1-9][0-9]*)(\.[0-9]*)?$/ // 匹配严格数字, 整数、浮点数、负数, 但不包括科学计数法
+  }
+};
+module.exports = exports['default'];

package/lib/Easy3wUpload/index.js

@@ -76,9 +76,16 @@ var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
+var _Easy3wUIConfig = require('../Easy3wUIConfig');
+
+var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
+
 // 文件上传配置
+
 var _ref = _comonConfig.objE3wUIFileConfig || {},
     maxSize = _ref.maxSize;
 // maxSizeB 大附件-文件大小限制 单位：MB
@@ -109,7 +116,7 @@ var Easy3wUpload = function (_Component) {
     }
 
     return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onPreview = function (file) {
-      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
+      var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
       var uid = file.uid,
@@ -224,7 +231,7 @@ var Easy3wUpload = function (_Component) {
     if (isRead) {
       upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showDownloadIcon: true, showPreviewIcon: true, showRemoveIcon: false } });
     }
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag;
 
     if (previewFileFlag && fileViewFlag !== false) {

package/lib/Easy3wUploadB/index.js

@@ -86,9 +86,16 @@ var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
+var _Easy3wUIConfig = require('../Easy3wUIConfig');
+
+var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
+
 // 文件上传配置
+
 var _ref = _comonConfig.objE3wUIFileConfig || {},
     maxSizeB = _ref.maxSizeB;
 // maxSizeB 大附件-文件大小限制 单位：MB
@@ -343,7 +350,7 @@ var BigFileUpload = function (_Component) {
       },
       fileList: this.state.fileList
     };
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag;
 
     if (previewFileFlag && fileViewFlag !== false) {
@@ -503,7 +510,7 @@ var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
   this.onPreview = function (file) {
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this3.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this3.props.objPreviewFile);
     var previewFileUrl = objPreviewFileNew.previewFileUrl,
         previewFileType = objPreviewFileNew.previewFileType;
     var uid = file.uid,

package/lib/Easy3wUploadM/index.js

@@ -76,10 +76,17 @@ var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
+var _Easy3wUIConfig = require('../Easy3wUIConfig');
+
+var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
+
 // const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
 // 文件上传配置
+
 var _ref = _comonConfig.objE3wUIFileConfig || {},
     maxSize = _ref.maxSize;
 // maxSizeB 大附件-文件大小限制 单位：MB
@@ -112,7 +119,7 @@ var Easy3wUploadM = function (_Component) {
       fileList: [{}]
       // 预览
     }, _this.onPreview = function (file) {
-      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
+      var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
       var uid = file.uid,
@@ -229,7 +236,7 @@ var Easy3wUploadM = function (_Component) {
     if (isRead) {
       upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showPreviewIcon: false, showRemoveIcon: false } });
     }
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag;
 
     if (previewFileFlag && fileViewFlag !== false) {

package/lib/index.js

@@ -407,4 +407,31 @@ Object.defineProperty(exports, 'Easy3wTree', {
   }
 });
 
+var _Easy3wUIConfig = require('./Easy3wUIConfig');
+
+Object.defineProperty(exports, 'Easy3wUIConfig', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wUIConfig)['default'];
+  }
+});
+
+var _Easy3wRow = require('./Easy3wRow');
+
+Object.defineProperty(exports, 'Easy3wRow', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wRow)['default'];
+  }
+});
+
+var _Easy3wCol = require('./Easy3wCol');
+
+Object.defineProperty(exports, 'Easy3wCol', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wCol)['default'];
+  }
+});
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.70-beta4",
+  "version": "1.5.70-beta6",
   "description": "easy3wui components for react",
   "keywords": [
     "react",

package/lib/Easy3wTree/index.less

@@ -1,6 +0,0 @@
-.easy3wTree {
-  .easy3wTreeSearch {
-    width: calc(100% - 12px);
-    margin: 0 6px;
-  }
-}