fmui-base 2.2.85 → 2.2.86

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.
package/README.md CHANGED
@@ -3,6 +3,7 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.2.86: 流程表单按钮超过三个按钮显示更多,修改更多按钮样式,待办保存按钮强制放到更多里面
6
7
  - 2.2.85: 北京ca开启电子签章获取ca签名,不受表单加签控制
7
8
  - 2.2.84: 选人组件baseCorpId取值问题修复
8
9
  - 2.2.83: 批示意见增加签名印章功能
@@ -6527,13 +6527,20 @@ var PageHome = function (_React$Component) {
6527
6527
  }
6528
6528
  buttonCodeList = buttonCodeList.concat();
6529
6529
  var alllength = buttonCodeList.length + extensionButtonList.length;
6530
- if (alllength > 4) {
6531
- buttonList.push({ name: '更多', type: 'text', display: 'inline', no: -1 });
6530
+ if (alllength > 3) {
6531
+ buttonList.push({ name: '更多', type: 'secondary', display: 'inline', no: -1 });
6532
6532
  var buttonCodeListNew = [];
6533
+ var mainSlotCount = 0;
6534
+ var todoSaveInMore = _this3.state.listType == "0";
6533
6535
  for (var c = 0; c < buttonCodeList.length; c++) {
6534
6536
  var buttonCode = buttonCodeList[c]['buttonCode'];
6535
6537
  var buttonName = buttonCodeList[c]['buttonName'];
6536
- if (c < 3) {
6538
+ if (todoSaveInMore && buttonCode == 'PAGE_SAVE') {
6539
+ actionSheetButtonOpt.push(buttonCode);
6540
+ actionSheetButtonOptName.push(buttonName);
6541
+ continue;
6542
+ }
6543
+ if (mainSlotCount < 2) {
6537
6544
  if (buttonCode == 'BACK') {
6538
6545
  buttonCodeListNew.push({ name: buttonName, type: 'danger', display: 'inline', no: 2 });
6539
6546
  } else if (buttonCode == 'PAGE_SAVE') {
@@ -6565,18 +6572,15 @@ var PageHome = function (_React$Component) {
6565
6572
  } else {
6566
6573
  buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
6567
6574
  }
6568
- } else if (c == 3) {
6569
- //buttonList.push({name:'更多',type:'secondary',display:'banner',no:-1});
6570
- actionSheetButtonOpt.push(buttonCode);
6571
- actionSheetButtonOptName.push(buttonName);
6572
- } else if (c > 3) {
6575
+ mainSlotCount++;
6576
+ } else {
6573
6577
  actionSheetButtonOpt.push(buttonCode);
6574
6578
  actionSheetButtonOptName.push(buttonName);
6575
6579
  }
6576
6580
  }
6577
- var nowNum = buttonCodeList.length;
6581
+ var nowNum = mainSlotCount;
6578
6582
  for (var d = 0; d < extensionButtonList.length; d++) {
6579
- if (nowNum < 3) {
6583
+ if (nowNum < 2) {
6580
6584
  buttonList.push(extensionButtonList[d]);
6581
6585
  } else {
6582
6586
  actionSheetButtonOpt.push(extensionButtonList[d].no);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.2.85",
3
+ "version": "2.2.86",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",