fmui-base 2.2.7 → 2.2.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +2 -0
  2. package/lib/msg_list/msgList.js +5 -5
  3. package/lib/process_info/processInfo.js +27 -22
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.2.9：统一待办列表样式
7
+ - 2.2.8：深圳CA加签
6
8
  - 2.2.7：深圳CA加签验签，支持签名图片
7
9
  - 2.2.6：一网通办首页去掉遮罩层，流程列表组件样式调整
8
10
  - 2.2.5：移动端支持深圳CA授权
package/lib/msg_list/msgList.js CHANGED
@@ -1104,7 +1104,7 @@ var PageHome = function (_React$Component2) {
1104
1104
  { title: undoDiv },
1105
1105
  _react2.default.createElement(
1106
1106
  HBox,
1107
- { vAlign: 'center', className: 't-BCf' },
1107
+ { vAlign: 'center', className: 't-BCf t-MT10' },
1108
1108
  _react2.default.createElement(
1109
1109
  Box,
1110
1110
  { flex: 1 },
@@ -1136,7 +1136,7 @@ var PageHome = function (_React$Component2) {
1136
1136
  { title: unreadDiv },
1137
1137
  _react2.default.createElement(
1138
1138
  HBox,
1139
- { vAlign: 'center', className: 't-BCf' },
1139
+ { vAlign: 'center', className: 't-BCf t-MT10' },
1140
1140
  _react2.default.createElement(
1141
1141
  Box,
1142
1142
  { flex: 1 },
@@ -1168,7 +1168,7 @@ var PageHome = function (_React$Component2) {
1168
1168
  { title: "已办" + (this.state.titleCount.done == 0 ? '' : '(' + this.state.titleCount.done + ')') },
1169
1169
  _react2.default.createElement(
1170
1170
  HBox,
1171
- { vAlign: 'center', className: 't-BCf' },
1171
+ { vAlign: 'center', className: 't-BCf t-MT10' },
1172
1172
  _react2.default.createElement(
1173
1173
  Box,
1174
1174
  { flex: 1 },
@@ -1200,7 +1200,7 @@ var PageHome = function (_React$Component2) {
1200
1200
  { title: "已阅" + (this.state.titleCount.read == 0 ? '' : '(' + this.state.titleCount.read + ')') },
1201
1201
  _react2.default.createElement(
1202
1202
  HBox,
1203
- { vAlign: 'center', className: 't-BCf' },
1203
+ { vAlign: 'center', className: 't-BCf t-MT10' },
1204
1204
  _react2.default.createElement(
1205
1205
  Box,
1206
1206
  { flex: 1 },
@@ -1232,7 +1232,7 @@ var PageHome = function (_React$Component2) {
1232
1232
  { title: "我的" + (this.state.titleCount.myself == 0 ? '' : '(' + this.state.titleCount.myself + ')') },
1233
1233
  _react2.default.createElement(
1234
1234
  HBox,
1235
- { vAlign: 'center', className: 't-BCf' },
1235
+ { vAlign: 'center', className: 't-BCf t-MT10' },
1236
1236
  _react2.default.createElement(
1237
1237
  Box,
1238
1238
  { flex: 1 },
package/lib/process_info/processInfo.js CHANGED
@@ -462,7 +462,7 @@ var PageHome = function (_React$Component) {
462
462
  selectProcessCode: '', //选中的子流程
463
463
  subProcessType: '', //子流程类型 0串行 1并行
464
464
  urgencyList: [], //紧急程度列表
465
- urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _param);
465
+ urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _param);
466
466
  FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
467
467
 
468
468
  //处理特有参数
@@ -1193,6 +1193,10 @@ var PageHome = function (_React$Component) {
1193
1193
  oauthWindowURL = content.oauthWindowURL;
1194
1194
  t.openCaPage(oauthWindowURL);
1195
1195
  }
1196
+ var isCaUser = "0";
1197
+ if (content.isCaUser && content.isCaUser != null && content.isCaUser != 'null' && typeof content.isCaUser != 'undefined' && content.isCaUser != '') {
1198
+ isCaUser = content.isCaUser;
1199
+ }
1196
1200
  var commentBackAlert = [];
1197
1201
  if (content.commentCasign == '1') {
1198
1202
  commentCasign = '1';
@@ -1428,7 +1432,8 @@ var PageHome = function (_React$Component) {
1428
1432
  urgencyList: urgencyList,
1429
1433
  urgentSelectList: urgentSelectList,
1430
1434
  backInitiatorEndFlow: backInitiatorEndFlow,
1431
- oauthWindowURL: oauthWindowURL
1435
+ oauthWindowURL: oauthWindowURL,
1436
+ isCaUser: isCaUser
1432
1437
  }, function () {
1433
1438
  t.refs["selectMember_circulate"].initSelectData();
1434
1439
  t.refs["selectMember_circulate1"].initSelectData();
@@ -4455,7 +4460,7 @@ var PageHome = function (_React$Component) {
4455
4460
  if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
4456
4461
  commentbizSn = param.commentId;
4457
4462
  }
4458
- if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
4463
+ if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
4459
4464
  param.commentbizSn = commentbizSn;
4460
4465
  }
4461
4466
  if (t.state.dataId != '' && t.state.dataId != null) {
@@ -4484,22 +4489,22 @@ var PageHome = function (_React$Component) {
4484
4489
  }
4485
4490
 
4486
4491
  //批示意见CA加签
4487
- if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
4492
+ if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
4488
4493
  t.commentSignCA(commentbizSn, param.comment);
4489
- } else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1') {
4494
+ } else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
4490
4495
  //二开批示意见CA加签
4491
4496
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
4492
4497
  mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
4493
4498
  }
4494
4499
  }
4495
4500
 
4496
- // if(getLoginUserInfo().isCaUser=='1' && t.state.caIsPrd=='1'){
4501
+ // if(t.state.isCaUser='1' && t.state.caIsPrd=='1'){
4497
4502
  // //CA加签
4498
4503
  // setTimeout(
4499
4504
  // function () {
4500
4505
  // t.fieldSignCA(dataId,param.formData);
4501
4506
  // },10);
4502
- // }else if(getLoginUserInfo().isCaUser=='1' ){
4507
+ // }else if(t.state.isCaUser='1' ){
4503
4508
  // //项目二开CA加签
4504
4509
  // if(typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function"){
4505
4510
  // mobileExt["fieldSignCA"]({type:type,dataId:dataId,isBatch:0},t.state);
@@ -4825,7 +4830,7 @@ var PageHome = function (_React$Component) {
4825
4830
  commentbizSn = param.commentId;
4826
4831
  }
4827
4832
 
4828
- // if(param.hasCommentField=='1'&&param.comment!=""&&t.state.commentCasign=="1"&&getLoginUserInfo().isCaUser=='1' && t.state.caIsPrd=='1'){
4833
+ // if(param.hasCommentField=='1'&&param.comment!=""&&t.state.commentCasign=="1"&&t.state.isCaUser='1' && t.state.caIsPrd=='1'){
4829
4834
  // param.commentbizSn=commentbizSn;
4830
4835
  // }
4831
4836
  param.commentbizSn = commentbizSn;
@@ -4875,9 +4880,9 @@ var PageHome = function (_React$Component) {
4875
4880
 
4876
4881
 
4877
4882
  //批示意见CA加签
4878
- if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
4883
+ if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
4879
4884
  t.commentSignCA(commentbizSn, param.comment);
4880
- } else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1') {
4885
+ } else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
4881
4886
  //二开批示意见CA加签
4882
4887
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
4883
4888
  mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
@@ -4888,12 +4893,12 @@ var PageHome = function (_React$Component) {
4888
4893
  mobileExt["operateCallBack"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
4889
4894
  }
4890
4895
 
4891
- if (getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
4896
+ if (t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
4892
4897
  //CA加签
4893
4898
  setTimeout(function () {
4894
4899
  t.fieldSignCA(dataId);
4895
4900
  }, 10);
4896
- } else if (getLoginUserInfo().isCaUser == '1') {
4901
+ } else if (t.state.isCaUser == '1') {
4897
4902
  //项目二开CA加签
4898
4903
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
4899
4904
  mobileExt["fieldSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
@@ -5406,7 +5411,7 @@ var PageHome = function (_React$Component) {
5406
5411
  if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
5407
5412
  commentbizSn = param.commentId;
5408
5413
  }
5409
- if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
5414
+ if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
5410
5415
  param.commentbizSn = commentbizSn;
5411
5416
  }
5412
5417
  // Dialog.confirm({
@@ -5427,9 +5432,9 @@ var PageHome = function (_React$Component) {
5427
5432
  content: t.state.finalButtons.get("BASE_TRANSFER") + '成功'
5428
5433
  });
5429
5434
  //批示意见CA加签
5430
- if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
5435
+ if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
5431
5436
  t.commentSignCA(commentbizSn, newComment);
5432
- } else if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1') {
5437
+ } else if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
5433
5438
  //二开批示意见CA加签
5434
5439
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
5435
5440
  mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
@@ -5438,12 +5443,12 @@ var PageHome = function (_React$Component) {
5438
5443
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
5439
5444
  mobileExt["operateCallBack"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
5440
5445
  }
5441
- if (getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
5446
+ if (t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
5442
5447
  //CA加签
5443
5448
  setTimeout(function () {
5444
5449
  t.fieldSignCA(dataId);
5445
5450
  }, 10);
5446
- } else if (getLoginUserInfo().isCaUser == '1') {
5451
+ } else if (t.state.isCaUser == '1') {
5447
5452
  //项目二开CA加签
5448
5453
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
5449
5454
  mobileExt["fieldSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
@@ -6032,7 +6037,7 @@ var PageHome = function (_React$Component) {
6032
6037
  if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
6033
6038
  commentbizSn = param.commentId;
6034
6039
  }
6035
- if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
6040
+ if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
6036
6041
  param.commentbizSn = commentbizSn;
6037
6042
  }
6038
6043
  // Dialog.confirm({
@@ -6059,9 +6064,9 @@ var PageHome = function (_React$Component) {
6059
6064
 
6060
6065
 
6061
6066
  //批示意见CA加签
6062
- if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
6067
+ if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
6063
6068
  t.commentSignCA(commentbizSn, t.state.spyj);
6064
- } else if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" && getLoginUserInfo().isCaUser == '1') {
6069
+ } else if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
6065
6070
  //二开批示意见CA加签
6066
6071
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
6067
6072
  mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
@@ -6070,12 +6075,12 @@ var PageHome = function (_React$Component) {
6070
6075
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
6071
6076
  mobileExt["operateCallBack"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
6072
6077
  }
6073
- if (getLoginUserInfo().isCaUser == '1' && t.state.caIsPrd == '1') {
6078
+ if (t.state.isCaUser = '1' && t.state.caIsPrd == '1') {
6074
6079
  //CA加签
6075
6080
  setTimeout(function () {
6076
6081
  t.fieldSignCA(dataId);
6077
6082
  }, 10);
6078
- } else if (getLoginUserInfo().isCaUser == '1') {
6083
+ } else if (t.state.isCaUser = '1') {
6079
6084
  //项目二开CA加签
6080
6085
  if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
6081
6086
  mobileExt["fieldSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.2.7",
3
+ "version": "2.2.9",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",