easy3wui 1.5.34 → 1.5.35-beta2

package/assets/exception.css

@@ -14,15 +14,15 @@
       flex: 0 0 62.5%;
   width: 62.5%;
   padding-right: 152px;
+  zoom: 1;
 }
-.e3wException .e3wExceptionImgBlock::before {
+.e3wException .e3wExceptionImgBlock::before,
+.e3wException .e3wExceptionImgBlock::after {
   display: table;
   content: '';
 }
 .e3wException .e3wExceptionImgBlock::after {
-  display: table;
   clear: both;
-  content: '';
 }
 .e3wException .e3wExceptionImgEle {
   height: 360px;

package/assets/formPage.css

@@ -38,3 +38,6 @@ input.ant-input-number-input {
 .rightText {
   text-align: right;
 }
+.bf-container.read-only .bf-controlbar {
+  display: none;
+}

package/assets/index.css

@@ -374,15 +374,15 @@ s {
       flex: 0 0 62.5%;
   width: 62.5%;
   padding-right: 152px;
+  zoom: 1;
 }
-.e3wException .e3wExceptionImgBlock::before {
+.e3wException .e3wExceptionImgBlock::before,
+.e3wException .e3wExceptionImgBlock::after {
   display: table;
   content: '';
 }
 .e3wException .e3wExceptionImgBlock::after {
-  display: table;
   clear: both;
-  content: '';
 }
 .e3wException .e3wExceptionImgEle {
   height: 360px;
@@ -1418,6 +1418,9 @@ input.ant-input-number-input {
 .rightText {
   text-align: right;
 }
+.bf-container.read-only .bf-controlbar {
+  display: none;
+}
 .e3wFootBtn {
   margin: 0px 8px;
 }
@@ -1449,7 +1452,7 @@ input.ant-input-number-input {
   color: #52c41a;
 }
 .e3wResult .e3wResultIcon > .e3wResultError {
-  color: #ff4d4f;
+  color: #f5222d;
 }
 .e3wResult .e3wResultTitle {
   font-size: 24px;

package/assets/result.css

@@ -16,7 +16,7 @@
   color: #52c41a;
 }
 .e3wResult .e3wResultIcon > .e3wResultError {
-  color: #ff4d4f;
+  color: #f5222d;
 }
 .e3wResult .e3wResultTitle {
   font-size: 24px;

package/lib/Easy3wFormPage/index.js

@@ -192,6 +192,14 @@ var _braftEditor2 = _interopRequireDefault(_braftEditor);
 
 require('braft-editor/dist/index.css');
 
+var _table = require('braft-extensions/dist/table');
+
+var _table2 = _interopRequireDefault(_table);
+
+require('braft-extensions/dist/table.css');
+
+require('braft-editor/dist/output.css');
+
 var _dva = require('dva');
 
 var _easy3wui = require('easy3wui');
@@ -203,6 +211,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 // import Easy3wUploadB from '../../Easy3wUploadB';
 // import Easy3wUploadM from '../../Easy3wUploadM';
 
+// 引入富文本表格功能
+var options = {
+  defaultRows: 3, // 默认行数
+  defaultColumns: 3, // 默认列数
+  withDropdown: false, // 插入表格前是否弹出下拉菜单
+  columnResizable: false, // 是否允许拖动调整列宽， 默认false
+  exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
+};
+_braftEditor2['default'].use((0, _table2['default'])(options)); // 表格
+
 _moment2['default'].locale('zh-cn');
 
 var Option = _select2['default'].Option;
@@ -527,24 +545,27 @@ var Easy3wFormPage = function (_Component) {
           });
         }
       }
-      if (readFlag || allReadFlag) {
+      if ((readFlag || allReadFlag) && fieldType !== 'braftEditor') {
         // allReadFlag
-        if (fieldType === 'braftEditor') {
-          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' })),
-            _react2['default'].createElement('div', { dangerouslySetInnerHTML: { __html: itemValue.toHTML() } }),
-            afterBtns
-          );
-        } else if (fieldType === 'checkBox' || fieldType === 'radio') {
+        // if (fieldType === 'braftEditor') {
+        //   return (
+        //     <FormItem
+        //       label={label}
+        //       {...formItemLayout}
+        //       {...formItemProps}
+        //       style={formItemStyle}
+        //     >
+        //       {getFieldDecorator(`${fieldId}Easy3wView`,
+        //         {
+        //           initialValue: 'easy3wView',
+        //           rules: [{ required, message: requiredMessage || `请填写${label}` }],
+        //         })(<Input type="hidden" />)
+        //       }
+        //       <div dangerouslySetInnerHTML={{ __html: itemValue.toHTML() }} />{afterBtns}
+        //     </FormItem>
+        //   );
+        // } else if (fieldType === 'checkBox' || fieldType === 'radio') {
+        if (fieldType === 'checkBox' || fieldType === 'radio') {
           return _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
@@ -1441,9 +1462,17 @@ var Easy3wFormPage = function (_Component) {
 
       return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
     }, _this.braftEditorHandler = function (item) {
+      var allReadFlag = _this.props.allReadFlag;
+      var readFlag = item.readFlag;
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_braftEditor2['default'], cmptPros);
+      cmptPros = (0, _extends3['default'])({}, cmptPros);
+      // const { cmptPros } = item;
+      // controls={[]}
+      if (readFlag || allReadFlag || cmptPros && cmptPros.readOnly) {
+        cmptPros.controls = [];
+      }
+      return _react2['default'].createElement(_braftEditor2['default'], (0, _extends3['default'])({ readOnly: readFlag || allReadFlag }, cmptPros));
     }, _this.cascaderHandler = function (item) {
       var cmptPros = item.cmptPros;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.34",
+  "version": "1.5.35-beta2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",
@@ -104,6 +104,7 @@
     "@hanyk/rc-viewer": "^0.0.3",
     "antd": "3.24.2",
     "braft-editor": "^2.3.8",
+    "braft-extensions": "^0.1.1",
     "lodash": "4.17.11",
     "react-images": "^1.0.0",
     "react-number-format": "^4.3.1",