fmui-base 2.1.63 → 2.1.65

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,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.1.65:表单自定义校验审批时不生效处理
7
+ - 2.1.64:发起子流程同步主流程数据时办理报错
6
8
  - 2.1.63:表单关联隐藏与流程节点设置隐藏冲突处理
7
9
  - 2.1.62:表单单选多选支持200字换行显示
8
10
  - 2.1.61:表单单选多选支持200字换行显示
@@ -1688,8 +1688,40 @@ var PageHome = function (_React$Component) {
1688
1688
  }, {
1689
1689
  key: 'checkSubmit',
1690
1690
  value: function checkSubmit(saveTable) {
1691
- debugger;
1692
1691
  console.log("检查表单提交===");
1692
+
1693
+ if (isSub != '' && saveTable) {
1694
+ var mainTblData = saveTable.mainTblData;
1695
+ if (mainTblData && mainTblData.length > 0) {
1696
+ for (var i = 0; i < mainTblData.length; i++) {
1697
+ if (mainTblData[i].key == 'id') {
1698
+ mainTblData.splice(i, 1);
1699
+ }
1700
+ }
1701
+ }
1702
+ var subTbl = saveTable.subTbl;
1703
+ if (subTbl && subTbl.length > 0) {
1704
+ for (var i = 0; i < subTbl.length; i++) {
1705
+ var subTblData = subTbl[i].subTblData;
1706
+ if (subTblData && subTblData.length > 0) {
1707
+ for (var j = 0; j < subTblData.length; j++) {
1708
+ var subTblDataItem = subTblData[j];
1709
+ if (subTblDataItem && subTblDataItem.length > 0) {
1710
+ for (var k = 0; k < subTblDataItem.length; k++) {
1711
+ if (subTblDataItem[k].key == 'id') {
1712
+ subTblDataItem[k].value = "";
1713
+ }
1714
+ }
1715
+ }
1716
+ }
1717
+ }
1718
+ }
1719
+ }
1720
+ }
1721
+ this.setState({
1722
+ editFormData: saveTable
1723
+ });
1724
+
1693
1725
  var mainTblData = saveTable.mainTblData;
1694
1726
  for (var i = 0; i < mainTblData.length; i++) {
1695
1727
  if (mainTblData[i].required) {
@@ -1763,7 +1795,9 @@ var PageHome = function (_React$Component) {
1763
1795
  }, {
1764
1796
  key: 'checkRegularSubmit',
1765
1797
  value: function checkRegularSubmit(saveTable, saveItem) {
1798
+ console.log("checkRegularSubmit===");
1766
1799
  var mainTblData = saveTable.mainTblData;
1800
+ var mainTblName = saveTable.mainTblName;
1767
1801
  var subTbl = saveTable.subTbl;
1768
1802
  for (var i = 0; i < mainTblData.length; i++) {
1769
1803
  var key = mainTblData[i].key;
@@ -1791,7 +1825,7 @@ var PageHome = function (_React$Component) {
1791
1825
  var otherValue = 0;
1792
1826
  var thisValue = 0;
1793
1827
  for (var f = 0; f < mainTblData.length; f++) {
1794
- if (mainTblData[f].uniqueName == otherUniqueName) {
1828
+ if (mainTblName + '_' + mainTblData[f].key == otherUniqueName) {
1795
1829
 
1796
1830
  if (value != '') {
1797
1831
  if (mainTblData[i].itemType == 'datetime') {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.1.63",
3
+ "version": "2.1.65",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",