easy3wui 4.0.28-beta6 → 4.0.28-beta8

package/assets/formPage.css

@@ -13,3 +13,6 @@
 .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
+.bf-container.read-only .bf-controlbar {
+  display: none;
+}

package/assets/index.css

@@ -1401,6 +1401,9 @@ s {
 .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
+.bf-container.read-only .bf-controlbar {
+  display: none;
+}
 .e3wFootBtn {
   margin: 0px 8px;
 }

package/lib/Easy3wFormPage/index.js

@@ -186,6 +186,12 @@ 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');
+
 var _easy3wui = require('easy3wui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
@@ -195,6 +201,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: 'border="1" style="border-collapse: collapse", ', // 指定输出HTML时附加到table标签上的属性字符串
+};
+_braftEditor2['default'].use((0, _table2['default'])(options)); // 表格
+
 _moment2['default'].locale('zh-cn');
 
 var Option = _select2['default'].Option;
@@ -283,7 +299,7 @@ var Easy3wFormPage = function (_Component) {
 
       var itemNew = item;
       var newCmptPros = {};
-      if (disableFlag) {
+      if (disableFlag || fieldType === 'textarea' && (allReadFlag || readFlag)) {
         if (cmptPros) {
           newCmptPros = (0, _extends3['default'])({}, cmptPros, { disabled: true });
         } else {
@@ -291,9 +307,6 @@ var Easy3wFormPage = function (_Component) {
         }
         itemNew = (0, _extends3['default'])({}, item, { cmptPros: newCmptPros });
       }
-      if (fieldType === 'textarea' && (allReadFlag || readFlag)) {
-        itemNew.disabled = true;
-      }
       switch (fieldType) {
         case 'autoComplete':
           return _this.autoCompleteHandler(itemNew);
@@ -508,23 +521,25 @@ var Easy3wFormPage = function (_Component) {
           });
         }
       }
-      if ((readFlag || allReadFlag) && fieldType !== 'textarea') {
-        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
-          );
-        }
+      if ((readFlag || allReadFlag) && (fieldType !== 'textarea' || fieldType !== 'braftEditor')) {
+        // 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>
+        //   );
+        // }
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
@@ -1321,9 +1336,12 @@ var Easy3wFormPage = function (_Component) {
 
       return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
     }, _this.braftEditorHandler = function (item) {
-      var cmptPros = item.cmptPros;
+      var allReadFlag = _this.props.allReadFlag;
+      var cmptPros = item.cmptPros,
+          readFlag = item.readFlag;
+      // const { cmptPros } = item;
 
-      return _react2['default'].createElement(_braftEditor2['default'], cmptPros);
+      return _react2['default'].createElement(_braftEditor2['default'], (0, _extends3['default'])({ readOnly: readFlag || allReadFlag }, cmptPros));
     }, _this.cascaderHandler = function (item) {
       var cmptPros = item.cmptPros;
 

package/lib/Easy3wNewFormPage/index.js

@@ -188,12 +188,28 @@ 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');
+
 var _easy3wui = require('easy3wui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 // import TagSelect from '../Easy3wTagSelect/index.js';
 
+// 引入富文本表格功能
+var options = {
+  defaultRows: 3, // 默认行数
+  defaultColumns: 3, // 默认列数
+  withDropdown: false, // 插入表格前是否弹出下拉菜单
+  columnResizable: false // 是否允许拖动调整列宽， 默认false
+  // exportAttrString: 'border="1" style="border-collapse: collapse", ', // 指定输出HTML时附加到table标签上的属性字符串
+};
+_braftEditor2['default'].use((0, _table2['default'])(options)); // 表格
+
 _moment2['default'].locale('zh-cn');
 
 var Option = _select2['default'].Option;
@@ -282,7 +298,7 @@ var Easy3wNewFormPage = function (_Component) {
 
       var itemNew = item;
       var newCmptPros = {};
-      if (disableFlag) {
+      if (disableFlag || fieldType === 'textarea' && (allReadFlag || readFlag)) {
         if (cmptPros) {
           newCmptPros = (0, _extends3['default'])({}, cmptPros, { disabled: true });
         } else {
@@ -290,9 +306,6 @@ var Easy3wNewFormPage = function (_Component) {
         }
         itemNew = (0, _extends3['default'])({}, item, { cmptPros: newCmptPros });
       }
-      if (fieldType === 'textarea' && (allReadFlag || readFlag)) {
-        itemNew.disabled = true;
-      }
       switch (fieldType) {
         case 'autoComplete':
           return _this.autoCompleteHandler(itemNew);
@@ -516,18 +529,21 @@ var Easy3wNewFormPage = function (_Component) {
           });
         }
       }
-      if ((readFlag || allReadFlag) && fieldType !== 'textarea') {
-        if (fieldType === 'braftEditor') {
-          return _react2['default'].createElement(
-            FormItem,
-            (0, _extends3['default'])({
-              label: label,
-              name: fieldId + 'Easy3wView',
-              style: formItemStyle
-            }, decoratorObj, formItemLayout, formItemProps),
-            _react2['default'].createElement('div', { dangerouslySetInnerHTML: { __html: itemValue.toHTML() } })
-          );
-        }
+      if ((readFlag || allReadFlag) && (fieldType !== 'textarea' || fieldType !== 'braftEditor')) {
+        // if (fieldType === 'braftEditor') {
+        //   return (
+        //     <FormItem
+        //       label={label}
+        //       name={`${fieldId}Easy3wView`}
+        //       style={formItemStyle}
+        //       {...decoratorObj}
+        //       {...formItemLayout}
+        //       {...formItemProps}
+        //     >
+        //       <div dangerouslySetInnerHTML={{ __html: itemValue.toHTML() }} />
+        //     </FormItem>
+        //   );
+        // }
         return _react2['default'].createElement(
           'div',
           null,
@@ -1344,9 +1360,12 @@ var Easy3wNewFormPage = function (_Component) {
 
       return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
     }, _this.braftEditorHandler = function (item) {
-      var cmptPros = item.cmptPros;
+      var allReadFlag = _this.props.allReadFlag;
+      var cmptPros = item.cmptPros,
+          readFlag = item.readFlag;
+      // const { cmptPros } = item;
 
-      return _react2['default'].createElement(_braftEditor2['default'], cmptPros);
+      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": "4.0.28-beta6",
+  "version": "4.0.28-beta8",
   "description": "easy3wui components for react",
   "keywords": [
     "react",
@@ -105,6 +105,7 @@
     "@hanyk/rc-viewer": "^0.0.3",
     "antd": "4.0.3",
     "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",