easy3wui 4.0.28-beta2 → 4.0.28-beta20

package/assets/formPage.css

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

package/assets/index.css

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

package/lib/Easy3wDownLoad/index.js

@@ -32,11 +32,7 @@ var _tooltip2 = _interopRequireDefault(_tooltip);
 
 require('antd/lib/tooltip/style');
 
-var _icon = require('antd/lib/icon');
-
-var _icon2 = _interopRequireDefault(_icon);
-
-require('antd/lib/icon/style');
+var _icons = require('@ant-design/icons');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
@@ -62,6 +58,8 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+// import Icon from 'antd/lib/icon';
+// import 'antd/lib/icon/style';
 var Easy3wDownLoad = function (_Component) {
   (0, _inherits3['default'])(Easy3wDownLoad, _Component);
 
@@ -185,7 +183,8 @@ var Easy3wDownLoad = function (_Component) {
         var url = _this2.urlDeal(urlDownloadFile, uid);
         var fileNameArr = name.toLowerCase().split('.');
         var fileType = fileNameArr[fileNameArr.length - 1];
-        if (previewFileFlag && fileViewFlag !== false) {
+        // if (previewFileFlag && fileViewFlag !== false) {
+        if (previewFileFlag && fileViewFlag !== false && fileType.indexOf('png') < 0 && fileType.indexOf('jpg') < 0 && fileType.indexOf('jpeg') < 0) {
           // 预览
           return _react2['default'].createElement(
             'div',
@@ -201,7 +200,7 @@ var Easy3wDownLoad = function (_Component) {
                 name
               )
             ),
-            _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
+            _react2['default'].createElement(_icons.DownloadOutlined, { onClick: function onClick() {
                 return _this2.touchDownload(obj, url);
               }, style: { float: 'right', lineHeight: '100%' } })
           );
@@ -232,14 +231,17 @@ var Easy3wDownLoad = function (_Component) {
         } else if (fileType && (fileType.indexOf('png') >= 0 || fileType.indexOf('jpg') >= 0 || fileType.indexOf('jpeg') >= 0)) {
           return _react2['default'].createElement(
             'div',
-            null,
+            { style: { width: '100%', display: 'flex', alignItems: 'center' } },
             _react2['default'].createElement(
               'a',
               { onClick: function onClick() {
                   return _this2.showImageView(url);
-                } },
+                }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
               name
-            )
+            ),
+            _react2['default'].createElement(_icons.DownloadOutlined, { onClick: function onClick() {
+                return _this2.touchDownload(obj, url);
+              }, style: { float: 'right', lineHeight: '100%' } })
           );
         } else {
           return _react2['default'].createElement(

package/lib/Easy3wFormPage/index.js

@@ -186,6 +186,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 _easy3wui = require('easy3wui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
@@ -195,6 +203,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;
@@ -275,13 +293,15 @@ var Easy3wFormPage = function (_Component) {
         func(e);
       }
     }, _this.getItemArea = function (item) {
+      var allReadFlag = _this.props.allReadFlag;
       var fieldType = item.fieldType,
           cmptPros = item.cmptPros,
+          readFlag = item.readFlag,
           disableFlag = item.disableFlag;
 
       var itemNew = item;
       var newCmptPros = {};
-      if (disableFlag) {
+      if (disableFlag || fieldType === 'textarea' && (allReadFlag || readFlag)) {
         if (cmptPros) {
           newCmptPros = (0, _extends3['default'])({}, cmptPros, { disabled: true });
         } else {
@@ -451,10 +471,10 @@ var Easy3wFormPage = function (_Component) {
           formItemProps = item.formItemProps,
           novalueFlag = item.novalueFlag,
           label = item.label,
-          fieldId = item.fieldId,
           required = item.required,
           requiredMessage = item.requiredMessage,
           cmptPros = item.cmptPros;
+      var fieldId = item.fieldId;
 
       var addRules = [];
       var hadOnBlurFlag = false;
@@ -467,14 +487,33 @@ var Easy3wFormPage = function (_Component) {
           addRules = rules;
         }
       }
+      var objValidator = {};
+      if (fieldType === 'braftEditor' && required) {
+        objValidator = {
+          validator: _this.validatorBraftEditor
+        };
+      }
       var decoratorObj = {
-        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }].concat(addRules)
+        rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
       };
       if (itemValue || itemValue === 0) {
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
           initialValue: itemValue
         });
       }
+      if (readFlag || allReadFlag) {
+        fieldId = fieldId + 'Easy3wView';
+        if (fieldType === 'braftEditor' && itemValue.isEmpty()) {
+          // 只读时，符合必填校验
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: _braftEditor2['default'].createEditorState('<p> </p>')
+          });
+        } else if (fieldType === 'textarea' && !(itemValue || itemValue === 0)) {
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: ' '
+          });
+        }
+      }
       if (cmptPros) {
         if (cmptPros.getValueFromEvent) {
           var getValueFromEvent = cmptPros.getValueFromEvent;
@@ -491,6 +530,14 @@ var Easy3wFormPage = function (_Component) {
           disableFlagReal = true;
         }
       }
+      // 只读文本框改为禁止录入
+      if (fieldType === 'textarea' && (readFlag || allReadFlag)) {
+        disableFlagReal = true;
+      } else if (fieldType === 'braftEditor') {
+        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+          valuePropName: 'defaultValue'
+        });
+      }
       if (loadFinishFlag === true && bigFormFlag === true) {
         if ((fieldType === 'input' || fieldType === 'textarea') && !hadOnBlurFlag && !disableFlagReal && !notProxyOnblurFlag) {
           decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
@@ -499,23 +546,25 @@ var Easy3wFormPage = function (_Component) {
           });
         }
       }
-      if (readFlag || 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
-          );
-        }
+      if ((readFlag || allReadFlag) && fieldType !== 'textarea' && fieldType !== 'braftEditor' || !label) {
+        // 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'])({
@@ -523,7 +572,7 @@ var Easy3wFormPage = function (_Component) {
           }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
-          getFieldDecorator(fieldId + 'Easy3wView', {
+          getFieldDecorator(fieldId, {
             initialValue: 'easy3wView',
             rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
           })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
@@ -1311,10 +1360,24 @@ var Easy3wFormPage = function (_Component) {
       var cmptPros = item.cmptPros;
 
       return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
+    }, _this.validatorBraftEditor = function (rule, value, callback) {
+      if (value.isEmpty()) {
+        callback(rule.message);
+      } else {
+        callback();
+      }
     }, _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, { style: { border: '1px solid #eee' } }));
     }, _this.cascaderHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1523,6 +1586,9 @@ var Easy3wFormPage = function (_Component) {
   /** autoComplete end */
 
   /** braftEditor start */
+  // 文章内容校验
+
+  // 富文本编辑器
 
   /** braftEditor end */
 

package/lib/Easy3wNewFormPage/index.js

@@ -188,12 +188,30 @@ 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 _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: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
+}; // 引入富文本表格功能
+
+_braftEditor2['default'].use((0, _table2['default'])(options)); // 表格
+
 _moment2['default'].locale('zh-cn');
 
 var Option = _select2['default'].Option;
@@ -274,13 +292,15 @@ var Easy3wNewFormPage = function (_Component) {
         func(e);
       }
     }, _this.getItemArea = function (item) {
+      var allReadFlag = _this.props.allReadFlag;
       var fieldType = item.fieldType,
           cmptPros = item.cmptPros,
+          readFlag = item.readFlag,
           disableFlag = item.disableFlag;
 
       var itemNew = item;
       var newCmptPros = {};
-      if (disableFlag) {
+      if (disableFlag || fieldType === 'textarea' && (allReadFlag || readFlag)) {
         if (cmptPros) {
           newCmptPros = (0, _extends3['default'])({}, cmptPros, { disabled: true });
         } else {
@@ -464,10 +484,10 @@ var Easy3wNewFormPage = function (_Component) {
           formItemProps = item.formItemProps,
           novalueFlag = item.novalueFlag,
           label = item.label,
-          fieldId = item.fieldId,
           required = item.required,
           requiredMessage = item.requiredMessage,
           cmptPros = item.cmptPros;
+      var fieldId = item.fieldId;
 
       var addRules = [];
       var hadOnBlurFlag = false;
@@ -480,9 +500,33 @@ var Easy3wNewFormPage = function (_Component) {
           addRules = rules;
         }
       }
+      var objValidator = {};
+      if (fieldType === 'braftEditor' && required) {
+        objValidator = {
+          validator: _this.validatorBraftEditor
+        };
+      }
       var decoratorObj = {
-        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }].concat(addRules)
+        rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
       };
+      if (itemValue || itemValue === 0) {
+        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+          initialValue: itemValue
+        });
+      }
+      if (readFlag || allReadFlag) {
+        fieldId = fieldId + 'Easy3wView';
+        if (fieldType === 'braftEditor' && itemValue.isEmpty()) {
+          // 只读时，符合必填校验
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: _braftEditor2['default'].createEditorState('<p> </p>')
+          });
+        } else if (fieldType === 'textarea' && !(itemValue || itemValue === 0)) {
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: ' '
+          });
+        }
+      }
       if (cmptPros) {
         if (cmptPros.getValueFromEvent) {
           var getValueFromEvent = cmptPros.getValueFromEvent;
@@ -499,6 +543,14 @@ var Easy3wNewFormPage = function (_Component) {
           disableFlagReal = true;
         }
       }
+      // 只读文本框改为禁止录入
+      if (fieldType === 'textarea' && (readFlag || allReadFlag)) {
+        disableFlagReal = true;
+      } else if (fieldType === 'braftEditor') {
+        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+          valuePropName: 'defaultValue'
+        });
+      }
       if (loadFinishFlag === true && bigFormFlag === true) {
         if ((fieldType === 'input' || fieldType === 'textarea') && !hadOnBlurFlag && !disableFlagReal && !notProxyOnblurFlag) {
           decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
@@ -507,18 +559,21 @@ var Easy3wNewFormPage = function (_Component) {
           });
         }
       }
-      if (readFlag || allReadFlag) {
-        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,
@@ -1334,10 +1389,24 @@ var Easy3wNewFormPage = function (_Component) {
       var cmptPros = item.cmptPros;
 
       return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
+    }, _this.validatorBraftEditor = function (rule, value, callback) {
+      if (value.isEmpty()) {
+        callback(rule.message);
+      } else {
+        callback();
+      }
     }, _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, { style: { border: '1px solid #eee' } }));
     }, _this.cascaderHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1601,6 +1670,9 @@ var Easy3wNewFormPage = function (_Component) {
   /** autoComplete end */
 
   /** braftEditor start */
+  // 文章内容校验
+
+  // 富文本编辑器
 
   /** braftEditor end */
 

package/lib/Easy3wUpload/index.js

@@ -396,7 +396,7 @@ var Easy3wUpload = function (_Component) {
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
         downloadArr: initialValue,
-        objPreviewFileNew: objPreviewFileNew
+        objPreviewFile: objPreviewFileNew
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(

package/lib/Easy3wUploadM/index.js

@@ -399,7 +399,7 @@ var Easy3wUploadM = function (_Component) {
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
         downloadArr: initialValue,
-        objPreviewFileNew: objPreviewFileNew
+        objPreviewFile: objPreviewFileNew
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "4.0.28-beta2",
+  "version": "4.0.28-beta20",
   "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",