Merge remote-tracking branch 'origin/master'

FormInsertDiy/RenderForm/index.js

-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import ZdyTable from '@/webPublic/one_stop_public/Table';
 import styles from './index.less';
 import { fetchTemplateByCode, fetchTableItem } from '@/webPublic/Services';
 
 export default function RenderForm({ get = 'web', isCg = 'yes', ...rest }) {
+  const tableRoot = useRef();
+  useEffect(() => {
+    const timerId =  setTimeout(() => {
+      const div = tableRoot.current && tableRoot.current.root;
+      if (div) {
+        div.style.overflow = 'unset';
+      }
+    }, 0);
+    return () => {
+      clearTimeout(timerId);
+    }
+  }, []);
   return (
     <div className={styles.zyd_onestop_style_class}>
-      <ZdyTable get={get} isCg={isCg} {...rest} />
+      <ZdyTable ref={tableRoot} get={get} isCg={isCg} {...rest} />
     </div>
   );
 }

FormInsertDiy/RenderForm/index.less

 .zyd_onestop_style_class{
   padding: 20px;
-  table, td, div{
+  table, td{
     overflow: unset !important;
   }
 

node_modules/.package_versions.json

+{}
\ No newline at end of file

one_stop_public/tableCompon/index.jsx

@@ -1665,7 +1665,7 @@ export default class tableCom extends Component {
 
 
       if (json.isLabel) {
-        if (obj.defaultValues && obj.defaultValues[formKey]) {
+        if (obj&&obj.defaultValues && obj.defaultValues[formKey]) {
           if(!isEdit ){
             return (
             <Row