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

FormInsertDiy/Export/index.js

@@ -77,7 +77,7 @@ export default class Index extends React.Component {
         objId: this.props.objId,
       },
       callback: (infos) => {
-      
+
         const mockData = [];
         const qs = [];
         const gs = [];
@@ -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}
@@ -368,7 +368,7 @@ export default class Index extends React.Component {
           title="自定义查询、排序、导出"
           style={{ textAlign: 'center' }}
           visible={visiable}
-      
+
           onOk={this.export}
           onCancel={this.onCancle}
           confirmLoading={confirmLoading}
@@ -376,7 +376,7 @@ export default class Index extends React.Component {
           <div style={{ overflowY: 'auto', maxHeight: '500px', height: '500px' }}>
           <div style={{ textAlign: 'left' }}>
               <Button type="primary">新增查询条件</Button>
-              
+
 
                 <Select style={{ width: 200, paddingRight: '10px' }}
                         value={currentQueryKey}
@@ -446,7 +446,7 @@ export default class Index extends React.Component {
             {currentOrderKey ?
               <span style={{ paddingLeft: '0' }}>
                  <Button type="primary"  onClick={this.okOrder}>确定</Button>
-                
+
                   </span>
               : ''}
             <div style={{ height: '12px' }}>
@@ -469,7 +469,7 @@ export default class Index extends React.Component {
                 <span style={{ paddingRight: '10px' }}>聚合条件:</span>
                 {!groupVisiable ?
                   <Button type="primary"  onClick={this.addGroup}>新增</Button>
-   
+
                   :
                   <span>
                 <Select style={{ width: 100 }}
@@ -489,11 +489,11 @@ export default class Index extends React.Component {
                 </Select>
                     {currentGroupKey ?
                           <Button type="primary"  onClick={this.okGroup}>确定</Button>
-                    
+
 
                       : ''}
                        <Button type="primary"  onClick={this.cancelGroup}>取消</Button>
-                 
+
               </span>}
                 {groups.map((r, i) =>
                   <FormItem key={i + r.name}
@@ -504,7 +504,7 @@ export default class Index extends React.Component {
                       <Input style={{ display: 'none' }}
                              value=""/>)}
                               <Button type="danger"  onClick={this.deleteGroup.bind(this, i)}>删除</Button>
-             
+
 
                   </FormItem>)}
               </div> : ''}

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

@@ -1366,7 +1366,7 @@ export default class tableCom extends Component {
       } else {
         uid= this.props.uuid 
       }
-     
+      
       if (!isEdit) {
         return obj[this.props.uuid] || json.initialValue || ""
       } else {
@@ -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, {