easy3wui 1.6.0 → 1.6.1

package/lib/Easy3wGridInput/index.js

@@ -57,13 +57,22 @@ var Easy3wGridInput = function (_Component) {
         patternMessage = _props.patternMessage;
     var getFieldDecorator = form.getFieldDecorator;
 
+    var _ref = cmptPros || {},
+        maxLength = _ref.maxLength,
+        disabled = _ref.disabled;
+
+    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { pattern: pattern, message: patternMessage }, { max: maxLength || 50, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 50) }];
+    if (disabled) {
+      rules.pop();
+    }
     return _react2['default'].createElement(
       _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         // trigger: 'onBlur',
         // valuePropName: 'defaultValue',
-        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { pattern: pattern, message: patternMessage }],
+        rules: rules,
+        // addRules = [{ max: maxLength, message: `录入文字长度不能超过${maxLength}` }, ...addRules];
         initialValue: value
       })(_react2['default'].createElement(_input2['default'], (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
     );

package/lib/Easy3wGridPage/index.js

@@ -286,7 +286,7 @@ var Easy3wGridPage = function (_Component) {
         rowKey: rowKey,
         rowSelection: rowSelection,
         bordered: bordered,
-        scroll: printFlag ? '' : scroll || { x: true },
+        scroll: printFlag ? {} : scroll || { x: true },
         onChange: this.handleTableChange,
         onRow: this.props.rowType ? function (record) {
           return {

package/lib/Easy3wGridTextArea/index.js

@@ -57,6 +57,14 @@ var Easy3wGridTextArea = function (_Component) {
         label = _props.label;
     var getFieldDecorator = form.getFieldDecorator;
 
+    var _ref = cmptPros || {},
+        maxLength = _ref.maxLength,
+        disabled = _ref.disabled;
+
+    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 1000, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 1000) }];
+    if (disabled) {
+      rules.pop();
+    }
     return _react2['default'].createElement(
       _form2['default'].Item,
       { style: { marginBottom: 0 } },
@@ -64,7 +72,7 @@ var Easy3wGridTextArea = function (_Component) {
         // trigger: 'onBlur',
         // valuePropName: 'defaultValue',
         initialValue: value,
-        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+        rules: rules
       })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
     );
   };

package/lib/Easy3wPositionButton/easy3wPositionButton.less

@@ -0,0 +1,8 @@
+@import '~antd/lib/style/themes/default.less';
+
+
+.positionDiv {
+    position: absolute;
+    right: 12px;
+    top: 10px;
+}

package/lib/Easy3wPositionButton/index.js

@@ -83,7 +83,7 @@ var Easy3wPositionButton = function (_Component) {
     var btnObj = this.getBtnObj();
     return _react2['default'].createElement(
       'div',
-      { className: 'positionDiv' },
+      { className: (0, _classnames2['default'])(['positionDiv']) },
       btnObj
     );
   };

package/lib/Easy3wUpload/index.js

@@ -80,7 +80,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 
 var FormItem = _form2['default'].Item;
 var formItemStyle = {
-  marginBottom: 6
+  // marginBottom: 0,
+  margin: 3
 };
 
 var Easy3wUpload = function (_Component) {
@@ -192,7 +193,7 @@ var Easy3wUpload = function (_Component) {
 
       var fileNameArr = name.toLowerCase().split('.');
       var fileType = fileNameArr[fileNameArr.length - 1];
-      var acceptDefault = '.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
+      var acceptDefault = '.msg,.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
       if (accept && accept.length > 0) {
         acceptDefault = accept;
       }
@@ -253,7 +254,7 @@ var Easy3wUpload = function (_Component) {
         var correctTypeFlag = true;
         var fileNameArr = name.toLowerCase().split('.');
         var fileType = fileNameArr[fileNameArr.length - 1];
-        var acceptDefault = '.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
+        var acceptDefault = '.msg,.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
         if (name.length > 100) {
           return false;
         }