easy3wui 1.5.86-7.beta → 1.5.86

package/lib/Easy3wTree/index.js

@@ -38,30 +38,31 @@ var _tree2 = _interopRequireDefault(_tree);
 
 require('antd/lib/tree/style');
 
-var _Easy3wI18N = require('../Easy3wI18N');
+var _Easy3wSpin = require('../Easy3wSpin');
 
-var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
+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
+ * selectedKeys: 选中节点key 非必须 Array
 */
 
 var Easy3wTree = function (_Component) {
@@ -83,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
     };
@@ -106,7 +105,9 @@ var Easy3wTree = function (_Component) {
   // 递归过滤树结构，并设置展开节点的 keys
 
   // #endregion
-  // 节点点击事件
+  // 节点点击事件--选择
+
+  // 节点点击事件--展开
 
   // 处理树组织
 
@@ -117,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',
@@ -140,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;
 
@@ -167,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 // 展开的节点
       });
     }
   };
@@ -185,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;
 
@@ -235,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,
@@ -254,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 // 返回匹配的子节点
         });
@@ -270,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') {
@@ -282,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

@@ -64,10 +64,6 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wI18N = require('../Easy3wI18N');
-
-var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
-
 var _Easy3wGetCookie = require('../Easy3wGetCookie');
 
 var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
@@ -167,33 +163,26 @@ var Easy3wUpload = function (_Component) {
         accept = _props.accept,
         required = _props.required,
         initialValue = _props.initialValue,
+        help = _props.help,
+        buttonName = _props.buttonName,
         form = _props.form,
         isRead = _props.isRead,
+        label = _props.label,
         className = _props.className,
         labelCol = _props.labelCol,
         wrapperCol = _props.wrapperCol,
+        extend = _props.extend,
+        extendBack = _props.extendBack,
         uploadDoneCallback = _props.uploadDoneCallback,
         removeCallback = _props.removeCallback,
         hadUpdBtn = _props.hadUpdBtn,
         propsAFlag = _props.propsAFlag,
         fileViewFlag = _props.fileViewFlag;
-    var _props2 = this.props,
-        help = _props2.help,
-        buttonName = _props2.buttonName,
-        label = _props2.label,
-        extend = _props2.extend,
-        extendBack = _props2.extendBack,
-        warnMessage = _props2.warnMessage;
-
-    help = (0, _Easy3wI18N2['default'])(help);
-    buttonName = (0, _Easy3wI18N2['default'])(buttonName);
-    label = (0, _Easy3wI18N2['default'])(label);
-    extend = (0, _Easy3wI18N2['default'])(extend);
-    extendBack = (0, _Easy3wI18N2['default'])(extendBack);
-    warnMessage = (0, _Easy3wI18N2['default'])(warnMessage);
     var limitSize = this.props.limitSize;
 
     limitSize = limitSize || maxSize || 200;
+    var warnMessage = this.props.warnMessage;
+
     var iniVal = [];
     if (initialValue) {
       iniVal = initialValue.map(function (obj) {
@@ -271,28 +260,28 @@ var Easy3wUpload = function (_Component) {
       if (name.length > 100) {
         _modal2['default'].info({
           style: { top: '38%' },
-          okText: (0, _Easy3wI18N2['default'])('Easy3wUI:知道了'),
-          content: (0, _Easy3wI18N2['default'])('Easy3wUI:文件名至多100个字符')
+          okText: '知道了',
+          content: '文件名至多100个字符'
         });
         return false;
       }
       if (!fileTypePass) {
         _modal2['default'].error({
           style: { top: '38%' },
-          content: (0, _Easy3wI18N2['default'])('Easy3wUI:不支持fileType类型的文件!', { fileType: fileType })
+          content: '\u4E0D\u652F\u6301' + fileType + '\u7C7B\u578B\u7684\u6587\u4EF6!'
         });
         return false;
       }
       if (!isLimitSize) {
         _modal2['default'].error({
           style: { top: '38%' },
-          content: (0, _Easy3wI18N2['default'])('Easy3wUI:附件必须小于limitSizeMB!', { limitSize: limitSize })
+          content: '\u9644\u4EF6\u5FC5\u987B\u5C0F\u4E8E' + limitSize + 'MB!'
         });
         return false;
       } else if (fileSize === 0) {
         _modal2['default'].error({
           style: { top: '38%' },
-          content: (0, _Easy3wI18N2['default'])('Easy3wUI:附件必须大于0MB!')
+          content: '附件必须大于0MB!'
         });
         return false;
       } else {
@@ -358,7 +347,7 @@ var Easy3wUpload = function (_Component) {
           if (status === 'error') {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: (0, _Easy3wI18N2['default'])('Easy3wUI:附件name上传失败!', { name: name })
+              content: '\u9644\u4EF6' + name + '\u4E0A\u4F20\u5931\u8D25!'
             });
             return false; // 上传失败
           }
@@ -374,7 +363,7 @@ var Easy3wUpload = function (_Component) {
             } else {
               _modal2['default'].error({
                 style: { top: '38%' },
-                content: (0, _Easy3wI18N2['default'])('Easy3wUI:附件name上传失败!', { name: name })
+                content: '\u9644\u4EF6' + name + '\u4E0A\u4F20\u5931\u8D25!'
               });
             }
             return false;
@@ -431,7 +420,8 @@ var Easy3wUpload = function (_Component) {
         urlDownloadFile: urlDownloadFile,
         downloadArr: initialValue,
         propsAFlag: propsAFlag,
-        fileViewFlag: fileViewFlag
+        fileViewFlag: fileViewFlag,
+        objPreviewFile: objPreviewFileNew
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(
@@ -517,8 +507,8 @@ Easy3wUpload.defaultProps = {
   // limitSizeDefault: 200,
   urlUpFileService: '',
   urlDownloadFile: '',
-  buttonName: (0, _Easy3wI18N2['default'])('Easy3wUI:上传'),
-  help: (0, _Easy3wI18N2['default'])('Easy3wUI:请上传附件'),
+  buttonName: '上传',
+  help: '请上传附件',
   required: true,
   isRead: false,
   label: '',