easy3wui 1.5.50 → 1.5.51-beta2

package/lib/Easy3wGetDesensitization/index.js

@@ -0,0 +1,43 @@
+'use strict';
+
+exports.__esModule = true;
+exports['default'] = Easy3wGetDesensitization;
+// 脱敏规则：
+// 1. 手机号：脱敏为前三位和后四位，中间用****代替
+// 2. 邮箱：脱敏为用户名的第一个字母和最后一个字母，中间用****代替，@后面的地址不变
+// 3. 身份证：脱敏为前三位和后四位，中间用****代替
+// 4. 其他字符串：不做脱敏
+function Easy3wGetDesensitization(strDesensitization, objRegex) {
+  // strDesensitization: 待脱敏的字符串 字符串类型
+  // objRegex: 自定义正则表达式 对象类型
+  // 返回脱敏后的字符串
+  var strText = strDesensitization;
+  if (strText && typeof strText === 'string') {
+    var _ref = objRegex || {},
+        phoneRegexNew = _ref.phoneRegex,
+        emailRegexNew = _ref.emailRegex,
+        idRegexNew = _ref.idRegex; // 自定义正则表达式
+
+
+    var phoneRegex = phoneRegexNew || /^1[3-9]\d{9}$/; // 手机号
+    var emailRegex = emailRegexNew || /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/; // 邮箱
+    var idRegex = idRegexNew || /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/; // 身份证-15或18位
+    if (phoneRegex.test(strText)) {
+      // 手机号
+      strText = strText.slice(0, 3) + '****' + strText.slice(-4); // 脱敏手机号
+    } else if (emailRegex.test(strText)) {
+      // 邮箱
+      var _strText$split = strText.split('@'),
+          username = _strText$split[0],
+          domain = _strText$split[1];
+
+      var desensitizedUsername = username.slice(0, 1) + '****';
+      strText = desensitizedUsername + '@' + domain; // 脱敏邮箱
+    } else if (idRegex.test(strText)) {
+      // 身份证
+      strText = strText.slice(0, 3) + '***********' + strText.slice(-4); // 脱敏身份证
+    }
+  }
+  return strText;
+}
+module.exports = exports['default'];

package/lib/Easy3wGridPage/index.js

@@ -56,26 +56,24 @@ var _tooltip2 = _interopRequireDefault(_tooltip);
 
 require('antd/lib/tooltip/style');
 
-var _icon = require('antd/lib/icon');
-
-var _icon2 = _interopRequireDefault(_icon);
-
-require('antd/lib/icon/style');
-
-var _modal = require('antd/lib/modal');
-
-var _modal2 = _interopRequireDefault(_modal);
-
-require('antd/lib/modal/style');
-
 var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
 
+var _dva = require('dva');
+
+var _easy3wui = require('easy3wui');
+
 var _comonConfig = require('comonConfigPath/comonConfig');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+(0, _dva.connect)(function (state) {
+  return {
+    globalData: state.globalData
+  };
+});
+
 var Easy3wGridPage = function (_Component) {
   (0, _inherits3['default'])(Easy3wGridPage, _Component);
 
@@ -104,13 +102,7 @@ var Easy3wGridPage = function (_Component) {
         ));
       });
     }
-    var dataList = _this.props.dataList;
-
-    var arrData = dataList && dataList.length ? _this.deepCopy(dataList) : [];
     _this.state = {
-      // 数据
-      arrData: arrData, // 列表
-      // 选择
       selectedRowKeysState: selectedKey || [],
       selectedRowsState: selectedVal || [],
       selRowKeysTags: selRowKeysTags,
@@ -120,64 +112,100 @@ var Easy3wGridPage = function (_Component) {
   }
 
   Easy3wGridPage.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-    var _props$dataList = this.props.dataList,
-        dataList = _props$dataList === undefined ? [] : _props$dataList;
-    var _nextProps$dataList = nextProps.dataList,
-        nextDataList = _nextProps$dataList === undefined ? [] : _nextProps$dataList;
-
-    var isEqual = this.touchDeepEqual(nextDataList, dataList);
-    if (!isEqual) {
-      this.setState({
-        arrData: nextDataList.length ? this.deepCopy(nextDataList) : []
-      });
-    }
     if (nextProps.cleanFlag === '1') {
       this.delAll();
     }
   };
-  // ---------------------------------- 数据脱敏 start ----------------------------------
-  // 数据校验与脱敏
-
-  // 数据脱敏--显隐
-
-  // ---------------------------------- 数据脱敏 end ----------------------------------
-  // 生成表格
-
-  // 数组深度复制
-
-  // 数组深度比较
-
 
   Easy3wGridPage.prototype.render = function render() {
     var _this2 = this;
 
     var _props = this.props,
         columns = _props.columns,
+        totalResult = _props.totalResult,
+        dataList = _props.dataList,
         loading = _props.loading,
         getCheckboxProps = _props.getCheckboxProps,
         needPaginationFlag = _props.needPaginationFlag,
+        autoAddNumber = _props.autoAddNumber,
         gridProps = _props.gridProps,
-        totalResult = _props.totalResult,
         rowKey = _props.rowKey,
         checkType = _props.checkType,
         bordered = _props.bordered,
         chooseFlag = _props.chooseFlag,
         scroll = _props.scroll,
         className = _props.className,
-        paginationInfo = _props.paginationInfo;
-    var arrData = this.state.arrData;
-    // [].concat(arrA)
-    // const arrColumns = this.touchCreateColumns([].concat(columns));
-    // const arrColumns = this.touchCreateColumns(JSON.parse(JSON.stringify(columns)));
-
-    var arrColumns = this.touchCreateColumns(this.deepCopy(columns));
-    // const arrColumns = this.touchCreateColumns(columns);
+        paginationInfo = _props.paginationInfo,
+        globalData = _props.globalData;
+    var dataDesensitizationEyeFlag = globalData.dataDesensitizationEyeFlag;
     var _state = this.state,
         selectedRowKeysState = _state.selectedRowKeysState,
         selectedRowsState = _state.selectedRowsState,
         selRowKeysTags = _state.selRowKeysTags;
 
     var paginationProps = false; // 默认不分页
+    var recursion = function recursion(arr) {
+      arr.forEach(function (item) {
+        var columnsType = item.type;
+        switch (columnsType) {
+          case 'shortText':
+            item.className = 'e3wGridShortText';break;
+          case 'longText':
+            item.className = 'e3wGridLongText';break;
+          case 'number':
+            item.className = 'e3wGridNumber';break;
+          case 'maxText':
+            item.className = 'e3wMaxText';break;
+          case 'numeralFormat':
+            item.className = 'e3wGridNumber';break;
+          default:
+            item.className = 'e3wGridShortText';
+            break;
+        }
+        if (item.children) {
+          recursion(item.children);
+        }
+      });
+    };
+    var recursionT = function recursionT(arr) {
+      arr.forEach(function (item) {
+        if (!item.render) {
+          item.render = function (text) {
+            var strTextNew = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? text : (0, _easy3wui.Easy3wGetDesensitization)(text) : text;
+            if (strTextNew && strTextNew.length * 14 > 160) {
+              return _react2['default'].createElement(
+                _tooltip2['default'],
+                { placement: 'topLeft', title: strTextNew, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
+                strTextNew
+              );
+            } else {
+              return strTextNew;
+            }
+          };
+          if (item.type === 'numeralFormat') {
+            item.render = function (text) {
+              return _react2['default'].createElement(
+                _tooltip2['default'],
+                { placement: 'topLeft', title: _this2.numeralFormat(text), style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
+                _this2.numeralFormat(text)
+              );
+            };
+          }
+        }if (item.fixed) {
+          item.className = 'e3wText';
+          item.minWidth = 5;
+        }
+        if (item.children) {
+          recursionT(item.children);
+        }
+      });
+    };
+    recursion(columns);
+    if (dataList) {
+      if (dataList.length > 0) {
+        recursionT(columns);
+      }
+    }
     var rowSelection = null;
     if (checkType) {
       // 若需选择框
@@ -204,6 +232,7 @@ var Easy3wGridPage = function (_Component) {
         }
       };
     }
+    var myColumns = columns;
     // 处理分页 start
     if (needPaginationFlag) {
       var defaultCurrent = paginationInfo ? paginationInfo.offset : 1;
@@ -222,10 +251,34 @@ var Easy3wGridPage = function (_Component) {
         showQuickJumper: true,
         pageSizeOptions: ['10', '20', '30', '40', '50', '100']
       };
+      if (autoAddNumber) {
+        if (columns.length > 0) {
+          myColumns = [{
+            title: '序号',
+            dataIndex: 'number',
+            className: 'e3wGridShortText',
+            render: function render(text, record, index) {
+              return _react2['default'].createElement(
+                'div',
+                null,
+                (current - 1) * limit + index + 1,
+                ' '
+              );
+            }
+          }].concat(columns);
+        }
+      }
     }
     var printArr = location.hash.split('/');
     var printValue = this.props.printValue || 'print';
     var printFlag = printArr[1] === printValue;
+    if (printFlag) {
+      myColumns.forEach(function (item) {
+        if (item.fixed) {
+          item.fixed = null;
+        }
+      });
+    }
     var alertRegionFlag = false;
     if (selRowKeysTags && selRowKeysTags instanceof Array && selRowKeysTags.length) {
       alertRegionFlag = true;
@@ -245,8 +298,8 @@ var Easy3wGridPage = function (_Component) {
       { className: gridProps || this.props.rowType ? gridProps.onRow || this.props.rowType ? 'onRow' : null : null },
       _react2['default'].createElement(_table2['default'], (0, _extends3['default'])({
         className: printFlag ? 'scrollPrint' : className || 'scrollX',
-        columns: arrColumns,
-        dataSource: arrData,
+        columns: myColumns,
+        dataSource: dataList,
         pagination: paginationProps,
         loading: loading,
         rowKey: rowKey,
@@ -583,317 +636,6 @@ var _initialiseProps = function _initialiseProps() {
       handleSearch(paginationInfo, formVal);
     }
   };
-
-  this.getcheckDesensitizeData = function (str, record, dataIndex) {
-    var phoneRegex = /^1[3-9]\d{9}$/; // 手机号
-    var emailRegex = /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/; // 邮箱
-    var idRegex = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/; // 身份证 可匹配15位或18位身份证
-    // let { arrData } = this.state;
-    // const { dataList } = this.props;
-    // if (arrData && arrData.length === 0) {
-    //   arrData = [...dataList];
-    // }
-    var strDesensitize = str; // 脱敏字符串
-    record[dataIndex + '-dataDesensitizationFlagTrue'] = false; // 当前字段--数据脱敏标识--未脱敏成功
-    if (phoneRegex.test(str)) {
-      // 手机号
-      record[dataIndex + '-dataDesensitizationFlagTrue'] = true; // 当前字段--数据脱敏标识--脱敏成功
-      strDesensitize = str.slice(0, 3) + '****' + str.slice(-4); // 脱敏手机号
-    } else if (emailRegex.test(str)) {
-      // 邮箱
-      record[dataIndex + '-dataDesensitizationFlagTrue'] = true; // 当前字段--数据脱敏标识--脱敏成功
-
-      var _str$split = str.split('@'),
-          username = _str$split[0],
-          domain = _str$split[1];
-
-      var desensitizedUsername = username.slice(0, 1) + '****';
-      strDesensitize = desensitizedUsername + '@' + domain; // 脱敏邮箱
-    } else if (idRegex.test(str)) {
-      // 身份证
-      record[dataIndex + '-dataDesensitizationFlagTrue'] = true; // 当前字段--数据脱敏标识--脱敏成功
-      strDesensitize = str.slice(0, 3) + '********' + str.slice(-4); // 脱敏身份证
-    }
-    // this.setState({
-    //   arrData, // 更新数据
-    // });
-    return strDesensitize;
-  };
-
-  this.getImplicit = function (event, dataIndex, index) {
-    event.stopPropagation(); // 禁止事件冒泡
-    var arrData = _this3.state.arrData;
-
-    if (_comonConfig.dataDesensitizationUrl) {
-      var xhr = new XMLHttpRequest();
-      xhr.onreadystatechange = function () {
-        if (xhr.readyState === 4 && xhr.status === 200) {
-          // 请求成功，处理响应数据
-          var _JSON$parse = JSON.parse(xhr.responseText),
-              _data = _JSON$parse.data;
-
-          var _ref = _data || {},
-              passFlag = _ref.passFlag,
-              passMsg = _ref.passMsg;
-
-          if (passFlag) {
-            arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] = !arrData[index][dataIndex + '-dataDesensitizationEyeFlag']; // 当前字段--数据脱敏标识--显隐
-            _this3.setState({
-              arrData: arrData // 更新数据
-            });
-          } else {
-            _modal2['default'].error({
-              content: passMsg || '用户无权限，请联系管理员',
-              okText: '确定'
-            });
-          }
-        }
-      };
-      var data = JSON.stringify({});
-      xhr.open('POST', _comonConfig.dataDesensitizationUrl, true); // 异步请求
-      xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
-      xhr.send(data); // 发送请求
-    } else {
-      arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] = !arrData[index][dataIndex + '-dataDesensitizationEyeFlag']; // 当前字段--数据脱敏标识--显隐
-      _this3.setState({
-        arrData: arrData // 更新数据
-      });
-    }
-    // return false;
-  };
-
-  this.touchCreateColumns = function (columns) {
-    var _props8 = _this3.props,
-        dataList = _props8.dataList,
-        autoAddNumber = _props8.autoAddNumber,
-        paginationInfo = _props8.paginationInfo;
-    var arrData = _this3.state.arrData;
-
-    var current = paginationInfo ? paginationInfo.offset : _this3.state.pagination.offset;
-    var limit = paginationInfo ? paginationInfo.limit : _this3.state.pagination.limit;
-    var printArr = location.hash.split('/');
-    var printValue = _this3.props.printValue || 'print';
-    var printFlag = printArr[1] === printValue;
-    var recursion = function recursion(arr) {
-      for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref2 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref2 = _i.value;
-        }
-
-        var item = _ref2;
-
-        var columnsType = item.type;
-        if (item.fixed && printFlag) {
-          item.fixed = null;
-        }
-        switch (columnsType) {
-          case 'shortText':
-            item.className = 'e3wGridShortText';break;
-          case 'longText':
-            item.className = 'e3wGridLongText';break;
-          case 'number':
-            item.className = 'e3wGridNumber';break;
-          case 'maxText':
-            item.className = 'e3wMaxText';break;
-          case 'numeralFormat':
-            item.className = 'e3wGridNumber';break;
-          default:
-            item.className = 'e3wGridShortText';
-            break;
-        }
-        if (item.children) {
-          recursion(item.children);
-        }
-      }
-    };
-    var recursionT = function recursionT(arr) {
-      var _loop = function _loop(item) {
-        if (item.fixed && printFlag) {
-          item.fixed = null;
-        }
-        var dataIndex = item.dataIndex;
-
-        if (!item.render) {
-          item.render = function (text, record, index) {
-            var renderTextDesensitize = '';
-            if (_comonConfig.dataDesensitizationFlag) {
-              renderTextDesensitize = _this3.getcheckDesensitizeData(text, record, dataIndex);
-            }
-            if (_comonConfig.dataDesensitizationFlag && record[dataIndex + '-dataDesensitizationFlagTrue']) {
-              if (text && text.length * 14 > 160) {
-                return _react2['default'].createElement(
-                  _tooltip2['default'],
-                  { placement: 'topLeft', title: _react2['default'].createElement(
-                      'span',
-                      null,
-                      arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? text : renderTextDesensitize,
-                      ' ',
-                      _react2['default'].createElement(
-                        'a',
-                        { onClick: function onClick(e) {
-                            return _this3.getImplicit(e, dataIndex, index);
-                          } },
-                        _react2['default'].createElement(_icon2['default'], { type: arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
-                      )
-                    ), style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
-                  _react2['default'].createElement(
-                    'span',
-                    null,
-                    arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? '' + text : renderTextDesensitize,
-                    ' ',
-                    _react2['default'].createElement(
-                      'a',
-                      { onClick: function onClick(e) {
-                          return _this3.getImplicit(e, dataIndex, index);
-                        } },
-                      _react2['default'].createElement(_icon2['default'], { type: arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
-                    )
-                  )
-                );
-              } else {
-                return _react2['default'].createElement(
-                  'span',
-                  null,
-                  arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? '' + text : renderTextDesensitize,
-                  ' ',
-                  _react2['default'].createElement(
-                    'a',
-                    { onClick: function onClick(e) {
-                        return _this3.getImplicit(e, dataIndex, index);
-                      } },
-                    _react2['default'].createElement(_icon2['default'], { type: arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
-                  )
-                );
-              }
-            } else if (text && text.length * 14 > 160) {
-              return _react2['default'].createElement(
-                _tooltip2['default'],
-                { placement: 'topLeft', title: text, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
-                text
-              );
-            } else {
-              return text;
-            }
-          };
-          if (item.type === 'numeralFormat') {
-            item.render = function (text) {
-              return _react2['default'].createElement(
-                _tooltip2['default'],
-                { placement: 'topLeft', title: _this3.numeralFormat(text), style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
-                _this3.numeralFormat(text)
-              );
-            };
-          }
-        }if (item.fixed) {
-          item.className = 'e3wText';
-          item.minWidth = 5;
-        }
-        if (item.children) {
-          recursionT(item.children);
-        }
-      };
-
-      for (var _iterator2 = arr, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        var item = _ref3;
-
-        _loop(item);
-      }
-    };
-    recursion(columns);
-    if (dataList) {
-      if (dataList.length > 0) {
-        recursionT(columns);
-      }
-    }
-    var columnsNew = columns;
-    if (autoAddNumber) {
-      if (columnsNew.length > 0) {
-        columnsNew = [{
-          title: '序号',
-          dataIndex: 'number',
-          className: 'e3wGridShortText',
-          render: function render(text, record, index) {
-            return _react2['default'].createElement(
-              'div',
-              null,
-              (current - 1) * limit + index + 1,
-              ' '
-            );
-          }
-        }].concat(columnsNew);
-      }
-    }
-    return [].concat(columnsNew);
-  };
-
-  this.deepCopy = function (obj) {
-    if (typeof obj !== 'object' || obj === null) {
-      return obj;
-    }
-
-    var copy = Array.isArray(obj) ? [] : {};
-
-    for (var key in obj) {
-      if (_react2['default'].isValidElement(obj[key])) {
-        copy[key] = obj[key];
-      } else if (key === 'children' && Array.isArray(obj[key]) || typeof obj[key] === 'object') {
-        copy[key] = _this3.deepCopy(obj[key]);
-      } else {
-        copy[key] = obj[key];
-      }
-    }
-
-    return copy;
-  };
-
-  this.touchDeepEqual = function (arrOne, arrTwo) {
-    if (arrOne.length === 0 && arrTwo.length === 0) {
-      return true;
-    }
-    if (arrOne.length !== arrTwo.length) {
-      return false;
-    }
-    for (var i = 0; i < arrOne.length; i += 1) {
-      var objOneKeys = Object.keys(arrOne[i]);
-      var objTwoKeys = Object.keys(arrTwo[i]);
-      if (objOneKeys.length !== objTwoKeys.length) {
-        return false;
-      }
-      for (var key in arrOne[i]) {
-        if (_react2['default'].isValidElement(arrOne[i][key]) || _react2['default'].isValidElement(arrTwo[i][key])) {
-          // 是一个 React 元素
-        } else if (key === 'children' && Array.isArray(arrOne[i][key]) && Array.isArray(arrTwo[i][key])) {
-          var isEqual = _this3.touchDeepEqual(arrOne[i][key], arrTwo[i][key]);
-          if (isEqual) {
-            // 相等
-          } else {
-            return false;
-          }
-        } else if (arrOne[i][key] !== arrTwo[i][key]) {
-          return false;
-        }
-      }
-    }
-    return true;
-  };
 };
 
 exports['default'] = Easy3wGridPage;

package/lib/index.js

@@ -380,4 +380,13 @@ Object.defineProperty(exports, 'Easy3wAESDecrypt', {
   }
 });
 
+var _Easy3wGetDesensitization = require('./Easy3wGetDesensitization');
+
+Object.defineProperty(exports, 'Easy3wGetDesensitization', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wGetDesensitization)['default'];
+  }
+});
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.50",
+  "version": "1.5.51-beta2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",