Commit d4011048 authored by alwayOnlie's avatar alwayOnlie

修改bug

parent 01bc2d1c
......@@ -11,28 +11,28 @@ const InternetError: React.FC<{}> = () => {
const handleReload = () => {
history.go(-1)
}
return (
<div className={styles.wrapper}>
<UserHeader logo={GlobalConfig.global.siteInfo.logo}/>
<UserHeader logo={GlobalConfig.global.siteInfo.logo} />
<div className={styles.errorBox}>
<Row>
<Row>
<Col span={12}>
<div className={styles.desc}>
<h1>哎呀!网络连接出错了</h1>
<h4>该错误可能由于如下原因所致:</h4>
<p>·电脑未连接到网络</p>
<p>·防火墙或杀毒软件阻止</p>
<Button
type="primary"
size="large"
style={{marginTop: 100}}
<Button
type="primary"
size="large"
style={{ marginTop: 100 }}
onClick={handleReload}
>刷新页面试试</Button>
</div>
</Col>
<Col span={12}>
<img className={styles.image} src={Img} alt="数商云服务"/>
<img className={styles.image} src={Img} alt="数商云服务" />
</Col>
</Row>
</div>
......
......@@ -162,15 +162,15 @@ const AddbillList: React.FC<{}> = () => {
};
const fetchOptions = (service) => {
return async function () {
const res = await service();
if (res.code === 1000) {
return res.data.map((item) => { return { label: item.name, value: item.status } })
}
return [];
}
}
// const fetchOptions = (service) => {
// return async function () {
// const res = await service();
// if (res.code === 1000) {
// return res.data.map((item) => { return { label: item.name, value: item.status } })
// }
// return [];
// }
// }
return (
......@@ -199,10 +199,10 @@ const AddbillList: React.FC<{}> = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncSelect(
"status",
fetchOptions(PublicApi.getContractApplyAmountGetStatusList)
)
// useAsyncSelect(
// "status",
// fetchOptions(PublicApi.getContractApplyAmountGetStatusList)
// )
},
components: {
DateRangePickerUnix,
......@@ -223,7 +223,7 @@ const AddbillList: React.FC<{}> = () => {
onClick={handleJumpAdd}
>
新建
</Button>
</Button>
</Space>,
layouts: {
span: 8
......
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants';
// import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants';
export const SchemaBli: any = {
type: 'object',
......@@ -51,14 +51,14 @@ export const SchemaBli: any = {
}
},
},
status: {
type: 'string',
enum: [],
"x-component-props": {
placeholder: '请选择内部状态'
},
title: '请选择外部状态',
},
// status: {
// type: 'string',
// enum: [],
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// title: '请选择外部状态',
// },
submit: {
'x-component': 'Submit',
'x-component-props': {
......@@ -113,14 +113,14 @@ export const addSchemaBli: ISchema = {
}
},
},
status: {
type: 'string',
enum: [],
"x-component-props": {
placeholder: '请选择内部状态'
},
title: '请选择外部状态',
},
// status: {
// type: 'string',
// enum: [],
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// title: '请选择外部状态',
// },
submit: {
'x-component': 'Submit',
'x-component-props': {
......
......@@ -127,7 +127,7 @@ const FormList = (props: any) => {
payRatio: '',
payAmount: '',
payWay: '1',
payParam: '',
payParam: '1',
id: 0,
},
)
......
import { PropsConfigType } from './ComponentConfigType';
import { EffectsCommandMap } from 'dva';
import { AnyAction } from 'redux';
export interface PropsNodeType {
[propName: string]: {
childNodes: VirtualDOMType[]
}
}
export interface VirtualDOMType {
key: string,
componentName: string,
props: any,
addPropsConfig?: PropsConfigType,
childNodes?: VirtualDOMType[] | PropsNodeType
}
export interface SelectedComponentInfoType {
selectedKey: string,
style: any,
parentPath: string,
componentName: string,
propName?: string,
propPath?: string,
path: string,
isContainer?: boolean,
isOnlyNode?: boolean,
childNodesRule?: string[],
domTreeKeys?: string[],
isRequiredHasChild?: boolean
}
export interface PropsSettingType {
props: any,
propsConfig: PropsConfigType,
mergePropsConfig: PropsConfigType,
addPropsConfig: PropsConfigType,
}
interface DragDataType {
defaultProps?: any,
componentName?: string,
templateData?: VirtualDOMType,
dragPath?: string,
dragParentPath?: string
}
export interface TemplateInfoType {
img: string,
id: string,
name: string,
config: string
}
export interface DropTargetInfoType {
isContainer: boolean,
propPath: string,
path: string,
isOnlyNode?: boolean,
childNodesRule?: string[],
componentName: string,
propName: string
}
export type PlatformStyleType = number[] | string[]
export interface PlatformInfoType {
isMobile: boolean,
size: PlatformStyleType,
}
export interface StateType {
componentConfigs: VirtualDOMType[],
selectedComponentInfo: SelectedComponentInfoType | {},
propsSetting: PropsSettingType | {},
styleSetting: any,
undo: any[],
redo: any[],
templateInfos: TemplateInfoType[],
hoverKey: null | string,
dragData: DragDataType | null,
dropTargetInfo: null | DropTargetInfoType,
platformInfo: PlatformInfoType
}
export type Effect = (
action: AnyAction,
effects: EffectsCommandMap & { select: <T>(func: (state: StateType) => T) => T },
) => void;
export type Reducer = (state: StateType, action: AnyAction) => StateType
export interface ModelType {
namespace: string,
state: StateType,
effects: {
submitConfigs: Effect,
searchTemplate: Effect,
getTemplateList: Effect,
addTemplateInfo: Effect,
deleteTemplate: Effect
},
reducers: {
saveTemplateInfos: Reducer;
addComponent: Reducer,
copyComponent: Reducer,
onLayoutSortChange: Reducer,
clearSelectedStatus: Reducer,
selectComponent: Reducer,
clearChildNodes: Reducer,
deleteComponent: Reducer,
addPropsConfig: Reducer,
deletePropsConfig: Reducer,
changeStyles: Reducer,
submitProps: Reducer,
overTarget: Reducer,
clearHovered: Reducer,
getDragData: Reducer,
getDropTargetInfo: Reducer,
changePlatform: Reducer,
undo: Reducer,
redo: Reducer,
}
}
import { PropsConfigType } from './ComponentConfigType';
import { EffectsCommandMap } from 'dva';
import { AnyAction } from 'redux';
export interface PropsNodeType {
[propName: string]: {
childNodes: VirtualDOMType[]
}
}
export interface VirtualDOMType {
key: string,
componentName: string,
props: any,
addPropsConfig?: PropsConfigType,
childNodes?: VirtualDOMType[] | PropsNodeType
}
export interface SelectedComponentInfoType {
selectedKey: string,
style: any,
parentPath: string,
componentName: string,
propName?: string,
propPath?: string,
path: string,
isContainer?: boolean,
isOnlyNode?: boolean,
childNodesRule?: string[],
domTreeKeys?: string[],
isRequiredHasChild?: boolean
}
export interface PropsSettingType {
props: any,
propsConfig: PropsConfigType,
mergePropsConfig: PropsConfigType,
addPropsConfig: PropsConfigType,
}
interface DragDataType {
defaultProps?: any,
componentName?: string,
templateData?: VirtualDOMType,
dragPath?: string,
dragParentPath?: string
}
export interface TemplateInfoType {
img: string,
id: string,
name: string,
config: string
}
export interface DropTargetInfoType {
isContainer: boolean,
propPath: string,
path: string,
isOnlyNode?: boolean,
childNodesRule?: string[],
componentName: string,
propName: string
}
export type PlatformStyleType = number[] | string[]
export interface PlatformInfoType {
isMobile: boolean,
size: PlatformStyleType,
}
export interface StateType {
componentConfigs: VirtualDOMType[],
selectedComponentInfo: SelectedComponentInfoType | {},
propsSetting: PropsSettingType | {},
styleSetting: any,
undo: any[],
redo: any[],
templateInfos: TemplateInfoType[],
hoverKey: null | string,
dragData: DragDataType | null,
dropTargetInfo: null | DropTargetInfoType,
platformInfo: PlatformInfoType
}
export type Effect = (
action: AnyAction,
effects: EffectsCommandMap & { select: <T>(func: (state: StateType) => T) => T },
) => void;
export type Reducer = (state: StateType, action: AnyAction) => StateType
export interface ModelType {
namespace: string,
state: StateType,
effects: {
submitConfigs: Effect,
searchTemplate: Effect,
getTemplateList: Effect,
addTemplateInfo: Effect,
deleteTemplate: Effect
},
reducers: {
saveTemplateInfos: Reducer;
addComponent: Reducer,
copyComponent: Reducer,
onLayoutSortChange: Reducer,
clearSelectedStatus: Reducer,
selectComponent: Reducer,
clearChildNodes: Reducer,
deleteComponent: Reducer,
addPropsConfig: Reducer,
deletePropsConfig: Reducer,
changeStyles: Reducer,
submitProps: Reducer,
overTarget: Reducer,
clearHovered: Reducer,
getDragData: Reducer,
getDropTargetInfo: Reducer,
changePlatform: Reducer,
undo: Reducer,
redo: Reducer,
}
}
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