fmui-base 2.1.0-beta.9 → 2.1.1-beta.1

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish --tag beta
 
 ## 更新日志
+- 2.1.1-beta.1：流程列表样式修改
+- 2.1.1-beta.0：流程表单修改
 - 2.1.0-beta.9：流程表单修改
 - 2.1.0-beta.8：周补丁功能合并
 - 2.1.0-beta.7：移动端关联表功能

package/lib/process_list/processList.js

@@ -197,9 +197,8 @@ var ListItem = function (_React$Component) {
         }
       }
       var comleteName = data.name;
-      if (data.type == 0) {
-        //待办
-        comleteName = data.curStepName;
+      if (data.type == 0) {//待办
+        // comleteName=   data.curStepName;
       } else if (data.type == 1) {
         //待阅
         comleteName = data.nodeName;
@@ -215,7 +214,7 @@ var ListItem = function (_React$Component) {
           comleteName = "取消";
           checkIsNotComplete = false;
         } else {
-          comleteName = data.curStepName;
+          comleteName = data.nodeName;
         }
       } else if (data.type == 3) {
         //已阅
@@ -232,30 +231,36 @@ var ListItem = function (_React$Component) {
           comleteName = "取消";
           checkIsNotComplete = false;
         } else {
-          comleteName = data.curStepName;
+          comleteName = data.nodeName;
         }
       }
       if (typeof comleteName == 'undefined' || comleteName == null) {
         checkIsNotComplete = false;
       }
 
-      var assigneeName = data.startUserName;
+      var assigneeName = '申请人：' + data.startUserName;
 
       if (data.type == 0) {
         //待办
-        assigneeName = data.startUserName;
+        assigneeName = '申请人：' + data.startUserName;
       } else if (data.type == 1) {
         //待阅
-        assigneeName = data.startUserName;
+        assigneeName = '申请人：' + data.startUserName;
       } else if (data.type == 2) {
         //已办
-        assigneeName = data.curUserName;
+        if (data.curUserName) {
+          assigneeName = '办理人：' + data.curUserName;
+        }
       } else if (data.type == 3) {
         //已阅
-        assigneeName = data.assigneeName;
-      } else {
+        if (data.startUserName) {
+          assigneeName = '申请人：' + data.startUserName;
+        }
+      } else if (data.type == 4) {
         //我的
-        assigneeName = data.curUserName;
+        if (data.curUserName) {
+          assigneeName = '办理人：' + data.curUserName;
+        }
       }
       if (typeof assigneeName == 'undefined' || assigneeName == null) {
         checkIsNotComplete = false;
@@ -300,73 +305,96 @@ var ListItem = function (_React$Component) {
 
       if (ss < 10) clock += '0';
       clock += ss;
-      return _react2.default.createElement(
-        'div',
-        null,
+      return (
+
+        //   <HBox className='approve-item'>
+        //   <Box className="approve-check">
+        //     <Box className={'t-checkbox-field-icon-list un-checked t-MR10'} >
+        //       <i className="iconfont icon-checked t-FCf t-FS14"></i>
+        //     </Box>
+        //   </Box>
+        //   <Box className="approve-right-text">
+        //     <HBox className='approveItem-title'>
+        //       <Box className="label label-danger">加急</Box>
+        //       <Box className="label label-info">暂不办理</Box>
+        //       <Box className="label label-warn">超时</Box>
+        //       <Box className="label label-primary">正常</Box>
+        //       <Box className="title">五月行政总值班值班表</Box>
+        //     </HBox>
+        //     <HBox className='approveItem-tag'>
+        //       <span className='label label-primary'>审核意见审核意见</span>
+        //       <i className='iconfont icon-right-arrow'></i>
+        //     </HBox>
+        //     <HBox className="bottom-text">
+        //       <Box className="text-item">申请人:王小红</Box>
+        //       <Box className="text-item">2022-08-28 10:58:58</Box>
+        //     </HBox>
+        //   </Box>
+        // </HBox>
         _react2.default.createElement(
           HBox,
-          { className: 't-BCf t-P16 t-PR12 dd-bottom-border', onClick: this.clickDetail.bind(this) },
+          { className: 'approve-item', onClick: this.clickDetail.bind(this) },
           _react2.default.createElement(
             Box,
-            { className: this.props.isBatch == false ? 't-DN' : 't-checkbox-field-icon-list un-checked t-MR10', 'data-taskId': this.props.id, 'data-module': this.props.module, 'data-processInstanceId': this.props.processInstanceId },
-            _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
+            { className: 'approve-check' },
+            _react2.default.createElement(
+              Box,
+              { className: this.props.isBatch == false ? 't-DN' : 't-checkbox-field-icon-list un-checked t-MR10', 'data-taskId': this.props.id, 'data-module': this.props.module, 'data-processInstanceId': this.props.processInstanceId },
+              _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
+            )
           ),
           _react2.default.createElement(
             Box,
-            { flex: 1 },
+            { className: 'approve-right-text' },
             _react2.default.createElement(
-              'div',
-              { className: 't-omit t-FC3 t-FS16 t-LH1_3 t-MR8' },
-              _react2.default.createElement('i', { className: this.props.urgency == '1' && this.props.type == 0 ? 'iconfont icon-caution t-FCoranger t-MR8 t-FS16' : 't-DN' }),
+              HBox,
+              { className: 'approveItem-title' },
+              _react2.default.createElement(
+                Box,
+                { className: this.props.urgency == '1' && this.props.type == 0 ? 'label label-danger' : 't-DN' },
+                '\u52A0\u6025'
+              ),
               _react2.default.createElement(
-                'i',
-                { className: this.props.dueDate != null && this.props.dueDate < clock && this.props.type == 0 ? 't-MR6 t-tag-orange t-FS10 t-P2' : 't-DN', 'data-reactid': '.0.0.1.0.$/=10.0.0.1.2' },
+                Box,
+                { className: this.props.dueDate != null && this.props.dueDate < clock && this.props.type == 0 ? 'label label-warn' : 't-DN' },
                 '\u8D85\u65F6'
               ),
-              this.props.title,
-              _react2.default.createElement('i', { className: this.props.deleted != null && this.props.deleted == '1' && this.props.type == 0 ? 'iconfont icon-suspension t-MR8 t-FS16' : 't-DN' })
+              _react2.default.createElement(
+                Box,
+                { className: this.props.deleted != null && this.props.deleted == '1' && this.props.type == 0 ? 'label label-info' : 't-DN' },
+                '\u6682\u4E0D\u529E\u7406'
+              ),
+              _react2.default.createElement(
+                Box,
+                null,
+                this.props.title
+              )
+            ),
+            _react2.default.createElement(
+              HBox,
+              { className: 'approveItem-tag' },
+              _react2.default.createElement(
+                'span',
+                { className: 'label label-primary' },
+                comleteName
+              )
             ),
             _react2.default.createElement(
               HBox,
-              { className: 't-FCddfontblue-40 t-LH1_3 t-PT8 t-FS14', vAlign: 'center' },
+              { className: 'bottom-text' },
               _react2.default.createElement(
-                HBox,
-                { vAlign: 'center' },
-                _react2.default.createElement(
-                  Box,
-                  null,
-                  _react2.default.createElement('i', { className: 'iconfont icon-time t-MR4 t-FS14' })
-                ),
-                _react2.default.createElement(
-                  Box,
-                  null,
-                  _react2.default.createElement(
-                    'span',
-                    { className: 't-omit t-MR26' },
-                    formatTime
-                  )
-                )
+                Box,
+                { className: checkIsNotComplete ? "text-item" : "t-DN" },
+                assigneeName
               ),
               _react2.default.createElement(
-                HBox,
-                { flex: 1, vAlign: 'center' },
-                _react2.default.createElement(
-                  Box,
-                  null,
-                  _react2.default.createElement(
-                    'span',
-                    { className: checkIsNotComplete ? 't-list-text t-FCoranger t-omit t-MR4' : 't-list-text t-FCgreen t-omit t-MR4' },
-                    checkIsNotComplete ? comleteName + '  ' + assigneeName : comleteName
-                  )
-                )
+                Box,
+                { className: 'text-item' },
+                formatTime
               )
             )
           ),
-          _react2.default.createElement(
-            Box,
-            null,
-            _react2.default.createElement(_AngleRight2.default, { width: 20, fill: '#ccc', className: 'demo-t-list-arrow' })
-          )
+          _react2.default.createElement('i', { className: 'iconfont icon-right-arrow' })
         )
       );
     }
@@ -1023,7 +1051,7 @@ var PageHome = function (_React$Component2) {
 
       return _react2.default.createElement(
         'div',
-        null,
+        { className: 'approve-list' },
         _react2.default.createElement(
           _Tab2.default,
           { activeKey: this.state.activeTabIndex, onChange: this.handleTabChange.bind(this), destroyInactiveTabPane: false },
@@ -1058,9 +1086,7 @@ var PageHome = function (_React$Component2) {
                   ref: 'transaction_undo_ref',
                   noDataImage: _variables2.default.nodataIcon,
                   currentPageKey: 'page',
-                  onRefresh: this.onScrollRefresh.bind(this),
-                  noDataTip: this.state.noDataTip0,
-                  onLoad: this.onLoad.bind(this)
+                  noDataTip: this.state.noDataTip0
                 },
                 _react2.default.createElement(ListItem, { type: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )

package/lib/process_list/processList.less

@@ -2,4 +2,103 @@
     left: 0;
     -webkit-transform: translate3d(0, 0, 0);
     transform: translate3d(0, 0, 0);
+}
+
+//新增审批列表
+.approve-item {
+  background: #FFFFFF;
+  border-radius: 10px;
+  margin-left: 8px;
+  margin-right: 8px;
+  margin-bottom: 10px;
+  padding-top: 15px;
+  padding-bottom: 10px;
+  position: relative;
+  line-height: 1;
+}
+
+.approve-item:before {
+  content: "";
+  width: 3px;
+  height: 15px;
+  background-image: linear-gradient(180deg, #7AADFF 0%, #3480FB 100%);
+  border-radius: 4px;
+  position: absolute;
+  top: 15px;
+  left: 0;
+}
+
+.approve-item .approve-check {
+  text-align: center;
+  align-items: center;
+  display: flex;
+  margin: 0 10px;
+}
+
+.approve-item .approve-right-text {
+  width: calc(100% - 50px);
+}
+
+.approve-item .approveItem-title {
+  width: 90%;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  font-family: SourceHanSansCN-Regular;
+  font-size: 16px;
+  color: #000000;
+  letter-spacing: 0;
+  font-weight: 400;
+}
+
+.approve-item .approveItem-title .tag {
+  font-size: 12px;
+}
+
+.approve-item .approveItem-tag {
+  display: flex;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+
+.approve-item .approveItem-title .title {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.approve-item .approveItem-tag .label {
+  max-width: 70%;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.approve-item .icon-right-arrow {
+  color: #BCBCBC;
+  font-size: 16px;
+  text-align: center;
+  position: absolute;
+  right: 15px;
+  bottom: 17px;
+}
+
+.approve-item .bottom-text {
+  font-family: SourceHanSansSC-Regular;
+  font-size: 12px;
+  color: #8C919D;
+  font-weight: 400;
+  width: 100%;
+}
+
+.approve-item .bottom-text .text-item {
+  margin-right: 10px;
+  max-width: 50%;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.approve-list .scrollHeight{
+  margin-top: 10px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.1.0-beta.9",
+  "version": "2.1.1-beta.1",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",