解决冲突

FormInsertDiy/AffairPage/ApplyPage/List.js

@@ -88,7 +88,6 @@ export default class List extends Component {
       list: [],
       loading: true,
     });
-
     search.getPageService({ ...data, appId: workId }).then((response) => {
       this.setState({
         loading: false,

FormInsertDiy/AffairPage/ApplyPage/index.js

@@ -24,12 +24,12 @@ export default class AffairPage extends React.Component {
   constructor(props) {
     super(props);
     let pathname = this.props.location.pathname;
-
+    const { dataBaseId, workId } = this.props;
     this.state = {
       showIframe: false,
       columns: [],
       pathname,
-      workId: '',
+      workId: workId || '',
       searchCondition: [],
       dataBaseId: '',
       addFields: [], // 新增时填写的字段。
@@ -138,14 +138,25 @@ export default class AffairPage extends React.Component {
       return false;
     }
     const {  pathname } = this.state;
-     service.getId(pathname).then((x)=>{
-       this.setState({
-         workId: x.workId,
-         dataBaseId: x.dataBaseId,
-       },()=>{
-         this.getColumns();
-       })
-     });
+    const { dataBaseId, workId } = this.props;
+    if(dataBaseId || workId){
+      this.setState({
+        workId,
+        dataBaseId,
+      },()=>{
+        this.getColumns();
+      });
+    }else{
+      service.getId(pathname).then((x)=>{
+        this.setState({
+          workId: x.workId,
+          dataBaseId: x.dataBaseId,
+        },()=>{
+          this.getColumns();
+        })
+      });
+    }
+
 
     window.addEventListener('message', (event) => {
       if (event.data === 'returnList') {
@@ -178,6 +189,7 @@ export default class AffairPage extends React.Component {
     const { workId, dataBaseId, addFields, showIframe, renderIframe } = this.state;
     const url = config.onestopPC.split('/#/');
     let iframeUrl = `${url[0]}/#/IFrameForApply?id=${workId}&token=${getToken()}`;
+    console.log(iframeUrl);
     // iframeUrl = `http://localhost:8000/onestop/IFrameForApply?id=${workId}&token=${getToken()}`;
     return (
       <PageHeaderWrapper title="">

FormInsertDiy/AffairPage/AuditPage/index.js

@@ -15,15 +15,16 @@ import { Link } from 'dva/router';
 export default class Index extends React.Component {
   constructor(props) {
     super(props);
+
     let pathname = this.props.location.pathname;
     this.state = {
       columns: [],
       dataList: [],
       headerInfo: [],
-      workId: '',
+      workId: this.props.workId || '',
       searchCondition: [],
       pathname,
-      dataBaseId: '',
+      dataBaseId: this.props.dataBaseId || '',
       addCondition: [],
       addFields: [], // 新增时填写的字段。
       tableInfo: {}, // 表格配置属性
@@ -94,14 +95,20 @@ export default class Index extends React.Component {
 
   componentDidMount() {
     const {  pathname } = this.state;
-    service.getId(pathname).then((x)=>{
-      this.setState({
-        workId: x.workId,
-        dataBaseId: x.dataBaseId,
-      },()=>{
-        this.getColumn();
-      })
-    });
+    const { workId } = this.state;
+    if(workId){
+      this.getColumn();
+    }else{
+      service.getId(pathname).then((x)=>{
+        this.setState({
+          workId: x.workId,
+          dataBaseId: x.dataBaseId,
+        },()=>{
+          this.getColumn();
+        })
+      });
+    }
+
   }
 
   render() {

FormInsertDiy/AffairPage/destruction.js

 import { text, number, date, format, taskNode } from '../config/index';
 import { isJSON } from '@/baseComponent/utils';
 import { translateAddFields } from '../config/index';
-import ColumnsRender from '@/highOrderComponent/ColumnsRender';
+import config from '@/config/config';
 import { Tooltip } from 'antd';
 import moment from 'moment';
 import React from 'react';
@@ -314,7 +314,12 @@ export function handleColumns(columns){
     if (item.dataType) {
       if (text.indexOf(item.dataType) > -1) { // 文本类型字段
         item.render = (text) => {
-          if (typeof text === 'string' && text.length > 20) {
+          if(item.extendType === 'file' && typeof text === 'string'){
+            let url = text.includes('http') ? text : config.sqlFormsServer + text;
+            console.log(url);
+            return <a href={url} target={'_blank'}>点击查看</a>;
+          }
+         else if (typeof text === 'string' && text.length > 20) {
             const oldTitle = text;
             const newTitle = text.slice(0, 7) + '...';
             return (
@@ -322,8 +327,14 @@ export function handleColumns(columns){
                 <span key={text}>{newTitle}</span>
               </Tooltip>
             );
-          } else if (typeof text === 'object' && Array.isArray(text.files) && text.files.length) {
-            return <a href={text.files[0].path} target={'_blank'}>点击查看</a>;
+          } else if (item.extendType === 'file' &&
+            typeof text === 'object' && Array.isArray(text.files) && text.files.length) {
+            let url = text.files[0].path.includes('http') ?
+              text.files[0].path :
+              config.sqlFormsServer + text.files[0].path;
+            return <a href={url} target={'_blank'}>
+              点击查看
+            </a>;
           } else {
             return text;
           }

one_stop_public/libs/ChildForm.jsx

 import React from 'react'
-import {  Button,  Row, Col, message } from 'antd';
+import { Button, Row, Col, message } from 'antd';
 import ZdyTable from '../Table'
 import UUID from 'react-native-uuid';
 
-import { Card, WingBlank} from 'antd-mobile';
+import { Card, WingBlank } from 'antd-mobile';
 
 
 export default class ChildForm extends React.Component {
@@ -142,11 +142,37 @@ export default class ChildForm extends React.Component {
                             span={span}
                         >
 
-                            <ZdyTable formConfig={datas} key={r} fatherCode={base52} isEdit={isEdit} index={r} obj={objs[r]} fatherObj={this.props.fatherObj} init={objs} isChild={true} get="web" form={form} mapData={mapData} sqlData={sqlData} {...datas} defaultValues={defaultValues} />
+                            <ZdyTable
+                                formConfig={datas}
+                                key={r}
+                                fatherCode={base52}
+                                isEdit={isEdit}
+                                index={r}
+                                obj={objs[r]}
+                                fatherObj={this.props.fatherObj}
+                                init={objs} isChild={true}
+                                get="web"
+                                form={form}
+                                mapData={mapData}
+                                sqlData={sqlData}
+                                {...datas}
+                                defaultValues={defaultValues} />
 
                             {rights.includes("delete") && isEdit ? <Button size="small"
-                                style={{ position: "absolute", right: 10, top: '50%',transform:'translateY(-50%)' }}
-                                type='danger' onClick={this.delete.bind(this, r)}>{deleteName || "删除"}</Button> : ""}
+                                style={{
+                                    position: "absolute",
+                                    left: ' 95%',
+                                    top: '10px',
+                                    transform: 'translateY(-50%)',
+                                    borderRadius: '50%',
+                                    height: '13px',
+                                    width: '13px',
+                                    padding: 0,
+                                    lineHeight: '10px'
+                                }}
+                                type='danger'
+                                onClick={this.delete.bind(this, r)}>{deleteName || "-"}
+                            </Button> : ""}
 
                         </Col>
 

one_stop_public/libs/TableSelect.js

@@ -14,18 +14,13 @@ export default class TableSelect extends React.Component {
   constructor(props) {
     super(props)
     const value = props.value || {};
-    
+
     this.state = {
-      selects: value.selects||{},
-      visiable:  value.visiable ,
-      isAll:value.isAll!=null?value.isAll:false,
-      querys: value.querys||[],
+      selects: value.selects || {},
+      visiable: value.visiable,
+      isAll: value.isAll != null ? value.isAll : false,
+      querys: value.querys || [],
       sql: value.sql,
-
-    
-
-      
-
     }
   }
 
@@ -33,6 +28,7 @@ export default class TableSelect extends React.Component {
     // Should provide an event to pass value to Form.
     const onChange = this.props.onChange;
     if (onChange) {
+      console.log("changedValue", changedValue)
       onChange(Object.assign({}, this.state, changedValue));
     }
   }
@@ -40,50 +36,50 @@ export default class TableSelect extends React.Component {
     // Should be a controlled component.
     if ('value' in nextProps) {
       const value = nextProps.value;
-     
-     if(value!=null&& value instanceof Object){
+
+      if (value != null && value instanceof Object) {
         this.setState(value);
       }
       //
     }
   }
   remove = (rowKey) => {
+    console.log(rowKey)
     const { selects } = this.state
     delete selects[rowKey]
+    console.log(selects)
     if (!('value' in this.props)) {
       this.setState({ selects });
     }
-    this.triggerChange({ selects});
-
- 
+    this.triggerChange({ selects });
   }
-  
+
   select = (obj) => {
-    var { selects} = this.state
-    const { json: {  isMultiple ,optionType} } = this.props
+    var { selects } = this.state
+    const { json: { isMultiple, optionType } } = this.props
     let valueName = this.props.json.valueName
-    
-    if(optionType == "reference" &&this.props.dataColumn.referenceObjId){
-      valueName=this.props.dataColumn.referenceCodeName
-      
+
+    if (optionType == "reference" && this.props.dataColumn.referenceObjId) {
+      valueName = this.props.dataColumn.referenceCodeName
+
     }
-   
+
     const kk = obj[valueName]
     if (kk == null) {
       message.error("指定的取值字段不存在或者值为空")
       return
     }
     if (!isMultiple) {
-      selects = { [kk]: {...obj,selectKey:kk} }
+      selects = { [kk]: { ...obj, selectKey: kk } }
     } else {
       selects[kk] = obj;
-      selects[kk].selectKey=kk
+      selects[kk].selectKey = kk
     }
 
     if (!('value' in this.props)) {
       this.setState({ selects });
     }
-    this.triggerChange({ selects});
+    this.triggerChange({ selects });
 
 
 
@@ -96,37 +92,35 @@ export default class TableSelect extends React.Component {
     values.splice(i, 1)
     labels.splice(i, 1)
     if (!('value' in this.props)) {
-      this.setState({ values, labels});
+      this.setState({ values, labels });
     }
     this.triggerChange({ values, labels });
 
-   
+
 
   }
   open = () => {
-   
+
     if (!('value' in this.props)) {
-      this.setState({ visiable: true});
+      this.setState({ visiable: true });
     }
     this.triggerChange({ visiable: true });
 
   }
   closeModal = () => {
     if (!('value' in this.props)) {
-      this.setState({ visiable: false});
+      this.setState({ visiable: false });
     }
     this.triggerChange({ visiable: false });
 
   }
 
   render() {
-
-    const { json: { isMultiple, sql, optionType, showTable }, dataColumn: { referenceObjId }, sqlModel, columns,dataSource } = this.props
-    let { valueName, labelName} =this.props.json
-   
-    if(optionType == "reference" &&referenceObjId){
-      valueName=this.props.dataColumn.referenceCodeName
-      labelName=this.props.dataColumn.referenceNameName
+    const { json: { isMultiple, sql, optionType, showTable }, dataColumn: { referenceObjId }, sqlModel, columns, dataSource } = this.props
+    let { valueName, labelName } = this.props.json
+    if (optionType == "reference" && referenceObjId) {
+      valueName = this.props.dataColumn.referenceCodeName
+      labelName = this.props.dataColumn.referenceNameName
     }
 
 
@@ -134,45 +128,44 @@ export default class TableSelect extends React.Component {
     if (valueName == null || valueName == "") {
       return <>请指定取值的列名</>
     }
-    const { selects, visiable, labels} = this.state
+    const { selects, visiable, labels } = this.state
 
 
 
-    const keys=[]
-    for(let i in selects){
+    const keys = []
+    for (let i in selects) {
       keys.push(selects[i][valueName])
     }
 
 
-    const columns2=[...columns,{
-      title:"操作",
-      render:(val,record)=><a onClick={this.remove.bind(this,record.selectKey)}>移除</a>
+    const columns2 = [...columns, {
+      title: "操作",
+      render: (val, record) => <a onClick={this.remove.bind(this, record.selectKey)}>移除</a>
     }]
-    const columns3=[...columns,{
-      title:"操作",
-    
-      render:(val,record)=>
-      keys.includes(record[valueName])?<span>已选择</span>:<a onClick={this.select.bind(this,record)}>选择</a>
+    const columns3 = [...columns, {
+      title: "操作",
+      render: (val, record) =>
+        keys.includes(record[valueName]) ? <span>已选择</span> : <a onClick={this.select.bind(this, record)}>选择</a>
     }]
-   const custom={
-    isAll:this.state.isAll,
-    querys: this.state.querys,
-    sql: this.state.sql,
-   }
-    console.log(columns3)
+    const custom = {
+      isAll: this.state.isAll,
+      querys: this.state.querys,
+      sql: this.state.sql,
+    }
+    // console.log(columns3)
     let allWidth = 0
-    if(columns3) {
-      columns3.map((item,index) => {
-        if(index === columns3.length-1){
+    if (columns3) {
+      columns3.map((item, index) => {
+        if (index === columns3.length - 1) {
           item.fixed = 'right'
           item.width = 50
           allWidth += 50
           return item
         }
-        if(index === columns3.length-2){
+        if (index === columns3.length - 2) {
           allWidth += 150
         } else {
-          if(item.width){
+          if (item.width) {
             allWidth += item.width
           } else {
             item.width = 180
@@ -182,23 +175,20 @@ export default class TableSelect extends React.Component {
         return item
       })
     }
+    console.log(selects, Object.keys(selects).length)
     return (
       <div>
-
-        {Object.keys(selects).length > 0 ? showTable ? <Table rowKey={valueName} size="small" dataSource={Object.values(selects)} columns={columns2} pagination={false} /> :
-
-          Object.keys(selects).map((k) => <Tag key={k} closable onClose={this.remove.bind(this, k)}>{selects[k][labelName]}</Tag>)
+        {Object.keys(selects).length > 0 ?
+          showTable ? <Table rowKey={valueName} size="small" dataSource={Object.values(selects)} columns={columns2} pagination={false} /> :
+            Object.keys(selects).map((k) => <Tag key={k} closable onClose={this.remove.bind(this, k)}>{selects[k][labelName]}</Tag>)
           : ""
-
         }
 
 
         <Button type="primary" onClick={this.open}>选择</Button>
         <Modal
-          width="1200px"
+          width="60%"
           maskClosable={false}
-
-
           title={`请选择`}
           visible={visiable}
           onOk={this.closeModal}
@@ -206,9 +196,10 @@ export default class TableSelect extends React.Component {
         >
 
           {optionType == "reference" ? referenceObjId ?
-            <FormList rights={this.props.rights || []} notShowBack={true} value={custom}  objId={referenceObjId} isFormCom={true} isSelect={true}   selects={keys} valueName={valueName} callback={this.select} sql={sql} /> : "未关联数据对象"
+            <FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={referenceObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} />
+            : "未关联数据对象"
             : sqlModel.dataObjId ?
-              <FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={sqlModel.dataObjId} isFormCom={true} isSelect={true}   selects={keys} valueName={valueName} callback={this.select} sql={sql} />
+              <FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={sqlModel.dataObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} />
               : <Table rowKey={valueName} size="small" dataSource={dataSource.list} columns={columns3} scroll={{ x: allWidth }} />}
         </Modal>
       </div>

one_stop_public/libs/formList/index.js

@@ -731,7 +731,7 @@ class FormList extends React.Component {
             {form.getFieldDecorator(item.name, {
               initialValue: formData == null ? '' : formData[item.name],
               rules: [{ required: !item.isNull }],
-            })(<Input readOnly={!isAdd} placeholder="请输入"/>)}
+            })(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入"/>)}
           </FormItem>
         );
       }
@@ -771,7 +771,7 @@ class FormList extends React.Component {
           {form.getFieldDecorator(item.name, {
             initialValue: formData == null ? '' : formData[item.name],
             rules: [{ required: !item.isNull }],
-          })(<Input placeholder="请输入"/>)}
+          })(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
         </FormItem>
       );
     } else if (number.indexOf(item.type) > -1) {
@@ -818,7 +818,7 @@ class FormList extends React.Component {
           {form.getFieldDecorator(item.name, {
             initialValue: formData == null ? '' : formData[item.name],
             rules: [{ required: !item.isNull }],
-          })(<Input placeholder="请输入"/>)}
+          })(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
         </FormItem>
       );
     }
@@ -832,11 +832,12 @@ class FormList extends React.Component {
     if (querys.length == 0) {
       return '';
     }
+
     return (
       <Form layout="inline">
         <Row >
           {querys.map((item) =>
-            <Col  span={8}  key={item.id}>
+            <Col style={{height:58}} span={8}  key={item.id}>
               {this.getItem(true,form, {
                 ...item,
                 isNull: true

zyd_public/LoginFromQrCode/index.js

@@ -8,7 +8,7 @@ import LoginWithQrCode from './LoginWithQrCode';
  *  wxSocketGateWay: websocket链接地址 'ws://scjoyedu.eicp.net:51337/wswx/test106/socket/'
  *  mockServer: 获取sessionId 接口前缀  'http://scjoyedu.eicp.net:51337/test106',
  * */
-export default function LoginByQrCode({ url, LoginType, wxSocketGateWay, mockServer }) {
+export default function LoginByQrCode({ hintStyle, url, LoginType, wxSocketGateWay, mockServer }) {
   return (
     <div>
       <div style={{ backgroundColor: 'white', width: 288, padding: 10, margin: 'auto' }}>
@@ -19,7 +19,7 @@ export default function LoginByQrCode({ url, LoginType, wxSocketGateWay, mockSer
           wxSocketGateWay={wxSocketGateWay}
         />
       </div>
-      <div style={{ marginTop: 20, color: 'white' }}>
+      <div style={{ marginTop: 20, color: 'white', ...hintStyle, }}>
         请使用
         <span style={{ color: 'red' }}>微信扫一扫</span>
         扫码登录