easy3wui 1.5.48 → 1.5.49-beta2

package/lib/Easy3wFormPage/index.js

@@ -498,7 +498,8 @@ var Easy3wFormPage = function (_Component) {
     _this.getcheckDesensitizeData = function (str, item) {
       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 = /^\d{15}(\d{2}[0-9xX])?$/; // 身份证
+      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]$)/; // 身份证
+      item.dataDesensitizationFlagTrue = false; // 当前字段--数据脱敏标识--脱敏成功
       if (phoneRegex.test(str)) {
         // 手机号
         item.dataDesensitizationFlagTrue = true; // 当前字段--数据脱敏标识--脱敏成功
@@ -513,12 +514,8 @@ var Easy3wFormPage = function (_Component) {
 
         var desensitizedUsername = username.slice(0, 1) + '****';
         return desensitizedUsername + '@' + domain; // 脱敏邮箱
-      } else if (idRegex.test(str) && str.length === 18) {
-        // 18位身份证
-        item.dataDesensitizationFlagTrue = true; // 当前字段--数据脱敏标识--脱敏成功
-        return str.slice(0, 3) + '***********' + str.slice(-4); // 脱敏身份证
-      } else if (idRegex.test(str) && str.length === 15) {
-        // 15位身份证
+      } else if (idRegex.test(str)) {
+        // 身份证
         item.dataDesensitizationFlagTrue = true; // 当前字段--数据脱敏标识--脱敏成功
         return str.slice(0, 3) + '********' + str.slice(-4); // 脱敏身份证
       } else {

package/lib/Easy3wGridPage/index.js

@@ -72,6 +72,10 @@ var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
 
+var _cloneDeep = require('lodash/cloneDeep');
+
+var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
+
 var _comonConfig = require('comonConfigPath/comonConfig');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
@@ -104,7 +108,14 @@ var Easy3wGridPage = function (_Component) {
         ));
       });
     }
+    var dataList = _this.props.dataList;
+
+    var arrData = dataList && dataList.length ? JSON.parse(JSON.stringify(dataList)) : [];
     _this.state = {
+      // 数据
+      arrData: arrData, // 列表
+      arrColumns: [], // 列
+      // 选择
       selectedRowKeysState: selectedKey || [],
       selectedRowsState: selectedVal || [],
       selRowKeysTags: selRowKeysTags,
@@ -114,6 +125,22 @@ var Easy3wGridPage = function (_Component) {
   }
 
   Easy3wGridPage.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+    var _props = this.props,
+        _props$dataList = _props.dataList,
+        dataList = _props$dataList === undefined ? [] : _props$dataList,
+        _props$columns = _props.columns,
+        columns = _props$columns === undefined ? [] : _props$columns;
+
+    if (nextProps.dataList.length !== dataList.length || JSON.stringify(nextProps.dataList) !== JSON.stringify(dataList)) {
+      this.setState({
+        arrData: nextProps.dataList && nextProps.dataList.length ? JSON.parse(JSON.stringify(nextProps.dataList)) : []
+      });
+    }
+    if (nextProps.columns.length !== columns.length || JSON.stringify(nextProps.columns) !== JSON.stringify(columns)) {
+      this.setState({
+        arrColumns: nextProps.columns && nextProps.columns.length ? this.formatColumns((0, _cloneDeep2['default'])(nextProps.columns)) : []
+      });
+    }
     if (nextProps.cleanFlag === '1') {
       this.delAll();
     }
@@ -123,151 +150,40 @@ var Easy3wGridPage = function (_Component) {
 
   // 数据脱敏--显隐
 
-
   // ---------------------------------- 数据脱敏 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,
-        rowKey = _props.rowKey,
-        checkType = _props.checkType,
-        bordered = _props.bordered,
-        chooseFlag = _props.chooseFlag,
-        scroll = _props.scroll,
-        className = _props.className,
-        paginationInfo = _props.paginationInfo;
+    var _props2 = this.props,
+        columns = _props2.columns,
+        loading = _props2.loading,
+        getCheckboxProps = _props2.getCheckboxProps,
+        needPaginationFlag = _props2.needPaginationFlag,
+        gridProps = _props2.gridProps,
+        totalResult = _props2.totalResult,
+        rowKey = _props2.rowKey,
+        checkType = _props2.checkType,
+        bordered = _props2.bordered,
+        chooseFlag = _props2.chooseFlag,
+        scroll = _props2.scroll,
+        className = _props2.className,
+        paginationInfo = _props2.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((0, _cloneDeep2['default'])(columns));
+    // const arrColumns = this.touchCreateColumns(columns);
     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) {
-        var dataIndex = item.dataIndex;
-
-        if (!item.render) {
-          item.render = function (text, record, index) {
-            var _record$id = record.id,
-                id = _record$id === undefined ? '' : _record$id;
-
-            var renderTextDesensitize = '';
-            if (_comonConfig.dataDesensitizationFlag) {
-              renderTextDesensitize = _this2.getcheckDesensitizeData(text, item, index);
-            }
-            var dataDesensitizationFlagTrue = item.dataDesensitizationFlagTrue;
-
-            if (_comonConfig.dataDesensitizationFlag && dataDesensitizationFlagTrue) {
-              if (text && text.length * 14 > 160) {
-                return _react2['default'].createElement(
-                  _tooltip2['default'],
-                  { placement: 'topLeft', title: _react2['default'].createElement(
-                      'span',
-                      null,
-                      _this2.state[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'] ? text : renderTextDesensitize,
-                      ' ',
-                      _react2['default'].createElement(
-                        'a',
-                        { onClick: function onClick() {
-                            return _this2.getImplicit(dataIndex, id, index);
-                          } },
-                        _react2['default'].createElement(_icon2['default'], { type: _this2.state[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
-                      )
-                    ), style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
-                  _react2['default'].createElement(
-                    'span',
-                    null,
-                    _this2.state[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'] ? text : renderTextDesensitize,
-                    ' ',
-                    _react2['default'].createElement(
-                      'a',
-                      { onClick: function onClick() {
-                          return _this2.getImplicit(dataIndex, id, index);
-                        } },
-                      _react2['default'].createElement(_icon2['default'], { type: _this2.state[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
-                    )
-                  )
-                );
-              } else {
-                return _react2['default'].createElement(
-                  'span',
-                  null,
-                  _this2.state[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'] ? text : renderTextDesensitize,
-                  ' ',
-                  _react2['default'].createElement(
-                    'a',
-                    { onClick: function onClick() {
-                        return _this2.getImplicit(dataIndex, id, index);
-                      } },
-                    _react2['default'].createElement(_icon2['default'], { type: _this2.state[dataIndex + '-' + id + '-' + index + '-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: _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) {
       // 若需选择框
@@ -294,7 +210,6 @@ var Easy3wGridPage = function (_Component) {
         }
       };
     }
-    var myColumns = columns;
     // 处理分页 start
     if (needPaginationFlag) {
       var defaultCurrent = paginationInfo ? paginationInfo.offset : 1;
@@ -313,34 +228,10 @@ 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;
@@ -360,8 +251,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: myColumns,
-        dataSource: dataList,
+        columns: this.state.arrColumns && this.state.arrColumns.length ? this.state.arrColumns : arrColumns,
+        dataSource: arrData,
         pagination: paginationProps,
         loading: loading,
         rowKey: rowKey,
@@ -401,11 +292,11 @@ var _initialiseProps = function _initialiseProps() {
     var _state2 = _this3.state,
         selectedRowKeysState = _state2.selectedRowKeysState,
         selectedRowsState = _state2.selectedRowsState;
-    var _props2 = _this3.props,
-        rowKey = _props2.rowKey,
-        rowKeyCname = _props2.rowKeyCname,
-        selectChangeCallback = _props2.selectChangeCallback,
-        chooseFlag = _props2.chooseFlag;
+    var _props3 = _this3.props,
+        rowKey = _props3.rowKey,
+        rowKeyCname = _props3.rowKeyCname,
+        selectChangeCallback = _props3.selectChangeCallback,
+        chooseFlag = _props3.chooseFlag;
 
     selectedRowKeysState.splice(selectedRowKeysState.findIndex(function (selectedRowKey) {
       return selectedRowKey === closeKey;
@@ -442,11 +333,11 @@ var _initialiseProps = function _initialiseProps() {
 
     var selectedRowKeysStateArr = selectedRowKeysState;
     var selectedRowsStateArr = selectedRowsState;
-    var _props3 = _this3.props,
-        rowKey = _props3.rowKey,
-        rowKeyCname = _props3.rowKeyCname,
-        selectChangeCallback = _props3.selectChangeCallback,
-        chooseFlag = _props3.chooseFlag;
+    var _props4 = _this3.props,
+        rowKey = _props4.rowKey,
+        rowKeyCname = _props4.rowKeyCname,
+        selectChangeCallback = _props4.selectChangeCallback,
+        chooseFlag = _props4.chooseFlag;
 
     var newSelRowKeysTags = [];
     selectedRowKeysStateArr.splice(selectedRowKeysStateArr.findIndex(function (selectedRowKey) {
@@ -493,12 +384,12 @@ var _initialiseProps = function _initialiseProps() {
     var _state4 = _this3.state,
         selectedRowKeysState = _state4.selectedRowKeysState,
         selectedRowsState = _state4.selectedRowsState;
-    var _props4 = _this3.props,
-        rowKey = _props4.rowKey,
-        rowKeyCname = _props4.rowKeyCname,
-        selectChangeCallback = _props4.selectChangeCallback,
-        chooseFlag = _props4.chooseFlag,
-        checkType = _props4.checkType;
+    var _props5 = _this3.props,
+        rowKey = _props5.rowKey,
+        rowKeyCname = _props5.rowKeyCname,
+        selectChangeCallback = _props5.selectChangeCallback,
+        chooseFlag = _props5.chooseFlag,
+        checkType = _props5.checkType;
 
     if (checkType === 'radio') {
       selectedRowKeysState = [];
@@ -534,11 +425,11 @@ var _initialiseProps = function _initialiseProps() {
     var _state5 = _this3.state,
         selectedRowKeysState = _state5.selectedRowKeysState,
         selectedRowsState = _state5.selectedRowsState;
-    var _props5 = _this3.props,
-        rowKey = _props5.rowKey,
-        rowKeyCname = _props5.rowKeyCname,
-        selectChangeCallback = _props5.selectChangeCallback,
-        chooseFlag = _props5.chooseFlag;
+    var _props6 = _this3.props,
+        rowKey = _props6.rowKey,
+        rowKeyCname = _props6.rowKeyCname,
+        selectChangeCallback = _props6.selectChangeCallback,
+        chooseFlag = _props6.chooseFlag;
 
     removeRows.forEach(function (removeRow) {
       selectedRowKeysState.splice(selectedRowKeysState.findIndex(function (selectedRowKey) {
@@ -611,11 +502,11 @@ var _initialiseProps = function _initialiseProps() {
 
     var selectedRowKeysStateArr = selectedRowKeysState;
     var selectedRowsStateArr = selectedRowsState;
-    var _props6 = _this3.props,
-        rowKey = _props6.rowKey,
-        rowKeyCname = _props6.rowKeyCname,
-        selectChangeCallback = _props6.selectChangeCallback,
-        chooseFlag = _props6.chooseFlag;
+    var _props7 = _this3.props,
+        rowKey = _props7.rowKey,
+        rowKeyCname = _props7.rowKeyCname,
+        selectChangeCallback = _props7.selectChangeCallback,
+        chooseFlag = _props7.chooseFlag;
 
     var flag = false;
     var newSelRowKeysTags = [];
@@ -684,10 +575,10 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.handleTableChange = function (pagination) {
-    var _props7 = _this3.props,
-        selfDealPageChangeFunc = _props7.selfDealPageChangeFunc,
-        getSearchCondition = _props7.getSearchCondition,
-        handleSearch = _props7.handleSearch;
+    var _props8 = _this3.props,
+        selfDealPageChangeFunc = _props8.selfDealPageChangeFunc,
+        getSearchCondition = _props8.getSearchCondition,
+        handleSearch = _props8.handleSearch;
 
     var formVal = getSearchCondition();
     var paginationInfo = { offset: pagination.current, limit: pagination.pageSize };
@@ -699,39 +590,45 @@ var _initialiseProps = function _initialiseProps() {
     }
   };
 
-  this.getcheckDesensitizeData = function (str, item) {
+  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 = /^\d{15}(\d{2}[0-9xX])?$/; // 身份证
-    item.dataDesensitizationFlagTrue = false; // 当前字段--数据脱敏标识--未脱敏成功
+    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)) {
       // 手机号
-      item.dataDesensitizationFlagTrue = true; // 当前字段--数据脱敏标识--脱敏成功
-      return str.slice(0, 3) + '****' + str.slice(-4); // 脱敏手机号
+      record[dataIndex + '-dataDesensitizationFlagTrue'] = true; // 当前字段--数据脱敏标识--脱敏成功
+      strDesensitize = str.slice(0, 3) + '****' + str.slice(-4); // 脱敏手机号
     } else if (emailRegex.test(str)) {
       // 邮箱
-      item.dataDesensitizationFlagTrue = true; // 当前字段--数据脱敏标识--脱敏成功
+      record[dataIndex + '-dataDesensitizationFlagTrue'] = true; // 当前字段--数据脱敏标识--脱敏成功
 
       var _str$split = str.split('@'),
           username = _str$split[0],
           domain = _str$split[1];
 
       var desensitizedUsername = username.slice(0, 1) + '****';
-      return desensitizedUsername + '@' + domain; // 脱敏邮箱
-    } else if (idRegex.test(str) && str.length === 18) {
-      // 18位身份证
-      item.dataDesensitizationFlagTrue = true; // 当前字段--数据脱敏标识--脱敏成功
-      return str.slice(0, 3) + '***********' + str.slice(-4); // 脱敏身份证
-    } else if (idRegex.test(str) && str.length === 15) {
-      // 15位身份证
-      item.dataDesensitizationFlagTrue = true; // 当前字段--数据脱敏标识--脱敏成功
-      return str.slice(0, 3) + '********' + str.slice(-4); // 脱敏身份证
-    } else {
-      return str;
+      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 (dataIndex, id, index) {
+  this.getImplicit = function (dataIndex, index) {
+    var arrData = _this3.state.arrData;
+
     if (_comonConfig.dataDesensitizationUrl) {
       var xhr = new XMLHttpRequest();
       xhr.onreadystatechange = function () {
@@ -745,9 +642,10 @@ var _initialiseProps = function _initialiseProps() {
               passMsg = _ref.passMsg;
 
           if (passFlag) {
-            var _this3$setState;
-
-            _this3.setState((_this3$setState = {}, _this3$setState[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'] = !_this3.state[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'], _this3$setState));
+            arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] = !arrData[index][dataIndex + '-dataDesensitizationEyeFlag']; // 当前字段--数据脱敏标识--显隐
+            _this3.setState({
+              arrData: arrData // 更新数据
+            });
           } else {
             _modal2['default'].error({
               content: passMsg || '用户无权限，请联系管理员',
@@ -761,10 +659,163 @@ var _initialiseProps = function _initialiseProps() {
       xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
       xhr.send(data); // 发送请求
     } else {
-      var _this3$setState2;
+      arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] = !arrData[index][dataIndex + '-dataDesensitizationEyeFlag']; // 当前字段--数据脱敏标识--显隐
+      _this3.setState({
+        arrData: arrData // 更新数据
+      });
+    }
+  };
+
+  this.touchCreateColumns = function (columns) {
+    var _props9 = _this3.props,
+        dataList = _props9.dataList,
+        autoAddNumber = _props9.autoAddNumber,
+        paginationInfo = _props9.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) {
+      arr.forEach(function (item) {
+        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) {
+      arr.forEach(function (item) {
+        if (item.fixed && printFlag) {
+          item.fixed = null;
+        }
+        var dataIndex = item.dataIndex;
 
-      _this3.setState((_this3$setState2 = {}, _this3$setState2[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'] = !_this3.state[dataIndex + '-' + id + '-' + index + '-dataDesensitizationEyeFlag'], _this3$setState2));
+        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() {
+                            return _this3.getImplicit(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() {
+                          return _this3.getImplicit(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() {
+                        return _this3.getImplicit(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);
+        }
+      });
+    };
+    recursion(columns);
+    if (dataList) {
+      if (dataList.length > 0) {
+        recursionT(columns);
+      }
+    }
+    var columnsNew = columns;
+    if (autoAddNumber) {
+      if (columns.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(columns);
+      }
     }
+    return columnsNew;
   };
 };
 

package/package.json

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