easy3wui 1.5.63 → 1.5.64-beta.2

package/assets/editBigTable copy.css

@@ -0,0 +1,17 @@
+.Easy3wEditBigTable {
+  background-color: #fff;
+}
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div {
+  height: 100%;
+}
+.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div > div.form-group {
+  height: 100%;
+}
+.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;
+  border-style: solid;
+  border-radius: 3px;
+}

package/assets/editBigTable.css

@@ -1,17 +1,46 @@
 .Easy3wEditBigTable {
   background-color: #fff;
 }
-.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div {
-  height: 100%;
-}
-.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div > div.form-group {
-  height: 100%;
-}
-.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;
-  border-style: solid;
-  border-radius: 3px;
+.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 .filterCell .filterCellContainer > div .filterCellInput {
+  inline-size: 100%;
+  padding: 4px;
+  font-size: 14px;
 }

package/assets/index.css

@@ -1485,17 +1485,46 @@ input.ant-input-number-input {
 .Easy3wEditBigTable {
   background-color: #fff;
 }
-.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div {
-  height: 100%;
+.Easy3wEditBigTable .reactGridToolbar {
+  text-align: end;
 }
-.Easy3wEditBigTable .react-grid-Header .react-grid-HeaderRow > div > div.react-grid-HeaderCell > div > div.form-group {
-  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 > input[type="text"].form-control.input-sm {
-  width: 100%;
-  height: 100%;
-  border-color: #ddd;
-  outline: none;
-  border-style: solid;
-  border-radius: 3px;
+.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;
 }

package/lib/Easy3wDownLoad/Easy3wRCView.js

@@ -1,65 +1,28 @@
-'use strict';
-
-exports.__esModule = true;
-
-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 _rcViewer = require('@hanyk/rc-viewer');
-
-var _rcViewer2 = _interopRequireDefault(_rcViewer);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
-
-var Easy3wRCView = function (_PureComponent) {
-  (0, _inherits3['default'])(Easy3wRCView, _PureComponent);
-
-  function Easy3wRCView() {
-    (0, _classCallCheck3['default'])(this, Easy3wRCView);
-    return (0, _possibleConstructorReturn3['default'])(this, _PureComponent.apply(this, arguments));
-  }
-
-  Easy3wRCView.prototype.componentDidUpdate = function componentDidUpdate() {
-    // eslint-disable-next-line react/no-string-refs
-    var viewer = this.refs.viewer.viewer;
-
-    viewer.show();
-  };
-
-  Easy3wRCView.prototype.render = function render() {
-    var _props = this.props,
-        imgUrl = _props.imgUrl,
-        hideModal = _props.hideModal;
-
-    return _react2['default'].createElement(
-      _rcViewer2['default'],
-      {
-        options: {
-          // 关闭时的回调
-          hide: hideModal
-        }
-        // eslint-disable-next-line react/no-string-refs
-        , ref: 'viewer'
-      },
-      _react2['default'].createElement('img', { style: { display: 'none' }, src: imgUrl, alt: '' })
-    );
-  };
-
-  return Easy3wRCView;
-}(_react.PureComponent);
-
-exports['default'] = Easy3wRCView;
-module.exports = exports['default'];
+// import React, { PureComponent } from 'react';
+// import RcViewer from '@hanyk/rc-viewer';
+
+// export default class Easy3wRCView extends PureComponent {
+//   componentDidUpdate() {
+//     // eslint-disable-next-line react/no-string-refs
+//     const { viewer } = this.refs.viewer;
+//     viewer.show();
+//   }
+//   render() {
+//     const { imgUrl, hideModal } = this.props;
+//     return (
+//       <RcViewer
+//         options={
+//           {
+//             // 关闭时的回调
+//             hide: hideModal,
+//           }
+//         }
+//         // eslint-disable-next-line react/no-string-refs
+//         ref="viewer"
+//       >
+//         <img style={{ display: 'none' }} src={imgUrl} alt="" />
+//       </RcViewer>
+//     );
+//   }
+// }
+"use strict";

package/lib/Easy3wEditBigTable/Easy3wEditBigTableForm.js

@@ -6,6 +6,10 @@ 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);
@@ -28,6 +32,8 @@ var _inherits3 = _interopRequireDefault(_inherits2);
 
 require('antd/lib/form/style');
 
+require('antd/lib/modal/style');
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -36,8 +42,6 @@ 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) {
@@ -52,7 +56,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
       _this[pureComponentName] = that;
     };
 
-    _this.getOptionLst = function () {
+    _this.touchCreateOptionLst = function () {
       var objOtherParameters = _this.props.objOtherParameters;
       var columns = objOtherParameters.columns;
 
@@ -62,11 +66,9 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
         var strName = item.strName,
             name = item.name,
             editable = item.editable,
-            editor = item.editor,
-            otherEditable = item.otherEditable;
-        // if (editable || editor || otherEditable) { // 编辑
+            renderEditCell = item.renderEditCell;
 
-        if (editable || editor) {
+        if (editable || renderEditCell) {
           // 编辑
           arrColumns.push({
             label: strName || name,
@@ -78,7 +80,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
       _this.arrColumns = arrColumns;
     };
 
-    _this.getBatchField = function () {
+    _this.touchGetBatchField = function () {
       var _this$props = _this.props,
           form = _this$props.form,
           objOtherParameters = _this$props.objOtherParameters;
@@ -160,7 +162,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
                   arg[_key] = arguments[_key];
                 }
 
-                return _this.onChange(arg, objColumn);
+                return _this.touchChangeField(arg, objColumn);
               }
             }, cmptPros)
           }]
@@ -170,7 +172,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
       return { fieldRowItems: fieldRowItems, hiddenItems: hiddenItems };
     };
 
-    _this.onChange = function (arg, objColumn) {
+    _this.touchChangeField = function (arg, objColumn) {
       var form = _this.props.form;
       var onChange = objColumn.onChange;
 
@@ -201,7 +203,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
             // strName 字串名称
             // name 字段名称
 
-            _lib.Modal.confirm({
+            _modal2['default'].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);
@@ -229,7 +231,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
     if (bidPureComponent && typeof bidPureComponent === 'function') {
       bidPureComponent(_this);
     }
-    _this.getOptionLst();
+    _this.touchCreateOptionLst();
     _this.state = {};
     return _this;
   }
@@ -259,9 +261,9 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
 
     var footBtnArr = [{ func: this.touchConfirm, cName: '保存' }, { func: this.touchCancel, cName: '关闭' }];
 
-    var _getBatchField = this.getBatchField(),
-        fieldRowItems = _getBatchField.fieldRowItems,
-        hiddenItems = _getBatchField.hiddenItems;
+    var _touchGetBatchField = this.touchGetBatchField(),
+        fieldRowItems = _touchGetBatchField.fieldRowItems,
+        hiddenItems = _touchGetBatchField.hiddenItems;
 
     var rowItems = [{
       cols: [{