Commit c2b0f651 authored by zhangwenshuai's avatar zhangwenshuai

update sub

parent b9ba9c62
import React, { useRef, useState } from 'react'; import React, { useEffect, useRef, useState } from 'react';
import { DatePicker } from 'antd'; import { DatePicker } from 'antd';
import { antiAssign } from '../../../../utils/utils'; import { antiAssign } from '../../../../utils/utils';
import styles from './styles.less'; import styles from './styles.less';
...@@ -23,6 +23,9 @@ export const ApolloDate = (props: any) => { ...@@ -23,6 +23,9 @@ export const ApolloDate = (props: any) => {
selfProps.disabled = !!props.disabled; selfProps.disabled = !!props.disabled;
const isOpen: any = useRef(); const isOpen: any = useRef();
const [curValue, setCurValue] = useState(value); const [curValue, setCurValue] = useState(value);
useEffect(() => {
setCurValue(value);
}, [value]);
const changeValue = (date: any, dateString: string) => { const changeValue = (date: any, dateString: string) => {
setCurValue(date); setCurValue(date);
if (typeof onChange === 'function') { if (typeof onChange === 'function') {
......
import React, { useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Input } from 'antd'; import { Input } from 'antd';
import styles from './styles.less'; import styles from './styles.less';
import { antiAssign } from '../../../../utils/utils'; import { antiAssign } from '../../../../utils/utils';
...@@ -25,6 +25,9 @@ export const ApolloInput = (props: ApolloInputProps) => { ...@@ -25,6 +25,9 @@ export const ApolloInput = (props: ApolloInputProps) => {
]); ]);
selfProps.disabled = !!props.disabled; selfProps.disabled = !!props.disabled;
const [curValue, setCurValue] = useState(value); const [curValue, setCurValue] = useState(value);
useEffect(() => {
setCurValue(value);
}, [value]);
const changeValue = (value: any) => { const changeValue = (value: any) => {
setCurValue(value); setCurValue(value);
if (typeof onChange === 'function') { if (typeof onChange === 'function') {
......
import React, { useState } from 'react'; import React, { useEffect, useState } from 'react';
import { InputNumber } from 'antd'; import { InputNumber } from 'antd';
import styles from './styles.less'; import styles from './styles.less';
import { ApolloNumberProps } from '../editInterface'; import { ApolloNumberProps } from '../editInterface';
...@@ -24,6 +24,9 @@ export const ApolloNumber = (props: ApolloNumberProps) => { ...@@ -24,6 +24,9 @@ export const ApolloNumber = (props: ApolloNumberProps) => {
]); ]);
selfProps.disabled = !!props.disabled; selfProps.disabled = !!props.disabled;
const [curValue, setCurValue] = useState(value); const [curValue, setCurValue] = useState(value);
useEffect(() => {
setCurValue(value);
}, [value]);
const changeValue = (value: any) => { const changeValue = (value: any) => {
setCurValue(value); setCurValue(value);
if (typeof onChange === 'function') { if (typeof onChange === 'function') {
......
import React, { useState, useRef } from 'react'; import React, { useState, useRef, useEffect } from 'react';
import { message } from 'antd'; import { message } from 'antd';
import Search from '../../extra/associationSearch'; import Search from '../../extra/associationSearch';
import { ApolloSearchProps } from '../editInterface'; import { ApolloSearchProps } from '../editInterface';
...@@ -31,6 +31,9 @@ export const ApolloSearch = (props: ApolloSearchProps) => { ...@@ -31,6 +31,9 @@ export const ApolloSearch = (props: ApolloSearchProps) => {
selfProps.mode = 'multiple'; selfProps.mode = 'multiple';
} }
const [curValue, setCurValue] = useState(value); const [curValue, setCurValue] = useState(value);
useEffect(() => {
setCurValue(value);
}, [value]);
const isOpen: any = useRef(); const isOpen: any = useRef();
const changeValue = (value: any) => { const changeValue = (value: any) => {
if (isMultiple && maxCount && maxCount < value.length) { if (isMultiple && maxCount && maxCount < value.length) {
......
import React, { useRef, useState } from 'react'; import React, { useEffect, useRef, useState } from 'react';
import { Select } from 'antd'; import { Select } from 'antd';
import { ApolloSelectProps } from '../editInterface'; import { ApolloSelectProps } from '../editInterface';
import { antiAssign } from '../../../../utils/utils'; import { antiAssign } from '../../../../utils/utils';
...@@ -31,6 +31,9 @@ export const ApolloSelect = (props: ApolloSelectProps) => { ...@@ -31,6 +31,9 @@ export const ApolloSelect = (props: ApolloSelectProps) => {
selfProps.mode = 'multiple'; selfProps.mode = 'multiple';
} }
const [curValue, setCurValue] = useState(value); const [curValue, setCurValue] = useState(value);
useEffect(() => {
setCurValue(value);
}, [value]);
const isOpen: any = useRef(); const isOpen: any = useRef();
const changeValue = (value: any) => { const changeValue = (value: any) => {
setCurValue(value); setCurValue(value);
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* 失去焦点:onBlurFn * 失去焦点:onBlurFn
* */ * */
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Form, Button, message, Tooltip } from 'antd'; import { Form, Button, Tooltip } from 'antd';
import _ from 'lodash'; import _ from 'lodash';
import IconFont from '@/submodule/components/IconFont/IconFont'; import IconFont from '@/submodule/components/IconFont/IconFont';
import { emptyModel } from '../component/base/_utils/setFormatter'; import { emptyModel } from '../component/base/_utils/setFormatter';
...@@ -35,7 +35,7 @@ class FormWrap extends Component { ...@@ -35,7 +35,7 @@ class FormWrap extends Component {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
const { const {
rowId, form, handleSubmit, data, rowData, detailType, form, handleSubmit, data, rowData, detailType,
} = this.props; } = this.props;
form.validateFieldsAndScroll((err, values) => { form.validateFieldsAndScroll((err, values) => {
if (!err) { if (!err) {
...@@ -44,10 +44,11 @@ class FormWrap extends Component { ...@@ -44,10 +44,11 @@ class FormWrap extends Component {
const item = data.find((temp: any) => { const item = data.find((temp: any) => {
return temp.columnName === key; return temp.columnName === key;
}); });
const { columnType, columnAttrObj, renderEditForm, readOnlyFlag, dynamicCellConfigDTO } = item; const { columnType, renderEditForm, readOnlyFlag, dynamicCellConfigDTO } = item;
if (readOnlyFlag || (dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag)) { /** !!此方法只在新增时使用,因此只读数据也上传,此段代码暂时注释,后有问题再看 * */
return; // if (readOnlyFlag || (dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag)) {
} // return;
// }
let detailConfig: any; let detailConfig: any;
if (typeof renderEditForm === 'function') { if (typeof renderEditForm === 'function') {
detailConfig = renderEditForm({ cellData: values[key], rowData, columnConfig: item }); detailConfig = renderEditForm({ cellData: values[key], rowData, columnConfig: item });
...@@ -117,7 +118,7 @@ class FormWrap extends Component { ...@@ -117,7 +118,7 @@ class FormWrap extends Component {
renderEditForm = (item) => { renderEditForm = (item) => {
const { getFieldDecorator } = this.props.form; const { getFieldDecorator } = this.props.form;
const { rowData, rowId, getInstanceDetail, onEmitChange } = this.props; const { rowData, rowId, getInstanceDetail, onEmitChange, changeParams } = this.props;
const { const {
columnType, columnType,
columnName, columnName,
...@@ -169,9 +170,14 @@ class FormWrap extends Component { ...@@ -169,9 +170,14 @@ class FormWrap extends Component {
columnCode: columnName, columnCode: columnName,
cellValueList: changedValue, cellValueList: changedValue,
}); });
// 编辑时回调,调接口
if (typeof onEmitChange === 'function') { if (typeof onEmitChange === 'function') {
onEmitChange(extraData); onEmitChange(extraData);
} }
// 新增时回调,不调接口
if (typeof changeParams === 'function') {
changeParams(columnName, changedValue, optionValue);
}
}; };
return ( return (
<FormItem key={columnName} label={this.renderLabel(item)}> <FormItem key={columnName} label={this.renderLabel(item)}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment