easy3wui 1.6.0 → 1.6.1

package/assets/login.css

@@ -6,6 +6,10 @@
   width: 368px;
   margin: 0 auto;
   z-index: 100;
+  background-color: #fff;
+  border: 1px solid #0000001f;
+  border-radius: 0.8em;
+  padding: 20px;
 }
 .e3wLoginMain .e3wLoginTabs {
   padding: 0 2px;

package/assets/userLayout.css

@@ -9,7 +9,7 @@
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100%;
-  padding: 40px 0 0 0;
+  padding: 60px 0 0 0;
   position: relative;
 }
 .e3wUserLayoutTop {
@@ -67,4 +67,5 @@
   width: 100%;
   height: 50px;
   z-index: 99;
+  position: fixed;
 }

package/lib/Easy3wButton/index.js

@@ -103,6 +103,7 @@ var Easy3wButton = function (_Component) {
       }
     }, _this.getOneBtnObj = function (obj, index) {
       var btnType = obj.btnType;
+      var cmptPros = _this.props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -117,7 +118,7 @@ var Easy3wButton = function (_Component) {
       }
       return _react2['default'].createElement(
         _button2['default'],
-        (0, _extends3['default'])({
+        (0, _extends3['default'])({}, cmptPros, {
           onClick: function onClick(e) {
             return _this.onClickFunc(e, obj.func);
           },
@@ -131,6 +132,7 @@ var Easy3wButton = function (_Component) {
     }, _this.getOneBtnTypeObj = function (obj, index) {
       var props = obj.props,
           btnType = obj.btnType;
+      var cmptPros = props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -148,7 +150,7 @@ var Easy3wButton = function (_Component) {
         props,
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({
+          (0, _extends3['default'])({}, cmptPros, {
             onClick: function onClick(e) {
               return _this.onClickFunc(e, obj.func);
             },
@@ -165,6 +167,7 @@ var Easy3wButton = function (_Component) {
           cName = obj.cName,
           confirmContent = obj.confirmContent,
           btnType = obj.btnType;
+      var cmptPros = _this.props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -184,13 +187,14 @@ var Easy3wButton = function (_Component) {
           }, key: index },
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
+          (0, _extends3['default'])({}, typeProps, cmptPros, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
           cName
         )
       );
     }, _this.getDropdownArrObj = function (obj) {
       var cName = obj.cName,
           dropdownArr = obj.dropdownArr;
+      var cmptPros = _this.props.cmptPros;
 
       var menuArr = dropdownArr.map(function (dropdown) {
         var func = dropdown.func;
@@ -213,7 +217,7 @@ var Easy3wButton = function (_Component) {
         { overlay: menuOverlay },
         _react2['default'].createElement(
           _button2['default'],
-          null,
+          cmptPros,
           cName,
           ' ',
           _react2['default'].createElement(_icon2['default'], { type: 'down' })

package/lib/Easy3wButtonOne/index.js

@@ -117,7 +117,7 @@ var Easy3wButtonOne = function (_Component) {
           } },
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
+          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFormBtn']) }),
           cName || children
         )
       );

package/lib/Easy3wFlow/index.js

@@ -2,6 +2,22 @@
 
 exports.__esModule = true;
 
+var _tooltip = require('antd/lib/tooltip');
+
+var _tooltip2 = _interopRequireDefault(_tooltip);
+
+var _row = require('antd/lib/row');
+
+var _row2 = _interopRequireDefault(_row);
+
+var _col = require('antd/lib/col');
+
+var _col2 = _interopRequireDefault(_col);
+
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
 var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -14,6 +30,14 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
+require('antd/lib/tooltip/style');
+
+require('antd/lib/row/style');
+
+require('antd/lib/col/style');
+
+require('antd/lib/icon/style');
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -34,6 +58,8 @@ var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
+var _antd = require('antd');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Easy3wFlow = function (_Component) {
@@ -53,6 +79,7 @@ var Easy3wFlow = function (_Component) {
       var renderTop = '';
       var renderMid = '';
       var renderBottom = '';
+      var isDetail = false; // 是否节点标题居上
       var styleflowline = (0, _classnames2['default'])('flowline4');
       var styleflowtext = (0, _classnames2['default'])('flowtext3');
 
@@ -60,7 +87,7 @@ var Easy3wFlow = function (_Component) {
       switch (flowLength) {
         case 2:
           styleflowline = (0, _classnames2['default'])('flowline2');
-          styleflowtext = (0, _classnames2['default'])('flowtext3');
+          styleflowtext = (0, _classnames2['default'])('flowtext2');
           break;
         case 3:
           styleflowline = (0, _classnames2['default'])('flowline3');
@@ -98,17 +125,40 @@ var Easy3wFlow = function (_Component) {
           processCode = _this$props.processCode,
           roleCode = _this$props.roleCode,
           flowCurCode = _this$props.flowCurCode,
-          picTrianglePath = _this$props.picTrianglePath;
-
+          picTrianglePath = _this$props.picTrianglePath,
+          flowCurMainCode = _this$props.flowCurMainCode;
+      // 初始化选中节点
+
+      var initMainCode = '';
+      if (flowLength > 0) {
+        initMainCode = flowCurMainCode || flowData[0].code;
+        var findObj = flowData.find(function (item) {
+          return item.status === '10';
+        });
+        if (findObj) {
+          initMainCode = flowCurMainCode || findObj.code;
+        }
+      }
       var renderTopTemp = flowData.map(function (flow, index) {
+        var styleflowcircle = (0, _classnames2['default'])(['flowcircle', 'haiergrey']);
+        if (flow.status === '10') {
+          styleflowcircle = flowCurCode.indexOf(flow.code) > -1 ? (0, _classnames2['default'])(['flowcircle-active-haierorange', 'haierorange']) : (0, _classnames2['default'])(['flowcircle', 'haierorange']);
+        } else if (flow.status === '20' || flow.status === '30') {
+          styleflowcircle = flowCurCode.indexOf(flow.code) > -1 ? (0, _classnames2['default'])(['flowcircle-active-haierblue', 'haierblue']) : (0, _classnames2['default'])(['flowcircle', 'haierblue']);
+        }
         return _react2['default'].createElement(
           'div',
-          null,
+          { className: (0, _classnames2['default'])('renderTopTemp' + flowData.length) },
           _react2['default'].createElement(
             'div',
             { className:
               // 10待处理；20已完成；30已完成可编辑；40未开始；50终止
-              flow.status === '10' ? (0, _classnames2['default'])(['flowcircle', 'haierorange']) : flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])(['flowcircle', 'haierblue']) : (0, _classnames2['default'])(['flowcircle', 'haiergrey'])
+              styleflowcircle
+              // flow.status === '10' ? classNames(['flowcircle', 'haierorange']) :
+              //  (
+              //    flow.status === '20' || flow.status === '30' ? classNames(['flowcircle', 'haierblue'])
+              //    : classNames(['flowcircle', 'haiergrey']))
+
             },
             index + 1
           ),
@@ -119,19 +169,20 @@ var Easy3wFlow = function (_Component) {
       });
 
       var renderMidTemp = flowData.map(function (flow) {
-        var item = flow.children.find(function (item, index, array) {
-          return item.status != '40';
+        var item = flow.children && flow.children.find(function (item, index, array) {
+          return item.status !== '40';
         });
-        item = item ? item : flow.children[0];
+        item = item || (flow.children ? flow.children[0] : '');
         var firstItem = item || flow;
         // const firstItem = flow.children[0] || flow;
         var firstItemCode = firstItem.code;
-        var handlePage = firstItem.handlePage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + firstItemCode + '&noReGetFlowFlag=1';
-        var readPage = firstItem.readPage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + firstItem.code + '&noReGetFlowFlag=1';
-        var handlIngPage = '/inside/SYS/FLOW/route/EFAC0000?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + firstItem.code + '&noReGetFlowFlag=1';
+        var handlePage = firstItem.handlePage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + firstItemCode + '&flowCurMainCode=' + (firstItem.mainCode || '1') + '&noReGetFlowFlag=1';
+        var readPage = firstItem.readPage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + firstItem.code + '&flowCurMainCode=' + (firstItem.mainCode || '1') + '&noReGetFlowFlag=1';
+        var handlIngPage = '/inside/SYS/FLOW/route/EFAC0000?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + firstItem.code + '&flowCurMainCode=' + (firstItem.mainCode || '1') + '&noReGetFlowFlag=1';
         var mainPage = null;
         var nodeAuthFlag = firstItem.nodeAuthFlag,
             status = firstItem.status;
+        var mainNodeState = flow.mainNodeState;
 
         if (status === '10' || status === '30') {
           mainPage = handlePage;
@@ -159,18 +210,111 @@ var Easy3wFlow = function (_Component) {
             mainPage = null;
           }
         }
-        var processIng = _react2['default'].createElement(_badge2['default'], { status: 'processing' });
-        // const mainPage = ((firstItem.status === '10' || firstItem.status === '30') ?
-        //   `${firstItem.handlePage}?businessId=${businessId}&processCode=${processCode}&roleCode=${roleCode}&flowCurCode=${firstItemCode}&noReGetFlowFlag=1`
-        //   : (firstItem.status === '20' ?
-        //     (firstItem.readPage ? `${firstItem.readPage}?businessId=${businessId}&processCode=${processCode}&roleCode=${roleCode}&flowCurCode=${firstItem.code}&noReGetFlowFlag=1` : null)
-        //     : null));
-        return _react2['default'].createElement(
+        // 未开始、进行中、延期、按期完成、延期完成(默认未开始)
+        var finishState = '';
+        if (flow.planDate) {
+          isDetail = true;
+        }
+        // 进行中
+        if (mainNodeState === 'normal') {
+          finishState = _react2['default'].createElement(_badge2['default'], { dot: 'true', className: (0, _classnames2['default'])('normal-style') });
+        }
+        // 延期
+        if (mainNodeState === 'delay') {
+          finishState = _react2['default'].createElement(_badge2['default'], { dot: 'true', className: (0, _classnames2['default'])('delay-style') });
+        }
+        // 按期完成
+        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: 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: 12 } }) });
+        }
+        if (mainNodeState === 'wait') {
+          finishState = _react2['default'].createElement(_badge2['default'], { dot: 'true', className: (0, _classnames2['default'])('wait-style') });
+        }
+        var defaultMidTitle = _react2['default'].createElement(
           'div',
-          { className: styleflowtext },
+          { className: flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])('floawt1') : flow.status === '10' ? (0, _classnames2['default'])(['floawt1', 'bold']) : (0, _classnames2['default'])(['floawt1', 'textgrey'])
+          },
+          mainPage ? _react2['default'].createElement(
+            'a',
+            { onClick: function onClick() {
+                return _this.dealURLClick(mainPage || '', flow, 1);
+              } },
+            _react2['default'].createElement(
+              'div',
+              {
+                className: flow.status === '10' ? (0, _classnames2['default'])(['textorange']) : flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])(['textblue']) : (0, _classnames2['default'])(['textgrey'])
+              },
+              flow.name || ''
+            )
+          ) : _react2['default'].createElement(
+            'div',
+            {
+              className: flow.status === '10' ? (0, _classnames2['default'])(['textorange']) : flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])(['textblue']) : (0, _classnames2['default'])('textgrey')
+            },
+            flow.name || ''
+          )
+        );
+
+        // 显示日期等详细信息
+        var detailMidTitle = _react2['default'].createElement(
+          _tooltip2['default'],
+          {
+            title: _react2['default'].createElement(
+              'div',
+              { style: { minWidth: '150px' } },
+              _react2['default'].createElement(
+                _row2['default'],
+                { wrap: false },
+                _react2['default'].createElement(
+                  _col2['default'],
+                  { span: 10, style: { textAlign: 'right' } },
+                  '\u8BA1\u5212\u65E5\u671F\uFF1A'
+                ),
+                _react2['default'].createElement(
+                  _col2['default'],
+                  { span: 14 },
+                  flow.planDate
+                )
+              ),
+              _react2['default'].createElement(
+                _row2['default'],
+                { wrap: false },
+                _react2['default'].createElement(
+                  _col2['default'],
+                  { span: 10, style: { textAlign: 'right' } },
+                  '\u5B9E\u9645\u65E5\u671F\uFF1A'
+                ),
+                _react2['default'].createElement(
+                  _col2['default'],
+                  { span: 14 },
+                  flow.finishDate
+                )
+              ),
+              _react2['default'].createElement(
+                _row2['default'],
+                { wrap: false },
+                _react2['default'].createElement(
+                  _col2['default'],
+                  { span: 10, style: { textAlign: 'right' } },
+                  '\u8D23\u4EFB\u4EBA\uFF1A'
+                ),
+                _react2['default'].createElement(
+                  _col2['default'],
+                  { span: 14 },
+                  flow.ownerName
+                )
+              )
+            )
+          },
           _react2['default'].createElement(
             'div',
-            { className: flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])('floawt1') : flow.status === '10' ? (0, _classnames2['default'])(['floawt1', 'bold']) : (0, _classnames2['default'])(['floawt1', 'textgrey'])
+            { className: flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])('floawt1detail') : flow.status === '10' ? (0, _classnames2['default'])(['floawt1detail', 'bold']) : (0, _classnames2['default'])(['floawt1detail', 'textgrey'])
             },
             mainPage ? _react2['default'].createElement(
               'a',
@@ -182,17 +326,46 @@ var Easy3wFlow = function (_Component) {
                 {
                   className: flow.status === '10' ? (0, _classnames2['default'])(['textorange']) : flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])(['textblue']) : (0, _classnames2['default'])(['textgrey'])
                 },
-                flow.name || ''
+                flow.name || '',
+                _react2['default'].createElement('br', null),
+                _react2['default'].createElement(
+                  'span',
+                  { className: (0, _classnames2['default'])(['planDate-style']) },
+                  flow.planDate,
+                  ' ',
+                  _react2['default'].createElement(
+                    'span',
+                    null,
+                    finishState
+                  )
+                )
               )
             ) : _react2['default'].createElement(
               'div',
               {
                 className: flow.status === '10' ? (0, _classnames2['default'])(['textorange']) : flow.status === '20' || flow.status === '30' ? (0, _classnames2['default'])(['textblue']) : (0, _classnames2['default'])('textgrey')
               },
-              flow.name || ''
+              flow.name || '',
+              _react2['default'].createElement('br', null),
+              _react2['default'].createElement(
+                'span',
+                { className: (0, _classnames2['default'])(['planDate-style']) },
+                flow.planDate,
+                ' ',
+                _react2['default'].createElement(
+                  'span',
+                  null,
+                  finishState
+                )
+              )
             )
           )
         );
+        return _react2['default'].createElement(
+          'div',
+          { className: styleflowtext },
+          flow.showDateFlag ? detailMidTitle : defaultMidTitle
+        );
       });
 
       renderTop = _react2['default'].createElement(
@@ -221,7 +394,7 @@ var Easy3wFlow = function (_Component) {
         flowData.forEach(function (item) {
           if (flowCurCode.startsWith(item.code)) {
             flowIndex = i;
-            subFlow = item.children;
+            subFlow = item.children || [];
           }
           i += 1;
         });
@@ -229,17 +402,17 @@ var Easy3wFlow = function (_Component) {
         flowData.forEach(function (item) {
           if (item.children && item.status === '10') {
             flowIndex = i;
-            subFlow = item.children;
+            subFlow = item.children || [];
           }
           i += 1;
         });
       }
       subFlowLength = subFlow.length;
 
-      var renderBottomTemp = subFlow.map(function (subItem) {
-        var handlePage = subItem.handlePage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + subItem.code + '&noReGetFlowFlag=1';
-        var readPage = subItem.readPage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + subItem.code + '&noReGetFlowFlag=1';
-        var handlIngPage = '/inside/SYS/FLOW/route/EFAC0000?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + subItem.code + '&noReGetFlowFlag=1';
+      var renderBottomTemp = subFlow && subFlow.map(function (subItem) {
+        var handlePage = subItem.handlePage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + subItem.code + '&flowCurMainCode=' + (subItem.mainCode || '1') + '&noReGetFlowFlag=1';
+        var readPage = subItem.readPage + '?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + subItem.code + '&flowCurMainCode=' + (subItem.mainCode || '1') + '&noReGetFlowFlag=1';
+        var handlIngPage = '/inside/SYS/FLOW/route/EFAC0000?businessId=' + businessId + '&processCode=' + processCode + '&roleCode=' + roleCode + '&flowCurCode=' + subItem.code + '&flowCurMainCode=' + (subItem.mainCode || '1') + '&noReGetFlowFlag=1';
         var page = null;
         var nodeAuthFlag = subItem.nodeAuthFlag,
             status = subItem.status;
@@ -270,11 +443,7 @@ var Easy3wFlow = function (_Component) {
             page = null;
           }
         }
-        // const page = ((subItem.status === '10' || subItem.status === '30') ?
-        //   `${subItem.handlePage}?businessId=${businessId}&processCode=${processCode}&roleCode=${roleCode}&flowCurCode=${subItem.code}&noReGetFlowFlag=1`
-        //   : (subItem.status === '20' ?
-        //     (subItem.readPage ? `${subItem.readPage}?businessId=${businessId}&processCode=${processCode}&roleCode=${roleCode}&flowCurCode=${subItem.code}&noReGetFlowFlag=1` : null)
-        //     : null));
+
         var processIng = _react2['default'].createElement(_badge2['default'], { status: 'processing' });
         return _react2['default'].createElement(
           'div',
@@ -505,9 +674,20 @@ var Easy3wFlow = function (_Component) {
       renderFlow = _react2['default'].createElement(
         'div',
         { className: (0, _classnames2['default'])('flowmain') },
-        renderTop,
-        renderMid,
-        renderBottom
+        isDetail ? _react2['default'].createElement(
+          'div',
+          null,
+          renderMid,
+          renderTop
+        ) : _react2['default'].createElement(
+          'div',
+          null,
+          '  ',
+          renderTop,
+          renderMid,
+          ' '
+        ),
+        subFlowLength > 0 ? renderBottom : ''
       );
       return renderFlow;
     }, _this.dealURLClick = function (url, flowNode, flowType) {

package/lib/Easy3wFormPage/easy3wFormPage.less

@@ -0,0 +1,37 @@
+@import '~antd/lib/style/themes/default.less';
+
+.formContent {
+    :global {
+        .ant-input-group-wrapper {
+            vertical-align: middle;
+        }
+        .ant-form-item-label {
+            line-height: 24px;
+        }
+        .ant-form-item-control {
+            line-height: 24px;
+        }
+        // .ant-form-item-label label { // * 号突出， 文字对齐
+        //     padding-left: 12px;
+        //     .ant-form-item-required::before {
+        //         margin-left: -10px;
+        //     }
+        // }
+        .ant-form-item-required::before {
+            // color: @formRequiredColor; // * 号颜色
+            margin-left: -10px;
+        }
+        .ant-form-item-label {
+            // text-align: @formItemLabelTextAlign; // label标题对齐方式
+            padding-left: 12px;
+        }
+    }
+}
+
+.countContent::after{
+    color: rgba(0, 0, 0, 0.45);
+    content: attr(date-count);
+    pointer-events: none;
+    float: right;
+    white-space: nowrap;
+  }