easy3wui 1.5.88-beta11 → 1.5.88-beta14

package/assets/formPage.css

@@ -37,6 +37,9 @@
 .e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+.e3wFormPageWrap .bf-container {
+  border: 1px solid #eee;
+}
 input.ant-input-number-input {
   text-align: right;
   padding-right: 21px;

package/assets/index.css

@@ -2440,6 +2440,9 @@
 .e3wFormPageWrap .inputDigit .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+.e3wFormPageWrap .bf-container {
+  border: 1px solid #eee;
+}
 input.ant-input-number-input {
   text-align: right;
   padding-right: 21px;

package/lib/Easy3wFormPage/indexPC.js

@@ -215,23 +215,23 @@ var _easy3wui = require('easy3wui');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wSpin = require('../Easy3wSpin');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
+// import Easy3wSpin from '../Easy3wSpin';
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// import TagSelect from '../Easy3wTagSelect/index.js';
-// import Easy3wUpload from '../../Easy3wUpload';
-// import Easy3wUploadB from '../../Easy3wUploadB';
-// import Easy3wUploadM from '../../Easy3wUploadM';
+// 引入富文本表格功能
 var objOptions = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
   withDropdown: false, // 插入表格前是否弹出下拉菜单
   columnResizable: false, // 是否允许拖动调整列宽， 默认false
   exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
-}; // 引入富文本表格功能
+};
+// import TagSelect from '../Easy3wTagSelect/index.js';
+// import Easy3wUpload from '../../Easy3wUpload';
+// import Easy3wUploadB from '../../Easy3wUploadB';
+// import Easy3wUploadM from '../../Easy3wUploadM';
 
 _braftEditor2['default'].use((0, _table2['default'])(objOptions)); // 表格
 
@@ -960,14 +960,6 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           });
         }
       }
-      var objEleProps = {};
-      objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': readFlag || allReadFlag ? '1' : '0', // 列只读
-        'data-col-disableFlag': disableFlagReal ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
-        'data-field-disableFlag': disableFlagReal ? '1' : '0' // 字段静止编辑
-      };
       if ((readFlag || allReadFlag) && fieldType !== 'braftEditor') {
         if ((fieldType === 'checkBox' || fieldType === 'radio') && label) {
           var boolCrRequired = readFlag ? false : isDisableRuleFlag;
@@ -976,7 +968,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
             (0, _extends3['default'])({
               label: label,
               required: required
-            }, formItemLayout, formItemProps, objEleProps, {
+            }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
             itemValue && itemValue.$$typeof ? _react2['default'].createElement(
@@ -987,14 +979,10 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
                 rules: [{ required: boolCrRequired, message: requiredMessage || '\u8BF7' + strRMsg + label }]
               })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
               itemValue
-            ) : _react2['default'].createElement(
-              'div',
-              null,
-              getFieldDecorator(fieldId, {
-                initialValue: itemValue,
-                rules: [{ required: boolCrRequired, message: requiredMessage || '\u8BF7' + strRMsg + label }]
-              })(itemArea)
-            )
+            ) : getFieldDecorator(fieldId, {
+              initialValue: itemValue,
+              rules: [{ required: boolCrRequired, message: requiredMessage || '\u8BF7' + strRMsg + label }]
+            })(itemArea)
           );
         } else if (fieldType === 'textarea' && typeof itemValue === 'string') {
           return _react2['default'].createElement(
@@ -1002,8 +990,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
             (0, _extends3['default'])({
               label: label,
               required: required
-            }, formItemLayout, formItemProps, objEleProps, {
-              'data-123': '123',
+            }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
             _react2['default'].createElement(
@@ -1024,7 +1011,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
             (0, _extends3['default'])({
               label: label,
               required: required
-            }, formItemLayout, formItemProps, objEleProps, {
+            }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
             getFieldDecorator(fieldId, {
@@ -1050,7 +1037,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
             (0, _extends3['default'])({
               label: label,
               required: required
-            }, formItemLayout, formItemProps, objEleProps, {
+            }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
             formItemChild,
@@ -1084,7 +1071,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           (0, _extends3['default'])({
             label: label,
             required: required
-          }, formItemLayout, formItemProps, objEleProps, {
+          }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           itemArea
@@ -1095,7 +1082,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           (0, _extends3['default'])({
             label: label,
             required: required
-          }, formItemLayout, formItemProps, objEleProps, {
+          }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           _react2['default'].createElement(
@@ -1131,8 +1118,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           required = item.required,
           requiredMessage = item.requiredMessage,
           cmptPros = item.cmptPros,
-          fieldType = item.fieldType,
-          disableFlag = item.disableFlag;
+          fieldType = item.fieldType;
 
       var itemValue = _this.getItemValue(item);
       var colSpan = cmptPros.colSpan;
@@ -1152,26 +1138,17 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
 
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, { getValueFromEvent: getValueFromEvent });
       }
-      var objEleProps = {
-        'data-fieldTypeP': 'strTemplate',
-        'data-fieldType': fieldType,
-        // 'data-col-readFlag': readFlag || allReadFlag ? '1' : '0', // 列只读
-        // 'data-col-disableFlag': disableFlag ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
-        'data-field-disableFlag': disableFlag ? '1' : '0' // 字段静止编辑
-      };
       if (readFlag || allReadFlag) {
         return _react2['default'].createElement(
           _col2['default'],
           { span: colSpan },
           _react2['default'].createElement(
             FormItem,
-            (0, _extends3['default'])({
+            {
               labelCol: { span: 48 },
-              wrapperCol: { span: 48 }
-            }, objEleProps, {
+              wrapperCol: { span: 48 },
               style: formItemStyle
-            }),
+            },
             getFieldDecorator(fieldId + 'Easy3wView', {
               initialValue: 'easy3wView',
               rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
@@ -1193,12 +1170,11 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
             { style: { position: 'relative' } },
             _react2['default'].createElement(
               FormItem,
-              (0, _extends3['default'])({
+              {
                 labelCol: { span: 48 },
-                wrapperCol: { span: 48 }
-              }, objEleProps, {
+                wrapperCol: { span: 48 },
                 style: formItemStyle
-              }),
+              },
               _react2['default'].createElement(
                 _popover2['default'],
                 {
@@ -1222,7 +1198,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       } else if (novalueFlag || fieldType === 'desc') {
         return _react2['default'].createElement(
           _col2['default'],
-          (0, _extends3['default'])({ span: colSpan }, objEleProps),
+          { span: colSpan },
           _react2['default'].createElement(
             'span',
             null,
@@ -1238,12 +1214,11 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
             { style: { position: 'relative' } },
             _react2['default'].createElement(
               FormItem,
-              (0, _extends3['default'])({
+              {
                 labelCol: { span: 48 },
-                wrapperCol: { span: 48 }
-              }, objEleProps, {
+                wrapperCol: { span: 48 },
                 style: formItemStyle
-              }),
+              },
               getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
             )
           )
@@ -1406,15 +1381,78 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         )
       );
     }, _this.getColItem = function (colObj, formItemLayout, disableCheckFlag) {
-      var fieldType = colObj.fieldType;
+      var allReadFlag = _this.props.allReadFlag;
+      var fieldType = colObj.fieldType,
+          readFlag = colObj.readFlag,
+          disableFlag = colObj.disableFlag,
+          cmptPros = colObj.cmptPros;
+
+      var _ref6 = cmptPros || {},
+          disabled = _ref6.disabled,
+          templateArray = _ref6.templateArray,
+          isRead = _ref6.isRead;
 
       var itemArea = _this.getItemArea(colObj);
       var itemValue = _this.getItemValue(colObj);
       var afterBtns = _this.getAfterBtn(colObj);
+
+      var objEleProps = {};
+      if (fieldType === 'strTemplate') {
+        var taReadFlag = true;
+        var taDisableFlag = true;
+        if (templateArray && templateArray instanceof Array) {
+          templateArray.map(function (obj) {
+            // const { fieldType } = obj;
+            var cmptProsTa = obj.cmptPros,
+                disableFlagTa = obj.disableFlag,
+                readFlagTa = obj.readFlag;
+
+            var _ref7 = cmptProsTa || {},
+                disabledTa = _ref7.disabled;
+
+            if (readFlagTa) {
+              // taReadFlag = readFlagTa;
+              // 字段只读
+            } else {
+              taReadFlag = false;
+            }
+            if (disableFlagTa || disabledTa) {
+              // taReadFlag = readFlagTa;
+              // 字段只读
+            } else {
+              taDisableFlag = false;
+            }
+            return obj;
+          });
+        }
+        objEleProps = {
+          'data-fieldtype': 'e3wFormCol_' + fieldType,
+          'data-col-readflag': taReadFlag || allReadFlag ? '1' : '0', // 列只读
+          'data-col-disableflag': taDisableFlag ? '1' : '0' // 列静止编辑
+          // 'data-field-readFlag': taReadFlag || allReadFlag ? '1' : '0', // 字段只读
+          // 'data-field-disableFlag': taDisableFlag ? '1' : '0', // 字段静止编辑
+        };
+      } else if (fieldType === 'upload' || fieldType === 'uploadM' || fieldType === 'uploadB') {
+        objEleProps = {
+          'data-fieldtype': 'e3wFormCol_' + fieldType,
+          'data-col-readflag': isRead ? '1' : '0', // 列只读
+          'data-col-disableflag': '0' // 列静止编辑
+          // 'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
+          // 'data-field-disableFlag': disableFlag || disabled ? '1' : '0', // 字段静止编辑
+        };
+      } else {
+        objEleProps = {
+          'data-fieldtype': 'e3wFormCol_' + fieldType,
+          'data-col-readflag': readFlag || allReadFlag ? '1' : '0', // 列只读
+          'data-col-disableflag': disableFlag || disabled ? '1' : '0' // 列静止编辑
+          // 'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
+          // 'data-field-disableFlag': disableFlag || disabled ? '1' : '0', // 字段静止编辑
+        };
+      }
       if (fieldType === 'upload') {
         var up = _react2['default'].createElement(
           'div',
-          { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+          (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
           _this.getUploadColItem(colObj, formItemLayout)
         );
         return up;
@@ -1422,7 +1460,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       if (fieldType === 'uploadB') {
         var _up = _react2['default'].createElement(
           'div',
-          { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+          (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
           _this.getUploadBColItem(colObj, formItemLayout)
         );
         return _up;
@@ -1430,7 +1468,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       if (fieldType === 'uploadM') {
         var _up2 = _react2['default'].createElement(
           'div',
-          { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+          (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
           _this.getUploadMColItem(colObj, formItemLayout)
         );
         return _up2;
@@ -1438,7 +1476,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       if (fieldType === 'inputNumberFormat') {
         var _up3 = _react2['default'].createElement(
           'div',
-          { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+          (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
           _this.inputNumberFormatHandler(colObj, formItemLayout, disableCheckFlag)
         );
         return _up3;
@@ -1446,7 +1484,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       if (fieldType === 'inputNumber') {
         var _up4 = _react2['default'].createElement(
           'div',
-          { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+          (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
           _this.inputNumberHandler(colObj, formItemLayout, disableCheckFlag)
         );
         return _up4;
@@ -1454,7 +1492,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       if (fieldType === 'inputAmount') {
         var _up5 = _react2['default'].createElement(
           'div',
-          { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+          (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
           _this.inputAmountHandler(colObj, formItemLayout, disableCheckFlag)
         );
         return _up5;
@@ -1462,14 +1500,14 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       if (fieldType === 'inputDigit') {
         var _up6 = _react2['default'].createElement(
           'div',
-          { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+          (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
           _this.inputDigitHandler(colObj, formItemLayout, disableCheckFlag)
         );
         return _up6;
       }
       var formItem = _react2['default'].createElement(
         'div',
-        { className: (0, _classnames2['default'])('e3wFormCol'), 'data-fieldType': 'e3wFormCol_' + fieldType },
+        (0, _extends3['default'])({ className: (0, _classnames2['default'])('e3wFormCol') }, objEleProps),
         _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout, disableCheckFlag)
       );
       return formItem;
@@ -1537,29 +1575,19 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         isReadVal = true;
       }
       var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { isRead: isReadVal });
-      // const objEleProps = this.getEleProps(colObj);
-      var objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': isReadVal ? '1' : '0', // 列只读
-        'data-col-disableFlag': isReadVal ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': isReadVal ? '1' : '0', // 字段只读
-        'data-field-disableFlag': isReadVal ? '1' : '0' // 字段静止编辑
-      };
       return _react2['default'].createElement(_easy3wui.Easy3wUpload, (0, _extends3['default'])({
         uploadName: fieldId,
         help: help || '请上传附件',
         sendData: {},
         form: form,
         required: required,
-        label: label,
-        objEleProps: objEleProps
+        label: label
       }, formItemLayout, cmptProsNew));
     }, _this.getUploadBColItem = function (colObj, formItemLayout) {
       var label = colObj.label,
           fieldId = colObj.fieldId,
           required = colObj.required,
-          cmptPros = colObj.cmptPros,
-          fieldType = colObj.fieldType;
+          cmptPros = colObj.cmptPros;
       var form = cmptPros.form;
       var allReadFlag = _this.props.allReadFlag;
 
@@ -1571,29 +1599,19 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         isReadVal = true;
       }
       var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { isRead: isReadVal });
-      // const objEleProps = this.getEleProps(colObj);
-      var objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': isReadVal ? '1' : '0', // 列只读
-        'data-col-disableFlag': isReadVal ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': isReadVal ? '1' : '0', // 字段只读
-        'data-field-disableFlag': isReadVal ? '1' : '0' // 字段静止编辑
-      };
       return _react2['default'].createElement(_easy3wui.Easy3wUploadB, (0, _extends3['default'])({
         uploadName: fieldId,
         name: fieldId,
         sendData: {},
         form: form,
         required: required,
-        label: label,
-        objEleProps: objEleProps
+        label: label
       }, formItemLayout, cmptProsNew));
     }, _this.getUploadMColItem = function (colObj, formItemLayout) {
       var label = colObj.label,
           fieldId = colObj.fieldId,
           required = colObj.required,
-          cmptPros = colObj.cmptPros,
-          fieldType = colObj.fieldType;
+          cmptPros = colObj.cmptPros;
       var form = cmptPros.form;
       var allReadFlag = _this.props.allReadFlag;
 
@@ -1605,20 +1623,12 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         isReadVal = true;
       }
       var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { isRead: isReadVal });
-      var objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': isReadVal ? '1' : '0', // 列只读
-        'data-col-disableFlag': isReadVal ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': isReadVal ? '1' : '0', // 字段只读
-        'data-field-disableFlag': isReadVal ? '1' : '0' // 字段静止编辑
-      };
       return _react2['default'].createElement(_easy3wui.Easy3wUploadM, (0, _extends3['default'])({
         uploadName: fieldId,
         sendData: {},
         form: form,
         required: required,
-        label: label,
-        objEleProps: objEleProps
+        label: label
       }, formItemLayout, cmptProsNew));
     }, _this.inputHandler = function (item) {
       var _item$cmptPros2 = item.cmptPros,
@@ -1854,8 +1864,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disableFlag = item.disableFlag,
           formItemProps = item.formItemProps,
           readFlag = item.readFlag,
-          hideLabel = item.hideLabel,
-          fieldType = item.fieldType;
+          hideLabel = item.hideLabel;
 
       var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
       var isDisableRuleFlag = required;
@@ -1873,20 +1882,13 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         addrules.push.apply(addrules, rules);
       }
       var afterBtns = _this.getAfterBtn(item);
-      var objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': readFlag || allReadFlag ? '1' : '0', // 列只读
-        'data-col-disableFlag': disableFlag ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
-        'data-field-disableFlag': disableFlag ? '1' : '0' // 字段静止编辑
-      };
       if (readFlag || allReadFlag) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
             label: hideLabel ? null : label,
             required: required
-          }, formItemLayout, formItemProps, objEleProps, {
+          }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           getFieldDecorator(fieldId + 'Easy3wView', {
@@ -1902,7 +1904,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         FormItem,
         (0, _extends3['default'])({
           label: hideLabel ? null : label
-        }, formItemLayout, formItemProps, objEleProps, {
+        }, formItemLayout, formItemProps, {
           style: formItemStyle
         }),
         _react2['default'].createElement(
@@ -1937,8 +1939,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disableFlag = item.disableFlag,
           formItemProps = item.formItemProps,
           readFlag = item.readFlag,
-          hideLabel = item.hideLabel,
-          fieldType = item.fieldType;
+          hideLabel = item.hideLabel;
 
       var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
       var isDisableRuleFlag = required;
@@ -1956,20 +1957,13 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         addrules.push.apply(addrules, rules);
       }
       var afterBtns = _this.getAfterBtn(item);
-      var objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': readFlag || allReadFlag ? '1' : '0', // 列只读
-        'data-col-disableFlag': disableFlag ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
-        'data-field-disableFlag': disableFlag ? '1' : '0' // 字段静止编辑
-      };
       if (readFlag || allReadFlag) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
             label: hideLabel ? null : label,
             required: required
-          }, formItemLayout, formItemProps, objEleProps, {
+          }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           getFieldDecorator(fieldId + 'Easy3wView', {
@@ -1985,7 +1979,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         FormItem,
         (0, _extends3['default'])({
           label: hideLabel ? null : label
-        }, formItemLayout, formItemProps, objEleProps, {
+        }, formItemLayout, formItemProps, {
           style: formItemStyle
         }),
         _react2['default'].createElement(
@@ -2032,8 +2026,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disableFlag = item.disableFlag,
           formItemProps = item.formItemProps,
           readFlag = item.readFlag,
-          hideLabel = item.hideLabel,
-          fieldType = item.fieldType;
+          hideLabel = item.hideLabel;
 
       var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
       var isDisableRuleFlag = required;
@@ -2053,21 +2046,13 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         addrules.push.apply(addrules, rules);
       }
       var afterBtns = _this.getAfterBtn(item);
-
-      var objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': readFlag || allReadFlag ? '1' : '0', // 列只读
-        'data-col-disableFlag': disableFlag ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
-        'data-field-disableFlag': disableFlag ? '1' : '0' // 字段静止编辑
-      };
       if (readFlag || allReadFlag) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
             label: hideLabel ? null : label,
             required: required
-          }, formItemLayout, formItemProps, objEleProps, {
+          }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           getFieldDecorator(fieldId + 'Easy3wView', {
@@ -2084,7 +2069,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         FormItem,
         (0, _extends3['default'])({
           label: hideLabel ? null : label
-        }, formItemLayout, formItemProps, objEleProps, {
+        }, formItemLayout, formItemProps, {
           style: formItemStyle
         }),
         _react2['default'].createElement(
@@ -2127,8 +2112,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disableFlag = item.disableFlag,
           formItemProps = item.formItemProps,
           readFlag = item.readFlag,
-          hideLabel = item.hideLabel,
-          fieldType = item.fieldType;
+          hideLabel = item.hideLabel;
 
       var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
       var isDisableRuleFlag = required;
@@ -2148,21 +2132,13 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         addrules.push.apply(addrules, rules);
       }
       var afterBtns = _this.getAfterBtn(item);
-      var objEleProps = {
-        'data-fieldType': fieldType,
-        'data-col-readFlag': readFlag || allReadFlag ? '1' : '0', // 列只读
-        'data-col-disableFlag': disableFlag ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
-        'data-field-disableFlag': disableFlag ? '1' : '0' // 字段静止编辑
-      };
-      // {...objEleProps}
       if (readFlag || allReadFlag) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
             label: hideLabel ? null : label,
             required: required
-          }, formItemLayout, formItemProps, objEleProps, {
+          }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           getFieldDecorator(fieldId + 'Easy3wView', {
@@ -2179,7 +2155,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         FormItem,
         (0, _extends3['default'])({
           label: hideLabel ? null : label
-        }, formItemLayout, formItemProps, objEleProps, {
+        }, formItemLayout, formItemProps, {
           style: formItemStyle
         }),
         _react2['default'].createElement(
@@ -2242,8 +2218,8 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
     }, _this.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      var _ref6 = cmptPros || {},
-          options = _ref6.options;
+      var _ref8 = cmptPros || {},
+          options = _ref8.options;
 
       return _react2['default'].createElement(
         _mentions2['default'],
@@ -2279,7 +2255,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
       }
       return _react2['default'].createElement(_braftEditor2['default'], (0, _extends3['default'])({ readOnly: readFlag || allReadFlag, onChange: readFlag || allReadFlag ? function () {} : function (value) {
           return _this.onChangeBraftEditor(fieldId, value);
-        } }, cmptPros, { style: { border: '1px solid #eee' } }));
+        } }, cmptPros));
     }, _this.onChangeBraftEditor = function (fieldId, value) {
       if (value && value.toHTML() !== '<p></p>') {
         var _this$props$form$setF3;
@@ -2308,30 +2284,10 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disableFlag = item.disableFlag;
       var templateArray = cmptPros.templateArray;
 
-      var taReadFlag = true;
-      var taDisableFlag = true;
       var templateArr = templateArray.map(function (obj) {
         var objArea = _this.getItemArea(obj);
         var fieldType = obj.fieldType;
-        var cmptProsTa = obj.cmptPros,
-            disableFlagTa = obj.disableFlag,
-            readFlagTa = obj.readFlag;
-
-        var _ref7 = cmptProsTa || {},
-            disabledTa = _ref7.disabled;
 
-        if (readFlagTa) {
-          // taReadFlag = readFlagTa;
-          // 字段只读
-        } else {
-          taReadFlag = false;
-        }
-        if (disableFlagTa || disabledTa) {
-          // taReadFlag = readFlagTa;
-          // 字段只读
-        } else {
-          taDisableFlag = false;
-        }
         if (fieldType === 'inputNumber') {
           objArea = _this.inputNumberHandler((0, _extends3['default'])({ hideLabel: true }, obj));
           // return up;
@@ -2351,17 +2307,9 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         var itemArea = _this.getStrTemplateItem(obj, objArea);
         return itemArea;
       });
-
-      var objEleProps = {
-        'data-fieldType': fieldTypeP,
-        'data-col-readFlag': taReadFlag || allReadFlag ? '1' : '0', // 列只读
-        'data-col-disableFlag': taDisableFlag ? '1' : '0', // 列静止编辑
-        'data-field-readFlag': readFlag || allReadFlag ? '1' : '0', // 字段只读
-        'data-field-disableFlag': disableFlag ? '1' : '0' // 字段静止编辑
-      };
       var retObj = _react2['default'].createElement(
         'div',
-        (0, _extends3['default'])({ className: (0, _classnames2['default'])(['e3wFormStrTemplate']) }, objEleProps),
+        { className: (0, _classnames2['default'])(['e3wFormStrTemplate']) },
         _react2['default'].createElement(
           _row2['default'],
           null,
@@ -2635,7 +2583,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
   Easy3wFormPagePC.prototype.render = function render() {
     var spinLoading = this.getLoading();
     return _react2['default'].createElement(
-      _Easy3wSpin2['default'],
+      _easy3wui.Easy3wSpin,
       { noStyle: true, spinLoading: spinLoading },
       _react2['default'].createElement(
         'div',
@@ -3202,18 +3150,18 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
 
       var threeRowItemFlag = false;
       for (var _iterator2 = rowItems, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref8;
+        var _ref9;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref8 = _iterator2[_i3++];
+          _ref9 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref8 = _i3.value;
+          _ref9 = _i3.value;
         }
 
-        var rItem = _ref8;
+        var rItem = _ref9;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -4113,8 +4061,8 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
     }, _this2.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      var _ref9 = cmptPros || {},
-          options = _ref9.options;
+      var _ref10 = cmptPros || {},
+          options = _ref10.options;
 
       return _react2['default'].createElement(
         _mentions2['default'],
@@ -4426,7 +4374,7 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
       noBorderFlag = _comonConfig.noBorderFlag;
     }
     return _react2['default'].createElement(
-      _Easy3wSpin2['default'],
+      _easy3wui.Easy3wSpin,
       { noStyle: true, spinLoading: spinLoading },
       _react2['default'].createElement(
         'div',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.88-beta11",
+  "version": "1.5.88-beta14",
   "description": "easy3wui components for react",
   "keywords": [
     "react",