easy3wui 1.5.72 → 1.5.73

package/lib/Easy3wGridInputAmount/index.js

@@ -0,0 +1,93 @@
+'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 _inputNumber = require('antd/lib/input-number');
+
+var _inputNumber2 = _interopRequireDefault(_inputNumber);
+
+require('antd/lib/input-number/style');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wGridInputAmount = function (_Component) {
+  (0, _inherits3['default'])(Easy3wGridInputAmount, _Component);
+
+  function Easy3wGridInputAmount() {
+    (0, _classCallCheck3['default'])(this, Easy3wGridInputAmount);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wGridInputAmount.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,
+        pattern = _props.pattern,
+        patternMessage = _props.patternMessage;
+    var getFieldDecorator = form.getFieldDecorator;
+
+    var rulesArr = [];
+    var requiredRule = { required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label };
+    var patternRule = { pattern: pattern, message: patternMessage };
+    rulesArr.push(requiredRule);
+    if (pattern) {
+      rulesArr.push(patternRule);
+    }
+    return _react2['default'].createElement(
+      _form2['default'].Item,
+      { style: { marginBottom: 0 } },
+      getFieldDecorator(fieldId, {
+        // trigger: 'onBlur',
+        // valuePropName: 'defaultValue',
+        rules: rulesArr,
+        initialValue: value
+      })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({
+        formatter: function formatter(val) {
+          return ('' + val).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+        },
+        parser: function parser(val) {
+          return val.replace(/\$\s?|(,*)/g, '');
+        },
+        precision: 2
+      }, cmptPros, {
+        style: { minWidth: 80, width: '100%' }
+      })))
+    );
+  };
+
+  return Easy3wGridInputAmount;
+}(_react.Component);
+
+exports['default'] = Easy3wGridInputAmount;
+module.exports = exports['default'];

package/lib/Easy3wGridInputDigit/index.js

@@ -0,0 +1,83 @@
+'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 _inputNumber = require('antd/lib/input-number');
+
+var _inputNumber2 = _interopRequireDefault(_inputNumber);
+
+require('antd/lib/input-number/style');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wGridInputDigit = function (_Component) {
+  (0, _inherits3['default'])(Easy3wGridInputDigit, _Component);
+
+  function Easy3wGridInputDigit() {
+    (0, _classCallCheck3['default'])(this, Easy3wGridInputDigit);
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+  }
+
+  Easy3wGridInputDigit.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,
+        pattern = _props.pattern,
+        patternMessage = _props.patternMessage;
+    var getFieldDecorator = form.getFieldDecorator;
+
+    var rulesArr = [];
+    var requiredRule = { required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label };
+    var patternRule = { pattern: pattern, message: patternMessage };
+    rulesArr.push(requiredRule);
+    if (pattern) {
+      rulesArr.push(patternRule);
+    }
+    return _react2['default'].createElement(
+      _form2['default'].Item,
+      { style: { marginBottom: 0 } },
+      getFieldDecorator(fieldId, {
+        // trigger: 'onBlur',
+        // valuePropName: 'defaultValue',
+        rules: rulesArr,
+        initialValue: value
+      })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({ precision: 2 }, cmptPros, { style: { minWidth: 80, width: '100%' } })))
+    );
+  };
+
+  return Easy3wGridInputDigit;
+}(_react.Component);
+
+exports['default'] = Easy3wGridInputDigit;
+module.exports = exports['default'];

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

@@ -102,6 +102,7 @@ var Easy3wGridPage = function (_Component) {
       selRowKeysTags: selRowKeysTags,
       pagination: { offset: 1, limit: 10 }
     };
+    _this.myRef = (0, _react.createRef)(); // 创建 ref
     return _this;
   }
 
@@ -129,16 +130,31 @@ 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,
         selRowKeysTags = _state.selRowKeysTags;
 
+    var printArr = location.hash.split('/');
+    var printValue = this.props.printValue || 'print';
+    var printFlag = printArr[1] === printValue;
+    var hasFormParentClass = this.myRef.current && this.myRef.current.closest('.e3wFormPageWrap'); // 是否处于表单页面
     var paginationProps = false; // 默认不分页
     var recursion = function recursion(arr) {
       arr.forEach(function (item) {
         var columnsType = item.type;
+        var title = item.title;
+
+        if (!(printFlag || hasFormParentClass) && title && typeof title === 'string' && title.length > 6) {
+          item.title = _react2['default'].createElement(
+            _tooltip2['default'],
+            { placement: 'topLeft', title: title },
+            title.substring(0, 6),
+            '...'
+          );
+        }
         switch (columnsType) {
           case 'shortText':
             item.className = 'e3wGridShortText';break;
@@ -231,7 +247,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;
@@ -250,10 +266,14 @@ var Easy3wGridPage = function (_Component) {
       };
       if (autoAddNumber) {
         if (columns.length > 0) {
+          var fixed = columns[0].fixed;
+
           myColumns = [{
             title: '序号',
             dataIndex: 'number',
             className: 'e3wGridShortText',
+            width: 50,
+            fixed: fixed,
             render: function render(text, record, index) {
               return _react2['default'].createElement(
                 'div',
@@ -266,9 +286,6 @@ var Easy3wGridPage = function (_Component) {
         }
       }
     }
-    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) {
@@ -290,11 +307,13 @@ var Easy3wGridPage = function (_Component) {
           '\u6E05\u7A7A'
         )
       ), type: 'info' });
+
+    // console.log('父级是否有 .e3wFormPageWrap:', hasParentClass);
     return _react2['default'].createElement(
       'div',
-      { className: gridProps || this.props.rowType ? gridProps.onRow || this.props.rowType ? 'onRow' : null : null },
+      { ref: this.myRef, 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',
+        className: printFlag || hasFormParentClass ? 'scrollPrint' : className || 'scrollX',
         columns: myColumns,
         dataSource: dataList,
         pagination: paginationProps,
@@ -624,15 +643,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'];