@bchr/bchr-front-lib 0.3.147 → 0.3.150

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

@@ -484,7 +484,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
               initialValue = initialValue || [];
 
               if (_typeof(initialValue) !== "object") {
-                initialValue = initialValue ? JSON.parse(initialValue) : [];
+                initialValue = initialValue ? initialValue.split(",") : [];
               }
             } else {
               if (typeof initialValue === 'number') {
@@ -514,7 +514,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
               initialValue = data[code] || [];
 
               if (_typeof(initialValue) !== "object") {
-                initialValue = initialValue ? JSON.parse(initialValue) : [];
+                initialValue = initialValue ? initialValue.split(",") : [];
               }
             } else {
               initialValue = data[code] && data[code] > 0 ? data[code] + "" : null;
@@ -1220,7 +1220,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
     value: function treeSelectOnChange(ref, config, callback, value, label, extra) {
       var display_code = config.display_code;
       label = extra.allCheckedNodes.map(function (item) {
-        var props = item.node.props;
+        var node = item.node;
+        var props = node ? item.node.props : item.node;
         var ext_attr_value = props.ext_attr_value,
             title = props.title;
 
@@ -1430,6 +1431,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
 
         if (value instanceof _moment["default"] && value._f === 'YYYY' || value instanceof _moment["default"] && value._f === 'YYYYMM') {
           value = value ? value.format(value._f) : '';
+        } else if (value instanceof Array) {
+          value = value ? value.join(",") : null;
         }
 
         this.props.data[attr] = value;

package/lib/base/layout/ui_tpl/modal/FormModifyModal.js

@@ -41,7 +41,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var ButtonGroup = _antd.Button.Group;
 
-var FormModifyModal = function FormModifyModal(props) {
+var FormModifyModal = function FormModifyModal(props, ref) {
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      closeLoading: closeLoading
+    };
+  });
   var formref = props.formref,
       onOk = props.onOk,
       data = props.data,
@@ -130,5 +135,6 @@ var FormModifyModal = function FormModifyModal(props) {
   })))));
 };
 
-var _default = FormModifyModal;
+var _default = /*#__PURE__*/(0, _react.forwardRef)(FormModifyModal);
+
 exports["default"] = _default;

package/package.json

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

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

@@ -528,7 +528,7 @@ class FormForModify extends React.Component{
                     if (b_multiple) {
                         initialValue = initialValue || [];
                         if (typeof initialValue !== "object") {
-                            initialValue = initialValue ? JSON.parse(initialValue) : [];
+                            initialValue = initialValue ? initialValue.split(",") : [];
                         }
                     }
                     else {
@@ -568,7 +568,7 @@ class FormForModify extends React.Component{
                     if (b_multiple) {
                         initialValue = data[code] || [];
                         if (typeof initialValue !== "object") {
-                            initialValue = initialValue ? JSON.parse(initialValue) : [];
+                            initialValue = initialValue ? initialValue.split(",") : [];
                         }
                     }
                     else {
@@ -1041,7 +1041,8 @@ class FormForModify extends React.Component{
         let {display_code} = config;
 
         label = extra.allCheckedNodes.map(item => {
-            let props = item.node.props;
+            let node = item.node;
+            let props = node ? item.node.props : item.node;
             let {ext_attr_value, title} = props;
 
             if (ext_attr_value != null && ext_attr_value.length > 0 && title.indexOf(ext_attr_value) === 0) {
@@ -1348,6 +1349,8 @@ class FormForModify extends React.Component{
 
             if ((value instanceof moment && value._f === 'YYYY') || (value instanceof moment && value._f === 'YYYYMM')) {
                 value = value ? value.format(value._f) : '';
+            } else if (value instanceof Array) {
+                value = value ? value.join(",") : null;
             }
 
             this.props.data[attr] = value;

package/src/base/layout/ui_tpl/modal/FormModifyModal.js

@@ -1,11 +1,16 @@
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useState, forwardRef, useImperativeHandle} from 'react';
 import SModal from "../../modal/SModal";
 import {Button, message, Spin} from "antd";
 import FormForModify from "../form/FormForModify";
 import $ from 'jquery';
 
 const ButtonGroup = Button.Group;
-const FormModifyModal = (props) => {
+const FormModifyModal = (props, ref) => {
+
+    useImperativeHandle(ref, () => ({
+        closeLoading
+    }));
+
     let {
         formref,
         onOk,
@@ -77,4 +82,4 @@ const FormModifyModal = (props) => {
     )
 }
 
-export default FormModifyModal;
+export default forwardRef(FormModifyModal);