easy3wui 1.4.190 → 1.4.194

package/assets/card.css

@@ -28,6 +28,7 @@
 .e3wCardForm :global .ant-card-head {
   padding: 0 !important;
   margin: 0 12px;
+  border: none;
 }
 .e3wCardForm :global .ant-card-body {
   padding: 0 !important;

package/assets/flow.css

@@ -728,8 +728,8 @@
 .flowmain .flowdoc img {
   display: inline-block;
   position: absolute;
-  right: 0;
-  bottom: 0;
+  right: -1px;
+  bottom: -1px;
   z-index: 1;
   width: 21px;
 }
@@ -867,8 +867,8 @@
 /*一个节点*/
 /* 流程图状态颜色 */
 .common {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
 }
 .planDate-style {
   color: #000000;
@@ -876,18 +876,18 @@
   margin-left: 12px;
 }
 .planDate-style .wait-style sup {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
   background-color: #bfbfbf;
 }
 .planDate-style .delay-style sup {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
   background-color: #fa8c16;
 }
 .planDate-style .normal-style sup {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
   background-color: #52c41a;
 }
 .planDate-style .normal-style :global .ant-scroll-number,

package/assets/index.css

@@ -98,6 +98,7 @@
 .e3wCardForm :global .ant-card-head {
   padding: 0 !important;
   margin: 0 12px;
+  border: none;
 }
 .e3wCardForm :global .ant-card-body {
   padding: 0 !important;
@@ -1172,8 +1173,8 @@ s {
 .flowmain .flowdoc img {
   display: inline-block;
   position: absolute;
-  right: 0;
-  bottom: 0;
+  right: -1px;
+  bottom: -1px;
   z-index: 1;
   width: 21px;
 }
@@ -1311,8 +1312,8 @@ s {
 /*一个节点*/
 /* 流程图状态颜色 */
 .common {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
 }
 .planDate-style {
   color: #000000;
@@ -1320,18 +1321,18 @@ s {
   margin-left: 12px;
 }
 .planDate-style .wait-style sup {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
   background-color: #bfbfbf;
 }
 .planDate-style .delay-style sup {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
   background-color: #fa8c16;
 }
 .planDate-style .normal-style sup {
-  height: 14px;
-  width: 14px;
+  height: 12px;
+  width: 12px;
   background-color: #52c41a;
 }
 .planDate-style .normal-style :global .ant-scroll-number,

package/lib/Easy3wFlow/index.js

@@ -194,7 +194,7 @@ var Easy3wFlow = function (_Component) {
         }
         // 进行中
         if (mainNodeState === 'normal') {
-          finishState = _react2['default'].createElement(_badge2['default'], { dot: 'true', classNames: (0, _classnames2['default'])('normal-style') });
+          finishState = _react2['default'].createElement(_badge2['default'], { dot: 'true', className: (0, _classnames2['default'])('normal-style') });
         }
         // 延期
         if (mainNodeState === 'delay') {
@@ -203,12 +203,12 @@ var Easy3wFlow = function (_Component) {
         // 按期完成
         if (mainNodeState === 'onTimeFinish') {
           finishState = _react2['default'].createElement(_badge2['default'], {
-            count: _react2['default'].createElement(_icon2['default'], { type: 'check-circle', style: { color: '#52c41a', paddingLeft: 12, paddingBottom: 3, fontSize: 14 } })
+            count: _react2['default'].createElement(_icon2['default'], { type: 'check-circle', style: { color: '#52c41a', paddingLeft: 12, paddingBottom: 3, fontSize: 12 } })
           });
         }
         // 延期完成
         if (mainNodeState === 'delayFinish') {
-          finishState = _react2['default'].createElement(_badge2['default'], { count: _react2['default'].createElement(_icon2['default'], { type: 'check-circle', style: { color: '#ea9d4f', paddingLeft: 12, paddingBottom: 3, fontSize: 14 } }) });
+          finishState = _react2['default'].createElement(_badge2['default'], { count: _react2['default'].createElement(_icon2['default'], { type: 'check-circle', style: { color: '#ea9d4f', paddingLeft: 12, paddingBottom: 3, fontSize: 12 } }) });
         }
         if (mainNodeState === 'wait') {
           finishState = _react2['default'].createElement(_badge2['default'], { dot: 'true', className: (0, _classnames2['default'])('wait-style') });
@@ -326,7 +326,7 @@ var Easy3wFlow = function (_Component) {
               _react2['default'].createElement('br', null),
               _react2['default'].createElement(
                 'span',
-                { style: { fontWeight: 'normal', marginLeft: '12px' } },
+                { className: (0, _classnames2['default'])(['planDate-style']) },
                 flow.planDate,
                 ' ',
                 _react2['default'].createElement(

package/lib/Easy3wFormPage/index.js

@@ -1774,18 +1774,20 @@ var Easy3wFormPage = function (_Component) {
 
   Easy3wFormPage.prototype.render = function render() {
     var getAllForms = this.getAllForms();
-    var borderFlag = this.props.borderFlag;
+    var _props = this.props,
+        borderFlag = _props.borderFlag,
+        noBorderFlag = _props.noBorderFlag;
 
-    if (borderFlag) {
+    if (!borderFlag || noBorderFlag) {
       return _react2['default'].createElement(
         'div',
-        { className: (0, _classnames2['default'])(['e3wFormPage']) },
+        { style: { marginTop: '9px' } },
         getAllForms
       );
     } else {
       return _react2['default'].createElement(
         'div',
-        { style: { marginTop: '9px' } },
+        { className: (0, _classnames2['default'])(['e3wFormPage']) },
         getAllForms
       );
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.4.190",
+  "version": "1.4.194",
   "description": "easy3wui components for react",
   "keywords": [
     "react",