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

FormInsertDiy/Export/index.js

@@ -359,7 +359,7 @@ export default class Index extends React.Component {
     } = this.state;
     return (
       <span>
-        <Button  onClick={this.open}>自定义导出</Button>
+        <Button shape='round' onClick={this.open}>自定义导出</Button>
         <div id='downloadDiv' style={{ display: 'none' }}></div>
         <Modal
           width={670}

FormInsertDiy/List/index.js

@@ -183,7 +183,7 @@ class FormList extends React.Component {
     }
     params = {
       ...params,
-      ...formValues,
+      query: JSON.stringify(formValues),
     };
     fetchData({ ...params, dataObjId: objId }, res => {
       if (!res.rows) {
@@ -306,6 +306,7 @@ class FormList extends React.Component {
       formValues,
       searchConfig,
     } = this.state;
+    const { hasExport, hasImport } = this.props;
 
     const parentMethods = {
       handleAdd: this.handleAdd,
@@ -343,18 +344,9 @@ class FormList extends React.Component {
             <Shell>
               <div style={{ paddingLeft: '10px', marginTop: '20px' }}>
                 <ButtonDiy icon="plus" className="primaryBlue" handleClick={this.add} name="新建" />
-                <ImportUtil objId={objId} />
-                <span>&nbsp;&nbsp;</span>
-
-                <ExportInfo objId={objId} />
-                <span>&nbsp;&nbsp;</span>
-                {selectedRows.length > 0 && (
-                  <ButtonDiy
-                    handleClick={this.batchDelete}
-                    name="批量删除"
-                    className="primaryRed"
-                  />
-                )}
+                {hasImport && <ImportUtil objId={objId} />}
+                {hasExport && <ExportInfo objId={objId} />}
+                <ButtonDiy handleClick={this.batchDelete} name="批量删除" />
               </div>
               <StandardTable
                 rowKey="row_id"

FormInsertDiy/config/index.js

@@ -61,7 +61,7 @@ const transLateTimeTOUnix = (value, dataType) => {
 const getFormArrayConfig = header => {
   let config = [];
   for (let item of header) {
-    if (item.isPrimaryKey) {
+    if (item.isPrimaryKey || item.isHidden) {
       // 主键
       continue;
       /* config.push(

one_stop_public/tableCompon/index.jsx

@@ -1375,7 +1375,7 @@ export default class tableCom extends Component {
             return <>{this.props.form.getFieldDecorator(uid, {
               initialValue: obj[this.props.uuid]||json.initialValue
     
-            })(<Input type="hidden" />)}<span style={{ fontWeight: get == 'mobile' ? 'bold' : '', marginRight: get == 'mobile' ? 12 : '' }} {...json.props}>{obj[this.props.uuid]}</span></>
+            })(<Input type="hidden" />)}<span style={{ fontWeight: get == 'mobile' ? 'bold' : '', marginRight: get == 'mobile' ? 12 : '' }} {...json.props}>{obj[this.props.uuid]||json.initialValue}</span></>
     
           }else{
             return <>{this.props.form.getFieldDecorator(uid, {