Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/tableCompon/Split_Index/RangePickerDiy.js

@@ -47,7 +47,7 @@ export default function RangePickerDiy(props){
   const [bindValue, setBindValue] = useState([undefined, undefined]);
 
   useEffect(() => {
-    console.log('RangePickerDiy组件Value', value);
+    // console.log('RangePickerDiy组件Value', value);
     if(!value || !Array.isArray(value) || value.length !==2){
       setBindValue([undefined, undefined]);
 

one_stop_public/utils/myutils.js

@@ -85,6 +85,7 @@ export function changeFromDraftState2(editorState) {
 }
 
 export function preHandle(values) {
+  // console.trace('123');
 	for (var key in values) {
 		if (!values[key]) continue;
 		if (key.indexOf('$') > -1) {
@@ -118,13 +119,14 @@ export function preHandle(values) {
 								  j.split('$').map((g,index) => {
 								    if(moment.isMoment(childObj[j][index])){
 								      childObj[g] = childObj[j][index].valueOf();
-                      childObj[j][index] = childObj[j][index].valueOf();
+                   //   childObj[j][index] = childObj[j][index].valueOf();
                     }
                   });
                   if(j === 'LckrMFujFgw$LckrXpIoQdc'){
-                    console.log(values[key][k][j], key, k, j);
+                    // console.log(values[key][k]['LckrMFujFgw'], key, k, j);
+                    // console.log(values[key][k]['LckrXpIoQdc'], key, k, j);
                   }
-                  // delete childObj[j];
+                  delete childObj[j];
                 // 我写的代码
 
 								  // 欢哥写的代码.
@@ -167,6 +169,9 @@ export function deepCopy(obj, parent = null) {
 	if (React.isValidElement(obj)) {
 		return React.cloneElement(obj);
 	}
+	// if(moment.isMoment(obj)){
+	//   return moment().clone)
+  // }
 	if (['boolean', 'string', 'number'].indexOf(typeof obj) > -1 || !obj) {
 		return obj;
 	}