fmui-base 2.0.74 → 2.0.75

package/lib/form/form.js

@@ -888,6 +888,37 @@ var PageHome = function (_React$Component) {
           if (maxDate) {
             itemParam.maxDate = maxDate;
           }
+          var fromCalculate = form.dataAttr.fromCalculate;
+          if (fromCalculate && typeof fromCalculate != "undefined") {
+            var calculateExpList = fromCalculate.calculateExpList; //计算公式列表
+            var calculateExp = fromCalculate.calculateExp; //计算公式
+            if (calculateExp) {
+              var fieldArray = this.getFieldArray(calculateExp);
+              if (!value) {
+                value = this.dealwithCalculate(calculateExp, fieldArray, form, allForm);
+              }
+              for (var i = 0; i < fieldArray.length; i++) {
+                var calculateExpValue;
+                if (calculateExpList) {
+                  calculateExpValue = calculateExpList[fieldArray[i]];
+                  if (!calculateExpValue) {
+                    calculateExpValue = [];
+                  }
+                } else {
+                  calculateExpList = {};
+                  calculateExpValue = [];
+                }
+
+                var calculateExpValueItem = {};
+                calculateExpValueItem.exp = calculateExp; //计算公式
+                calculateExpValueItem.result = uniqueName; //公式结果字段
+                calculateExpValueItem.key = key; //公式结果字段key
+                calculateExpValue.push(calculateExpValueItem);
+                calculateExpList[fieldArray[i]] = calculateExpValue;
+              }
+              data.calculateExpList = calculateExpList;
+            }
+          }
         } else {
           dateFormat = "YMDHM";
         }

package/lib/form/subForm.js

@@ -340,11 +340,15 @@ var PageHome = function (_React$Component) {
     key: 'reloadSubItemParam',
     value: function reloadSubItemParam(itemNew) {
       if (itemNew != null && itemNew != undefined && Array.isArray(itemNew)) {
+        var itemParam = this.state.itemParam;
+        var value = itemParam.value;
         for (var i = 0; i < itemNew.length; i++) {
           var fieldCode = itemNew[i].key;
           var value = itemNew[i].value;
           var index = itemNew[i].index;
-          var itemParam = this.state.itemParam;
+          if (value[index]) {
+            value[index][fieldCode] = value;
+          }
           if (this.refs[fieldCode + '_' + index]) {
             var valueItem = {};
             valueItem.key = 'value';

package/lib/form/table.js

@@ -365,19 +365,19 @@ var PageHome = function (_React$Component) {
 									} else {
 										if (itemExt.index || itemExt.index == 0) {
 											if (itemExt.subCode) {
+
 												t.refs["sub_" + itemExt.key].refs[itemExt.key + "_" + itemExt.subCode + "_" + itemExt.index].reloadItemParam(itemExt.value);
+												// t.refs["sub_" + itemExt.key].reloadSubItemParam([itemExt]);
 												for (var iExtSub = 0; iExtSub < subTbl.length; iExtSub++) {
 													var subTblName = subTbl[iExtSub].subTblName;
 													if (subTblName == itemExt.key) {
 														if (itemExt.data) {
 															var subTblData = subTbl[iExtSub].subTblData;
-															for (var iExtSubData = 0; iExtSubData < subTblData.length; iExtSubData++) {
-																if (subTblData.length > itemExt.index) {
-																	var subTblItemData = subTblData[iExtSubData];
-																	for (var iExtSubDataItem = 0; iExtSubDataItem < subTblItemData.length; iExtSubDataItem++) {
-																		if (itemExt.subCode == subTblItemData[iExtSubDataItem].key) {
-																			subTblItemData[iExtSubDataItem].value = itemExt.data;
-																		}
+															if (subTblData.length > itemExt.index) {
+																var subTblItemData = subTbl[iExtSub].subTblData[itemExt.index];
+																for (var iExtSubDataItem = 0; iExtSubDataItem < subTblItemData.length; iExtSubDataItem++) {
+																	if (itemExt.subCode == subTblItemData[iExtSubDataItem].key) {
+																		subTblItemData[iExtSubDataItem].value = itemExt.data;
 																	}
 																}
 															}
@@ -953,6 +953,19 @@ var PageHome = function (_React$Component) {
 											}
 										}
 									}
+									if (itemParam.itemType == 'datetime' || itemParam.itemType == 'text') {
+										console.log("adddays");
+										var adddaysDateRegExp = new RegExp("adddays\\(", "g");
+										if (exp.match(adddaysDateRegExp)) {
+											//当有adddays函数
+											if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
+												//filedItemValue = 0;
+												return false;
+											} else {
+												filedItemValue = filedItemValue.value ? filedItemValue.value : filedItemValue;
+											}
+										}
+									}
 
 									if (typeof filedItemValue == 'undefined' || filedItemValue == "" && filedItemValue != "0" || filedItemValue == null) {
 										//当filedItemValue为空或者其他异常状态时置为0
@@ -977,6 +990,7 @@ var PageHome = function (_React$Component) {
 							exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
 							exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
 							exp = exp.replace(new RegExp("differHalfDate\\(", "g"), 'calculate.differHalfDate(');
+							exp = exp.replace(new RegExp("adddays\\(", "g"), 'calculate.adddays(');
 							try {
 								var res = eval(exp);
 							} catch (e) {
@@ -1018,8 +1032,8 @@ var PageHome = function (_React$Component) {
 							var resultMap = {};
 							resultMap.key = 'value';
 							resultMap.value = res;
-							this.refs[resultItem].reloadItemParam([resultMap]);
 							data = this.editData(resultKey, res, data);
+							this.refs[resultItem].reloadItemParam([resultMap]);
 						}
 						if (returnResultItem && returnResultItem.length > 0) {
 							for (var r = 0; r < returnResultItem.length; r++) {

package/lib/poppage/tree/tree.js

@@ -187,9 +187,9 @@ var Page = function (_React$Component2) {
     //this.initData();
 
 
-    /*// 子组件初始化
-    initState() {
-      }*/
+    /*// 子组件初始化
+    initState() {
+     }*/
 
     //初始化数据
 

package/lib/select-fileno/pageHome.js

@@ -626,7 +626,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'closMask',
     value: function closMask() {
-      /* $("#App").removeAttr("style");
+      /* $("#App").removeAttr("style");
        $(document).scrollTop(this.props.top);*/
     }
   }, {

package/lib/select-serialnumber/pageHome.js

@@ -540,7 +540,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'closMask',
     value: function closMask() {
-      /* $("#App").removeAttr("style");
+      /* $("#App").removeAttr("style");
        $(document).scrollTop(this.props.top);*/
     }
   }, {

package/lib/select-serialnumber/pageHome1.js

@@ -538,7 +538,7 @@ var Page = function (_Component) {
   }, {
     key: 'closMask',
     value: function closMask() {
-      /* $("#App").removeAttr("style");
+      /* $("#App").removeAttr("style");
        $(document).scrollTop(this.props.top);*/
     }
   }, {

package/lib/signature/draw.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-/**
- * Created by louizhai on 17/6/30.
- * description: Use canvas to draw.
+/**
+ * Created by louizhai on 17/6/30.
+ * description: Use canvas to draw.
  */
 function Draw(canvas, degree) {
   var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};

package/lib/signature/sign.less

@@ -1,73 +1,73 @@
-.page-demo {
-  color:#666;
-}
-
-
-#canvasBox {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-.greet {
-  padding: 20px;
-  font-size: 20px;
-  user-select: none;
-}
-.greet a {
-  cursor: pointer;
-}
-.greet select {
-  font-size: 18px;
-}
-canvas {
-  flex: 1;
-  //border: 0.5px solid #ccc;
-  cursor: crosshair;
-}
-
-
-
-
-@media screen and (orientation: portrait) {
-  .dd-write-sign-page {
-    position: absolute;
-    width: 100vh;
-    height: 100vw;
-    top: 0;
-    left: 100vw;
-    -webkit-transform: rotate(90deg);
-    -moz-transform: rotate(90deg);
-    -ms-transform: rotate(90deg);
-    transform: rotate(90deg);
-    transform-origin: 0% 0%;
-  }
-}
-
-@media screen and (orientation: landscape) {
-  .dd-write-sign-page {
-    -webkit-transform: rotate(0);
-    -moz-transform: rotate(0);
-    -ms-transform: rotate(0);
-    transform: rotate(0)
-  }
-}
-
-.dd-write-sign {
-  height: calc(~"100% - 83px");
-}
-
-.dd-write-sign-del.t-text-button {
-  height: 32px;
-  line-height: 32px;
-
-  .iconfont {
-    height: 32px;
-  }
-}
-.img-border{
-  border:1px solid #ccc;
-
-}
-
-
-
+.page-demo {
+  color:#666;
+}
+
+
+#canvasBox {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.greet {
+  padding: 20px;
+  font-size: 20px;
+  user-select: none;
+}
+.greet a {
+  cursor: pointer;
+}
+.greet select {
+  font-size: 18px;
+}
+canvas {
+  flex: 1;
+  //border: 0.5px solid #ccc;
+  cursor: crosshair;
+}
+
+
+
+
+@media screen and (orientation: portrait) {
+  .dd-write-sign-page {
+    position: absolute;
+    width: 100vh;
+    height: 100vw;
+    top: 0;
+    left: 100vw;
+    -webkit-transform: rotate(90deg);
+    -moz-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    transform: rotate(90deg);
+    transform-origin: 0% 0%;
+  }
+}
+
+@media screen and (orientation: landscape) {
+  .dd-write-sign-page {
+    -webkit-transform: rotate(0);
+    -moz-transform: rotate(0);
+    -ms-transform: rotate(0);
+    transform: rotate(0)
+  }
+}
+
+.dd-write-sign {
+  height: calc(~"100% - 83px");
+}
+
+.dd-write-sign-del.t-text-button {
+  height: 32px;
+  line-height: 32px;
+
+  .iconfont {
+    height: 32px;
+  }
+}
+.img-border{
+  border:1px solid #ccc;
+
+}
+
+
+

package/lib/signature//346/211/213/345/206/231/347/255/276/345/220/215/344/275/277/347/224/250/346/226/207/346/241/243.md

@@ -1,12 +1,12 @@
-# 手写签名使用文档
-
-1. 安装fmui 0.0.36-ygy以上的版本
-2. 引用： import Sign from 'fmui/lib/signature';
-3. 写标签 
-```
-<Sign upload={(val)=>{alert(val)}}/>
-```
-4. 参数 
-	- upload ： (必填项)回调方法，返回参数为生成手写签名图片的id
-	- title : (必填项)显示的输入框标题
+# 手写签名使用文档
+
+1. 安装fmui 0.0.36-ygy以上的版本
+2. 引用： import Sign from 'fmui/lib/signature';
+3. 写标签 
+```
+<Sign upload={(val)=>{alert(val)}}/>
+```
+4. 参数 
+	- upload ： (必填项)回调方法，返回参数为生成手写签名图片的id
+	- title : (必填项)显示的输入框标题
 	- fileId : 初始化签名图片文件id

package/package.json

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