easy3wui 1.5.70-beta8 → 1.5.70

package/assets/formPage.css

@@ -13,9 +13,14 @@
 .e3wFormPageWrap .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
-.e3wFormPageWrap .inputNumberFormat,
-.e3wFormPageWrap .inputAmount,
-.e3wFormPageWrap .inputDigit {
+.e3wFormPageWrap .e3wFormItem input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.e3wFormPageWrap .e3wFormItem .rightText {
+  text-align: right;
+}
+.e3wFormPageWrap .inputNumberFormat {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;
@@ -24,28 +29,15 @@
       flex-wrap: nowrap;
   line-height: 32px;
 }
-.e3wFormPageWrap .inputNumberFormat .addonBtns,
-.e3wFormPageWrap .inputAmount .addonBtns,
-.e3wFormPageWrap .inputDigit .addonBtns {
+.e3wFormPageWrap .inputNumberFormat .addonBtns {
   height: 32px;
   width: auto;
   border-left: none;
   border-right: 1px solid #d9d9d9;
 }
-.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn,
-.e3wFormPageWrap .inputAmount .inputNumberBtns .e3wFootBtn,
-.e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
+.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
-.ant-input-number:hover input.ant-input-number-input {
-  padding-right: 33px;
-}
-input.ant-input-number-input {
-  text-align: right;
-}
-.rightText {
-  text-align: right;
-}
 .bf-container.read-only .bf-content {
   height: auto;
 }

package/assets/index.css

@@ -2404,9 +2404,14 @@ s {
 .e3wFormPageWrap .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
-.e3wFormPageWrap .inputNumberFormat,
-.e3wFormPageWrap .inputAmount,
-.e3wFormPageWrap .inputDigit {
+.e3wFormPageWrap .e3wFormItem input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.e3wFormPageWrap .e3wFormItem .rightText {
+  text-align: right;
+}
+.e3wFormPageWrap .inputNumberFormat {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;
@@ -2415,28 +2420,15 @@ s {
       flex-wrap: nowrap;
   line-height: 32px;
 }
-.e3wFormPageWrap .inputNumberFormat .addonBtns,
-.e3wFormPageWrap .inputAmount .addonBtns,
-.e3wFormPageWrap .inputDigit .addonBtns {
+.e3wFormPageWrap .inputNumberFormat .addonBtns {
   height: 32px;
   width: auto;
   border-left: none;
   border-right: 1px solid #d9d9d9;
 }
-.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn,
-.e3wFormPageWrap .inputAmount .inputNumberBtns .e3wFootBtn,
-.e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
+.e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
-.ant-input-number:hover input.ant-input-number-input {
-  padding-right: 33px;
-}
-input.ant-input-number-input {
-  text-align: right;
-}
-.rightText {
-  text-align: right;
-}
 .bf-container.read-only .bf-content {
   height: auto;
 }
@@ -2609,7 +2601,3 @@ input.ant-input-number-input {
   border-style: solid;
   border-radius: 3px;
 }
-.easy3wTree .easy3wTreeSearch {
-  width: calc(88%);
-  margin: 0 6px;
-}

package/lib/Easy3wDownLoad/index.js

@@ -70,13 +70,9 @@ var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
-var _Easy3wUIConfig = require('../Easy3wUIConfig');
-
-var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
+// const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
 
 var Easy3wDownLoad = function (_Component) {
   (0, _inherits3['default'])(Easy3wDownLoad, _Component);
@@ -87,7 +83,7 @@ var Easy3wDownLoad = function (_Component) {
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
     _this.onPreview = function (file, url) {
-      var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
+      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
       var uid = file.uid,
@@ -202,7 +198,7 @@ var Easy3wDownLoad = function (_Component) {
         fileViewURL = _props.fileViewURL,
         fileCallURL = _props.fileCallURL;
 
-    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag,
         downloadFileFlag = objPreviewFileNew.downloadFileFlag,
         previewFileType = objPreviewFileNew.previewFileType;

package/lib/Easy3wFormPage/index.js

@@ -220,14 +220,14 @@ var _ref = _comonConfig.objEasy3wUIConfig || {},
 var _ref2 = objEasy3wFormPage || {},
     projectType = _ref2.projectType;
 
-var objOptions = {
+var options = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
   withDropdown: false, // 插入表格前是否弹出下拉菜单
   columnResizable: false, // 是否允许拖动调整列宽， 默认false
   exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
 };
-_braftEditor2['default'].use((0, _table2['default'])(objOptions)); // 表格
+_braftEditor2['default'].use((0, _table2['default'])(options)); // 表格
 
 _moment2['default'].locale('zh-cn');
 
@@ -404,8 +404,6 @@ var Easy3wFormPage = function (_Component) {
         //   return this.inputNumberFormatHandler(itemNew);
         case 'numberInput':
           return _this.numberInputHandler(itemNew);
-        case 'email':
-          return _this.inputEmailHandler(itemNew);
         case 'mention':
           return _this.mentionHandler(itemNew);
         case 'rate':
@@ -454,35 +452,12 @@ var Easy3wFormPage = function (_Component) {
 
       var value = item.value;
 
-      var _ref4 = cmptPros || {},
-          addonAfter = _ref4.addonAfter,
-          numeralFormat = _ref4.numeralFormat;
-      // numeralFormat 新组件(金额、数字)的格式化参数
-
-
       if (numberFormat) {
         return (0, _numeral2['default'])(value).format('0,0.00');
       }
       if (fieldType === 'numberInput' && value) {
         return (0, _numeral2['default'])(value).format('0,0.00');
       }
-      // if (fieldType === 'inputAmount' && value) { // 金额
-      //   let strValue = numeral(value).format(numeralFormat || '0,0.00');
-      //   if (allReadFlag || readFlag) {
-      //     // strValue = `${strValue}${addonAfter}`;
-      //     strValue = <span>{strValue}{addonAfter || ''}</span>;
-      //   }
-      //   return strValue;
-      // }
-      // if (fieldType === 'inputDigit' && value) { // 数字
-      //   const { precision = 2 } = cmptPros || {};
-      //   let strValue = numeral(value).format(numeralFormat || `0.${'0'.repeat(precision)}`);
-      //   // let strValue = numeral(value).format('0.00');
-      //   if (allReadFlag || readFlag) {
-      //     strValue = <span>{strValue}{addonAfter || ''}</span>;
-      //   }
-      //   return strValue;
-      // }
       if (fieldType === 'braftEditor') {
         return _braftEditor2['default'].createEditorState(value);
       }
@@ -592,12 +567,6 @@ var Easy3wFormPage = function (_Component) {
         case 'textarea':
           strRMsg = '填写';
           break;
-        // case 'inputAmount': // 金额
-        //   strRMsg = '填写';
-        //   break;
-        // case 'inputDigit': // 数字
-        //   strRMsg = '填写';
-        //   break;
         case 'numberInput':
           strRMsg = '填写';
           break;
@@ -704,8 +673,6 @@ var Easy3wFormPage = function (_Component) {
       } else if (fieldType === 'mobile') {
         var e3wMobileNation = form.getFieldValue(fieldId + 'AddonBefore');
         addRules = [{ pattern: _comonConfig.objMobileRegular ? _comonConfig.objMobileRegular[e3wMobileNation] : objMobileRegularDefault[e3wMobileNation], message: '手机格式错误！' }].concat(addRules);
-      } else if (fieldType === 'email') {
-        addRules = [{ type: 'email', message: '邮箱地址格式错误！' }].concat(addRules);
       }
       var decoratorObj = {
         rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7' + strRMsg + label }].concat(addRules)
@@ -1043,18 +1010,18 @@ var Easy3wFormPage = function (_Component) {
 
       var threeRowItemFlag = false;
       for (var _iterator = rowItems, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref5;
+        var _ref4;
 
         if (_isArray) {
           if (_i >= _iterator.length) break;
-          _ref5 = _iterator[_i++];
+          _ref4 = _iterator[_i++];
         } else {
           _i = _iterator.next();
           if (_i.done) break;
-          _ref5 = _i.value;
+          _ref4 = _i.value;
         }
 
-        var rItem = _ref5;
+        var rItem = _ref4;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -1213,14 +1180,6 @@ var Easy3wFormPage = function (_Component) {
         var _up4 = _this.inputNumberHandler(colObj, formItemLayout, disableCheckFlag);
         return _up4;
       }
-      if (fieldType === 'inputAmount') {
-        var _up5 = _this.inputAmountHandler(colObj, formItemLayout, disableCheckFlag);
-        return _up5;
-      }
-      if (fieldType === 'inputDigit') {
-        var _up6 = _this.inputDigitHandler(colObj, formItemLayout, disableCheckFlag);
-        return _up6;
-      }
       var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout, disableCheckFlag);
       return formItem;
     }, _this.getAllForms = function () {
@@ -1345,17 +1304,12 @@ var Easy3wFormPage = function (_Component) {
       var _item$cmptPros = item.cmptPros,
           cmptPros = _item$cmptPros === undefined ? {} : _item$cmptPros;
 
-      return _react2['default'].createElement(_input2['default'], cmptPros);
-    }, _this.inputEmailHandler = function (item) {
-      var _item$cmptPros2 = item.cmptPros,
-          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
-
       return _react2['default'].createElement(_input2['default'], cmptPros);
     }, _this.mobileHandler = function (item) {
       var fieldId = item.fieldId,
           required = item.required,
-          _item$cmptPros3 = item.cmptPros,
-          cmptPros = _item$cmptPros3 === undefined ? {} : _item$cmptPros3;
+          _item$cmptPros2 = item.cmptPros,
+          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
 
       var addonBeforeCmptPros = item.addonBeforeCmptPros || {};
       addonBeforeCmptPros = (0, _extends3['default'])({ allowClear: false, style: { minWidth: '90px' } }, addonBeforeCmptPros);
@@ -1550,8 +1504,8 @@ var Easy3wFormPage = function (_Component) {
         _message3['default'].info('\u8F93\u5165\u5B57\u6570\u4E0D\u80FD\u8D85\u8FC7' + maxLength);
       }
     }, _this.textareaHandler = function (item) {
-      var _item$cmptPros4 = item.cmptPros,
-          cmptPros = _item$cmptPros4 === undefined ? {} : _item$cmptPros4;
+      var _item$cmptPros3 = item.cmptPros,
+          cmptPros = _item$cmptPros3 === undefined ? {} : _item$cmptPros3;
 
       var maxlength = void 0;
       if (cmptPros.maxLength || cmptPros.maxlength) {
@@ -1725,170 +1679,6 @@ var Easy3wFormPage = function (_Component) {
           )
         )
       );
-    }, _this.inputAmountHandler = function (item, formItemLayout, disableCheckFlag) {
-      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,
-          hideLabel = item.hideLabel;
-
-      var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
-      var isDisableRuleFlag = required;
-      if (readFlag === undefined) {
-        if (disableFlag && isApproval && disableCheckFlag) {
-          isDisableRuleFlag = required;
-        } else if (disableFlag && isApproval) {
-          isDisableRuleFlag = false;
-        }
-      }
-      var addrules = [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
-      var addonAfter = cmptPros.addonAfter,
-          rules = cmptPros.rules;
-
-      if (rules) {
-        // const { rules } = cmptPros;
-        addrules.push.apply(addrules, rules);
-      }
-      var afterBtns = _this.getAfterBtn(item);
-      if (readFlag || allReadFlag) {
-        return _react2['default'].createElement(
-          FormItem,
-          (0, _extends3['default'])({
-            label: hideLabel ? null : label,
-            required: required
-          }, formItemLayout, formItemProps, {
-            style: formItemStyle
-          }),
-          getFieldDecorator(fieldId + 'Easy3wView', {
-            initialValue: 'easy3wView',
-            rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
-          })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
-          ('' + value).replace(/\B(?=(\d{3})+(?!\d))/g, ','),
-          addonAfter,
-          ' ',
-          afterBtns
-        );
-      }
-      return _react2['default'].createElement(
-        FormItem,
-        (0, _extends3['default'])({
-          label: hideLabel ? null : label
-        }, formItemLayout, formItemProps, {
-          style: formItemStyle
-        }),
-        _react2['default'].createElement(
-          'div',
-          { className: (0, _classnames2['default'])(['inputAmount']) },
-          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={onChangeValue => this.props.form.setFieldsValue({ [item.fieldId]: onChangeValue })}
-          }, cmptPros, {
-            style: { flex: 1 }
-          }))),
-          addonAfter ? _react2['default'].createElement(
-            'div',
-            { className: (0, _classnames2['default'])(['ant-input-group-addon', 'addonBtns']), style: { borderRadius: '0px 4px 4px 0px' } },
-            addonAfter
-          ) : null,
-          _react2['default'].createElement(
-            'div',
-            { className: (0, _classnames2['default'])(['inputNumberBtns']) },
-            afterBtns
-          )
-        )
-      );
-    }, _this.inputDigitHandler = function (item, formItemLayout, disableCheckFlag) {
-      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,
-          hideLabel = item.hideLabel;
-
-      var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
-      var isDisableRuleFlag = required;
-      if (readFlag === undefined) {
-        if (disableFlag && isApproval && disableCheckFlag) {
-          isDisableRuleFlag = required;
-        } else if (disableFlag && isApproval) {
-          isDisableRuleFlag = false;
-        }
-      }
-      var addrules = [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
-      var addonAfter = cmptPros.addonAfter,
-          rules = cmptPros.rules;
-
-      if (rules) {
-        // const { rules } = cmptPros;
-        addrules.push.apply(addrules, rules);
-      }
-      var afterBtns = _this.getAfterBtn(item);
-      if (readFlag || allReadFlag) {
-        return _react2['default'].createElement(
-          FormItem,
-          (0, _extends3['default'])({
-            label: hideLabel ? null : label,
-            required: required
-          }, formItemLayout, formItemProps, {
-            style: formItemStyle
-          }),
-          getFieldDecorator(fieldId + 'Easy3wView', {
-            initialValue: 'easy3wView',
-            rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
-          })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
-          value,
-          addonAfter,
-          ' ',
-          afterBtns
-        );
-      }
-      return _react2['default'].createElement(
-        FormItem,
-        (0, _extends3['default'])({
-          label: hideLabel ? null : label
-        }, formItemLayout, formItemProps, {
-          style: formItemStyle
-        }),
-        _react2['default'].createElement(
-          'div',
-          { className: (0, _classnames2['default'])(['inputDigit']) },
-          getFieldDecorator(fieldId, { rules: addrules, initialValue: value })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({
-            precision: 2 // 数值精度 2 保留两位小数  0 整数  可以通过cmptPros修改
-            , style: { flex: 1 },
-            disabled: disableFlag
-          }, cmptPros))),
-          addonAfter ? _react2['default'].createElement(
-            'div',
-            { className: (0, _classnames2['default'])(['ant-input-group-addon', 'addonBtns']), style: { borderRadius: '0px 4px 4px 0px' } },
-            addonAfter
-          ) : null,
-          _react2['default'].createElement(
-            'div',
-            { className: (0, _classnames2['default'])(['inputNumberBtns']) },
-            afterBtns
-          )
-        )
-      );
     }, _this.numberInputHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1979,24 +1769,14 @@ var Easy3wFormPage = function (_Component) {
 
       var templateArr = templateArray.map(function (obj) {
         var objArea = _this.getItemArea(obj);
-        var fieldType = obj.fieldType;
-
-        if (fieldType === 'inputNumber') {
+        if (obj.fieldType === 'inputNumber') {
           objArea = _this.inputNumberHandler((0, _extends3['default'])({ hideLabel: true }, obj));
           // return up;
         }
-        if (fieldType === 'inputNumberFormat') {
+        if (obj.fieldType === 'inputNumberFormat') {
           objArea = _this.inputNumberFormatHandler((0, _extends3['default'])({ hideLabel: true }, obj));
           // return up;
         }
-        if (fieldType === 'inputAmount') {
-          var up = _this.inputAmountHandler((0, _extends3['default'])({ hideLabel: true }, obj));
-          return up;
-        }
-        if (fieldType === 'inputDigit') {
-          var _up7 = _this.inputDigitHandler((0, _extends3['default'])({ hideLabel: true }, obj));
-          return _up7;
-        }
         var itemArea = _this.getStrTemplateItem(obj, objArea);
         return itemArea;
       });
@@ -2095,9 +1875,6 @@ var Easy3wFormPage = function (_Component) {
   /** upload end */
   /** input start */
 
-  /** input end */
-  // #region inputEmail
-
   /** input end */
   /** mobile start */
 
@@ -2168,12 +1945,7 @@ var Easy3wFormPage = function (_Component) {
   /** inputNumber start */
 
   /** inputNumber end */
-  // #region 金额
 
-  // #endregion
-  // #region 数字
-
-  // #endregion
   /** numberInput start */
   // numberInputHandler = (item) => {
   //   return (
@@ -2798,18 +2570,18 @@ var Easy3wFormPageTight = function (_Component2) {
 
       var threeRowItemFlag = false;
       for (var _iterator2 = rowItems, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref6;
+        var _ref5;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref6 = _iterator2[_i3++];
+          _ref5 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref6 = _i3.value;
+          _ref5 = _i3.value;
         }
 
-        var rItem = _ref6;
+        var rItem = _ref5;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -2953,28 +2725,28 @@ var Easy3wFormPageTight = function (_Component2) {
         return up;
       }
       if (fieldType === 'uploadB') {
-        var _up8 = _this2.getUploadBColItem(colObj, formItemLayout);
-        return _up8;
+        var _up5 = _this2.getUploadBColItem(colObj, formItemLayout);
+        return _up5;
       }
       if (fieldType === 'uploadM') {
-        var _up9 = _this2.getUploadMColItem(colObj, formItemLayout);
-        return _up9;
+        var _up6 = _this2.getUploadMColItem(colObj, formItemLayout);
+        return _up6;
       }
       if (fieldType === 'select') {
-        var _up10 = _this2.getSelectColItem(colObj, formItemLayout);
-        return _up10;
+        var _up7 = _this2.getSelectColItem(colObj, formItemLayout);
+        return _up7;
       }
       if (fieldType === 'radio') {
-        var _up11 = _this2.getRadioColItem(colObj, formItemLayout);
-        return _up11;
+        var _up8 = _this2.getRadioColItem(colObj, formItemLayout);
+        return _up8;
       }
       if (fieldType === 'checkBox') {
-        var _up12 = _this2.getCheckBoxColItem(colObj, formItemLayout);
-        return _up12;
+        var _up9 = _this2.getCheckBoxColItem(colObj, formItemLayout);
+        return _up9;
       }
       if (fieldType === 'inputNumberFormat') {
-        var _up13 = _this2.inputNumberFormatHandler(colObj, formItemLayout);
-        return _up13;
+        var _up10 = _this2.inputNumberFormatHandler(colObj, formItemLayout);
+        return _up10;
       }
       var formItem = _this2.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout);
       return formItem;
@@ -3588,8 +3360,8 @@ var Easy3wFormPageTight = function (_Component2) {
           form = _this2$props7.form,
           allReadFlag = _this2$props7.allReadFlag;
       var getFieldDecorator = form.getFieldDecorator;
-      var _item$cmptPros5 = item.cmptPros,
-          cmptPros = _item$cmptPros5 === undefined ? {} : _item$cmptPros5,
+      var _item$cmptPros4 = item.cmptPros,
+          cmptPros = _item$cmptPros4 === undefined ? {} : _item$cmptPros4,
           label = item.label,
           fieldId = item.fieldId,
           required = item.required,
@@ -3678,8 +3450,7 @@ var Easy3wFormPageTight = function (_Component2) {
         onPressEnter: function onPressEnter(e) {
           return _this2.numberInputonBlur(e, item);
         },
-        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }],
-        className: (0, _classnames2['default'])(['rightText'])
+        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }]
       }, cmptPros, {
         size: 'small'
       }));

package/lib/Easy3wGridPage/index.js

@@ -129,8 +129,7 @@ var Easy3wGridPage = function (_Component) {
         chooseFlag = _props.chooseFlag,
         scroll = _props.scroll,
         className = _props.className,
-        paginationInfo = _props.paginationInfo,
-        handleSearchNew = _props.handleSearchNew;
+        paginationInfo = _props.paginationInfo;
     var _state = this.state,
         selectedRowKeysState = _state.selectedRowKeysState,
         selectedRowsState = _state.selectedRowsState,
@@ -140,16 +139,6 @@ var Easy3wGridPage = function (_Component) {
     var recursion = function recursion(arr) {
       arr.forEach(function (item) {
         var columnsType = item.type;
-        var title = item.title;
-
-        if (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;
@@ -242,7 +231,7 @@ var Easy3wGridPage = function (_Component) {
     }
     var myColumns = columns;
     // 处理分页 start
-    if (needPaginationFlag || handleSearchNew) {
+    if (needPaginationFlag) {
       var defaultCurrent = paginationInfo ? paginationInfo.offset : 1;
       var defaultPageSize = paginationInfo ? paginationInfo.limit : 10;
       var current = paginationInfo ? paginationInfo.offset : this.state.pagination.offset;
@@ -261,14 +250,10 @@ 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',
@@ -639,21 +624,15 @@ var _initialiseProps = function _initialiseProps() {
     var _props7 = _this3.props,
         selfDealPageChangeFunc = _props7.selfDealPageChangeFunc,
         getSearchCondition = _props7.getSearchCondition,
-        handleSearch = _props7.handleSearch,
-        handleSearchNew = _props7.handleSearchNew;
+        handleSearch = _props7.handleSearch;
 
-    var formVal = {};
-    if (getSearchCondition && typeof getSearchCondition === 'function') {
-      formVal = getSearchCondition();
-    }
+    var formVal = getSearchCondition();
     var paginationInfo = { offset: pagination.current, limit: pagination.pageSize };
     _this3.setState({ pagination: paginationInfo });
-    if (selfDealPageChangeFunc && typeof selfDealPageChangeFunc === 'function') {
+    if (selfDealPageChangeFunc) {
       selfDealPageChangeFunc(paginationInfo, formVal);
-    } else if (handleSearch && typeof handleSearch === 'function') {
+    } else {
       handleSearch(paginationInfo, formVal);
-    } else if (handleSearchNew && typeof handleSearchNew === 'function') {
-      handleSearchNew(paginationInfo, formVal);
     }
   };
 };

package/lib/Easy3wModal/index.js

@@ -230,9 +230,10 @@ var Easy3wModal = function (_Component) {
         loadingFlag = _props.loadingFlag,
         cancelHandler = _props.cancelHandler,
         onOk = _props.onOk,
-        width = _props.width;
+        width = _props.width,
+        footBtnArr = _props.footBtnArr;
 
-    var btnObj = this.getBtnObj();
+    var btnObj = footBtnArr && footBtnArr.length ? this.getBtnObj() : null;
     return _react2['default'].createElement(
       _modal2['default'],
       (0, _extends3['default'])({