easy3wui 1.5.64-beta.4 → 1.5.64-beta.6

package/assets/editBigTable.css

@@ -44,3 +44,31 @@
   padding: 4px;
   font-size: 14px;
 }
+.Easy3wEditBigTable .textEditor {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+  box-sizing: border-box;
+  inline-size: 100%;
+  block-size: 100%;
+  padding-block: 0;
+  padding-inline: 6px;
+  border: 2px solid #ccc;
+  vertical-align: top;
+  color: var(--rdg-color);
+  background-color: var(--rdg-background-color);
+  font-family: inherit;
+  font-size: var(--rdg-font-size);
+}
+.Easy3wEditBigTable .textEditor:focus {
+  border-color: var(--rdg-selection-color);
+  outline: none;
+}
+.Easy3wEditBigTable .textEditor:-ms-input-placeholder {
+  color: #999;
+  opacity: 1;
+}
+.Easy3wEditBigTable .textEditor::placeholder {
+  color: #999;
+  opacity: 1;
+}

package/assets/index.css

@@ -1528,3 +1528,31 @@ input.ant-input-number-input {
   padding: 4px;
   font-size: 14px;
 }
+.Easy3wEditBigTable .textEditor {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+  box-sizing: border-box;
+  inline-size: 100%;
+  block-size: 100%;
+  padding-block: 0;
+  padding-inline: 6px;
+  border: 2px solid #ccc;
+  vertical-align: top;
+  color: var(--rdg-color);
+  background-color: var(--rdg-background-color);
+  font-family: inherit;
+  font-size: var(--rdg-font-size);
+}
+.Easy3wEditBigTable .textEditor:focus {
+  border-color: var(--rdg-selection-color);
+  outline: none;
+}
+.Easy3wEditBigTable .textEditor:-ms-input-placeholder {
+  color: #999;
+  opacity: 1;
+}
+.Easy3wEditBigTable .textEditor::placeholder {
+  color: #999;
+  opacity: 1;
+}

package/lib/Easy3wDownLoad/Easy3wRCView.js

@@ -27,16 +27,20 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 var Easy3wRCView = function (_PureComponent) {
   (0, _inherits3['default'])(Easy3wRCView, _PureComponent);
 
-  function Easy3wRCView() {
+  function Easy3wRCView(props) {
     (0, _classCallCheck3['default'])(this, Easy3wRCView);
-    return (0, _possibleConstructorReturn3['default'])(this, _PureComponent.apply(this, arguments));
+
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _PureComponent.call(this, props));
+
+    _this.viewerRef = _react2['default'].createRef(); // 创建 ref
+    return _this;
   }
 
   Easy3wRCView.prototype.componentDidUpdate = function componentDidUpdate() {
-    // eslint-disable-next-line react/no-string-refs
-    var viewer = this.refs.viewer.viewer;
-
-    viewer.show();
+    var viewer = this.viewerRef.current; // 使用 ref 的 current 属性
+    if (viewer) {
+      viewer.show();
+    }
   };
 
   Easy3wRCView.prototype.render = function render() {
@@ -52,7 +56,8 @@ var Easy3wRCView = function (_PureComponent) {
           hide: hideModal
         }
         // eslint-disable-next-line react/no-string-refs
-        , ref: 'viewer'
+        // ref="viewer"
+        , ref: this.viewerRef // 使用回调 ref 或 createRef
       },
       _react2['default'].createElement('img', { style: { display: 'none' }, src: imgUrl, alt: '' })
     );

package/lib/Easy3wEditBigTable/index.js

@@ -34,6 +34,8 @@ var _reactDataGrid = require('react-data-grid');
 
 var _reactDataGrid2 = _interopRequireDefault(_reactDataGrid);
 
+require('react-data-grid/lib/styles.css');
+
 var _reactDataGridAddons = require('react-data-grid-addons');
 
 var _xlsx = require('xlsx');
@@ -54,8 +56,7 @@ var _Easy3wEditBigTableForm2 = _interopRequireDefault(_Easy3wEditBigTableForm);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-/* eslint-disable no-alert */
-var Selectors = _reactDataGridAddons.Data.Selectors;
+var Selectors = _reactDataGridAddons.Data.Selectors; /* eslint-disable no-alert */
 
 var Easy3wEditBigTable = function (_Component) {
   (0, _inherits3['default'])(Easy3wEditBigTable, _Component);
@@ -556,6 +557,19 @@ var Easy3wEditBigTable = function (_Component) {
       });
     };
 
+    _this.touchRowsChange = function (updatedRows, _ref3) {
+      var indexes = _ref3.indexes,
+          column = _ref3.column;
+    }
+    // const { cellKey, toRowData, updated } = objUpdated;
+    // const { cellKey }
+    // const touchAutoCompute
+
+    // #endregion 表单编辑
+
+    // #region 行选择
+    ;
+
     _this.touchSelectedRowsChange = function (selectedRows) {
       var rowKey = _this.props.rowKey;
 
@@ -596,9 +610,9 @@ var Easy3wEditBigTable = function (_Component) {
   Easy3wEditBigTable.prototype.componentWillUnmount = function componentWillUnmount() {
     var objToolbarProps = this.props.objToolbarProps;
 
-    var _ref3 = objToolbarProps || {},
-        _ref3$unloadSaveFlag = _ref3.unloadSaveFlag,
-        unloadSaveFlag = _ref3$unloadSaveFlag === undefined ? true : _ref3$unloadSaveFlag;
+    var _ref4 = objToolbarProps || {},
+        _ref4$unloadSaveFlag = _ref4.unloadSaveFlag,
+        unloadSaveFlag = _ref4$unloadSaveFlag === undefined ? true : _ref4$unloadSaveFlag;
     // unloadSaveFlag 是否在卸载后保存 true 需要保存 false 不需要保存
 
 
@@ -685,7 +699,7 @@ var Easy3wEditBigTable = function (_Component) {
 
   // #endregion 保存
 
-  // #region 行选择
+  // #region 表单编辑
 
 
   // #endregion 行选择
@@ -702,11 +716,11 @@ var Easy3wEditBigTable = function (_Component) {
         selectedRows = _state.selectedRows;
     var _props = this.props,
         columns = _props.columns,
-        rows = _props.rows,
         objToolbarProps = _props.objToolbarProps,
         rowKey = _props.rowKey,
         topTotalFlag = _props.topTotalFlag,
-        bottomTotalFlag = _props.bottomTotalFlag;
+        bottomTotalFlag = _props.bottomTotalFlag,
+        objOtherProps = _props.objOtherProps;
     // #region 表格数据处理，排序(sort)、筛选(filter)
 
     this.arrRows = this.touchDP();
@@ -727,7 +741,10 @@ var Easy3wEditBigTable = function (_Component) {
       objToolbarProps ? this.getToolbar() : '',
       _react2['default'].createElement(_reactDataGrid2['default'], (0, _extends5['default'])({}, objPrps, {
         columns: columns // 表头
-        , rows: this.arrRows // 行数据
+        , defaultColumnOptions: {
+          resizable: true // 可调整列宽
+        },
+        rows: this.arrRows // 行数据
         , headerRowHeight: objFilters.enabled ? 70 : undefined // 表头高度
         // 排序
         , sortColumns: sortColumns // 排序字段
@@ -738,7 +755,10 @@ var Easy3wEditBigTable = function (_Component) {
         },
         selectedRows: selectedRows,
         onSelectedRowsChange: this.touchSelectedRowsChange
-      })),
+        // 表格编辑时触发
+        // onRowsChange={rows => this.saveEditBigTableModelZJ('onSelectedRowsChange', rows)}
+        , onRowsChange: this.touchRowsChange
+      }, objOtherProps)),
       visible ? _react2['default'].createElement(_Easy3wEditBigTableForm2['default'] // 批量录入Modal
       , { visible: visible // 是否显示
         , objOtherParameters: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.64-beta.4",
+  "version": "1.5.64-beta.6",
   "description": "easy3wui components for react",
   "keywords": [
     "react",