easy3wui 1.4.41 → 1.4.92

package/lib/Easy3wGridCheckBox/index.js

@@ -14,21 +14,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _checkbox = require('antd/lib/checkbox');
+var _react = require('react');
 
-var _checkbox2 = _interopRequireDefault(_checkbox);
+var _react2 = _interopRequireDefault(_react);
 
-require('antd/lib/checkbox/style');
+var _form = require('antd/lib/form');
 
-var _react = require('react');
+var _form2 = _interopRequireDefault(_form);
 
-var _react2 = _interopRequireDefault(_react);
+require('antd/lib/form/style');
 
-var _compatible = require('@ant-design/compatible');
+var _checkbox = require('antd/lib/checkbox');
 
-require('@ant-design/compatible/assets/index.css');
+var _checkbox2 = _interopRequireDefault(_checkbox);
 
-var _antd = require('antd');
+require('antd/lib/checkbox/style');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -53,7 +53,7 @@ var Easy3wGridCheckBox = function (_Component) {
     var getFieldDecorator = form.getFieldDecorator;
 
     return _react2['default'].createElement(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         initialValue: value,

package/lib/Easy3wGridDatePicker/index.js

@@ -2,10 +2,6 @@
 
 exports.__esModule = true;
 
-var _datePicker = require('antd/lib/date-picker');
-
-var _datePicker2 = _interopRequireDefault(_datePicker);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -22,17 +18,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-require('antd/lib/date-picker/style');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _compatible = require('@ant-design/compatible');
+var _form = require('antd/lib/form');
 
-require('@ant-design/compatible/assets/index.css');
+var _form2 = _interopRequireDefault(_form);
 
-var _antd = require('antd');
+require('antd/lib/form/style');
+
+var _datePicker = require('antd/lib/date-picker');
+
+var _datePicker2 = _interopRequireDefault(_datePicker);
+
+require('antd/lib/date-picker/style');
 
 var _moment = require('moment');
 
@@ -70,7 +70,7 @@ var Easy3wGridDatePicker = function (_Component) {
 
     var val = value ? (0, _moment2['default'])(value, dateFormat) : undefined;
     return _react2['default'].createElement(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }],

package/lib/Easy3wGridDateTimePicker/index.js

@@ -2,10 +2,6 @@
 
 exports.__esModule = true;
 
-var _datePicker = require('antd/lib/date-picker');
-
-var _datePicker2 = _interopRequireDefault(_datePicker);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -22,17 +18,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-require('antd/lib/date-picker/style');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _compatible = require('@ant-design/compatible');
+var _form = require('antd/lib/form');
 
-require('@ant-design/compatible/assets/index.css');
+var _form2 = _interopRequireDefault(_form);
 
-var _antd = require('antd');
+require('antd/lib/form/style');
+
+var _datePicker = require('antd/lib/date-picker');
+
+var _datePicker2 = _interopRequireDefault(_datePicker);
+
+require('antd/lib/date-picker/style');
 
 var _moment = require('moment');
 
@@ -100,7 +100,7 @@ var Easy3wGridDateTimePicker = function (_Component) {
 
     var val = value ? (0, _moment2['default'])(value, dateFormat) : undefined;
     return _react2['default'].createElement(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }],

package/lib/Easy3wGridInput/index.js

@@ -2,10 +2,6 @@
 
 exports.__esModule = true;
 
-var _input = require('antd/lib/input');
-
-var _input2 = _interopRequireDefault(_input);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -22,17 +18,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-require('antd/lib/input/style');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _compatible = require('@ant-design/compatible');
+var _form = require('antd/lib/form');
 
-require('@ant-design/compatible/assets/index.css');
+var _form2 = _interopRequireDefault(_form);
 
-var _antd = require('antd');
+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 }; }
 
@@ -51,18 +51,19 @@ var Easy3wGridInput = function (_Component) {
         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;
 
     return _react2['default'].createElement(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         // trigger: 'onBlur',
         // valuePropName: 'defaultValue',
-        rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }, { pattern: pattern, message: patternMessage }],
+        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { pattern: pattern, message: patternMessage }],
         initialValue: value
       })(_react2['default'].createElement(_input2['default'], (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
     );

package/lib/Easy3wGridInputNumber/index.js

@@ -2,10 +2,6 @@
 
 exports.__esModule = true;
 
-var _inputNumber = require('antd/lib/input-number');
-
-var _inputNumber2 = _interopRequireDefault(_inputNumber);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -22,17 +18,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-require('antd/lib/input-number/style');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _compatible = require('@ant-design/compatible');
+var _form = require('antd/lib/form');
 
-require('@ant-design/compatible/assets/index.css');
+var _form2 = _interopRequireDefault(_form);
 
-var _antd = require('antd');
+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 }; }
 
@@ -51,20 +51,21 @@ var Easy3wGridInputNumber = function (_Component) {
         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: '\u8BF7\u586B\u5199' + label };
+    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(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         // trigger: 'onBlur',

package/lib/Easy3wGridInputNumberFormat/index.js

@@ -2,10 +2,6 @@
 
 exports.__esModule = true;
 
-var _inputNumber = require('antd/lib/input-number');
-
-var _inputNumber2 = _interopRequireDefault(_inputNumber);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -22,17 +18,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-require('antd/lib/input-number/style');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _compatible = require('@ant-design/compatible');
+var _form = require('antd/lib/form');
 
-require('@ant-design/compatible/assets/index.css');
+var _form2 = _interopRequireDefault(_form);
 
-var _antd = require('antd');
+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 }; }
 
@@ -51,20 +51,21 @@ var Easy3wGridInputNumberFormat = function (_Component) {
         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: '\u8BF7\u586B\u5199' + label };
+    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(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         // trigger: 'onBlur',

package/lib/Easy3wGridPage/index.js

@@ -83,7 +83,7 @@ var Easy3wGridPage = function (_Component) {
       selectedVal.forEach(function (obj) {
         selRowKeysTags.push(_react2['default'].createElement(
           _tag2['default'],
-          { key: obj[rowKey], closable: true, onClose: function onClose() {
+          { key: obj[rowKey], closable: true, afterClose: function afterClose() {
               return _this.onCloseTag(obj[rowKey]);
             } },
           obj[rowKeyCname]
@@ -337,22 +337,20 @@ var _initialiseProps = function _initialiseProps() {
       selectedRowsState.forEach(function (selectedRow) {
         newSelRowKeysTags.push(_react2['default'].createElement(
           _tag2['default'],
-          { key: selectedRow[rowKey], closable: true, onClose: function onClose() {
+          { key: selectedRow[rowKey], closable: true, afterClose: function afterClose() {
               return _this3.onCloseTag(selectedRow[rowKey]);
             } },
           selectedRow[rowKeyCname]
         ));
       });
     }
-    var arrSelectedRowKeysState = [].concat(selectedRowKeysState);
-    var arrSelectedRowsState = [].concat(selectedRowsState);
     _this3.setState({
-      selectedRowKeysState: arrSelectedRowKeysState,
-      selectedRowsState: arrSelectedRowsState,
+      selectedRowKeysState: selectedRowKeysState,
+      selectedRowsState: selectedRowsState,
       selRowKeysTags: newSelRowKeysTags
     });
     if (selectChangeCallback) {
-      selectChangeCallback(arrSelectedRowKeysState, arrSelectedRowsState);
+      selectChangeCallback(selectedRowKeysState, selectedRowsState);
     }
   };
 
@@ -380,7 +378,7 @@ var _initialiseProps = function _initialiseProps() {
       selectedRowsStateArr.forEach(function (selectedRow) {
         newSelRowKeysTags.push(_react2['default'].createElement(
           _tag2['default'],
-          { key: selectedRow[rowKey], closable: true, onClose: function onClose() {
+          { key: selectedRow[rowKey], closable: true, afterClose: function afterClose() {
               return _this3.onRowSelectedClose(selectedRow[rowKey]);
             } },
           selectedRow[rowKeyCname]
@@ -421,44 +419,33 @@ var _initialiseProps = function _initialiseProps() {
         chooseFlag = _props4.chooseFlag,
         checkType = _props4.checkType;
 
-    var arrSelectedRowKeysState = [].concat(selectedRowKeysState);
-    var arrSelectedRowsState = [].concat(selectedRowsState);
     if (checkType === 'radio') {
-      arrSelectedRowKeysState = [];
-      arrSelectedRowsState = [];
+      selectedRowKeysState = [];
+      selectedRowsState = [];
     }
     addRows.forEach(function (addRow) {
-      arrSelectedRowKeysState = arrSelectedRowKeysState.filter(function (item) {
-        return item !== addRow[rowKey];
-      });
-      arrSelectedRowsState = arrSelectedRowsState.filter(function (item) {
-        return item[rowKey] !== addRow[rowKey];
-      });
-    });
-    addRows.forEach(function (addRow) {
-      arrSelectedRowKeysState.push(addRow[rowKey]);
-      arrSelectedRowsState.push(addRow);
+      selectedRowKeysState.push(addRow[rowKey]);
+      selectedRowsState.push(addRow);
     });
     var newSelRowKeysTags = [];
     if (chooseFlag) {
-      arrSelectedRowsState.forEach(function (selectedRow) {
+      selectedRowsState.forEach(function (selectedRow) {
         newSelRowKeysTags.push(_react2['default'].createElement(
           _tag2['default'],
-          { key: selectedRow[rowKey], closable: true, onClose: function onClose() {
+          { key: selectedRow[rowKey], closable: true, afterClose: function afterClose() {
               return _this3.onCloseTag(selectedRow[rowKey]);
             } },
           selectedRow[rowKeyCname]
         ));
       });
     }
-
     _this3.setState({
-      selectedRowKeysState: arrSelectedRowKeysState,
-      selectedRowsState: arrSelectedRowsState,
+      selectedRowKeysState: selectedRowKeysState,
+      selectedRowsState: selectedRowsState,
       selRowKeysTags: newSelRowKeysTags
     });
     if (selectChangeCallback) {
-      selectChangeCallback(arrSelectedRowKeysState, arrSelectedRowsState, true, addRows);
+      selectChangeCallback(selectedRowKeysState, selectedRowsState, true, addRows);
     }
   };
 
@@ -485,22 +472,20 @@ var _initialiseProps = function _initialiseProps() {
       selectedRowsState.forEach(function (selectedRow) {
         newSelRowKeysTags.push(_react2['default'].createElement(
           _tag2['default'],
-          { key: selectedRow[rowKey], closable: true, onClose: function onClose() {
+          { key: selectedRow[rowKey], closable: true, afterClose: function afterClose() {
               return _this3.onCloseTag(selectedRow[rowKey]);
             } },
           selectedRow[rowKeyCname]
         ));
       });
     }
-    var arrSelectedRowKeysState = [].concat(selectedRowKeysState);
-    var arrSelectedRowsState = [].concat(selectedRowsState);
     _this3.setState({
-      selectedRowKeysState: arrSelectedRowKeysState,
-      selectedRowsState: arrSelectedRowsState,
+      selectedRowKeysState: selectedRowKeysState,
+      selectedRowsState: selectedRowsState,
       selRowKeysTags: newSelRowKeysTags
     });
     if (selectChangeCallback) {
-      selectChangeCallback(arrSelectedRowKeysState, arrSelectedRowsState, false, removeRows);
+      selectChangeCallback(selectedRowKeysState, selectedRowsState, false, removeRows);
     }
   };
 
@@ -539,7 +524,7 @@ var _initialiseProps = function _initialiseProps() {
         selectedRowsStateArr.forEach(function (selectedRow) {
           newSelRowKeysTags.push(_react2['default'].createElement(
             _tag2['default'],
-            { key: selectedRow[rowKey], closable: true, onClose: function onClose() {
+            { key: selectedRow[rowKey], closable: true, afterClose: function afterClose() {
                 return _this3.onRowSelectedClose(selectedRow[rowKey]);
               } },
             selectedRow[rowKeyCname]
@@ -555,7 +540,7 @@ var _initialiseProps = function _initialiseProps() {
         selectedRowsStateArr.forEach(function (selectedRow) {
           newSelRowKeysTags.push(_react2['default'].createElement(
             _tag2['default'],
-            { key: selectedRow[rowKey], closable: true, onClose: function onClose() {
+            { key: selectedRow[rowKey], closable: true, afterClose: function afterClose() {
                 return _this3.onRowSelectedClose(selectedRow[rowKey]);
               } },
             selectedRow[rowKeyCname]
@@ -569,7 +554,7 @@ var _initialiseProps = function _initialiseProps() {
         selectedRowsStateArr.forEach(function (selectedRow) {
           newSelRowKeysTags.push(_react2['default'].createElement(
             _tag2['default'],
-            { key: selectedRow[rowKey], closable: true, onClose: function onClose() {
+            { key: selectedRow[rowKey], closable: true, afterClose: function afterClose() {
                 return _this3.onRowSelectedClose(selectedRow[rowKey]);
               } },
             selectedRow[rowKeyCname]

package/lib/Easy3wGridRadio/index.js

@@ -14,21 +14,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _radio = require('antd/lib/radio');
+var _react = require('react');
 
-var _radio2 = _interopRequireDefault(_radio);
+var _react2 = _interopRequireDefault(_react);
 
-require('antd/lib/radio/style');
+var _form = require('antd/lib/form');
 
-var _react = require('react');
+var _form2 = _interopRequireDefault(_form);
 
-var _react2 = _interopRequireDefault(_react);
+require('antd/lib/form/style');
 
-var _compatible = require('@ant-design/compatible');
+var _radio = require('antd/lib/radio');
 
-require('@ant-design/compatible/assets/index.css');
+var _radio2 = _interopRequireDefault(_radio);
 
-var _antd = require('antd');
+require('antd/lib/radio/style');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -49,15 +49,16 @@ var Easy3wGridRadio = function (_Component) {
         form = _props.form,
         cmptPros = _props.cmptPros,
         required = _props.required,
+        requiredMessage = _props.requiredMessage,
         label = _props.label;
     var getFieldDecorator = form.getFieldDecorator;
 
     return _react2['default'].createElement(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         initialValue: value,
-        rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }]
+        rules: [{ required: required, message: requiredMessage || '\u8BF7\u9009\u62E9' + label }]
       })(_react2['default'].createElement(RadioGroup, cmptPros))
     );
   };

package/lib/Easy3wGridSelect/index.js

@@ -18,21 +18,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _select = require('antd/lib/select');
+var _react = require('react');
 
-var _select2 = _interopRequireDefault(_select);
+var _react2 = _interopRequireDefault(_react);
 
-require('antd/lib/select/style');
+var _form = require('antd/lib/form');
 
-var _react = require('react');
+var _form2 = _interopRequireDefault(_form);
 
-var _react2 = _interopRequireDefault(_react);
+require('antd/lib/form/style');
 
-var _compatible = require('@ant-design/compatible');
+var _select = require('antd/lib/select');
 
-require('@ant-design/compatible/assets/index.css');
+var _select2 = _interopRequireDefault(_select);
 
-var _antd = require('antd');
+require('antd/lib/select/style');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -66,7 +66,7 @@ var Easy3wGridSelect = function (_Component) {
       );
     });
     return _react2['default'].createElement(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         initialValue: value,

package/lib/Easy3wGridTextArea/index.js

@@ -18,21 +18,21 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _input = require('antd/lib/input');
+var _react = require('react');
 
-var _input2 = _interopRequireDefault(_input);
+var _react2 = _interopRequireDefault(_react);
 
-require('antd/lib/input/style');
+var _form = require('antd/lib/form');
 
-var _react = require('react');
+var _form2 = _interopRequireDefault(_form);
 
-var _react2 = _interopRequireDefault(_react);
+require('antd/lib/form/style');
 
-var _compatible = require('@ant-design/compatible');
+var _input = require('antd/lib/input');
 
-require('@ant-design/compatible/assets/index.css');
+var _input2 = _interopRequireDefault(_input);
 
-var _antd = require('antd');
+require('antd/lib/input/style');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -53,17 +53,18 @@ var Easy3wGridTextArea = function (_Component) {
         form = _props.form,
         cmptPros = _props.cmptPros,
         required = _props.required,
+        requiredMessage = _props.requiredMessage,
         label = _props.label;
     var getFieldDecorator = form.getFieldDecorator;
 
     return _react2['default'].createElement(
-      _compatible.Form.Item,
+      _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         // trigger: 'onBlur',
         // valuePropName: 'defaultValue',
         initialValue: value,
-        rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }]
+        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
       })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
     );
   };