fmui-base 2.3.39 → 2.3.41

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.41：移动端支持表单字段校验属性
+- 2.3.40：表单html字段增加className="ueditor-content"
 - 2.3.39：表单说明组件附件允许下载
 - 2.3.38：选人组件增加参数noSelectRoot，为1时根组织不可选，默认根组织可选
 - 2.3.37：已办列表增加办理缓急标识，表单说明组件附件允许下载

package/lib/common/formValidUtil.js

@@ -0,0 +1,127 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkCompareRegular = checkCompareRegular;
+exports.isDateTimeValue = isDateTimeValue;
+/**
+ * 表单校验工具（与 PC form.runtime.util.api.js compare 逻辑对齐）
+ */
+
+function isDateTimeLikeValue(value) {
+  if (value === null || value === undefined || value === '') {
+    return false;
+  }
+  return (/^\d{4}-\d{1,2}-\d{1,2}/.test(String(value).trim())
+  );
+}
+
+function shouldParseAsDateTime(itemType, inputFormat, fieldType, value) {
+  if (itemType === 'datetime' || itemType === 'datetimeStep') {
+    return true;
+  }
+  if (fieldType === 'date' || inputFormat === 'date') {
+    return true;
+  }
+  return isDateTimeLikeValue(value);
+}
+
+function parseCompareValue(value, meta) {
+  if (value === null || value === undefined || value === '') {
+    return 0;
+  }
+  var itemType = meta && meta.itemType;
+  var inputFormat = meta && meta.inputFormat;
+  var fieldType = meta && meta.fieldType;
+  if (shouldParseAsDateTime(itemType, inputFormat, fieldType, value)) {
+    var time = new Date(String(value).replace(/-/g, '/')).getTime();
+    return isNaN(time) ? 0 : time;
+  }
+  var num = parseFloat(value);
+  if (!isNaN(num) && String(value).trim() !== '') {
+    return num;
+  }
+  return value;
+}
+
+function getFieldMeta(saveItem, key, mainTblData, index) {
+  var row = mainTblData[index] || {};
+  var formItem = null;
+  if (saveItem && saveItem.length) {
+    for (var i = 0; i < saveItem.length; i++) {
+      if (saveItem[i].itemCode === key) {
+        formItem = saveItem[i];
+        break;
+      }
+    }
+  }
+  return {
+    itemType: row.itemType || formItem && formItem.itemType,
+    inputFormat: row.inputFormat || formItem && formItem.inputFormat,
+    fieldType: row.fieldType || formItem && formItem.fieldType
+  };
+}
+
+function resolveOtherCompareValue(otherId, mainTblName, mainTblData, saveItem) {
+  if (!otherId) {
+    return 0;
+  }
+  if (otherId.indexOf('+') > -1) {
+    var plusArr = otherId.split('+');
+    var leftVal = resolveOtherCompareValue(plusArr[0], mainTblName, mainTblData, saveItem);
+    return eval(leftVal + '+' + plusArr[1]);
+  }
+  if (otherId.indexOf('-') > -1 && otherId.indexOf('_') > -1) {
+    var minusParts = otherId.split('-');
+    if (minusParts.length === 2 && /^\d+(\.\d+)?$/.test(minusParts[1])) {
+      var baseVal = resolveOtherCompareValue(minusParts[0], mainTblName, mainTblData, saveItem);
+      return eval(baseVal + '-' + minusParts[1]);
+    }
+  }
+  if (otherId.indexOf('*') > -1) {
+    var mulArr = otherId.split('*');
+    var mulLeft = resolveOtherCompareValue(mulArr[0], mainTblName, mainTblData, saveItem);
+    return eval(mulLeft + '*' + mulArr[1]);
+  }
+  if (otherId.indexOf('/') > -1) {
+    var divArr = otherId.split('/');
+    var divLeft = resolveOtherCompareValue(divArr[0], mainTblName, mainTblData, saveItem);
+    return eval(divLeft + '/' + divArr[1]);
+  }
+  for (var f = 0; f < mainTblData.length; f++) {
+    if (mainTblName + '_' + mainTblData[f].key === otherId) {
+      return parseCompareValue(mainTblData[f].value, getFieldMeta(saveItem, mainTblData[f].key, mainTblData, f));
+    }
+  }
+  return 0;
+}
+
+/**
+ * compare|>|表名_字段名 字段比较校验，失败返回提示，成功返回空字符串
+ */
+function checkCompareRegular(regular, tips, currentValue, currentMeta, mainTblName, mainTblData, saveItem) {
+  if (!regular || regular.indexOf('compare') === -1) {
+    return '';
+  }
+  var regularArr = regular.split('|');
+  if (regularArr.length < 3 || !regularArr[1] || !regularArr[2]) {
+    return '';
+  }
+  var compareMark = regularArr[1];
+  var otherUniqueName = regularArr[2];
+  var thisValue = parseCompareValue(currentValue, currentMeta);
+  var otherValue = resolveOtherCompareValue(otherUniqueName, mainTblName, mainTblData, saveItem);
+  try {
+    if (eval(thisValue + compareMark + otherValue)) {
+      return tips || '';
+    }
+  } catch (e) {
+    return tips || '';
+  }
+  return '';
+}
+
+function isDateTimeValue(value, meta) {
+  return shouldParseAsDateTime(meta && meta.itemType, meta && meta.inputFormat, meta && meta.fieldType, value);
+}

package/lib/form/form.js

@@ -2368,6 +2368,7 @@ var PageHome = function (_React$Component) {
               mainTblData[i].inputFormat = itemParam.inputFormat;
               mainTblData[i].fieldType = itemParam.fieldType;
               mainTblData[i].decimalPlace = itemParam.decimalPlace;
+              mainTblData[i].itemType = itemParam.itemType;
               // if(item.showValue){
               //   value = item.showValue;
               //   item.showValue = null;
@@ -4405,7 +4406,7 @@ var PageHome = function (_React$Component) {
                 )
               )
             ),
-            _react2.default.createElement('div', { className: 't-FBH t-PL16 t-fw', dangerouslySetInnerHTML: { __html: t.state.itemParam.value } }),
+            _react2.default.createElement('div', { className: 't-FBH t-PL16 t-fw ueditor-content', dangerouslySetInnerHTML: { __html: t.state.itemParam.value } }),
             t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
           ) : _react2.default.createElement(
             'div',

package/lib/form_info/formInfo.js

@@ -78,6 +78,8 @@ var _table2 = _interopRequireDefault(_table);
 
 var _filterEmptySubTblRows = require('../form/filterEmptySubTblRows');
 
+var _formValidUtil = require('../common/formValidUtil');
+
 var _FlowChart = require('./FlowChart');
 
 var _FlowChart2 = _interopRequireDefault(_FlowChart);
@@ -1091,6 +1093,7 @@ var PageHome = function (_React$Component) {
         key: 'checkRegularSubmit',
         value: function checkRegularSubmit(saveTable, saveItem) {
             var mainTblData = saveTable.mainTblData;
+            var mainTblName = saveTable.mainTblName || '';
             var subTbl = saveTable.subTbl;
             for (var i = 0; i < mainTblData.length; i++) {
                 var key = mainTblData[i].key;
@@ -1110,6 +1113,16 @@ var PageHome = function (_React$Component) {
                                         if (!s.test(value)) {
                                             return saveItem[j].itemTitle + ':' + tips;
                                         }
+                                    } else if (regular.indexOf('compare') != -1) {
+                                        var currentMeta = {
+                                            itemType: mainTblData[i].itemType || saveItem[j].itemType,
+                                            inputFormat: mainTblData[i].inputFormat || saveItem[j].inputFormat,
+                                            fieldType: mainTblData[i].fieldType || saveItem[j].fieldType
+                                        };
+                                        var compareMsg = (0, _formValidUtil.checkCompareRegular)(regular, tips, value, currentMeta, mainTblName, mainTblData, saveItem);
+                                        if (compareMsg) {
+                                            return saveItem[j].itemTitle + ':' + compareMsg;
+                                        }
                                     } else {
                                         var extRegex = /^(.+?)(\d+)-(\d+)$/; //判断是否为 *1-2或n1-2等默认属性的形式
                                         var mac = regular.match(extRegex),

package/lib/process_info/processInfo.js

@@ -90,6 +90,8 @@ var _formExtHelper = require('../form/formExtHelper');
 
 var _filterEmptySubTblRows = require('../form/filterEmptySubTblRows');
 
+var _formValidUtil = require('../common/formValidUtil');
+
 var _FlowChart = require('./FlowChart');
 
 var _FlowChart2 = _interopRequireDefault(_FlowChart);
@@ -2079,34 +2081,14 @@ var PageHome = function (_React$Component) {
                                             return saveItem[j].itemTitle + ':' + tips;
                                         }
                                     } else if (regular.indexOf('compare') != -1) {
-                                        var regularArr = regular.split('|');
-                                        if (regularArr.length == 3) {
-                                            var compareMark = regularArr[1];
-                                            var otherUniqueName = regularArr[2];
-                                            var otherValue = 0;
-                                            var thisValue = 0;
-                                            for (var f = 0; f < mainTblData.length; f++) {
-                                                if (mainTblName + '_' + mainTblData[f].key == otherUniqueName) {
-
-                                                    if (value != '') {
-                                                        if (mainTblData[i].itemType == 'datetime') {
-                                                            thisValue = new Date(value).getTime();
-                                                        } else {
-                                                            thisValue = value;
-                                                        }
-                                                    }
-                                                    if (mainTblData[f].value != '') {
-                                                        if (mainTblData[f].itemType == 'datetime') {
-                                                            otherValue = new Date(mainTblData[f].value).getTime();
-                                                        } else {
-                                                            otherValue = mainTblData[f].value;
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                            if (eval(thisValue + compareMark + otherValue)) {
-                                                return saveItem[j].itemTitle + ':' + tips;
-                                            }
+                                        var currentMeta = {
+                                            itemType: mainTblData[i].itemType || saveItem[j].itemType,
+                                            inputFormat: mainTblData[i].inputFormat || saveItem[j].inputFormat,
+                                            fieldType: mainTblData[i].fieldType || saveItem[j].fieldType
+                                        };
+                                        var compareMsg = (0, _formValidUtil.checkCompareRegular)(regular, tips, value, currentMeta, mainTblName, mainTblData, saveItem);
+                                        if (compareMsg) {
+                                            return saveItem[j].itemTitle + ':' + compareMsg;
                                         }
                                     } else {
                                         var extRegex = /^(.+?)(\d+)-(\d+)$/; //判断是否为 *1-2或n1-2等默认属性的形式

package/package.json

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