fmui-base 2.2.1 → 2.2.3

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.3：流程表单样式
+- 2.2.2：表单多行文本支持浮点型判断
 - 2.2.1：表单关联增加行隐藏参数
 - 2.1.99：移动端选人组件，默认展开当前登录人所在组织
 - 2.1.98：组件样式调整

package/lib/form/form.js

@@ -373,6 +373,7 @@ var PageHome = function (_React$Component) {
         itemParam.required = required;
         if (itemType == 'text') {
           itemParam.inputFormat = form.inputFormat;
+          itemParam.fieldType = form.fieldType;
           itemParam.decimalPlace = form.decimalPlace;
         }
 
@@ -406,6 +407,7 @@ var PageHome = function (_React$Component) {
               tableData.required = required;
               tableData.label = title;
               tableData.inputFormat = form.inputFormat;
+              tableData.fieldType = form.fieldType;
               tableData.decimalPlace = form.decimalPlace;
               tableData.fieldId = form.fieldId;
               tableData.uniqueName = uniqueName;
@@ -444,6 +446,7 @@ var PageHome = function (_React$Component) {
               tableData.required = required;
               tableData.label = title;
               tableData.inputFormat = form.inputFormat;
+              tableData.fieldType = form.fieldType;
               tableData.decimalPlace = form.decimalPlace;
               tableData.fieldId = form.fieldId;
               tableData.uniqueName = uniqueName;
@@ -465,6 +468,7 @@ var PageHome = function (_React$Component) {
                 tableData.required = required;
                 tableData.label = title;
                 tableData.inputFormat = form.inputFormat;
+                tableData.fieldType = form.fieldType;
                 tableData.decimalPlace = form.decimalPlace;
                 tableData.fieldId = form.fieldId;
                 tableData.uniqueName = uniqueName;
@@ -487,6 +491,7 @@ var PageHome = function (_React$Component) {
               tableData.required = required;
               tableData.label = title;
               tableData.inputFormat = form.inputFormat;
+              tableData.fieldType = form.fieldType;
               tableData.decimalPlace = form.decimalPlace;
               tableData.fieldId = form.fieldId;
               tableData.uniqueName = uniqueName;
@@ -512,6 +517,7 @@ var PageHome = function (_React$Component) {
           itemParam.required = required;
           itemParam.readOnly = readOnly;
           tableData.inputFormat = form.inputFormat;
+          tableData.fieldType = form.fieldType;
           tableData.decimalPlace = form.decimalPlace;
           tableData.fieldId = form.fieldId;
           tableData.uniqueName = uniqueName;
@@ -643,6 +649,7 @@ var PageHome = function (_React$Component) {
         //单行文本框
         //alert('260=====');
         itemParam.inputFormat = form.inputFormat; //文本类型
+        itemParam.fieldType = form.fieldType; //字段类型
         itemParam.decimalPlace = form.decimalPlace; //小数位数
         itemParam.dataAttr = form['dataAttr'];
         itemParam.maxlength = form['length'];
@@ -1917,6 +1924,7 @@ var PageHome = function (_React$Component) {
                     relatedItem.required = itemParam.required;
                     relatedItem.label = itemParam.title;
                     relatedItem.inputFormat = itemParam.inputFormat;
+                    relatedItem.fieldType = itemParam.fieldType;
                     relatedItem.decimalPlace = itemParam.decimalPlace;
                     // if(item.showValue){
                     //   value = item.showValue;
@@ -1950,6 +1958,7 @@ var PageHome = function (_React$Component) {
               mainTblData[i].required = itemParam.required;
               mainTblData[i].label = itemParam.title;
               mainTblData[i].inputFormat = itemParam.inputFormat;
+              mainTblData[i].fieldType = itemParam.fieldType;
               mainTblData[i].decimalPlace = itemParam.decimalPlace;
               // if(item.showValue){
               //   value = item.showValue;
@@ -2073,6 +2082,7 @@ var PageHome = function (_React$Component) {
     key: 'handleTextChange',
     value: function handleTextChange(item, newValue) {
       var inputFormat = item.inputFormat;
+      var fieldType = item.fieldType;
       var decimalPlace = parseInt(item.decimalPlace);
       var length = item.maxlength;
       var patrn = /^-?\d+(\.\d+)?$/;
@@ -2110,7 +2120,7 @@ var PageHome = function (_React$Component) {
             return false;
           }
         }
-        if (inputFormat == 'float') {
+        if (inputFormat == 'float' || fieldType == 'float') {
           if (!Number(newValue) && !patrn.test(Number(newValue))) {
             _Toast2.default.show({
               type: 'error',
@@ -2229,6 +2239,10 @@ var PageHome = function (_React$Component) {
       data = this.editData(name, newValue, data);
       var itemParam = this.state.itemParam;
       var length = itemParam.maxlength;
+      var inputFormat = itemParam.inputFormat;
+      var fieldType = itemParam.fieldType;
+      var decimalPlace = parseInt(itemParam.decimalPlace);
+      var patrn = /^-?\d+(\.\d+)?$/;
 
       if (this.checkEmoji(newValue)) {
         _Toast2.default.show({
@@ -2246,6 +2260,34 @@ var PageHome = function (_React$Component) {
           return false;
         }
       }
+      if (inputFormat == 'float' || fieldType == 'float') {
+        if (!Number(newValue) && !patrn.test(Number(newValue))) {
+          _Toast2.default.show({
+            type: 'error',
+            content: itemParam.title + "应为小数"
+          });
+          return false;
+        } else {
+          var newValueArray = newValue.split(".");
+          if (newValueArray.length > 1) {
+            if (newValueArray[1].length > decimalPlace) {
+              _Toast2.default.show({
+                type: 'error',
+                content: "小数应小于等于" + decimalPlace
+              });
+              return false;
+            }
+          }
+        }
+      } else if (inputFormat == 'int') {
+        if (!/^-?[0-9]\d*$/.test(newValue)) {
+          _Toast2.default.show({
+            type: 'error',
+            content: itemParam.title + "应为整数"
+          });
+          return false;
+        }
+      }
       itemParam.value = newValue;
       this.setState({
         itemParam: itemParam

package/lib/poppage/check.js

@@ -535,7 +535,7 @@ var PageHome = function (_React$Component) {
                             _react2.default.createElement(
                                 Box,
                                 { className: isIcon || readOnly ? 't-DN' : 't-PR4' },
-                                _react2.default.createElement('b', { className: 'iconfont icon-back t-rotate-180 t-FCc t-FS16 t-FS14' })
+                                _react2.default.createElement('b', { className: 'iconfont icon-right-arrow t-rotate-180 t-FCc t-FS16' })
                             )
                         )
                     )

package/lib/process_info/FlowChart.js

@@ -155,7 +155,7 @@ var Page = function (_React$Component) {
                 { className: 'recording-card' },
                 _react2.default.createElement(
                   'div',
-                  { className: 'recording-message theme-color' },
+                  { className: i == this.state.processLogList.length - 1 ? "recording-message theme-color active" : "recording-message theme-color" },
                   _react2.default.createElement(
                     'div',
                     { className: 't-omit', style: { color: '#999999' } },

package/lib/upload/upload.js

@@ -633,7 +633,7 @@ var PageHome = function (_React$Component) {
                 ),
                 _react2.default.createElement(
                     'div',
-                    { className: t.state.uploadType == 'image' ? "t-FBH t-fw" : "upload" },
+                    { className: t.state.uploadType == 'image' ? "t-FBH t-fw t-JCR" : "upload" },
                     t.state.initList.map(function (item, i) {
                         function calculate(no) {
                             var a = no / 1024;

package/package.json

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