@bchr/bchr-front-lib 0.3.100 → 0.3.104

package/lib/base/AppFormulaFunctions.js

@@ -1,26 +1,48 @@
 "use strict";
 
-window.AppFormulaFunctions = {};
-
-window.AppFormulaFunctions.currentMonthStartDay = function (date) {
-  var currentDate = new Date(date),
-      currentYear = currentDate.getFullYear(),
-      currentMouth = currentDate.getMonth() + 1;
-  return currentYear + "-" + currentMouth + "-1";
-};
-
-window.AppFormulaFunctions.nextMonthStartDay = function (date) {
-  var currentDate = new Date(date),
-      currentYear = currentDate.getFullYear(),
-      currentMouth = currentDate.getMonth() + 1;
-  return new Date(currentYear, currentMouth, 1);
-};
-
-window.AppFormulaFunctions.currentDateToDeadline = function (date, during) {
-  debugger;
-  var changeDate = new Date(new Date(date).getTime() + during * 24 * 60 * 60 * 1000);
-  var changeYear = changeDate.getFullYear(),
-      changeMouth = changeDate.getMonth() + 1,
-      changeDay = changeDate.getDay();
-  return changeYear + '-' + changeMouth + '-' + changeDay;
+var _moment = _interopRequireDefault(require("moment"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+window.AppFormulaFunctions = {
+  currentMonthStartDay: function currentMonthStartDay(dateStr) {
+    if (dateStr) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.date(1).format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  nextMonthStartDay: function nextMonthStartDay(dateStr) {
+    if (dateStr) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(1, 'months').date(1).format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  datePlusDays: function datePlusDays(dateStr, during_days) {
+    if (dateStr && during_days) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(during_days, 'days').format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  datePlusMonths: function datePlusMonths(dateStr, during_months) {
+    if (dateStr && during_months) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(during_months, 'months').format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  datePlusYears: function datePlusYears(dateStr, during_years) {
+    if (dateStr && during_years) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(during_years, 'years').format("YYYY-MM-DD");
+    }
+
+    return null;
+  }
 };

package/lib/base/layout/ui_tpl/form/FormForBrowse.js

@@ -372,7 +372,7 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
             if (typeof initialValue === 'boolean') {
               value = initialValues[display_code] ? "是" : "否";
             } else {
-              value = (initialValue || '').toLowerCase() === 'true' ? "是" : "否";
+              value = (initialValue + '' || '').toLowerCase() === 'true' || (initialValue + '' || '').toLowerCase() === '1' ? "是" : "否";
             }
 
             break;

package/lib/base/layout/ui_tpl/form/FormForModify.js

@@ -21,6 +21,8 @@ var _HttpService = _interopRequireDefault(require("../../../../services/HttpServ
 
 var _InputPassword = _interopRequireDefault(require("../InputPassword"));
 
+require("../../../AppFormulaFunctions");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -57,6 +59,12 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+var FormulasValueType = {
+  Disabled: "disabled",
+  Enabled: "enabled",
+  Function: "AppFormulaFunctions"
+};
+
 var FormForModify = /*#__PURE__*/function (_React$Component) {
   _inherits(FormForModify, _React$Component);
 
@@ -137,9 +145,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
       }));
     });
 
-    _defineProperty(_assertThisInitialized(_this2), "buildFormItems", function (editFormulasState) {
+    _defineProperty(_assertThisInitialized(_this2), "buildFormItems", function () {
       var _this2$props2 = _this2.props,
-          data = _this2$props2.data,
           info_set_fields = _this2$props2.info_set_fields,
           ext_form_items = _this2$props2.ext_form_items;
 
@@ -147,91 +154,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         return;
       }
 
-      var setFieldsValue = _this2.ref.current.setFieldsValue;
-
       if (info_set_fields && info_set_fields.length > 0) {
-        info_set_fields.forEach(function (formItem) {
-          formItem.initialValue = null;
-
-          _this2.preParseFormItemExtConfig(formItem);
-
-          if (editFormulasState && editFormulasState.length) {
-            formItem.b_disabled = formItem.b_readonly;
-
-            for (var i = 0, len = editFormulasState.length; i < len; i++) {
-              var editFormulaStateItem = editFormulasState[i].editFormulaItem;
-
-              if (editFormulaStateItem) {
-                editFormulaStateItem.otherFormItemResponses.forEach(function (item) {
-                  if (formItem.code === item.formItemCode) {
-                    if (item.formItemValue === 'disabled') {
-                      formItem.b_disabled = true;
-                    } else if (item.formItemValue === 'enabled') {
-                      formItem.b_disabled = false;
-                    } else {
-                      formItem.initialValue = item.formItemValue || data[formItem.display_code];
-                    }
-
-                    if (formItem.initialValue || data[formItem.code]) {
-                      if (formItem.code.indexOf('date') !== -1) {
-                        setFieldsValue(_defineProperty({}, formItem.code, (0, _moment["default"])(formItem.initialValue || data[formItem.code])));
-
-                        if (formItem.code.endsWith("_date")) {
-                          data[formItem.code] = (0, _moment["default"])(formItem.initialValue || data[formItem.code]).valueOf();
-                        } else if (formItem.code.indexOf('_date$') !== -1) {
-                          data[formItem.code] = (0, _moment["default"])(formItem.initialValue || data[formItem.code]).format("YYYY-MM-DD");
-                        }
-                      } else {
-                        setFieldsValue(_defineProperty({}, formItem.code, formItem.initialValue || data[formItem.code]));
-                        data[formItem.code] = formItem.initialValue || data[formItem.code];
-                      }
-                    }
-                  }
-                });
-              }
-            }
-          } else {
-            if (formItem.editFormulaConfigs) {
-              for (var _i = 0, _len = formItem.editFormulaConfigs.length; _i < _len; _i++) {
-                var editFormulaConfig = formItem.editFormulaConfigs[_i];
-                var initialValue = formItem.ui_render_type === 'switch' ? (data[formItem.code] && data[formItem.code].toString() || '').toLowerCase() !== 'true' : data[formItem.code];
-                var formulaValueOf = formItem.ui_render_type === 'switch' ? (editFormulaConfig.onValueOf || '').toLowerCase() !== 'true' : editFormulaConfig.onValueOf;
-
-                if (formulaValueOf === initialValue) {
-                  var currentOtherFormItemResponses = editFormulaConfig.otherFormItemResponses;
-                  currentOtherFormItemResponses.forEach(function (item) {
-                    info_set_fields.forEach(function (formItemInner) {
-                      if (formItemInner.code === item.formItemCode) {
-                        if (item.formItemValue === 'disabled') {
-                          formItemInner.b_disabled = true;
-                        } else if (item.formItemValue === 'enabled') {
-                          formItemInner.b_disabled = false;
-                        } else {
-                          formItemInner.initialValue = item.formItemValue || data[formItemInner.display_code];
-                        }
-
-                        if (formItemInner.initialValue || data[formItemInner.code]) {
-                          if (formItemInner.code.indexOf('date') !== -1) {
-                            setFieldsValue(_defineProperty({}, formItemInner.code, (0, _moment["default"])(formItemInner.initialValue || data[formItemInner.code])));
-
-                            if (formItemInner.code.endsWith("_date")) {
-                              data[formItemInner.code] = (0, _moment["default"])(formItemInner.initialValue || data[formItemInner.code]).valueOf();
-                            } else if (formItemInner.code.indexOf('_date$') !== -1) {
-                              data[formItemInner.code] = (0, _moment["default"])(formItem.initialValue || data[formItemInner.code]).format("YYYY-MM-DD");
-                            }
-                          } else {
-                            setFieldsValue(_defineProperty({}, formItemInner.code, formItemInner.initialValue || data[formItemInner.code]));
-                            data[formItemInner.code] = formItemInner.initialValue || data[formItemInner.code];
-                          }
-                        }
-                      }
-                    });
-                  });
-                }
-              }
-            }
-          }
-        });
         var groupNames = info_set_fields.map(function (item) {
           return item.belong_form_group;
         }).filter(function (item, index, arr) {
@@ -311,8 +234,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
 
         var editFormulaConfigs = [];
 
-        for (var _i2 = 0, _len2 = pureFormulaTextItems.length; _i2 < _len2; _i2++) {
-          var formulaTextItem = pureFormulaTextItems[_i2];
+        for (var _i = 0, _len = pureFormulaTextItems.length; _i < _len; _i++) {
+          var formulaTextItem = pureFormulaTextItems[_i];
           var formulaChildTextItems = formulaTextItem.split("=>");
 
           if (formulaChildTextItems.length !== 2) {
@@ -647,7 +570,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
             valuePropName = "checked";
 
             if (typeof initialValue !== 'boolean') {
-              initialValue = (initialValue || '').toLowerCase() === 'true';
+              initialValue = (initialValue + '' || '').toLowerCase() === 'true' || (initialValue + '' || '').toLowerCase() === '1';
               displayValue = initialValue ? "是" : "否";
             }
 
@@ -770,9 +693,131 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
       return dict.title;
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "formItemOnChangeForFormula", function (config, value) {
+      var formItemFormulaConfigs = config.editFormulaConfigs;
+
+      if (formItemFormulaConfigs && formItemFormulaConfigs.length > 0) {
+        var fieldCodeKeyMap = _this2.state.fieldCodeKeyMap;
+        var _this2$props4 = _this2.props,
+            data = _this2$props4.data,
+            def_docs = _this2$props4.def_docs;
+        var setFieldsValue = _this2.ref.current.setFieldsValue; // value exists
+
+        var editFormulaItem = config.editFormulaConfigs.find(function (editFormulaItem) {
+          return editFormulaItem.onValueOf === value.toString() || editFormulaItem.onValueOf === "value";
+        });
+
+        if (editFormulaItem) {
+          var otherFormItemResponses = editFormulaItem.otherFormItemResponses;
+
+          var _loop = function _loop(i, len) {
+            var otherFormItem = otherFormItemResponses[i];
+
+            if (!otherFormItem) {
+              return "continue";
+            }
+
+            var formItemCode = otherFormItem.formItemCode,
+                formItemValue = otherFormItem.formItemValue;
+            var otherFormItemConfig = fieldCodeKeyMap[formItemCode];
+
+            if (!otherFormItemConfig) {
+              return "continue";
+            }
+
+            if (!formItemValue) {
+              return "continue";
+            }
+
+            var code = otherFormItemConfig.code,
+                display_code = otherFormItemConfig.display_code,
+                ref_pk = otherFormItemConfig.ref_pk,
+                ui_render_type = otherFormItemConfig.ui_render_type;
+
+            if (FormulasValueType.Disabled == formItemValue) {
+              data[code] = null;
+              setFieldsValue(_defineProperty({}, code, null));
+
+              if (display_code) {
+                data[display_code] = null;
+                setFieldsValue(_defineProperty({}, display_code, null));
+              }
+
+              otherFormItemConfig.b_disabled = true;
+              otherFormItemConfig.b_readonly = true;
+            } else if (FormulasValueType.Enabled == formItemValue) {
+              otherFormItemConfig.b_disabled = false;
+              otherFormItemConfig.b_readonly = true;
+            } else if (formItemValue.startsWith(FormulasValueType.Function)) {
+              var formulaFunctionValue;
+
+              if (formItemValue.search("#value#") !== -1) {
+                formulaFunctionValue = eval(formItemValue.replace('#value#', "value").replace("@", ","));
+              } else {
+                var formItemValueList = formItemValue.split("#");
+
+                if (!formItemValueList || formItemValueList.length != 3) {
+                  console.log("formula error, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
+                  return "continue";
+                }
+
+                var realFormulaValue = formItemValueList[0] + "data[formItemValueList[1]]" + formItemValueList[2];
+                formulaFunctionValue = eval(realFormulaValue.replace("@", ","));
+              }
+
+              if (!formulaFunctionValue) {
+                console.log("formula function return null, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
+                return "continue";
+              }
+
+              data[code] = formulaFunctionValue;
+              var otherFormItemValue;
+
+              if (_consts.UI_RENDER_TYPE.DATE == ui_render_type) {
+                otherFormItemValue = (0, _moment["default"])(formulaFunctionValue, "YYYY-MM-DD");
+              } else {
+                otherFormItemValue = formulaFunctionValue;
+              }
+
+              setFieldsValue(_defineProperty({}, code, otherFormItemValue));
+            } else {
+              data[code] = formItemValue;
+              setFieldsValue(_defineProperty({}, code, formItemValue));
+
+              if (display_code && display_code.trim().length > 0) {
+                var dictList = def_docs["def_" + ref_pk];
+
+                if (dictList && dictList.length > 0) {
+                  var filteredDict = dictList.find(function (item) {
+                    return item.pk.toString() == formItemValue;
+                  });
+
+                  if (filteredDict) {
+                    var ref_title = filteredDict.title;
+                    data[display_code] = ref_title;
+                    setFieldsValue(_defineProperty({}, display_code, ref_title));
+                  }
+                }
+              }
+            }
+          };
+
+          for (var i = 0, len = otherFormItemResponses.length; i < len; i++) {
+            var _ret = _loop(i, len);
+
+            if (_ret === "continue") continue;
+          }
+        }
+
+        _this2.setState({
+          fieldCodeKeyMap: fieldCodeKeyMap
+        });
+      }
+    });
+
     _this2.ref = _this2.props.formref || /*#__PURE__*/_react["default"].createRef();
     _this2.state = {
-      editFormulasState: []
+      fieldCodeKeyMap: {}
     };
     return _this2;
   }
@@ -780,32 +825,36 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
   _createClass(FormForModify, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this3 = this;
-
       var _this$props = this.props,
           data = _this$props.data,
           info_set_fields = _this$props.info_set_fields;
-      var editFormulasState = this.state.editFormulasState;
-      info_set_fields.forEach(function (formItem) {
-        _this3.preParseFormItemExtConfig(formItem);
-
-        if (formItem.editFormulaConfigs) {
-          for (var i = 0, len = formItem.editFormulaConfigs.length; i < len; i++) {
-            var editFormulaConfig = formItem.editFormulaConfigs[i];
-            var initialValue = formItem.ui_render_type === 'switch' ? (data[formItem.code] && data[formItem.code].toString() || '').toLowerCase() !== 'true' : data[formItem.code];
-            var formulaValueOf = formItem.ui_render_type === 'switch' ? (editFormulaConfig.onValueOf || '').toLowerCase() !== 'true' : editFormulaConfig.onValueOf;
-
-            if (formulaValueOf === initialValue) {
-              editFormulasState.push({
-                editFormulasStateCode: formItem.code,
-                editFormulaItem: editFormulaConfig
-              });
-            }
-          }
+      var fieldCodeKeyMap = this.state.fieldCodeKeyMap;
+
+      if (info_set_fields && info_set_fields.length > 0) {
+        return;
+      }
+
+      for (var i = 0, len = info_set_fields.length; i < len; i++) {
+        var formItem = info_set_fields[i];
+        this.preParseFormItemExtConfig(formItem);
+        var code = formItem.code,
+            ui_render_type = formItem.ui_render_type;
+        var fieldCodeValue = data[code];
+
+        if (_consts.UI_RENDER_TYPE.SWITCH == ui_render_type) {
+          fieldCodeValue = (fieldCodeValue + '' || '').toLowerCase() === 'true' || (fieldCodeValue + '' || '').toLowerCase() === '1' ? "true" : "false";
         }
-      });
+
+        if (fieldCodeValue) {
+          this.formItemOnChangeForFormula(formItem, fieldCodeValue);
+        }
+
+        formItem.b_disabled = formItem.b_readonly;
+        fieldCodeKeyMap[formItem.code] = formItem;
+      }
+
       this.setState({
-        editFormulasState: editFormulasState
+        fieldCodeKeyMap: fieldCodeKeyMap
       });
     }
   }, {
@@ -917,6 +966,10 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         formData[config.code] = date.format(dateFormat);
       }
 
+      if (dateString) {
+        this.formItemOnChangeForFormula(config, dateString);
+      }
+
       if (callback && typeof callback === "function") {
         callback(date, dateString);
       }
@@ -946,8 +999,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "selectOnChange",
     value: function selectOnChange(config, callback, value, option) {
-      var _this4 = this;
-
       var display_code = config.display_code,
           code = config.code;
 
@@ -991,75 +1042,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         this.props.data[display_code] = display_value;
       }
 
-      if (config.editFormulaConfigs && config.editFormulaConfigs.length) {
-        var editFormulasState = this.state.editFormulasState;
-        var _this$ref$current = this.ref.current,
-            setFieldsValue = _this$ref$current.setFieldsValue,
-            resetFields = _this$ref$current.resetFields;
-
-        if (value) {
-          var editFormulaItem = config.editFormulaConfigs.filter(function (editFormulaItem) {
-            return editFormulaItem.onValueOf === value.toString();
-          })[0];
-
-          if (editFormulaItem) {
-            if (value) {
-              editFormulaItem.otherFormItemResponses.forEach(function (item) {
-                if (item.formItemValue === 'disabled') {
-                  resetFields([item.formItemCode]);
-                  setFieldsValue(_defineProperty({}, item.formItemCode, null));
-
-                  if (item.formItemCode.endsWith('_pk') && _this4.props.data["".concat(item.formItemCode.split('_pk')[0], "_ext_name")]) {
-                    _this4.props.data["".concat(item.formItemCode.split('_pk')[0], "_ext_name")] = null;
-                  } else if (item.formItemCode.indexOf('_pk$') !== -1 && _this4.props.data["".concat(item.formItemCode.split('_pk$')[0], "_ext_name$").concat(item.formItemCode.split('_pk$')[1])]) {
-                    _this4.props.data["".concat(item.formItemCode.split('_pk$')[0], "_ext_name$").concat(item.formItemCode.split('_pk$')[1])] = null;
-                  }
-
-                  _this4.props.data[item.formItemCode] = null;
-                }
-              });
-            }
-
-            if (editFormulasState.filter(function (item) {
-              return item.editFormulasStateCode === code;
-            }).length) {
-              editFormulasState.forEach(function (item) {
-                if (item.editFormulasStateCode === code) {
-                  item.editFormulaItem = editFormulaItem;
-                }
-              });
-            } else {
-              editFormulasState.push({
-                editFormulasStateCode: code,
-                editFormulaItem: editFormulaItem
-              });
-            }
-          } else {
-            if (editFormulasState.filter(function (item) {
-              return item.editFormulasStateCode === code;
-            }).length) {
-              editFormulasState.forEach(function (item) {
-                if (item.editFormulasStateCode === code) {
-                  item.editFormulaItem = null;
-                }
-              });
-            }
-          }
-        } else {
-          if (editFormulasState.filter(function (item) {
-            return item.editFormulasStateCode === code;
-          }).length) {
-            editFormulasState.forEach(function (item) {
-              if (item.editFormulasStateCode === code) {
-                item.editFormulaItem = null;
-              }
-            });
-          }
-        }
-
-        this.setState({
-          editFormulasState: editFormulasState
-        });
+      if (value) {
+        this.formItemOnChangeForFormula(config, value);
       }
 
       if (callback && typeof callback === "function") {
@@ -1091,7 +1075,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "buildTreeNode",
     value: function buildTreeNode(defNodes) {
-      var _this5 = this;
+      var _this3 = this;
 
       if (!defNodes || defNodes.length === 0) {
         return null;
@@ -1112,7 +1096,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
           ext_attr_value: ext_attr_value,
           selectable: item.selectable,
           prop: ext_attr_value
-        }, _this5.buildTreeNode(item.children));
+        }, _this3.buildTreeNode(item.children));
       });
     }
   }, {
@@ -1169,59 +1153,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "switchOnChange",
     value: function switchOnChange(config, callback, checked, event) {
-      var _this6 = this;
-
-      if (config.editFormulaConfigs && config.editFormulaConfigs.length) {
-        var code = config.code;
-        var editFormulasState = this.state.editFormulasState;
-        var _this$ref$current2 = this.ref.current,
-            setFieldsValue = _this$ref$current2.setFieldsValue,
-            resetFields = _this$ref$current2.resetFields;
-        var editFormulaItem = config.editFormulaConfigs.filter(function (editFormulaItem) {
-          return editFormulaItem.onValueOf === checked.toString();
-        })[0];
-
-        if (editFormulaItem) {
-          if (!checked) {
-            editFormulaItem.otherFormItemResponses.forEach(function (item) {
-              resetFields([item.formItemCode]);
-              setFieldsValue(_defineProperty({}, item.formItemCode, null));
-
-              if (item.formItemCode.endsWith('_pk') && _this6.props.data["".concat(item.formItemCode.split('_pk')[0], "_ext_name")]) {
-                _this6.props.data["".concat(item.formItemCode.split('_pk')[0], "_ext_name")] = null;
-              } else if (item.formItemCode.indexOf('_pk$') !== -1 && _this6.props.data["".concat(item.formItemCode.split('_pk$')[0], "_ext_name$").concat(item.formItemCode.split('_pk$')[1])]) {
-                _this6.props.data["".concat(item.formItemCode.split('_pk$')[0], "_ext_name$").concat(item.formItemCode.split('_pk$')[1])] = null;
-              }
-
-              _this6.props.data[item.formItemCode] = null;
-            });
-          }
-
-          if (editFormulasState.filter(function (item) {
-            return item.editFormulasStateCode === code;
-          }).length) {
-            editFormulasState.forEach(function (item) {
-              if (item.editFormulasStateCode === code) {
-                item.editFormulaItem = editFormulaItem;
-              }
-            });
-          } else {
-            editFormulasState.push({
-              editFormulasStateCode: code,
-              editFormulaItem: editFormulaItem
-            });
-          }
-        } else {
-          editFormulasState.push({
-            editFormulasStateCode: code,
-            editFormulaItem: null
-          });
-        }
-
-        this.setState({
-          editFormulasState: editFormulasState
-        });
-      }
+      this.formItemOnChangeForFormula(config, checked);
 
       if (callback && typeof callback === "function") {
         callback(checked, event);
@@ -1319,7 +1251,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var props = this.props;
-      var editFormulasState = this.state.editFormulasState;
+      var fieldCodeKeyMap = this.state.fieldCodeKeyMap;
       return /*#__PURE__*/_react["default"].createElement(_antd.ConfigProvider, {
         locale: _zh_CN["default"]
       }, /*#__PURE__*/_react["default"].createElement(_antd.Form, _extends({}, props, {
@@ -1327,7 +1259,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         ref: this.ref,
         scrollToFirstError: true,
         onValuesChange: this.onValuesChange.bind(this)
-      }), this.buildFormItems(editFormulasState), this.buildExtFormItems()));
+      }), this.buildFormItems(fieldCodeKeyMap), this.buildExtFormItems()));
     }
   }]);
 

package/lib/services/HttpService.js

@@ -131,22 +131,24 @@ var HttpService = /*#__PURE__*/function () {
         rpcMethodName = "";
       }
 
-      if (jsonObject) {
-        ajaxOptions.data = jsonObject;
-      }
+      if (!this.__checkJSONObjectSecurity(jsonObject)) {
+        if (jsonObject) {
+          ajaxOptions.data = jsonObject;
+        }
 
-      if (ajaxOptions.rpcMethodName) {
-        delete ajaxOptions.rpcMethodName;
-      }
+        if (ajaxOptions.rpcMethodName) {
+          delete ajaxOptions.rpcMethodName;
+        }
 
-      ajaxOptions.type = "post";
-      ajaxOptions.dataType = "json";
+        ajaxOptions.type = "post";
+        ajaxOptions.dataType = "json";
 
-      if (!ajaxOptions.url) {
-        ajaxOptions.url = this.requestContextPath + rpcMethodName;
-      }
+        if (!ajaxOptions.url) {
+          ajaxOptions.url = this.requestContextPath + rpcMethodName;
+        }
 
-      return _jquery["default"].ajax(ajaxOptions);
+        return _jquery["default"].ajax(ajaxOptions);
+      }
     }
   }, {
     key: "__postForMock",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.100",
+  "version": "0.3.104",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/AppFormulaFunctions.js

@@ -1,24 +1,48 @@
-window.AppFormulaFunctions = {};
-
-window.AppFormulaFunctions.currentMonthStartDay = function (date) {
-    var currentDate = new Date(date),
-        currentYear = currentDate.getFullYear(),
-        currentMouth = currentDate.getMonth() + 1;
-    return currentYear + "-" + currentMouth + "-1"
-}
-
-window.AppFormulaFunctions.nextMonthStartDay = function (date) {
-    var currentDate = new Date(date),
-        currentYear = currentDate.getFullYear(),
-        currentMouth = currentDate.getMonth() + 1;
-    return new Date(currentYear, currentMouth, 1)
-}
-
-window.AppFormulaFunctions.currentDateToDeadline = function (date, during) {
-    debugger
-    var changeDate = new Date(new Date(date).getTime() + during * 24 * 60 * 60 * 1000);
-    var changeYear = changeDate.getFullYear(),
-        changeMouth = changeDate.getMonth() + 1,
-        changeDay = changeDate.getDay();
-    return changeYear + '-' + changeMouth + '-' + changeDay;
-}
+import moment from "moment";
+
+window.AppFormulaFunctions = {
+    currentMonthStartDay : function (dateStr) {
+        if (dateStr) {
+            let baseDate = moment(dateStr, "YYYY-MM-DD");
+            return  baseDate.date(1).format("YYYY-MM-DD");
+        }
+
+        return null;
+    },
+
+    nextMonthStartDay : function (dateStr) {
+        if (dateStr) {
+            let baseDate = moment(dateStr, "YYYY-MM-DD");
+            return  baseDate.add(1,'months').date(1).format("YYYY-MM-DD");
+        }
+
+        return null;
+    },
+
+    datePlusDays : function (dateStr, during_days) {
+        if (dateStr && during_days) {
+            let baseDate = moment(dateStr, "YYYY-MM-DD");
+            return baseDate.add(during_days, 'days').format("YYYY-MM-DD")
+        }
+
+        return null;
+    },
+
+    datePlusMonths : function (dateStr, during_months) {
+        if (dateStr && during_months) {
+            let baseDate = moment(dateStr, "YYYY-MM-DD");
+            return baseDate.add(during_months, 'months').format("YYYY-MM-DD")
+        }
+
+        return null;
+    },
+
+    datePlusYears : function (dateStr, during_years) {
+        if (dateStr && during_years) {
+            let baseDate = moment(dateStr, "YYYY-MM-DD");
+            return baseDate.add(during_years, 'years').format("YYYY-MM-DD")
+        }
+
+        return null;
+    }
+};

package/src/base/layout/ui_tpl/form/FormForBrowse.js

@@ -334,7 +334,7 @@ class FormForBrowse extends React.Component{
                     if (typeof initialValue === 'boolean') {
                         value = (initialValues[display_code] ? "是" : "否");
                     } else {
-                        value = ((initialValue || '').toLowerCase() === 'true' ? "是" : "否");
+                        value = (((initialValue + '' || '').toLowerCase() === 'true' || (initialValue + '' || '').toLowerCase() === '1') ? "是" : "否");
                     }
                     break;
                 default:

package/src/base/layout/ui_tpl/form/FormForModify.js

@@ -22,6 +22,13 @@ import {UI_RENDER_TYPE} from "../consts";
 import zhCN from "antd/es/locale/zh_CN";
 import HttpService from "../../../../services/HttpService";
 import InputPassword from "../InputPassword";
+import '../../../AppFormulaFunctions'
+
+const FormulasValueType = {
+    Disabled : "disabled",
+    Enabled  : "enabled",
+    Function : "AppFormulaFunctions",
+}
 
 class FormForModify extends React.Component{
     constructor(props) {
@@ -30,28 +37,41 @@ class FormForModify extends React.Component{
         this.ref = this.props.formref || React.createRef();
 
         this.state = {
-            editFormulasState: []
+            fieldCodeKeyMap: {},
         }
     }
 
     componentDidMount() {
         let {data, info_set_fields} = this.props;
-        let {editFormulasState} = this.state;
-        info_set_fields.forEach(formItem => {
+        let {fieldCodeKeyMap} = this.state;
+
+        if (info_set_fields && info_set_fields.length > 0) {
+            return;
+        }
+
+        for (let i = 0, len = info_set_fields.length; i < len; i++) {
+            let formItem = info_set_fields[i];
+
             this.preParseFormItemExtConfig(formItem);
-            if (formItem.editFormulaConfigs) {
-                for (let i = 0, len = formItem.editFormulaConfigs.length; i < len; i++) {
-                    let editFormulaConfig = formItem.editFormulaConfigs[i];
-                    let initialValue = formItem.ui_render_type === 'switch' ? ((data[formItem.code] && data[formItem.code].toString()) || '').toLowerCase() !== 'true' : data[formItem.code];
-                    let formulaValueOf = formItem.ui_render_type === 'switch' ? (editFormulaConfig.onValueOf || '').toLowerCase() !== 'true' : editFormulaConfig.onValueOf;
-
-                    if (formulaValueOf === initialValue) {
-                        editFormulasState.push({editFormulasStateCode: formItem.code, editFormulaItem: editFormulaConfig})
-                    }
-                }
+
+            let {code, ui_render_type} = formItem;
+            let fieldCodeValue = data[code];
+
+            if (UI_RENDER_TYPE.SWITCH == ui_render_type) {
+                fieldCodeValue = (((fieldCodeValue + '' || '').toLowerCase() === 'true' || (fieldCodeValue + '' || '').toLowerCase() === '1') ? "true" : "false");
             }
+
+            if (fieldCodeValue) {
+                this.formItemOnChangeForFormula(formItem, fieldCodeValue);
+            }
+
+            formItem.b_disabled = formItem.b_readonly;
+            fieldCodeKeyMap[formItem.code] = formItem;
+        }
+
+        this.setState({
+            fieldCodeKeyMap,
         })
-        this.setState({editFormulasState})
     }
 
     buildExtFormItems = () => {
@@ -129,94 +149,13 @@ class FormForModify extends React.Component{
         )
     }
 
-    buildFormItems = (editFormulasState) => {
-        let {data, info_set_fields, ext_form_items} = this.props;
+    buildFormItems = () => {
+        let {info_set_fields, ext_form_items} = this.props;
         if (this.ref.current == null) {
             return;
         }
 
-        let {setFieldsValue} = this.ref.current;
         if (info_set_fields && info_set_fields.length > 0) {
-            info_set_fields.forEach(formItem => {
-                formItem.initialValue = null;
-
-                this.preParseFormItemExtConfig(formItem);
-
-                if (editFormulasState && editFormulasState.length) {
-                    formItem.b_disabled = formItem.b_readonly;
-                    for (let i = 0, len = editFormulasState.length; i < len; i++) {
-                        let editFormulaStateItem = editFormulasState[i].editFormulaItem;
-                        if (editFormulaStateItem) {
-                            editFormulaStateItem.otherFormItemResponses.forEach(item => {
-                                if (formItem.code === item.formItemCode) {
-                                    if (item.formItemValue === 'disabled') {
-                                        formItem.b_disabled = true;
-                                    } else if (item.formItemValue === 'enabled') {
-                                        formItem.b_disabled = false;
-                                    } else {
-                                        formItem.initialValue = item.formItemValue || data[formItem.display_code];
-                                    }
-                                    if (formItem.initialValue || data[formItem.code]) {
-                                        if (formItem.code.indexOf('date') !== -1) {
-                                            setFieldsValue({[formItem.code]: moment(formItem.initialValue || data[formItem.code])});
-                                            if (formItem.code.endsWith("_date")) {
-                                                data[formItem.code] = moment(formItem.initialValue || data[formItem.code]).valueOf();
-                                            } else if (formItem.code.indexOf('_date$') !== -1) {
-                                                data[formItem.code] = moment(formItem.initialValue || data[formItem.code]).format("YYYY-MM-DD");
-                                            }
-                                        } else {
-                                            setFieldsValue({[formItem.code]: formItem.initialValue || data[formItem.code]});
-                                            data[formItem.code] = formItem.initialValue || data[formItem.code];
-                                        }
-                                    }
-                                }
-                            })
-                        }
-                    }
-
-                } else {
-                    if (formItem.editFormulaConfigs) {
-                        for (let i = 0, len = formItem.editFormulaConfigs.length; i < len; i++) {
-                            let editFormulaConfig = formItem.editFormulaConfigs[i];
-                            let initialValue = formItem.ui_render_type === 'switch' ? ((data[formItem.code] && data[formItem.code].toString()) || '').toLowerCase() !== 'true' : data[formItem.code];
-                            let formulaValueOf = formItem.ui_render_type === 'switch' ? (editFormulaConfig.onValueOf || '').toLowerCase() !== 'true' : editFormulaConfig.onValueOf;
-
-                            if (formulaValueOf === initialValue) {
-                                let currentOtherFormItemResponses = editFormulaConfig.otherFormItemResponses;
-                                currentOtherFormItemResponses.forEach(item => {
-                                    info_set_fields.forEach(formItemInner => {
-                                        if (formItemInner.code === item.formItemCode) {
-                                            if (item.formItemValue === 'disabled') {
-                                                formItemInner.b_disabled = true;
-                                            } else if (item.formItemValue === 'enabled') {
-                                                formItemInner.b_disabled = false;
-                                            } else {
-                                                formItemInner.initialValue = item.formItemValue || data[formItemInner.display_code];
-                                            }
-                                            if (formItemInner.initialValue || data[formItemInner.code]) {
-                                                if (formItemInner.code.indexOf('date') !== -1) {
-                                                    setFieldsValue({[formItemInner.code]: moment(formItemInner.initialValue || data[formItemInner.code])})
-                                                    if (formItemInner.code.endsWith("_date")) {
-                                                        data[formItemInner.code] = moment(formItemInner.initialValue || data[formItemInner.code]).valueOf();
-                                                    } else if (formItemInner.code.indexOf('_date$') !== -1) {
-                                                        data[formItemInner.code] = moment(formItem.initialValue || data[formItemInner.code]).format("YYYY-MM-DD");
-                                                    }
-                                                } else {
-                                                    setFieldsValue({[formItemInner.code]: formItemInner.initialValue || data[formItemInner.code]});
-                                                    data[formItemInner.code] = formItemInner.initialValue || data[formItemInner.code];
-                                                }
-                                            }
-                                        }
-                                    })
-                                })
-                            }
-
-                        }
-
-                    }
-
-                }
-            })
 
             let groupNames = info_set_fields.map(item => item.belong_form_group).filter((item, index, arr) => item && item.trim().length > 0 && arr.indexOf(item) === index);
 
@@ -703,7 +642,7 @@ class FormForModify extends React.Component{
                     valuePropName = "checked";
 
                     if (typeof initialValue !== 'boolean') {
-                        initialValue = (initialValue || '').toLowerCase() === 'true';
+                        initialValue = (initialValue + '' || '').toLowerCase() === 'true' || (initialValue + '' || '').toLowerCase() === '1';
                         displayValue = (initialValue ? "是" : "否");
                     }
 
@@ -927,6 +866,10 @@ class FormForModify extends React.Component{
             formData[config.code] = date.format(dateFormat);
         }
 
+        if (dateString) {
+            this.formItemOnChangeForFormula(config, dateString);
+        }
+
         if (callback && typeof callback === "function") {
             callback(date, dateString);
         }
@@ -999,56 +942,8 @@ class FormForModify extends React.Component{
             this.props.data[display_code] = display_value;
         }
 
-        if (config.editFormulaConfigs && config.editFormulaConfigs.length) {
-            let {editFormulasState} = this.state;
-            let {setFieldsValue, resetFields} = this.ref.current;
-
-            if (value) {
-                let editFormulaItem = config.editFormulaConfigs.filter(editFormulaItem => editFormulaItem.onValueOf === value.toString())[0];
-                if (editFormulaItem) {
-                    if (value) {
-                        editFormulaItem.otherFormItemResponses.forEach(item => {
-                            if (item.formItemValue === 'disabled') {
-                                resetFields([item.formItemCode]);
-                                setFieldsValue({[item.formItemCode]: null});
-                                if (item.formItemCode.endsWith('_pk') && this.props.data[`${item.formItemCode.split('_pk')[0]}_ext_name`]) {
-                                    this.props.data[`${item.formItemCode.split('_pk')[0]}_ext_name`] = null;
-                                } else if (item.formItemCode.indexOf('_pk$') !== -1 && this.props.data[`${item.formItemCode.split('_pk$')[0]}_ext_name$${item.formItemCode.split('_pk$')[1]}`]) {
-                                    this.props.data[`${item.formItemCode.split('_pk$')[0]}_ext_name$${item.formItemCode.split('_pk$')[1]}`] = null;
-                                }
-                                this.props.data[item.formItemCode] = null;
-                            }
-                        })
-                    }
-                    if (editFormulasState.filter(item => item.editFormulasStateCode === code).length) {
-                        editFormulasState.forEach(item => {
-                            if (item.editFormulasStateCode === code) {
-                                item.editFormulaItem = editFormulaItem;
-                            }
-                        })
-                    } else {
-                        editFormulasState.push({editFormulasStateCode: code, editFormulaItem});
-                    }
-                } else {
-                    if (editFormulasState.filter(item => item.editFormulasStateCode === code).length) {
-                        editFormulasState.forEach(item => {
-                            if (item.editFormulasStateCode === code) {
-                                item.editFormulaItem = null;
-                            }
-                        })
-                    }
-                }
-            } else {
-                if (editFormulasState.filter(item => item.editFormulasStateCode === code).length) {
-                    editFormulasState.forEach(item => {
-                        if (item.editFormulasStateCode === code) {
-                            item.editFormulaItem = null;
-                        }
-                    })
-                }
-            }
-
-            this.setState({editFormulasState})
+        if (value) {
+            this.formItemOnChangeForFormula(config, value)
         }
 
         if (callback && typeof callback === "function") {
@@ -1146,39 +1041,106 @@ class FormForModify extends React.Component{
         }
     }
 
-    switchOnChange(config, callback, checked, event) {
-        if (config.editFormulaConfigs && config.editFormulaConfigs.length) {
-            let {code} = config;
-            let {editFormulasState} = this.state;
-            let {setFieldsValue, resetFields} = this.ref.current;
-            let editFormulaItem = config.editFormulaConfigs.filter(editFormulaItem => editFormulaItem.onValueOf === checked.toString())[0];
+    formItemOnChangeForFormula = (config, value) => {
+        let formItemFormulaConfigs = config.editFormulaConfigs;
+        if (formItemFormulaConfigs && formItemFormulaConfigs.length > 0) {
+            let {fieldCodeKeyMap} = this.state;
+            let {data, def_docs}  = this.props;
+            let {setFieldsValue}  = this.ref.current;
+            // value exists
+            let editFormulaItem = config.editFormulaConfigs.find(editFormulaItem => editFormulaItem.onValueOf === value.toString() || editFormulaItem.onValueOf === "value");
+
             if (editFormulaItem) {
-                if (!checked) {
-                    editFormulaItem.otherFormItemResponses.forEach(item => {
-                        resetFields([item.formItemCode]);
-                        setFieldsValue({[item.formItemCode]: null});
-                        if (item.formItemCode.endsWith('_pk') && this.props.data[`${item.formItemCode.split('_pk')[0]}_ext_name`]) {
-                            this.props.data[`${item.formItemCode.split('_pk')[0]}_ext_name`] = null;
-                        } else if (item.formItemCode.indexOf('_pk$') !== -1 && this.props.data[`${item.formItemCode.split('_pk$')[0]}_ext_name$${item.formItemCode.split('_pk$')[1]}`]) {
-                            this.props.data[`${item.formItemCode.split('_pk$')[0]}_ext_name$${item.formItemCode.split('_pk$')[1]}`] = null;
+                let otherFormItemResponses = editFormulaItem.otherFormItemResponses;
+
+                for (let i = 0, len = otherFormItemResponses.length; i < len; i++) {
+                    let otherFormItem = otherFormItemResponses[i];
+                    if (!otherFormItem) {
+                        continue;
+                    }
+
+                    let {formItemCode, formItemValue} = otherFormItem;
+                    let otherFormItemConfig = fieldCodeKeyMap[formItemCode];
+                    if (!otherFormItemConfig) {
+                        continue;
+                    }
+
+                    if (!formItemValue) {
+                        continue;
+                    }
+
+                    let {code, display_code, ref_pk, ui_render_type} = otherFormItemConfig;
+                    if (FormulasValueType.Disabled == formItemValue) {
+                        data[code] = null;
+                        setFieldsValue({[code]: null});
+
+                        if (display_code) {
+                            data[display_code] = null;
+                            setFieldsValue({[display_code]: null});
                         }
-                        this.props.data[item.formItemCode] = null;
-                    })
-                }
-                if (editFormulasState.filter(item => item.editFormulasStateCode === code).length) {
-                    editFormulasState.forEach(item => {
-                        if (item.editFormulasStateCode === code) {
-                            item.editFormulaItem = editFormulaItem;
+
+                        otherFormItemConfig.b_disabled = true;
+                        otherFormItemConfig.b_readonly = true;
+                    } else if (FormulasValueType.Enabled == formItemValue) {
+
+                        otherFormItemConfig.b_disabled = false;
+                        otherFormItemConfig.b_readonly = true;
+                    } else if (formItemValue.startsWith(FormulasValueType.Function)) {
+                        let formulaFunctionValue;
+                        if (formItemValue.search("#value#") !== -1) {
+                            formulaFunctionValue = eval(formItemValue.replace('#value#', `value`).replace("@", ","));
+                        } else {
+                            let formItemValueList = formItemValue.split("#");
+                            if (!formItemValueList || formItemValueList.length != 3) {
+                                console.log("formula error, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
+                                continue;
+                            }
+
+                            let realFormulaValue = formItemValueList[0] + `data[formItemValueList[1]]` + formItemValueList[2];
+
+                            formulaFunctionValue = eval(realFormulaValue.replace("@", ","));
                         }
-                    })
-                } else {
-                    editFormulasState.push({editFormulasStateCode: code, editFormulaItem});
+
+                        if (!formulaFunctionValue) {
+                            console.log("formula function return null, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
+                            continue;
+                        }
+
+                        data[code] = formulaFunctionValue;
+
+                        let otherFormItemValue;
+                        if (UI_RENDER_TYPE.DATE == ui_render_type) {
+                            otherFormItemValue = moment(formulaFunctionValue, "YYYY-MM-DD");
+                        } else {
+                            otherFormItemValue = formulaFunctionValue;
+                        }
+                        setFieldsValue({[code]: otherFormItemValue});
+                    } else {
+                        data[code] = formItemValue;
+                        setFieldsValue({[code]: formItemValue});
+
+                        if (display_code && display_code.trim().length > 0) {
+                            let dictList = def_docs["def_" + ref_pk];
+                            if (dictList && dictList.length > 0) {
+                                let filteredDict = dictList.find(item => item.pk.toString() == formItemValue);
+                                if (filteredDict) {
+                                    let ref_title = filteredDict.title;
+
+                                    data[display_code] = ref_title;
+                                    setFieldsValue({[display_code]: ref_title});
+                                }
+                            }
+                        }
+                    }
                 }
-            } else {
-                editFormulasState.push({editFormulasStateCode: code, editFormulaItem: null});
             }
-            this.setState({editFormulasState})
+
+            this.setState({fieldCodeKeyMap})
         }
+    }
+
+    switchOnChange(config, callback, checked, event) {
+        this.formItemOnChangeForFormula(config, checked);
 
         if (callback && typeof callback === "function") {
             callback(checked, event);
@@ -1241,7 +1203,7 @@ class FormForModify extends React.Component{
 
     render() {
         let {props} = this;
-        let {editFormulasState} = this.state;
+        let {fieldCodeKeyMap} = this.state;
         return (
             <ConfigProvider locale={zhCN}>
                 <Form
@@ -1251,7 +1213,7 @@ class FormForModify extends React.Component{
                     scrollToFirstError
                     onValuesChange={this.onValuesChange.bind(this)}
                 >
-                    {this.buildFormItems(editFormulasState)}
+                    {this.buildFormItems(fieldCodeKeyMap)}
                     {this.buildExtFormItems()}
                 </Form>
             </ConfigProvider>

package/src/services/HttpService.js

@@ -114,22 +114,24 @@ class HttpService {
             rpcMethodName = "";
         }
 
-        if (jsonObject) {
-            ajaxOptions.data = jsonObject;
-        }
+        if (!this.__checkJSONObjectSecurity(jsonObject)) {
+            if (jsonObject) {
+                ajaxOptions.data = jsonObject;
+            }
 
-        if (ajaxOptions.rpcMethodName) {
-            delete ajaxOptions.rpcMethodName;
-        }
+            if (ajaxOptions.rpcMethodName) {
+                delete ajaxOptions.rpcMethodName;
+            }
 
-        ajaxOptions.type = "post";
-        ajaxOptions.dataType = "json";
+            ajaxOptions.type = "post";
+            ajaxOptions.dataType = "json";
 
-        if (!ajaxOptions.url) {
-            ajaxOptions.url  = this.requestContextPath + rpcMethodName;
-        }
+            if (!ajaxOptions.url) {
+                ajaxOptions.url  = this.requestContextPath + rpcMethodName;
+            }
 
-        return $.ajax(ajaxOptions);
+            return $.ajax(ajaxOptions);
+        }
     }
 
     __postForMock(mockOptions) {