easy3wui 1.5.24 → 1.5.25

package/assets/formPage.css

@@ -13,3 +13,28 @@
 .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
+.inputNumberFormat {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: row;
+      flex-direction: row;
+  -ms-flex-wrap: nowrap;
+      flex-wrap: nowrap;
+  line-height: 32px;
+}
+.inputNumberFormat .addonBtns {
+  height: 32px;
+  width: auto;
+  border-left: none;
+  border-right: 1px solid #d9d9d9;
+}
+.inputNumberFormat .inputNumberBtns .e3wFootBtn {
+  margin: 0;
+}
+input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.rightText {
+  text-align: right;
+}

package/assets/index.css

@@ -1394,6 +1394,31 @@ s {
 .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
+.inputNumberFormat {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: row;
+      flex-direction: row;
+  -ms-flex-wrap: nowrap;
+      flex-wrap: nowrap;
+  line-height: 32px;
+}
+.inputNumberFormat .addonBtns {
+  height: 32px;
+  width: auto;
+  border-left: none;
+  border-right: 1px solid #d9d9d9;
+}
+.inputNumberFormat .inputNumberBtns .e3wFootBtn {
+  margin: 0;
+}
+input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.rightText {
+  text-align: right;
+}
 .e3wFootBtn {
   margin: 0px 8px;
 }

package/lib/Easy3wButton/index.js

@@ -190,7 +190,9 @@ var Easy3wButton = function (_Component) {
       );
     }, _this.getDropdownArrObj = function (obj) {
       var cName = obj.cName,
-          dropdownArr = obj.dropdownArr;
+          dropdownArr = obj.dropdownArr,
+          _obj$dropdownProps = obj.dropdownProps,
+          dropdownProps = _obj$dropdownProps === undefined ? {} : _obj$dropdownProps;
 
       var menuArr = dropdownArr.map(function (dropdown) {
         var func = dropdown.func;
@@ -210,7 +212,7 @@ var Easy3wButton = function (_Component) {
       );
       return _react2['default'].createElement(
         _dropdown2['default'],
-        { overlay: menuOverlay },
+        (0, _extends3['default'])({ overlay: menuOverlay }, dropdownProps),
         _react2['default'].createElement(
           _button2['default'],
           null,

package/lib/Easy3wFormPage/index.js

@@ -282,9 +282,11 @@ var Easy3wFormPage = function (_Component) {
         func(e);
       }
     }, _this.getItemArea = function (item) {
+      var allReadFlag = _this.props.allReadFlag;
       var fieldType = item.fieldType,
           cmptPros = item.cmptPros,
-          disableFlag = item.disableFlag;
+          disableFlag = item.disableFlag,
+          readFlag = item.readFlag;
 
       var itemNew = item;
       var newCmptPros = {};
@@ -296,6 +298,14 @@ var Easy3wFormPage = function (_Component) {
         }
         itemNew = (0, _extends3['default'])({}, item, { cmptPros: newCmptPros });
       }
+      if ((readFlag || allReadFlag) && (fieldType === 'checkBox' || fieldType === 'radio')) {
+        if (cmptPros) {
+          newCmptPros = (0, _extends3['default'])({}, cmptPros, { disabled: true });
+        } else {
+          newCmptPros = { disabled: true };
+        }
+        itemNew = (0, _extends3['default'])({}, item, { cmptPros: newCmptPros });
+      }
       switch (fieldType) {
         case 'autoComplete':
           return _this.autoCompleteHandler(itemNew);
@@ -319,8 +329,8 @@ var Easy3wFormPage = function (_Component) {
           return _this.inputHandler(itemNew);
         case 'textarea':
           return _this.textareaHandler(itemNew);
-        case 'inputNumber':
-          return _this.inputNumberHandler(itemNew);
+        // case 'inputNumber':
+        //   return this.inputNumberHandler(itemNew);
         // case 'inputNumberFormat':
         //   return this.inputNumberFormatHandler(itemNew);
         case 'numberInput':
@@ -377,6 +387,9 @@ var Easy3wFormPage = function (_Component) {
         return _braftEditor2['default'].createEditorState(value);
       }
       if (allReadFlag || readFlag) {
+        if (fieldType === 'rangePicker' && value instanceof Array) {
+          value = value.length ? value.join(' 至 ') : '';
+        }
         return value;
       }
       if (fieldType === 'datePicker') {
@@ -514,6 +527,7 @@ var Easy3wFormPage = function (_Component) {
         }
       }
       if (readFlag || allReadFlag) {
+        // allReadFlag
         if (fieldType === 'braftEditor') {
           return _react2['default'].createElement(
             FormItem,
@@ -529,22 +543,36 @@ var Easy3wFormPage = function (_Component) {
             _react2['default'].createElement('div', { dangerouslySetInnerHTML: { __html: itemValue.toHTML() } }),
             afterBtns
           );
+        } else if (fieldType === 'checkBox' || fieldType === 'radio') {
+          return _react2['default'].createElement(
+            FormItem,
+            (0, _extends3['default'])({
+              label: label
+            }, formItemLayout, formItemProps, {
+              style: formItemStyle
+            }),
+            getFieldDecorator(fieldId + 'Easy3wView', {
+              initialValue: itemValue,
+              rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+            })(itemArea)
+          );
+        } else {
+          return _react2['default'].createElement(
+            FormItem,
+            (0, _extends3['default'])({
+              label: label
+            }, formItemLayout, formItemProps, {
+              style: formItemStyle
+            }),
+            getFieldDecorator(fieldId + 'Easy3wView', {
+              initialValue: 'easy3wView',
+              rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+            })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
+            itemValue,
+            ' ',
+            afterBtns
+          );
         }
-        return _react2['default'].createElement(
-          FormItem,
-          (0, _extends3['default'])({
-            label: label
-          }, formItemLayout, formItemProps, {
-            style: formItemStyle
-          }),
-          getFieldDecorator(fieldId + 'Easy3wView', {
-            initialValue: 'easy3wView',
-            rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
-          })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
-          itemValue,
-          ' ',
-          afterBtns
-        );
       }
       if (popoverFlag) {
         var title = popProps.title,
@@ -916,6 +944,10 @@ var Easy3wFormPage = function (_Component) {
         var _up3 = _this.inputNumberFormatHandler(colObj, formItemLayout);
         return _up3;
       }
+      if (fieldType === 'inputNumber') {
+        var _up4 = _this.inputNumberHandler(colObj, formItemLayout);
+        return _up4;
+      }
       var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout);
       return formItem;
     }, _this.getAllForms = function () {
@@ -1054,10 +1086,11 @@ var Easy3wFormPage = function (_Component) {
       return _react2['default'].createElement(
         _select2['default'],
         (0, _extends3['default'])({
-          style: { width: '100%' }
-        }, cmptPros, {
-          allowClear: true
-        }),
+          style: { width: '100%' },
+          allowClear: true,
+          showSearch: true // 是否开启搜索
+          , optionFilterProp: 'children' // 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索
+        }, cmptPros),
         selectOpts
       );
     }, _this.tagSelectHandler = function (item) {
@@ -1188,22 +1221,83 @@ var Easy3wFormPage = function (_Component) {
         _message3['default'].info('\u8F93\u5165\u5B57\u6570\u4E0D\u80FD\u8D85\u8FC7' + maxLength);
       }
     }, _this.textareaHandler = function (item) {
-      var cmptPros = item.cmptPros;
+      var _item$cmptPros2 = item.cmptPros,
+          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
 
       var maxlength = void 0;
-      if (!cmptPros || cmptPros && !cmptPros.rows) {
-        cmptPros = (0, _extends3['default'])({}, cmptPros, { autosize: true });
-      }
-      if (cmptPros && (cmptPros.maxLength || cmptPros.maxlength)) {
+      if (cmptPros.maxLength || cmptPros.maxlength) {
         maxlength = cmptPros.maxLength || cmptPros.maxlength;
       }
+      if (!cmptPros.rows) {
+        cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, cmptPros);
+      }
       return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
           return _this.textAreaOnchange(e, maxlength);
         } }, cmptPros));
-    }, _this.inputNumberHandler = function (item) {
-      var cmptPros = item.cmptPros;
+    }, _this.inputNumberHandler = function (item, formItemLayout) {
+      var allReadFlag = _this.props.allReadFlag;
+      var getFieldDecorator = _this.props.form.getFieldDecorator;
+      var cmptPros = item.cmptPros,
+          label = item.label,
+          fieldId = item.fieldId,
+          requiredMessage = item.requiredMessage,
+          required = item.required,
+          value = item.value,
+          disableFlag = item.disableFlag,
+          formItemProps = item.formItemProps,
+          readFlag = item.readFlag;
+
+      var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
+      if (cmptPros && cmptPros.rules) {
+        var rules = cmptPros.rules;
 
-      return _react2['default'].createElement(_inputNumber2['default'], cmptPros);
+        addrules.push.apply(addrules, rules);
+      }
+      var afterBtns = _this.getAfterBtn(item);
+      if (readFlag || allReadFlag) {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle
+          }),
+          getFieldDecorator(fieldId + 'Easy3wView', {
+            initialValue: 'easy3wView',
+            rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+          })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
+          value,
+          ' ',
+          afterBtns
+        );
+      }
+      return _react2['default'].createElement(
+        FormItem,
+        (0, _extends3['default'])({
+          label: label
+        }, formItemLayout, formItemProps, {
+          style: formItemStyle
+        }),
+        _react2['default'].createElement(
+          'div',
+          { className: (0, _classnames2['default'])(['inputNumberFormat']) },
+          getFieldDecorator(fieldId, { rules: addrules, initialValue: value })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({
+            precision: 2,
+            style: { flex: 1 },
+            disabled: disableFlag
+          }, cmptPros))),
+          cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
+            'div',
+            { className: (0, _classnames2['default'])(['ant-input-group-addon', 'addonBtns']), style: { borderRadius: '0px 4px 4px 0px' } },
+            cmptPros.addonAfter
+          ) : null : null,
+          _react2['default'].createElement(
+            'div',
+            { className: (0, _classnames2['default'])(['inputNumberBtns']) },
+            afterBtns
+          )
+        )
+      );
     }, _this.inputNumberFormatHandler = function (item, formItemLayout) {
       var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
@@ -1250,43 +1344,32 @@ var Easy3wFormPage = function (_Component) {
         }),
         _react2['default'].createElement(
           'div',
-          { style: { position: 'relative' } },
-          _react2['default'].createElement(
-            _row2['default'],
-            null,
-            _react2['default'].createElement(
-              _col2['default'],
-              { span: cmptPros && cmptPros.addonAfter ? 21 : 24 },
-              getFieldDecorator(fieldId, { rules: addrules, 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,
-                disabled: disableFlag,
-                onChange: function onChange(onChangeValue) {
-                  var _this$props$form$setF;
+          { className: (0, _classnames2['default'])(['inputNumberFormat']) },
+          getFieldDecorator(fieldId, { rules: addrules, 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,
+            disabled: disableFlag,
+            onChange: function onChange(onChangeValue) {
+              var _this$props$form$setF;
 
-                  return _this.props.form.setFieldsValue((_this$props$form$setF = {}, _this$props$form$setF[item.fieldId] = onChangeValue, _this$props$form$setF));
-                },
-                style: { width: '100%', bottom: '4px' }
-              }, cmptPros)))
-            ),
-            _react2['default'].createElement(
-              _col2['default'],
-              { span: cmptPros && cmptPros.addonAfter ? 3 : 0 },
-              cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
-                'span',
-                { className: 'ant-input-group-addon', style: { lineHeight: '30px', borderRadius: '0px 5px 5px 0px' } },
-                cmptPros.addonAfter
-              ) : null : null
-            )
-          ),
+              return _this.props.form.setFieldsValue((_this$props$form$setF = {}, _this$props$form$setF[item.fieldId] = onChangeValue, _this$props$form$setF));
+            }
+          }, cmptPros, {
+            style: { flex: 1 }
+          }))),
+          cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
+            'div',
+            { className: (0, _classnames2['default'])(['ant-input-group-addon', 'addonBtns']), style: { borderRadius: '0px 4px 4px 0px' } },
+            cmptPros.addonAfter
+          ) : null : null,
           _react2['default'].createElement(
             'div',
-            { style: { position: 'absolute', left: '100%', zIndex: 2, top: '0px' } },
+            { className: (0, _classnames2['default'])(['inputNumberBtns']) },
             afterBtns
           )
         )
@@ -1302,7 +1385,8 @@ var Easy3wFormPage = function (_Component) {
         onPressEnter: function onPressEnter(e) {
           return _this.numberInputonBlur(e, item);
         },
-        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }]
+        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }],
+        className: (0, _classnames2['default'])(['rightText'])
       }, cmptPros));
     }, _this.numberInputonChange = function (e) {
       var value = e.target.value;
@@ -1356,10 +1440,14 @@ var Easy3wFormPage = function (_Component) {
       var templateArray = cmptPros.templateArray;
 
       var templateArr = templateArray.map(function (obj) {
-        if (obj.fieldType === 'inputNumberFormat') {
-          var up = _this.inputNumberFormatHandler(obj);
+        if (obj.fieldType === 'inputNumber') {
+          var up = _this.inputNumberHandler(obj);
           return up;
         }
+        if (obj.fieldType === 'inputNumberFormat') {
+          var _up5 = _this.inputNumberFormatHandler(obj);
+          return _up5;
+        }
         var objArea = _this.getItemArea(obj);
         var itemArea = _this.getStrTemplateItem(obj, objArea);
         return itemArea;

package/lib/Easy3wGridSelect/index.js

@@ -74,7 +74,9 @@ var Easy3wGridSelect = function (_Component) {
       })(_react2['default'].createElement(
         _select2['default'],
         (0, _extends3['default'])({
-          style: { minWidth: 100, width: '100%' }
+          style: { minWidth: 100, width: '100%' },
+          showSearch: true // 是否开启搜索
+          , optionFilterProp: 'children' // 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索
         }, cmptPros),
         _react2['default'].createElement(
           Option,

package/lib/Easy3wGridTextArea/index.js

@@ -51,16 +51,20 @@ var Easy3wGridTextArea = function (_Component) {
         fieldId = _props.fieldId,
         value = _props.value,
         form = _props.form,
-        cmptPros = _props.cmptPros,
         required = _props.required,
         requiredMessage = _props.requiredMessage,
         label = _props.label;
+    var cmptPros = this.props.cmptPros;
     var getFieldDecorator = form.getFieldDecorator;
 
     var _ref = cmptPros || {},
         maxLength = _ref.maxLength,
-        disabled = _ref.disabled;
+        disabled = _ref.disabled,
+        rows = _ref.rows;
 
+    if (!rows) {
+      cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, cmptPros);
+    }
     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();
@@ -73,7 +77,7 @@ var Easy3wGridTextArea = function (_Component) {
         // valuePropName: 'defaultValue',
         initialValue: value,
         rules: rules
-      })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
+      })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({ style: { minWidth: 80 } }, cmptPros)))
     );
   };
 

package/lib/Easy3wModal/index.js

@@ -122,6 +122,7 @@ var Easy3wModal = function (_Component) {
         footer: btnObj,
         width: width,
         destroyOnClose: true,
+        maskClosable: false,
         style: { top: 20 }
       }, this.props, {
         afterClose: function afterClose() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.24",
+  "version": "1.5.25",
   "description": "easy3wui components for react",
   "keywords": [
     "react",