@bchr/bchr-front-lib 0.3.106 → 0.3.107

package/lib/base/BaseAppUtils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.customDefIcon = customDefIcon;
 exports.rebuildDate = rebuildDate;
-exports.jsonToMap = exports.mapToJson = exports.parentsInsertchildrenOfCustomizeAsParentColumn = exports.listToTreeDataOfCustomizeAsParentColumn = exports.praseStrEmpty = exports.listToTreeDataByTopParentPk = exports.listToTreeData = exports.getFunctionLetHelpFilePath = exports.buildPathNameWithPropsMatch = exports.FunctionLetHelper = exports.genGetterAndReadonlySetter = void 0;
+exports.treeDataToListByChildFieldName = exports.jsonToMap = exports.mapToJson = exports.parentsInsertchildrenOfCustomizeAsParentColumn = exports.listToTreeDataOfCustomizeAsParentColumn = exports.praseStrEmpty = exports.listToTreeDataByTopParentPk = exports.listToTreeData = exports.getFunctionLetHelpFilePath = exports.buildPathNameWithPropsMatch = exports.FunctionLetHelper = exports.genGetterAndReadonlySetter = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -195,6 +195,31 @@ var listToTreeData = function listToTreeData(data) {
 
 exports.listToTreeData = listToTreeData;
 
+function getChildNodesToListData(parent_nodes, listData, childFieldName) {
+  for (var i = 0, len = parent_nodes.length; i < len; i++) {
+    var parent_node_item = parent_nodes[i];
+    listData.push(parent_node_item);
+    var childrenData = parent_node_item[childFieldName];
+
+    if (childrenData && childrenData.length > 0) {
+      getChildNodesToListData(childrenData, listData, childFieldName);
+    }
+  }
+}
+
+var treeDataToListByChildFieldName = function treeDataToListByChildFieldName(treeData, childFieldName) {
+  var listData = [];
+
+  if (!treeData || treeData.length == 0) {
+    return listData;
+  }
+
+  getChildNodesToListData(treeData, listData, childFieldName);
+  return listData;
+};
+
+exports.treeDataToListByChildFieldName = treeDataToListByChildFieldName;
+
 var listToTreeDataByTopParentPk = function listToTreeDataByTopParentPk(data, topParentPk, children_data_container_column_name) {
   if (topParentPk != 0 && !topParentPk) {
     return [];

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

@@ -23,6 +23,8 @@ var _InputPassword = _interopRequireDefault(require("../InputPassword"));
 
 require("../../../AppFormulaFunctions");
 
+var _BaseAppUtils = require("../../../BaseAppUtils");
+
 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; }
@@ -779,36 +781,73 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
                 return "continue";
               }
 
-              data[code] = formulaFunctionValue;
-              var otherFormItemValue;
+              var convertedStateValue = _this2.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForState");
 
-              if (_consts.UI_RENDER_TYPE.DATE == ui_render_type) {
-                otherFormItemValue = (0, _moment["default"])(formulaFunctionValue, "YYYY-MM-DD");
-              } else {
-                otherFormItemValue = formulaFunctionValue;
+              var convertedFormItemValue = _this2.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForForm");
+
+              data[code] = convertedStateValue;
+              setFieldsValue(_defineProperty({}, code, convertedFormItemValue));
+
+              if (!display_code || display_code.trim().length == 0) {
+                return "continue";
               }
 
-              setFieldsValue(_defineProperty({}, code, otherFormItemValue));
-            } else {
-              data[code] = formItemValue;
-              setFieldsValue(_defineProperty({}, code, formItemValue));
+              var defList = def_docs["def_" + ref_pk];
+
+              if (defList && defList.length > 0) {
+                var dictList;
+
+                if (_consts.UI_RENDER_TYPE.SELECT == ui_render_type) {
+                  dictList = defList;
+                } else if (_consts.UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
+                  dictList = (0, _BaseAppUtils.treeDataToListByChildFieldName)(defList, "children");
+                }
+
+                var filteredDict = dictList.find(function (item) {
+                  return item.value == formulaFunctionValue;
+                });
+
+                if (filteredDict) {
+                  var ref_title = filteredDict.title;
+                  data[display_code] = ref_title;
+                  setFieldsValue(_defineProperty({}, display_code, ref_title));
+                }
+              }
+            } // last: set value for other form item
+            else {
+                var _convertedStateValue = _this2.convertStringValueForFormula(ui_render_type, formItemValue, "dataForState");
 
-              if (display_code && display_code.trim().length > 0) {
-                var dictList = def_docs["def_" + ref_pk];
+                var _convertedFormItemValue = _this2.convertStringValueForFormula(ui_render_type, formItemValue, "dataForForm");
 
-                if (dictList && dictList.length > 0) {
-                  var filteredDict = dictList.find(function (item) {
-                    return item.pk.toString() == formItemValue;
+                data[code] = _convertedStateValue;
+                setFieldsValue(_defineProperty({}, code, _convertedFormItemValue));
+
+                if (!display_code || display_code.trim().length == 0) {
+                  return "continue";
+                }
+
+                var _defList = def_docs["def_" + ref_pk];
+
+                if (_defList && _defList.length > 0) {
+                  var _dictList;
+
+                  if (_consts.UI_RENDER_TYPE.SELECT == ui_render_type) {
+                    _dictList = _defList;
+                  } else if (_consts.UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
+                    _dictList = (0, _BaseAppUtils.treeDataToListByChildFieldName)(_defList, "children");
+                  }
+
+                  var _filteredDict = _dictList.find(function (item) {
+                    return item.value == formItemValue;
                   });
 
-                  if (filteredDict) {
-                    var ref_title = filteredDict.title;
-                    data[display_code] = ref_title;
-                    setFieldsValue(_defineProperty({}, display_code, ref_title));
+                  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++) {
@@ -856,7 +895,13 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
       for (var _i2 = 0; _i2 < fieldsLength; _i2++) {
         var _formItem = info_set_fields[_i2];
         var code = _formItem.code,
-            ui_render_type = _formItem.ui_render_type;
+            ui_render_type = _formItem.ui_render_type,
+            editFormulaConfigs = _formItem.editFormulaConfigs;
+
+        if (!editFormulaConfigs || editFormulaConfigs.length == 0) {
+          continue;
+        }
+
         var fieldCodeValue = data[code];
 
         if (_consts.UI_RENDER_TYPE.SWITCH == ui_render_type) {
@@ -1165,6 +1210,83 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         callback(props);
       }
     }
+  }, {
+    key: "convertStringValueForFormula",
+    // 日期类型的值在表单中和state中的值对象不同(for_data_type: dataForForm || dataForState)
+    value: function convertStringValueForFormula(ui_render_type, formItemValue, for_data_type) {
+      var value;
+
+      switch (ui_render_type) {
+        case _consts.UI_RENDER_TYPE.INPUT:
+        case _consts.UI_RENDER_TYPE.INPUT_NUMBER:
+        case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+        case _consts.UI_RENDER_TYPE.TEXT_AREA:
+        case _consts.UI_RENDER_TYPE.TREE_SELECT:
+          value = formItemValue;
+          break;
+
+        case _consts.UI_RENDER_TYPE.SELECT:
+          if (typeof formItemValue === 'number') {
+            value = formItemValue && formItemValue > 0 ? formItemValue : null;
+          } else {
+            value = Number(formItemValue);
+            value = formItemValue && formItemValue > 0 ? formItemValue : null;
+          }
+
+          break;
+
+        case _consts.UI_RENDER_TYPE.DATE:
+          if (for_data_type == "dataForForm") {
+            value = formItemValue ? (0, _moment["default"])(formItemValue) : "";
+          } else {
+            value = formItemValue;
+          }
+
+          break;
+
+        case _consts.UI_RENDER_TYPE.DATE_YEAR:
+          if (for_data_type == "dataForForm") {
+            value = formItemValue ? (0, _moment["default"])(formItemValue, 'YYYY') : "";
+          } else {
+            value = formItemValue;
+          }
+
+          break;
+
+        case _consts.UI_RENDER_TYPE.DATE_MONTH:
+          if (for_data_type == "dataForForm") {
+            value = formItemValue ? (0, _moment["default"])(formItemValue, 'YYYYMM') : "";
+          } else {
+            value = formItemValue;
+          }
+
+          break;
+
+        case _consts.UI_RENDER_TYPE.DATE_TIME:
+          if (for_data_type == "dataForForm") {
+            value = formItemValue ? (0, _moment["default"])(formItemValue).format("YYYY-MM-DD hh:mm:ss") : "";
+          } else {
+            value = formItemValue;
+          }
+
+          break;
+
+        case _consts.UI_RENDER_TYPE.SWITCH:
+          if (typeof formItemValue === 'boolean') {
+            value = formItemValue;
+          } else {
+            value = (formItemValue + '' || '').toLowerCase() === 'true' || (formItemValue + '' || '').toLowerCase() === '1' ? true : false;
+          }
+
+          break;
+
+        default:
+          value = formItemValue;
+          break;
+      }
+
+      return value;
+    }
   }, {
     key: "switchOnChange",
     value: function switchOnChange(config, callback, checked, event) {

package/package.json

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

package/src/base/BaseAppUtils.js

@@ -146,6 +146,31 @@ const listToTreeData = function(data) {
     return treeData;
 };
 
+
+function getChildNodesToListData(parent_nodes, listData, childFieldName) {
+    for (let i = 0, len = parent_nodes.length; i < len; i++) {
+        let parent_node_item = parent_nodes[i];
+        listData.push(parent_node_item);
+
+        let childrenData = parent_node_item[childFieldName];
+        if (childrenData && childrenData.length > 0) {
+            getChildNodesToListData(childrenData, listData, childFieldName);
+        }
+    }
+}
+
+const treeDataToListByChildFieldName = function(treeData, childFieldName) {
+    let listData = [];
+
+    if (!treeData || treeData.length == 0) {
+        return listData;
+    }
+
+    getChildNodesToListData(treeData, listData, childFieldName);
+
+    return listData;
+};
+
 const listToTreeDataByTopParentPk = function(data, topParentPk, children_data_container_column_name) {
     if (topParentPk != 0 && !topParentPk) {
         return [];
@@ -261,5 +286,6 @@ export {
     listToTreeDataOfCustomizeAsParentColumn,
     parentsInsertchildrenOfCustomizeAsParentColumn,
     mapToJson,
-    jsonToMap
+    jsonToMap,
+    treeDataToListByChildFieldName
 }

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

@@ -23,6 +23,7 @@ import zhCN from "antd/es/locale/zh_CN";
 import HttpService from "../../../../services/HttpService";
 import InputPassword from "../InputPassword";
 import '../../../AppFormulaFunctions'
+import {treeDataToListByChildFieldName} from "../../../BaseAppUtils";
 
 const FormulasValueType = {
     Disabled : "disabled",
@@ -65,7 +66,12 @@ class FormForModify extends React.Component{
         for (let i = 0; i < fieldsLength; i++) {
             let formItem = info_set_fields[i];
 
-            let {code, ui_render_type} = formItem;
+            let {code, ui_render_type, editFormulaConfigs} = formItem;
+
+            if (!editFormulaConfigs || editFormulaConfigs.length == 0) {
+                continue;
+            }
+
             let fieldCodeValue = data[code];
 
             if (UI_RENDER_TYPE.SWITCH == ui_render_type) {
@@ -1122,29 +1128,61 @@ class FormForModify extends React.Component{
                             continue;
                         }
 
-                        data[code] = formulaFunctionValue;
+                        let convertedStateValue    = this.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForState");
+                        let convertedFormItemValue = this.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForForm");
 
-                        let otherFormItemValue;
-                        if (UI_RENDER_TYPE.DATE == ui_render_type) {
-                            otherFormItemValue = moment(formulaFunctionValue, "YYYY-MM-DD");
-                        } else {
-                            otherFormItemValue = formulaFunctionValue;
+                        data[code] = convertedStateValue;
+                        setFieldsValue({[code]: convertedFormItemValue});
+
+                        if (!display_code || display_code.trim().length == 0) {
+                            continue;
                         }
-                        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});
-                                }
+
+                        let defList = def_docs["def_" + ref_pk];
+                        if (defList && defList.length > 0) {
+                            let dictList;
+                            if (UI_RENDER_TYPE.SELECT == ui_render_type) {
+                                dictList = defList;
+                            } else if (UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
+                                dictList = treeDataToListByChildFieldName(defList, "children");
+                            }
+
+                            let filteredDict = dictList.find(item => item.value == formulaFunctionValue);
+                            if (filteredDict) {
+                                let ref_title = filteredDict.title;
+
+                                data[display_code] = ref_title;
+                                setFieldsValue({[display_code]: ref_title});
+                            }
+                        }
+                    }
+                    // last: set value for other form item
+                    else {
+                        let convertedStateValue    = this.convertStringValueForFormula(ui_render_type, formItemValue, "dataForState");
+                        let convertedFormItemValue = this.convertStringValueForFormula(ui_render_type, formItemValue, "dataForForm");
+
+                        data[code] = convertedStateValue;
+                        setFieldsValue({[code]: convertedFormItemValue});
+
+                        if (!display_code || display_code.trim().length == 0) {
+                            continue;
+                        }
+
+                        let defList = def_docs["def_" + ref_pk];
+                        if (defList && defList.length > 0) {
+                            let dictList;
+                            if (UI_RENDER_TYPE.SELECT == ui_render_type) {
+                                dictList = defList;
+                            } else if (UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
+                                dictList = treeDataToListByChildFieldName(defList, "children");
+                            }
+
+                            let filteredDict = dictList.find(item => item.value == formItemValue);
+                            if (filteredDict) {
+                                let ref_title = filteredDict.title;
+
+                                data[display_code] = ref_title;
+                                setFieldsValue({[display_code]: ref_title});
                             }
                         }
                     }
@@ -1155,6 +1193,68 @@ class FormForModify extends React.Component{
         }
     }
 
+    // 日期类型的值在表单中和state中的值对象不同(for_data_type: dataForForm || dataForState)
+    convertStringValueForFormula(ui_render_type, formItemValue, for_data_type) {
+        let value;
+        switch (ui_render_type) {
+            case UI_RENDER_TYPE.INPUT:
+            case UI_RENDER_TYPE.INPUT_NUMBER:
+            case UI_RENDER_TYPE.INPUT_PASSWORD:
+            case UI_RENDER_TYPE.TEXT_AREA:
+            case UI_RENDER_TYPE.TREE_SELECT:
+                value = formItemValue;
+                break;
+            case UI_RENDER_TYPE.SELECT:
+                if (typeof formItemValue === 'number') {
+                    value = formItemValue && formItemValue > 0 ? formItemValue : null;
+                } else {
+                    value = Number(formItemValue);
+                    value = formItemValue && formItemValue > 0 ? formItemValue : null;
+                }
+                break;
+            case UI_RENDER_TYPE.DATE:
+                if (for_data_type == "dataForForm") {
+                    value = (formItemValue ? moment(formItemValue) : "");
+                } else {
+                    value = formItemValue;
+                }
+                break;
+            case UI_RENDER_TYPE.DATE_YEAR:
+                if (for_data_type == "dataForForm") {
+                    value = (formItemValue ? moment(formItemValue, 'YYYY') : "");
+                } else {
+                    value = formItemValue;
+                }
+                break;
+            case UI_RENDER_TYPE.DATE_MONTH:
+                if (for_data_type == "dataForForm") {
+                    value = (formItemValue ? moment(formItemValue, 'YYYYMM') : "");
+                } else {
+                    value = formItemValue;
+                }
+                break;
+            case UI_RENDER_TYPE.DATE_TIME:
+                if (for_data_type == "dataForForm") {
+                    value = (formItemValue ? moment(formItemValue).format("YYYY-MM-DD hh:mm:ss") : "");
+                } else {
+                    value = formItemValue;
+                }
+                break;
+            case UI_RENDER_TYPE.SWITCH:
+                if (typeof formItemValue === 'boolean') {
+                    value = formItemValue;
+                } else {
+                    value = (((formItemValue + '' || '').toLowerCase() === 'true' || (formItemValue + '' || '').toLowerCase() === '1') ? true : false);
+                }
+                break;
+            default:
+                value = formItemValue;
+                break;
+        }
+
+        return value;
+    }
+
     switchOnChange(config, callback, checked, event) {
         this.formItemOnChangeForFormula(config, checked);