easy3wui 1.5.84 → 1.5.85

package/README.md

@@ -4,6 +4,8 @@ easy3w UI 组件
 npm run compile
 # 发布代码
 npm publish
+# 测试版发布
+npm publish --tag beta
 
 react-data-grid使用6.0.1版本对应的react@16
 7版本未形成稳定版本，暂时使用6.0.1版本；对应的react@18+版本
@@ -13,7 +15,7 @@ https://www.npmjs.com/
 // 官方镜像源
 npm config set registry https://registry.npmjs.org/
 // 淘宝镜像源
-npm config set registry https://registry.npmmirror.com/
+npm config set registry http://registry.npm.taobao.org/
 检查当前npm源：
 npm config get registry
 

package/lib/Easy3wCard/indexM.js

@@ -2,6 +2,10 @@
 
 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);
@@ -24,6 +28,12 @@ var _card2 = _interopRequireDefault(_card);
 
 require('antd/lib/card/style');
 
+var _alert = require('antd/lib/alert');
+
+var _alert2 = _interopRequireDefault(_alert);
+
+require('antd/lib/alert/style');
+
 var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
@@ -42,20 +52,146 @@ var Easy3wCardM = function (_Component) {
   (0, _inherits3['default'])(Easy3wCardM, _Component);
 
   function Easy3wCardM() {
+    var _temp, _this, _ret;
+
     (0, _classCallCheck3['default'])(this, Easy3wCardM);
-    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
-  }
 
-  Easy3wCardM.prototype.render = function render() {
-    var _props = this.props,
-        label = _props.label,
-        children = _props.children,
-        mobileShowFlag = _props.mobileShowFlag;
-
-    return _react2['default'].createElement(
-      _react2['default'].Fragment,
-      null,
-      mobileShowFlag === false ? '' : _react2['default'].createElement(
+    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, _Component.call.apply(_Component, [this].concat(args))), _this), _this.touchRender = function () {
+      var _this$props = _this.props,
+          e3wCardId = _this$props.e3wCardId,
+          e3wCardCfg = _this$props.e3wCardCfg,
+          mobileShowFlag = _this$props.mobileShowFlag;
+
+      var objCfg = e3wCardId && e3wCardCfg && e3wCardCfg instanceof Object && e3wCardCfg[e3wCardId] && e3wCardCfg[e3wCardId] instanceof Object ? e3wCardCfg[e3wCardId] : {};
+      var cardHelpInfo = objCfg.cardHelpInfo,
+          cardDspFlag = objCfg.cardDspFlag,
+          cardReqFlag = objCfg.cardReqFlag,
+          cardSName = objCfg.cardSName;
+      // const labelF = objCfg.cardSName || label;
+
+      var _this$props2 = _this.props,
+          label = _this$props2.label,
+          children = _this$props2.children;
+      // 创建 children 的可变副本，避免修改只读的 props.children
+
+      if (children != null) {
+        children = _react2['default'].Children.toArray(children);
+        // 如果转换后数组为空，设置为 null 以保持原行为
+        if (children.length === 0) {
+          children = null;
+        }
+      }
+      if (cardHelpInfo) {
+        if (children && children instanceof Array) {
+          // children 现在是数组
+          if (children.length === 1) {
+            // 单个元素，检查是否是 Alert
+            var _children = children,
+                item = _children[0];
+
+            var _ref3 = item || {},
+                props = _ref3.props;
+
+            var _ref4 = props || {},
+                closable = _ref4.closable,
+                message = _ref4.message,
+                typeA = _ref4.type;
+
+            if (closable && message && typeA === 'success') {
+              children = null;
+            }
+          } else {
+            // 多个元素，查找并移除 Alert
+            var foundIndex = children.findIndex(function (item) {
+              var _ref5 = item || {},
+                  props = _ref5.props;
+
+              var _ref6 = props || {},
+                  closable = _ref6.closable,
+                  message = _ref6.message,
+                  typeA = _ref6.type;
+
+              return closable && message && typeA === 'success';
+            });
+            if (foundIndex !== -1) {
+              children.splice(foundIndex, 1);
+              // 如果移除后数组为空，设置为 null
+              if (children.length === 0) {
+                children = null;
+              }
+            }
+          }
+        }
+        // 注意：children 现在要么是数组，要么是 null
+        // 原 else if 分支处理 children 是单个对象的情况，现在已经被数组包装
+      }
+      var hasReqFlag = false;
+      if (label && label instanceof Object) {
+        var _label = label,
+            _props = _label.props;
+
+        var _ref7 = _props || {},
+            childrenLabel = _ref7.children;
+
+        if (childrenLabel && childrenLabel instanceof Array) {
+          // 创建 childrenLabel 的可变副本，避免修改只读的 props.children
+          var childrenLabelCopy = _react2['default'].Children.toArray(childrenLabel);
+          var _foundIndex = childrenLabelCopy.findIndex(function (item) {
+            var propsCL = item.props;
+
+            var _ref8 = propsCL || {},
+                childrenLabelC = _ref8.children,
+                style = _ref8.style;
+
+            var _ref9 = style || {},
+                color = _ref9.color;
+            // const { name } = type && type instanceof Object ? type : {};
+
+
+            return childrenLabelC === '*' && (color === 'red' || color === '#f00');
+          });
+
+          if (_foundIndex !== -1) {
+            hasReqFlag = true;
+            if (cardReqFlag === '0') {
+              // 移除红色星号元素
+              childrenLabelCopy.splice(_foundIndex, 1);
+              // 创建新的 label 元素，使用修改后的 children
+              label = _react2['default'].cloneElement(label, (0, _extends3['default'])({}, _props, {
+                children: childrenLabelCopy.length === 1 ? childrenLabelCopy[0] : childrenLabelCopy
+              }));
+            }
+          }
+        }
+      }
+      if (cardSName) {
+        label = _react2['default'].createElement(
+          'span',
+          null,
+          cardReqFlag === '1' ? _react2['default'].createElement(
+            'span',
+            { style: { color: 'red' } },
+            '*'
+          ) : '',
+          cardSName
+        );
+      } else if (label && cardReqFlag === '1' && !hasReqFlag) {
+        label = _react2['default'].createElement(
+          'span',
+          null,
+          _react2['default'].createElement(
+            'span',
+            { style: { color: 'red' } },
+            '*'
+          ),
+          label
+        );
+      }
+      var content = _react2['default'].createElement(
         _card2['default'],
         {
           title: label ? _react2['default'].createElement(
@@ -68,9 +204,21 @@ var Easy3wCardM = function (_Component) {
           className: (0, _classnames2['default'])(['e3wCardForm']),
           size: size || 'default'
         },
+        cardHelpInfo ? _react2['default'].createElement(_alert2['default'], {
+          message: cardHelpInfo,
+          type: 'success',
+          closable: true
+        }) : '',
         children
-      )
-    );
+      );
+      return cardDspFlag === '0' ? null : cardDspFlag === '1' ? content : mobileShowFlag === false ? null : content;
+    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
+  }
+  // 根据配置重新渲染 去除原内容： 如帮助及红色*号
+
+
+  Easy3wCardM.prototype.render = function render() {
+    return this.touchRender();
   };
 
   return Easy3wCardM;

package/lib/Easy3wCard/indexPC.js

@@ -2,6 +2,10 @@
 
 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);
@@ -24,6 +28,12 @@ var _card2 = _interopRequireDefault(_card);
 
 require('antd/lib/card/style');
 
+var _alert = require('antd/lib/alert');
+
+var _alert2 = _interopRequireDefault(_alert);
+
+require('antd/lib/alert/style');
+
 var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
@@ -42,30 +52,196 @@ var Easy3wCardPC = function (_Component) {
   (0, _inherits3['default'])(Easy3wCardPC, _Component);
 
   function Easy3wCardPC() {
+    var _temp, _this, _ret;
+
     (0, _classCallCheck3['default'])(this, Easy3wCardPC);
-    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
-  }
 
-  Easy3wCardPC.prototype.render = function render() {
-    var _props = this.props,
-        label = _props.label,
-        children = _props.children;
-
-    return _react2['default'].createElement(
-      _card2['default'],
-      {
-        title: label ? _react2['default'].createElement(
+    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, _Component.call.apply(_Component, [this].concat(args))), _this), _this.touchRender = function () {
+      var _this$props = _this.props,
+          e3wCardId = _this$props.e3wCardId,
+          e3wCardCfg = _this$props.e3wCardCfg;
+
+      var objCfg = e3wCardId && e3wCardCfg && e3wCardCfg instanceof Object && e3wCardCfg[e3wCardId] && e3wCardCfg[e3wCardId] instanceof Object ? e3wCardCfg[e3wCardId] : {};
+      var cardHelpInfo = objCfg.cardHelpInfo,
+          cardDspFlag = objCfg.cardDspFlag,
+          cardReqFlag = objCfg.cardReqFlag,
+          cardSName = objCfg.cardSName;
+      // const labelF = objCfg.cardSName || label;
+
+      var _this$props2 = _this.props,
+          label = _this$props2.label,
+          children = _this$props2.children;
+      // 创建 children 的可变副本，避免修改只读的 props.children
+
+      if (children != null) {
+        children = _react2['default'].Children.toArray(children);
+        // 如果转换后数组为空，设置为 null 以保持原行为
+        if (children.length === 0) {
+          children = null;
+        }
+      }
+      if (cardHelpInfo) {
+        if (children && children instanceof Array) {
+          // children 现在是数组
+          if (children.length === 1) {
+            // 单个元素，检查是否是 Alert
+            var _children = children,
+                item = _children[0];
+
+            var _ref3 = item || {},
+                props = _ref3.props;
+
+            var _ref4 = props || {},
+                closable = _ref4.closable,
+                message = _ref4.message,
+                typeA = _ref4.type;
+
+            if (closable && message && typeA === 'success') {
+              children = null;
+            }
+          } else {
+            // 多个元素，查找并移除 Alert
+            var foundIndex = children.findIndex(function (item) {
+              var _ref5 = item || {},
+                  props = _ref5.props;
+
+              var _ref6 = props || {},
+                  closable = _ref6.closable,
+                  message = _ref6.message,
+                  typeA = _ref6.type;
+
+              return closable && message && typeA === 'success';
+            });
+            if (foundIndex !== -1) {
+              children.splice(foundIndex, 1);
+              // 如果移除后数组为空，设置为 null
+              if (children.length === 0) {
+                children = null;
+              }
+            }
+          }
+        }
+        // 注意：children 现在要么是数组，要么是 null
+        // 原 else if 分支处理 children 是单个对象的情况，现在已经被数组包装
+      }
+      var hasReqFlag = false;
+      if (label && label instanceof Object) {
+        var _label = label,
+            _props = _label.props;
+
+        var _ref7 = _props || {},
+            childrenLabel = _ref7.children;
+
+        if (childrenLabel && childrenLabel instanceof Array) {
+          // 创建 childrenLabel 的可变副本，避免修改只读的 props.children
+          var childrenLabelCopy = _react2['default'].Children.toArray(childrenLabel);
+          var _foundIndex = childrenLabelCopy.findIndex(function (item) {
+            var propsCL = item.props;
+
+            var _ref8 = propsCL || {},
+                childrenLabelC = _ref8.children,
+                style = _ref8.style;
+
+            var _ref9 = style || {},
+                color = _ref9.color;
+            // const { name } = type && type instanceof Object ? type : {};
+
+
+            return childrenLabelC === '*' && (color === 'red' || color === '#f00');
+          });
+
+          if (_foundIndex !== -1) {
+            hasReqFlag = true;
+            if (cardReqFlag === '0') {
+              // 移除红色星号元素
+              childrenLabelCopy.splice(_foundIndex, 1);
+              // 创建新的 label 元素，使用修改后的 children
+              label = _react2['default'].cloneElement(label, (0, _extends3['default'])({}, _props, {
+                children: childrenLabelCopy.length === 1 ? childrenLabelCopy[0] : childrenLabelCopy
+              }));
+            }
+          }
+        }
+      }
+      if (cardSName) {
+        label = _react2['default'].createElement(
+          'span',
+          null,
+          cardReqFlag === '1' ? _react2['default'].createElement(
+            'span',
+            { style: { color: 'red' } },
+            '*'
+          ) : '',
+          cardSName
+        );
+      } else if (label && cardReqFlag === '1' && !hasReqFlag) {
+        label = _react2['default'].createElement(
           'span',
-          { className: (0, _classnames2['default'])(['e3wCardSpanCardTitle']) },
-          _react2['default'].createElement('s', null),
+          null,
+          _react2['default'].createElement(
+            'span',
+            { style: { color: 'red' } },
+            '*'
+          ),
           label
-        ) : '',
-        bordered: false,
-        className: (0, _classnames2['default'])(['e3wCardForm']),
-        size: size || 'default'
-      },
-      children
-    );
+        );
+      }
+      return cardDspFlag === '0' ? null : _react2['default'].createElement(
+        _card2['default'],
+        {
+          title: label ? _react2['default'].createElement(
+            'span',
+            { className: (0, _classnames2['default'])(['e3wCardSpanCardTitle']) },
+            _react2['default'].createElement('s', null),
+            label
+          ) : '',
+          bordered: false,
+          className: (0, _classnames2['default'])(['e3wCardForm']),
+          size: size || 'default'
+          // ref={this.myRef}
+        },
+        cardHelpInfo ? _react2['default'].createElement(_alert2['default'], {
+          message: cardHelpInfo,
+          type: 'success',
+          closable: true,
+          showIcon: true
+        }) : '',
+        children
+      );
+    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
+  }
+  // constructor(props) {
+  //   super(props);
+  //   this.myRef = this.createRef();
+  // }
+
+  // componentDidUpdate() {
+  //   // 使用 findDOMNode 获取 Card 组件的 DOM 节点
+  //   // eslint-disable-next-line react/no-find-dom-node
+  //   const cardNode = ReactDOM.findDOMNode(this.myRef.current);
+  //   if (cardNode) {
+  //     // 查找 Card 内部的 antd Alert 元素
+  //     const alertElements = cardNode.querySelectorAll('.ant-card-body>.ant-alert');
+  //     console.log('alertElements', alertElements);
+  //     // 遍历并移除所有 Alert 元素
+  //     // alertElements.forEach((alertElement) => {
+  //     //   if (alertElement.parentNode) {
+  //     //     console.log('alertElement.parentNode.removeChild', alertElement.parentNode.removeChild);
+  //     //     alertElement.parentNode.removeChild(alertElement);
+  //     //   }
+  //     // });
+  //   }
+  // }
+
+  // 根据配置重新渲染 去除原内容： 如帮助及红色*号
+
+
+  Easy3wCardPC.prototype.render = function render() {
+    return this.touchRender();
   };
 
   return Easy3wCardPC;

package/lib/Easy3wEditBigTable/index.js

@@ -2,6 +2,18 @@
 
 exports.__esModule = true;
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
+var _tooltip = require('antd/lib/tooltip');
+
+var _tooltip2 = _interopRequireDefault(_tooltip);
+
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -22,6 +34,10 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
+require('antd/lib/icon/style');
+
+require('antd/lib/tooltip/style');
+
 require('antd/lib/modal/style');
 
 var _react = require('react');
@@ -54,13 +70,13 @@ var Selectors = _reactDataGridAddons.Data.Selectors;
 // import XLSX from 'xlsx';
 /* eslint-disable no-alert */
 
-var Easy3wEditBigTable = function (_Component) {
-  (0, _inherits3['default'])(Easy3wEditBigTable, _Component);
+var Easy3wEditBigTable = function (_React$Component) {
+  (0, _inherits3['default'])(Easy3wEditBigTable, _React$Component);
 
   function Easy3wEditBigTable(props) {
     (0, _classCallCheck3['default'])(this, Easy3wEditBigTable);
 
-    var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _React$Component.call(this, props));
 
     _initialiseProps.call(_this);
 
@@ -248,7 +264,7 @@ var Easy3wEditBigTable = function (_Component) {
       _react2['default'].createElement(
         'style',
         null,
-        strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n              .custom-edit-cell {  \n                background-color: #f6ffed;\n              }\n            '
+        strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n              .custom-edit-cell {\n                background-color: #f6ffed;\n              }\n            '
       ),
       _react2['default'].createElement(_reactDataGrid2['default'], (0, _extends3['default'])({}, this.props, {
         ref: this.ReactDataGridRef,
@@ -298,7 +314,7 @@ var Easy3wEditBigTable = function (_Component) {
   };
 
   return Easy3wEditBigTable;
-}(_react.Component);
+}(_react2['default'].Component);
 
 Easy3wEditBigTable.defaultProps = {
   rowKey: 'autoAddNumber_idx_edit' // 表格主键 原始数据索引
@@ -1040,7 +1056,139 @@ var _initialiseProps = function _initialiseProps() {
         columns = _props9.columns;
     // 自动添加序号
 
-    var columnsNew = [].concat(columns);
+    var columnsNew = [];
+    for (var _iterator = columns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      var column = _ref2;
+      var required = column.required,
+          titlec = column.name,
+          helpInfo = column.helpInfo;
+      var e3wFieldCfg = _this3.props.e3wFieldCfg;
+      var dataIndex = column.key;
+
+      var objCfg = e3wFieldCfg && e3wFieldCfg[dataIndex] && e3wFieldCfg[dataIndex] instanceof Object ? e3wFieldCfg[dataIndex] : null;
+      if (objCfg) {
+        var fieldSName = objCfg.fieldSName,
+            fieldDesc = objCfg.fieldDesc,
+            fieldHelpInfo = objCfg.fieldHelpInfo,
+            fieldReqFlag = objCfg.fieldReqFlag,
+            fieldDspFlag = objCfg.fieldDspFlag;
+
+        if (fieldDspFlag === '0') {
+          // return column;
+          // eslint-disable-next-line no-continue
+          continue;
+        } else {
+          required = fieldReqFlag === '0' ? false : fieldReqFlag === '1' ? true : required;
+          if (fieldSName) {
+            titlec = fieldSName;
+          }
+          helpInfo = fieldHelpInfo || helpInfo;
+          if (helpInfo) {
+            var needHelpFlag = true;
+            if (titlec && titlec instanceof Object) {
+              var _titlec = titlec,
+                  titleType = _titlec.type,
+                  props = _titlec.props;
+
+              var _ref3 = titleType || {},
+                  name = _ref3.name;
+
+              var _ref4 = props || {},
+                  titleT = _ref4.title,
+                  children = _ref4.children,
+                  restProps = (0, _objectWithoutProperties3['default'])(_ref4, ['title', 'children']);
+
+              if (name === 'Tooltip' && titleT) {
+                // 创建新的Tooltip组件，继承现有props，更新title
+                titlec = _react2['default'].createElement(
+                  _tooltip2['default'],
+                  (0, _extends3['default'])({}, restProps, {
+                    title: _react2['default'].createElement(
+                      'span',
+                      { style: { whiteSpace: 'pre-wrap' } },
+                      helpInfo
+                    )
+                  }),
+                  children
+                );
+                needHelpFlag = false;
+              }
+            }
+            if (needHelpFlag) {
+              titlec = _react2['default'].createElement(
+                _tooltip2['default'],
+                {
+                  placement: 'top',
+                  title: _react2['default'].createElement(
+                    'span',
+                    { style: { whiteSpace: 'pre-wrap' } },
+                    helpInfo
+                  )
+                },
+                titlec,
+                _react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
+              );
+            }
+          }
+          if (required) {
+            titlec = _react2['default'].createElement(
+              'span',
+              null,
+              _react2['default'].createElement(
+                'span',
+                { style: { color: 'red' } },
+                '*'
+              ),
+              titlec
+            );
+          }
+        }
+        column.name = titlec;
+        // } else {
+      } else {
+        if (helpInfo) {
+          titlec = _react2['default'].createElement(
+            _tooltip2['default'],
+            {
+              placement: 'top',
+              title: _react2['default'].createElement(
+                'span',
+                { style: { whiteSpace: 'pre-wrap' } },
+                helpInfo
+              )
+            },
+            titlec,
+            _react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
+          );
+        }
+        if (required) {
+          // required, title: titlec, helpInfo
+          titlec = _react2['default'].createElement(
+            'span',
+            null,
+            _react2['default'].createElement(
+              'span',
+              { style: { color: 'red' } },
+              '*'
+            ),
+            titlec
+          );
+        }
+        column.name = titlec;
+      }
+      columnsNew.push((0, _extends3['default'])({}, column));
+    }
     if (autoAddNumber && typeof autoAddNumber === 'boolean') {
       var objColumns = columns && columns.length > 0 ? columns[0] : {};
       var _objColumns$frozen = objColumns.frozen,
@@ -1069,8 +1217,8 @@ var _initialiseProps = function _initialiseProps() {
   this.saveEditBigTableZJ = function () {
     var objToolbarProps = _this3.props.objToolbarProps;
 
-    var _ref2 = objToolbarProps || {},
-        saveEditBigTable = _ref2.saveEditBigTable;
+    var _ref5 = objToolbarProps || {},
+        saveEditBigTable = _ref5.saveEditBigTable;
 
     if (saveEditBigTable && typeof saveEditBigTable === 'function') {
       // 数据变更-回调函数