easy3wui 1.5.64-beta.13 → 1.5.64-beta.15

package/assets/editBigTable.css

@@ -1,77 +1,17 @@
 .Easy3wEditBigTable {
   background-color: #fff;
 }
-.Easy3wEditBigTable .reactGridToolbar {
-  text-align: end;
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div {
+  height: 100%;
 }
-.Easy3wEditBigTable .reactGridToolbar .btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1.42857143;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  -ms-touch-action: manipulation;
-  touch-action: manipulation;
-  cursor: pointer;
-  -webkit-user-select: none;
-  color: inherit;
-  background: white;
-  border: 1px solid #e7eaec;
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div > div.form-group {
+  height: 100%;
 }
-.Easy3wEditBigTable .filterCell {
-  line-height: 35px;
-  padding: 0;
-}
-.Easy3wEditBigTable .filterCell .filterCellContainer input,
-.Easy3wEditBigTable .filterCell .filterCellContainer button,
-.Easy3wEditBigTable .filterCell .filterCellContainer select,
-.Easy3wEditBigTable .filterCell .filterCellContainer optgroup,
-.Easy3wEditBigTable .filterCell .filterCellContainer textarea {
-  line-height: normal;
-}
-.Easy3wEditBigTable .filterCell .filterCellContainer > div {
-  padding-block: 0;
-}
-.Easy3wEditBigTable .filterCell .filterCellContainer > div:first-child {
-  border-block-end: 1px solid var(--rdg-border-color);
-}
-.Easy3wEditBigTable .filterCell .filterCellContainer > div .filterCellInput {
-  inline-size: 100%;
-  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);
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div > div.form-group > input[type="text"].form-control.input-sm {
+  width: 100%;
+  height: 100%;
+  border-color: #ddd;
   outline: none;
-}
-.Easy3wEditBigTable .textEditor:-ms-input-placeholder {
-  color: #999;
-  opacity: 1;
-}
-.Easy3wEditBigTable .textEditor::placeholder {
-  color: #999;
-  opacity: 1;
-}
-.Easy3wEditBigTable .rdg-row:not(.rdg-summary-row) .rdg-cell:not([aria-readonly]) {
-  background-color: #f6ffed;
+  border-style: solid;
+  border-radius: 3px;
 }

package/assets/index.css

@@ -1485,77 +1485,17 @@ input.ant-input-number-input {
 .Easy3wEditBigTable {
   background-color: #fff;
 }
-.Easy3wEditBigTable .reactGridToolbar {
-  text-align: end;
-}
-.Easy3wEditBigTable .reactGridToolbar .btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1.42857143;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  -ms-touch-action: manipulation;
-  touch-action: manipulation;
-  cursor: pointer;
-  -webkit-user-select: none;
-  color: inherit;
-  background: white;
-  border: 1px solid #e7eaec;
-}
-.Easy3wEditBigTable .filterCell {
-  line-height: 35px;
-  padding: 0;
-}
-.Easy3wEditBigTable .filterCell .filterCellContainer input,
-.Easy3wEditBigTable .filterCell .filterCellContainer button,
-.Easy3wEditBigTable .filterCell .filterCellContainer select,
-.Easy3wEditBigTable .filterCell .filterCellContainer optgroup,
-.Easy3wEditBigTable .filterCell .filterCellContainer textarea {
-  line-height: normal;
-}
-.Easy3wEditBigTable .filterCell .filterCellContainer > div {
-  padding-block: 0;
-}
-.Easy3wEditBigTable .filterCell .filterCellContainer > div:first-child {
-  border-block-end: 1px solid var(--rdg-border-color);
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div {
+  height: 100%;
 }
-.Easy3wEditBigTable .filterCell .filterCellContainer > div .filterCellInput {
-  inline-size: 100%;
-  padding: 4px;
-  font-size: 14px;
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div > div.form-group {
+  height: 100%;
 }
-.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);
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div > div.form-group > input[type="text"].form-control.input-sm {
+  width: 100%;
+  height: 100%;
+  border-color: #ddd;
   outline: none;
-}
-.Easy3wEditBigTable .textEditor:-ms-input-placeholder {
-  color: #999;
-  opacity: 1;
-}
-.Easy3wEditBigTable .textEditor::placeholder {
-  color: #999;
-  opacity: 1;
-}
-.Easy3wEditBigTable .rdg-row:not(.rdg-summary-row) .rdg-cell:not([aria-readonly]) {
-  background-color: #f6ffed;
+  border-style: solid;
+  border-radius: 3px;
 }

package/lib/Easy3wDownLoad/Easy3wRCView.js

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

package/lib/Easy3wEditBigTable/Easy3wEditBigTableForm.js

@@ -6,10 +6,6 @@ var _form = require('antd/lib/form');
 
 var _form2 = _interopRequireDefault(_form);
 
-var _modal = require('antd/lib/modal');
-
-var _modal2 = _interopRequireDefault(_modal);
-
 var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
 
 var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
@@ -32,8 +28,6 @@ var _inherits3 = _interopRequireDefault(_inherits2);
 
 require('antd/lib/form/style');
 
-require('antd/lib/modal/style');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -42,6 +36,8 @@ var _antd = require('antd');
 
 var _easy3wui = require('easy3wui');
 
+var _lib = require('antd/lib');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Easy3wEditBigTableForm = function (_PureComponent) {
@@ -56,7 +52,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
       _this[pureComponentName] = that;
     };
 
-    _this.touchCreateOptionLst = function () {
+    _this.getOptionLst = function () {
       var objOtherParameters = _this.props.objOtherParameters;
       var columns = objOtherParameters.columns;
 
@@ -66,9 +62,11 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
         var strName = item.strName,
             name = item.name,
             editable = item.editable,
-            renderEditCell = item.renderEditCell;
+            editor = item.editor,
+            otherEditable = item.otherEditable;
+        // if (editable || editor || otherEditable) { // 编辑
 
-        if (editable || renderEditCell) {
+        if (editable || editor) {
           // 编辑
           arrColumns.push({
             label: strName || name,
@@ -80,7 +78,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
       _this.arrColumns = arrColumns;
     };
 
-    _this.touchGetBatchField = function () {
+    _this.getBatchField = function () {
       var _this$props = _this.props,
           form = _this$props.form,
           objOtherParameters = _this$props.objOtherParameters;
@@ -162,7 +160,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
                   arg[_key] = arguments[_key];
                 }
 
-                return _this.touchChangeField(arg, objColumn);
+                return _this.onChange(arg, objColumn);
               }
             }, cmptPros)
           }]
@@ -172,7 +170,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
       return { fieldRowItems: fieldRowItems, hiddenItems: hiddenItems };
     };
 
-    _this.touchChangeField = function (arg, objColumn) {
+    _this.onChange = function (arg, objColumn) {
       var form = _this.props.form;
       var onChange = objColumn.onChange;
 
@@ -203,7 +201,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
             // strName 字串名称
             // name 字段名称
 
-            _modal2['default'].confirm({
+            _lib.Modal.confirm({
               content: '\u8BF7\u786E\u8BA4\u6B64\u5217' + (strName || name) + '\u5168\u90E8\u8BBE\u7F6E\u6210\u5F55\u5165\u503C\uFF0C\u5C06\u8986\u76D6\u539F\u503C!',
               onOk: function onOk() {
                 confirmCallback(valuesNew, objColumn);
@@ -231,7 +229,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
     if (bidPureComponent && typeof bidPureComponent === 'function') {
       bidPureComponent(_this);
     }
-    _this.touchCreateOptionLst();
+    _this.getOptionLst();
     _this.state = {};
     return _this;
   }
@@ -261,9 +259,9 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
 
     var footBtnArr = [{ func: this.touchConfirm, cName: '保存' }, { func: this.touchCancel, cName: '关闭' }];
 
-    var _touchGetBatchField = this.touchGetBatchField(),
-        fieldRowItems = _touchGetBatchField.fieldRowItems,
-        hiddenItems = _touchGetBatchField.hiddenItems;
+    var _getBatchField = this.getBatchField(),
+        fieldRowItems = _getBatchField.fieldRowItems,
+        hiddenItems = _getBatchField.hiddenItems;
 
     var rowItems = [{
       cols: [{

package/lib/Easy3wEditBigTable/Editors/EditorNumber.js

@@ -0,0 +1,92 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _reactDataGrid = require('react-data-grid');
+
+var _reactDataGrid2 = _interopRequireDefault(_reactDataGrid);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var editors = _reactDataGrid2['default'].editors;
+var EditorBase = editors.EditorBase;
+
+var EditorNumber = function (_EditorBase) {
+  (0, _inherits3['default'])(EditorNumber, _EditorBase);
+
+  function EditorNumber() {
+    var _temp, _this, _ret;
+
+    (0, _classCallCheck3['default'])(this, EditorNumber);
+
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _EditorBase.call.apply(_EditorBase, [this].concat(args))), _this), _this.setInputRef = function (input) {
+      _this.input = input;
+    }, _this.getInputNode = function () {
+      return _this.setInputRef();
+    }, _this.getValue = function () {
+      var _ref;
+
+      // const { value } = this.state;
+      return _ref = {}, _ref[_this.props.column.key] = _this.getInputNode().value, _ref;
+    }, _this.onBlur = function (event) {
+      var _this$props = _this.props,
+          onBlur = _this$props.onBlur,
+          onCommit = _this$props.onCommit;
+
+      if (onBlur && typeof onBlur === 'function') {
+        onBlur(event);
+      }
+      if (onCommit && typeof onCommit === 'function') {
+        onCommit();
+      }
+    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
+  }
+  // 获取 input 节点
+
+  // 获取 input 值
+
+  // input 失去焦点
+
+
+  EditorNumber.prototype.render = function render() {
+    var value = this.props.value;
+
+    return _react2['default'].createElement('input', (0, _extends3['default'])({
+      ref: this.setInputRef,
+      type: 'number',
+      className: 'form-control',
+      defaultValue: value
+    }, this.props, {
+      onBlur: this.onBlur
+    }));
+  };
+
+  return EditorNumber;
+}(EditorBase);
+
+exports['default'] = EditorNumber;
+module.exports = exports['default'];

package/lib/Easy3wEditBigTable/Editors/EditorsDatePicker.js

@@ -0,0 +1,168 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _datePicker = require('antd/lib/date-picker');
+
+var _datePicker2 = _interopRequireDefault(_datePicker);
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+require('antd/lib/date-picker/style');
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _antd = require('antd');
+
+var _zh_CN = require('antd/lib/date-picker/locale/zh_CN');
+
+var _zh_CN2 = _interopRequireDefault(_zh_CN);
+
+require('moment/locale/zh-cn');
+
+var _moment = require('moment');
+
+var _moment2 = _interopRequireDefault(_moment);
+
+var _reactDataGrid = require('react-data-grid');
+
+var _reactDataGrid2 = _interopRequireDefault(_reactDataGrid);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var editors = _reactDataGrid2['default'].editors;
+// import ReactDOM from 'react-dom';
+
+var EditorBase = editors.EditorBase;
+
+
+_moment2['default'].locale('zh-cn');
+var dateFormatDefault = 'YYYY-MM-DD';
+
+var EditorsDatePicker = function (_React$Component) {
+  (0, _inherits3['default'])(EditorsDatePicker, _React$Component);
+
+  function EditorsDatePicker(props) {
+    (0, _classCallCheck3['default'])(this, EditorsDatePicker);
+
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _React$Component.call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var value = props.value,
+        refCallback = props.refCallback;
+
+    if (refCallback && refCallback instanceof Function) {
+      refCallback(_this);
+    }
+    _this.state = {
+      value: value
+    };
+    return _this;
+  }
+  // 获取组件节点
+
+  // 设置样式
+
+  // 获取 input 节点
+
+  // 获取 input 值
+
+  // input 值改变时回调
+
+  // input 失去焦点时回调
+
+
+  EditorsDatePicker.prototype.render = function render() {
+    var _props$cmptPros = this.props.cmptPros,
+        cmptPros = _props$cmptPros === undefined ? {} : _props$cmptPros;
+    var dateFormat = cmptPros.dateFormat;
+    var value = this.state.value;
+
+    return _react2['default'].createElement(_datePicker2['default'], (0, _extends3['default'])({
+      style: this.getStyle(),
+      autoFocus: true,
+      locale: _zh_CN2['default'],
+      format: dateFormat || dateFormatDefault,
+      value: value ? (0, _moment2['default'])(value, dateFormat || dateFormatDefault) : null,
+      ref: this.getReactDataGridZJ
+      // autoFocus
+    }, cmptPros, {
+      onChange: this.onChange,
+      onBlur: this.onBlur
+    }));
+  };
+
+  return EditorsDatePicker;
+}(_react2['default'].Component);
+
+var _initialiseProps = function _initialiseProps() {
+  var _this2 = this;
+
+  this.getReactDataGridZJ = function (el) {
+    _this2.EditorsZJ = el;
+    return el;
+  };
+
+  this.getStyle = function () {
+    return {
+      width: '100%',
+      minWidth: '120px'
+    };
+  };
+
+  this.getInputNode = function () {
+    return _this2.getReactDataGridZJ();
+  };
+
+  this.getValue = function () {
+    var _ref;
+
+    var value = _this2.state.value;
+
+    return _ref = {}, _ref[_this2.props.column.key] = value, _ref;
+  };
+
+  this.onChange = function (momentDate, strDate) {
+    var _props = _this2.props,
+        onChange = _props.onChange,
+        _props$cmptPros2 = _props.cmptPros,
+        cmptPros = _props$cmptPros2 === undefined ? {} : _props$cmptPros2;
+    var dateFormat = cmptPros.dateFormat;
+
+    if (onChange) {
+      onChange(momentDate, strDate);
+    }
+    var value = momentDate ? momentDate.format(dateFormat || dateFormatDefault) : null;
+    _this2.setState({ value: value });
+  };
+
+  this.onBlur = function () {
+    var _props2 = _this2.props,
+        onCommit = _props2.onCommit,
+        onBlur = _props2.onBlur;
+
+    if (onCommit) {
+      onCommit();
+    }
+  };
+};
+
+exports['default'] = EditorsDatePicker;
+module.exports = exports['default'];