easy3wui 1.5.88-beta12 → 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)); // 表格
 
@@ -1389,7 +1389,8 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
 
       var _ref6 = cmptPros || {},
           disabled = _ref6.disabled,
-          templateArray = _ref6.templateArray;
+          templateArray = _ref6.templateArray,
+          isRead = _ref6.isRead;
 
       var itemArea = _this.getItemArea(colObj);
       var itemValue = _this.getItemValue(colObj);
@@ -1425,17 +1426,25 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           });
         }
         objEleProps = {
-          'data-fieldType': 'e3wFormCol_' + fieldType,
-          'data-col-readFlag': taReadFlag || allReadFlag ? '1' : '0', // 列只读
-          'data-col-disableFlag': taDisableFlag ? '1' : '0' // 列静止编辑
+          '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-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', // 字段静止编辑
         };
@@ -2246,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;
@@ -2574,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',
@@ -4365,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-beta12",
+  "version": "1.5.88-beta14",
   "description": "easy3wui components for react",
   "keywords": [
     "react",