@bchr/bchr-front-lib 0.3.88 → 0.3.89

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

@@ -163,7 +163,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
                     } else if (item.formItemValue === 'enabled') {
                       formItem.b_disabled = false;
                     } else {
-                      formItem.initialValue = item.formItemValue || '';
+                      formItem.initialValue = item.formItemValue || data[formItem.display_code];
                     }
                   }
                 });
@@ -177,10 +177,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
                 var formulaValueOf = formItem.ui_render_type === 'switch' ? (editFormulaConfig.onValueOf || '').toLowerCase() !== 'true' : editFormulaConfig.onValueOf;
 
                 if (formulaValueOf === initialValue) {
-                  editFormulasState.push({
-                    editFormulasStateCode: formItem.code,
-                    editFormulaItem: editFormulaConfig
-                  });
                   var currentOtherFormItemResponses = editFormulaConfig.otherFormItemResponses;
                   currentOtherFormItemResponses.forEach(function (item) {
                     info_set_fields.forEach(function (formItemInner) {
@@ -190,7 +186,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
                         } else if (item.formItemValue === 'enabled') {
                           formItemInner.b_disabled = false;
                         } else {
-                          formItemInner.initialValue = item.formItemValue || '';
+                          formItemInner.initialValue = item.formItemValue || data[formItem.display_code];
                         }
                       }
                     });
@@ -385,7 +381,12 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
 
       display_code = display_code || code;
       var initialValue = dataItem.initialValue || data[code];
-      var displayValue = dataItem.initialValue || data[display_code];
+      var displayValue = data[display_code];
+
+      if (code === 'old__end_date$i_hi_person_contract') {
+        console.log(code, initialValue);
+      }
+
       var component, valuePropName;
 
       if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -464,36 +465,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
             }, ext_props));
             break;
 
-          case _consts.UI_RENDER_TYPE.DATE_YEAR:
-            initialValue = initialValue ? (0, _moment["default"])(initialValue) : "";
-            displayValue = displayValue ? (0, _moment["default"])(displayValue).format("YYYY") : "";
-            component = (b_disabled !== undefined ? b_disabled : b_readonly) ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.DatePicker, _extends({
-              key: form_id + "_" + code,
-              getPopupContainer: function getPopupContainer() {
-                return document.getElementById("ant_form_item_".concat(code));
-              },
-              placeholder: "请选择" + name,
-              picker: "year",
-              onChange: _this2.datePickerOnChange.bind(_assertThisInitialized(_this2), dataItem, onChange),
-              disabledDate: _this2.disabledDate.bind(_assertThisInitialized(_this2), dataItem)
-            }, ext_props));
-            break;
-
-          case _consts.UI_RENDER_TYPE.DATE_MONTH:
-            initialValue = initialValue ? (0, _moment["default"])(initialValue) : "";
-            displayValue = displayValue ? (0, _moment["default"])(displayValue).format("YYYY-MM") : "";
-            component = (b_disabled !== undefined ? b_disabled : b_readonly) ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.DatePicker, _extends({
-              key: form_id + "_" + code,
-              getPopupContainer: function getPopupContainer() {
-                return document.getElementById("ant_form_item_".concat(code));
-              },
-              placeholder: "请选择" + name,
-              picker: "month",
-              onChange: _this2.datePickerOnChange.bind(_assertThisInitialized(_this2), dataItem, onChange),
-              disabledDate: _this2.disabledDate.bind(_assertThisInitialized(_this2), dataItem)
-            }, ext_props));
-            break;
-
           case _consts.UI_RENDER_TYPE.DATE_TIME:
             initialValue = initialValue ? (0, _moment["default"])(initialValue) : "";
             displayValue = displayValue ? (0, _moment["default"])(displayValue).format("YYYY-MM-DD hh:mm:ss") : "";
@@ -747,7 +718,35 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
 
   _createClass(FormForModify, [{
     key: "componentDidMount",
-    value: function 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] || '').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
+              });
+            }
+          }
+        }
+      });
+      this.setState({
+        editFormulasState: editFormulasState
+      });
+    }
   }, {
     key: "validator",
     value: function validator(b_required, ui_render_type, rule, value) {
@@ -926,6 +925,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
       }
 
       if (config.editFormulaConfigs && config.editFormulaConfigs.length) {
+        var data = this.props.data;
         var editFormulasState = this.state.editFormulasState;
         var setFieldsValue = this.ref.current.setFieldsValue;
 
@@ -938,7 +938,11 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
             if (value) {
               editFormulaItem.otherFormItemResponses.forEach(function (item) {
                 if (item.formItemValue === 'disabled') {
-                  setFieldsValue(_defineProperty({}, item.formItemCode, ''));
+                  if (item.formItemCode.indexOf('date') !== -1) {
+                    setFieldsValue(_defineProperty({}, item.formItemCode, (0, _moment["default"])(data[item.formItemCode]) || ''));
+                  } else {
+                    setFieldsValue(_defineProperty({}, item.formItemCode, data[item.formItemCode] || ''));
+                  }
                 }
               });
             }
@@ -1014,7 +1018,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "buildTreeNode",
     value: function buildTreeNode(defNodes) {
-      var _this3 = this;
+      var _this4 = this;
 
       if (!defNodes || defNodes.length === 0) {
         return null;
@@ -1035,7 +1039,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
           ext_attr_value: ext_attr_value,
           selectable: item.selectable,
           prop: ext_attr_value
-        }, _this3.buildTreeNode(item.children));
+        }, _this4.buildTreeNode(item.children));
       });
     }
   }, {
@@ -1092,9 +1096,9 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "switchOnChange",
     value: function switchOnChange(config, callback, checked, event) {
-      var code = config.code;
-
       if (config.editFormulaConfigs && config.editFormulaConfigs.length) {
+        var data = this.props.data;
+        var code = config.code;
         var editFormulasState = this.state.editFormulasState;
         var setFieldsValue = this.ref.current.setFieldsValue;
         var editFormulaItem = config.editFormulaConfigs.filter(function (editFormulaItem) {
@@ -1104,7 +1108,11 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         if (editFormulaItem) {
           if (!checked) {
             editFormulaItem.otherFormItemResponses.forEach(function (item) {
-              setFieldsValue(_defineProperty({}, item.formItemCode, ''));
+              if (item.formItemCode.indexOf('date') !== -1) {
+                setFieldsValue(_defineProperty({}, item.formItemCode, (0, _moment["default"])(data[item.formItemCode]) || ''));
+              } else {
+                setFieldsValue(_defineProperty({}, item.formItemCode, data[item.formItemCode] || ''));
+              }
             });
           }
 
@@ -1159,14 +1167,14 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
     key: "deleteFile",
     value: function () {
       var _deleteFile = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(dataItem) {
-        var file_pk, _this$props, file_service_path, appconfig, _this;
+        var file_pk, _this$props2, file_service_path, appconfig, _this;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 file_pk = this.props.data[dataItem.code];
-                _this$props = this.props, file_service_path = _this$props.file_service_path, appconfig = _this$props.appconfig;
+                _this$props2 = this.props, file_service_path = _this$props2.file_service_path, appconfig = _this$props2.appconfig;
                 _context.prev = 2;
                 _this = this;
                 _context.next = 6;