@bchr/bchr-front-lib 0.3.105 → 0.3.106

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

@@ -62,6 +62,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var FormulasValueType = {
   Disabled: "disabled",
   Enabled: "enabled",
+  Clear: "clear",
   Function: "AppFormulaFunctions"
 };
 
@@ -748,6 +749,14 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
             } else if (FormulasValueType.Enabled == formItemValue) {
               otherFormItemConfig.b_disabled = false;
               otherFormItemConfig.b_readonly = false;
+            } else if (FormulasValueType.Clear == formItemValue) {
+              data[code] = null;
+              setFieldsValue(_defineProperty({}, code, null));
+
+              if (display_code) {
+                data[display_code] = null;
+                setFieldsValue(_defineProperty({}, display_code, null));
+              }
             } else if (formItemValue.startsWith(FormulasValueType.Function)) {
               var formulaFunctionValue;
 
@@ -834,11 +843,20 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         return;
       }
 
-      for (var i = 0, len = info_set_fields.length; i < len; i++) {
+      var fieldsLength = info_set_fields.length; // first parse formula
+
+      for (var i = 0; i < fieldsLength; i++) {
         var formItem = info_set_fields[i];
         this.preParseFormItemExtConfig(formItem);
-        var code = formItem.code,
-            ui_render_type = formItem.ui_render_type;
+        formItem.b_disabled = formItem.b_readonly;
+        fieldCodeKeyMap[formItem.code] = formItem;
+      } // then initialization form item
+
+
+      for (var _i2 = 0; _i2 < fieldsLength; _i2++) {
+        var _formItem = info_set_fields[_i2];
+        var code = _formItem.code,
+            ui_render_type = _formItem.ui_render_type;
         var fieldCodeValue = data[code];
 
         if (_consts.UI_RENDER_TYPE.SWITCH == ui_render_type) {
@@ -846,11 +864,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         }
 
         if (fieldCodeValue) {
-          this.formItemOnChangeForFormula(formItem, fieldCodeValue);
+          this.formItemOnChangeForFormula(_formItem, fieldCodeValue);
         }
-
-        formItem.b_disabled = formItem.b_readonly;
-        fieldCodeKeyMap[formItem.code] = formItem;
       }
 
       this.setState({

package/package.json

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

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

@@ -27,6 +27,7 @@ import '../../../AppFormulaFunctions'
 const FormulasValueType = {
     Disabled : "disabled",
     Enabled  : "enabled",
+    Clear    : "clear",
     Function : "AppFormulaFunctions",
 }
 
@@ -49,11 +50,21 @@ class FormForModify extends React.Component{
             return;
         }
 
-        for (let i = 0, len = info_set_fields.length; i < len; i++) {
+        let fieldsLength = info_set_fields.length;
+        // first parse formula
+        for (let i = 0; i < fieldsLength; i++) {
             let formItem = info_set_fields[i];
 
             this.preParseFormItemExtConfig(formItem);
 
+            formItem.b_disabled = formItem.b_readonly;
+            fieldCodeKeyMap[formItem.code] = formItem;
+        }
+
+        // then initialization form item
+        for (let i = 0; i < fieldsLength; i++) {
+            let formItem = info_set_fields[i];
+
             let {code, ui_render_type} = formItem;
             let fieldCodeValue = data[code];
 
@@ -64,9 +75,6 @@ class FormForModify extends React.Component{
             if (fieldCodeValue) {
                 this.formItemOnChangeForFormula(formItem, fieldCodeValue);
             }
-
-            formItem.b_disabled = formItem.b_readonly;
-            fieldCodeKeyMap[formItem.code] = formItem;
         }
 
         this.setState({
@@ -1085,6 +1093,14 @@ class FormForModify extends React.Component{
 
                         otherFormItemConfig.b_disabled = false;
                         otherFormItemConfig.b_readonly = false;
+                    } else if (FormulasValueType.Clear == formItemValue) {
+                        data[code] = null;
+                        setFieldsValue({[code]: null});
+
+                        if (display_code) {
+                            data[display_code] = null;
+                            setFieldsValue({[display_code]: null});
+                        }
                     } else if (formItemValue.startsWith(FormulasValueType.Function)) {
                         let formulaFunctionValue;
                         if (formItemValue.search("#value#") !== -1) {