easy3wui 1.5.89-beta7 → 1.5.89-beta9

package/assets/formPage.css

@@ -77,40 +77,40 @@
 .e3wFormPageWrapPC .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .bf-container {
   border: 1px solid #eee;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
   border: none;
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
   border: none;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   width: 100%;
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
 }
-.approval_flag_only .e3wFormPageWrapPC .ant-row.ant-form-item {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .ant-row.ant-form-item {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;

package/assets/index.css

@@ -2561,40 +2561,40 @@
 .e3wFormPageWrapPC .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .bf-container {
   border: 1px solid #eee;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
   border: none;
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
   border: none;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
   padding: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
   padding-bottom: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   width: 100%;
   height: auto;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
   margin-left: 0;
 }
-.approval_flag_only .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
   border-bottom: 1px solid var(--primary-color);
 }
-.approval_flag_only .e3wFormPageWrapPC .ant-row.ant-form-item {
+.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .ant-row.ant-form-item {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;

package/lib/Easy3wButton/index.js

@@ -64,6 +64,12 @@ var _icon2 = _interopRequireDefault(_icon);
 
 require('antd/lib/icon/style');
 
+var _popover = require('antd/lib/popover');
+
+var _popover2 = _interopRequireDefault(_popover);
+
+require('antd/lib/popover/style');
+
 var _notification = require('antd/lib/notification');
 
 var _notification2 = _interopRequireDefault(_notification);
@@ -106,7 +112,10 @@ var Easy3wButton = function (_Component) {
         func(e);
       }
     }, _this.getOneBtnObj = function (obj, index) {
-      var btnType = obj.btnType;
+      var btnType = obj.btnType,
+          strPopoverContent = obj.strPopoverContent,
+          _obj$objPopoverConten = obj.objPopoverContent,
+          objPopoverContent = _obj$objPopoverConten === undefined ? {} : _obj$objPopoverConten;
 
       var typeProps = {};
       if (btnType) {
@@ -121,7 +130,7 @@ var Easy3wButton = function (_Component) {
       } else {
         typeProps = { type: 'primary' };
       }
-      return _react2['default'].createElement(
+      var btnEle = _react2['default'].createElement(
         _button2['default'],
         (0, _extends3['default'])({
           onClick: function onClick(e) {
@@ -134,9 +143,17 @@ var Easy3wButton = function (_Component) {
         }),
         obj.cName
       );
+      return strPopoverContent ? _react2['default'].createElement(
+        _popover2['default'],
+        (0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
+        btnEle
+      ) : btnEle;
     }, _this.getOneBtnTypeObj = function (obj, index) {
       var props = obj.props,
-          btnType = obj.btnType;
+          btnType = obj.btnType,
+          strPopoverContent = obj.strPopoverContent,
+          _obj$objPopoverConten2 = obj.objPopoverContent,
+          objPopoverContent = _obj$objPopoverConten2 === undefined ? {} : _obj$objPopoverConten2;
 
       var typeProps = {};
       if (btnType) {
@@ -151,7 +168,7 @@ var Easy3wButton = function (_Component) {
       } else {
         typeProps = { type: 'primary' };
       }
-      return _react2['default'].createElement(
+      var btnEle = _react2['default'].createElement(
         _upload2['default'],
         props,
         _react2['default'].createElement(
@@ -168,11 +185,19 @@ var Easy3wButton = function (_Component) {
           obj.cName
         )
       );
+      return strPopoverContent ? _react2['default'].createElement(
+        _popover2['default'],
+        (0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
+        btnEle
+      ) : btnEle;
     }, _this.getOneBtnPopconfirmObj = function (obj, index) {
       var func = obj.func,
           cName = obj.cName,
           confirmContent = obj.confirmContent,
-          btnType = obj.btnType;
+          btnType = obj.btnType,
+          strPopoverContent = obj.strPopoverContent,
+          _obj$objPopoverConten3 = obj.objPopoverContent,
+          objPopoverContent = _obj$objPopoverConten3 === undefined ? {} : _obj$objPopoverConten3;
 
       var typeProps = {};
       if (btnType) {
@@ -187,7 +212,7 @@ var Easy3wButton = function (_Component) {
       } else {
         typeProps = { type: 'primary' };
       }
-      return _react2['default'].createElement(
+      var btnEle = _react2['default'].createElement(
         _popconfirm2['default'],
         { title: confirmContent, onConfirm: function onConfirm(e) {
             return _this.onClickFunc(e, func);
@@ -198,6 +223,11 @@ var Easy3wButton = function (_Component) {
           cName
         )
       );
+      return strPopoverContent ? _react2['default'].createElement(
+        _popover2['default'],
+        (0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
+        btnEle
+      ) : btnEle;
     }, _this.getDropdownArrObj = function (obj) {
       var cName = obj.cName,
           dropdownArr = obj.dropdownArr,
@@ -205,14 +235,22 @@ var Easy3wButton = function (_Component) {
           dropdownProps = _obj$dropdownProps === undefined ? {} : _obj$dropdownProps;
 
       var menuArr = dropdownArr.map(function (dropdown) {
-        var func = dropdown.func;
-
+        var func = dropdown.func,
+            strPopoverContent = dropdown.strPopoverContent,
+            _dropdown$objPopoverC = dropdown.objPopoverContent,
+            objPopoverContent = _dropdown$objPopoverC === undefined ? {} : _dropdown$objPopoverC;
+
+        var menuItemCName = strPopoverContent ? _react2['default'].createElement(
+          _popover2['default'],
+          (0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
+          dropdown.cName
+        ) : dropdown.cName;
         return _react2['default'].createElement(
           _menu2['default'].Item,
           { key: cName, onClick: function onClick(e) {
               return _this.onClickFunc(e, func);
             } },
-          dropdown.cName
+          menuItemCName
         );
       });
       var menuOverlay = _react2['default'].createElement(
@@ -240,12 +278,16 @@ var Easy3wButton = function (_Component) {
             dropdownArr = btn.dropdownArr;
 
         if (type) {
+          // 附件上传
           return _this.getOneBtnTypeObj(btn, index);
         } else if (dropdownArr) {
+          // 下拉按钮
           return _this.getDropdownArrObj(btn, index);
         } else if (confirmContent) {
+          // 二次确认
           return _this.getOneBtnPopconfirmObj(btn, index);
         } else {
+          // 单按钮
           return _this.getOneBtnObj(btn, index);
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.89-beta7",
+  "version": "1.5.89-beta9",
   "description": "easy3wui components for react",
   "keywords": [
     "react",