Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb

src/components/Flow/components/judgeComponent/index.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import { Checkbox, Select, TreeSelect } from "antd";
 import { DeleteOutlined } from "@ant-design/icons";
 import { ComponentName, FormItem } from "../../node/judgeNode/mapServe";
-import { InputNumberFiled } from "../../node/fields";
+import { InputNumberField } from "../../node/fields";
 import { connect } from "umi";
 
 const { Option } = Select;
@@ -166,7 +166,7 @@ const RenderJudge = (props: any) => {
             />
             {judge?.values[0] == 6 ? (
               <div style={{ display: "flex", justifyContent: "space-between" }}>
-                <InputNumberFiled
+                <InputNumberField
                   value={judge?.condition?.smallValue}
                   onChange={(value) => {
                     handleChange([], item, {
@@ -203,7 +203,7 @@ const RenderJudge = (props: any) => {
                     <Option key={item.value}>{item.label}</Option>
                   ))}
                 </Select>
-                <InputNumberFiled
+                <InputNumberField
                   value={judge?.condition?.bigValue}
                   onChange={(value) => {
                     handleChange([], item, {
@@ -214,7 +214,7 @@ const RenderJudge = (props: any) => {
                 />
               </div>
             ) : (
-              <InputNumberFiled
+              <InputNumberField
                 value={judge?.condition?.smallValue}
                 onChange={(value) => {
                   handleChange([], item, { smallValue: value });

src/components/Flow/node/auditNode/mapServe.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useMemo } from 'react';
 import { FlowchartFormWrapper } from '@antv/xflow';
-import { Position, Size, ColorPicker, InputNumberFiled, InputFiled, SelectField } from '../fields';
+import { Position, Size, ColorPicker, InputNumberField, InputField, SelectField } from '../fields';
 import { PREFIX } from '../constants';
 import { connect } from "umi";
 import { UnityAction } from '@/utils/utils';
@@ -113,7 +113,7 @@ const Component = (props: any) => {
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
         <h5>内容</h5>
-        <InputFiled
+        <InputField
           label="标题"
           value={nodeConfig.label}
           onChange={value => {
@@ -159,7 +159,7 @@ const Component = (props: any) => {
             onNodeConfigChange('stroke', value);
           }}
         />
-        <InputNumberFiled
+        <InputNumberField
           label="消息数量"
           value={nodeConfig.count}
           onChange={value => {
@@ -167,7 +167,7 @@ const Component = (props: any) => {
           }}
         />
         <div className={`${PREFIX}-node-text-style`}>
-          <InputNumberFiled
+          <InputNumberField
             label="字号"
             value={nodeConfig.fontSize}
             width={68}

src/components/Flow/node/circle/mapServe.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { FlowchartFormWrapper, MODELS, useXFlowApp } from '@antv/xflow';
-import { Position, Size, ColorPicker, InputNumberFiled, InputFiled, SelectField } from '../fields';
+import { Position, Size, ColorPicker, InputNumberField, InputField, SelectField } from '../fields';
 import { PREFIX } from '../constants';
 import { connect } from "umi";
 import { UnityAction } from '@/utils/utils';
@@ -70,7 +70,7 @@ const Component = (props: any) => {
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
         <h5>内容</h5>
-        <InputFiled
+        <InputField
           label="标题"
           value={nodeConfig.label}
           disabled={meta?.editMode == 2}
@@ -136,7 +136,7 @@ const Component = (props: any) => {
                 onNodeConfigChange('stroke', value);
               }}
             />
-            <InputNumberFiled
+            <InputNumberField
               label="消息数量"
               value={nodeConfig.count}
               onChange={value => {
@@ -146,7 +146,7 @@ const Component = (props: any) => {
           </div>
 
           <div className={`${PREFIX}-node-text-style`}>
-            <InputNumberFiled
+            <InputNumberField
               label="字号"
               value={nodeConfig.fontSize}
               width={68}

src/components/Flow/node/control-map-service/components/edge.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { FlowchartFormWrapper } from '@antv/xflow';
-import { ColorPicker, InputNumberFiled, InputFiled, SelectField } from '../../fields';
+import { ColorPicker, InputNumberField, InputField, SelectField } from '../../fields';
 import { PREFIX, DefaultEdgeConfig, ArrowStrokeMaps, ArrowMaps } from '../../constants';
 
 export type MarkerCfg = {
@@ -112,7 +112,7 @@ const EdgeComponent = (props: any) => {
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
         <h5>内容</h5>
-        <InputFiled
+        <InputField
           label="标签"
           value={edgeConfig.label}
           onChange={value => {
@@ -173,7 +173,7 @@ const EdgeComponent = (props: any) => {
               );
             }}
           />
-          <InputNumberFiled
+          <InputNumberField
             value={getAttrs('strokeWidth')}
             min={1}
             onChange={value => {
@@ -192,7 +192,7 @@ const EdgeComponent = (props: any) => {
       <div className={`${PREFIX}-panel-group`}>
         <h5>标签</h5>
         <div className={`${PREFIX}-edge-text-style`}>
-          <InputNumberFiled
+          <InputNumberField
             label="字号"
             min={10}
             width={68}

src/components/Flow/node/control-map-service/components/group.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { FlowchartFormWrapper } from '@antv/xflow';
 import {
-  InputFiled,
+  InputField,
   ColorPicker,
   Position,
-  InputNumberFiled,
+  InputNumberField,
   Size,
 } from '../../fields';
 import  { IConfig } from './node';
@@ -41,7 +41,7 @@ const GroupComponent = (props: any) => {
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
         <h5>内容</h5>
-        <InputFiled
+        <InputField
           label="标题"
           value={groupConfig.label}
           onChange={(value) => {
@@ -80,7 +80,7 @@ const GroupComponent = (props: any) => {
           }}
         />
         <div className={`${PREFIX}-node-text-style`}>
-          <InputNumberFiled
+          <InputNumberField
             label="字号"
             value={groupConfig.fontSize}
             width={68}

src/components/Flow/node/control-map-service/components/node.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { FlowchartFormWrapper } from '@antv/xflow';
 import {
-  InputFiled,
+  InputField,
   ColorPicker,
   Position,
-  InputNumberFiled,
+  InputNumberField,
   Size,
 } from '../../fields';
 import { PREFIX, DefaultNodeConfig } from '../../constants';
@@ -49,7 +49,7 @@ const NodeComponent = (props: any) => {
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
         <h5>内容</h5>
-        <InputFiled
+        <InputField
           label="标题"
           value={nodeConfig.label}
           onChange={(value) => {
@@ -88,7 +88,7 @@ const NodeComponent = (props: any) => {
           }}
         />
         <div className={`${PREFIX}-node-text-style`}>
-          <InputNumberFiled
+          <InputNumberField
             label="字号"
             value={nodeConfig.fontSize}
             width={68}

src/components/Flow/node/fields/index.ts

@@ -1,23 +1,23 @@
-import InputFiled from './input';
+import InputField from './input';
 import ColorPicker from './color';
-import InputNumberFiled from './input-number';
+import InputNumberField from './input-number';
 import Size from './size';
 import Position from './position';
 import SelectField from './select';
 import RadioField from './radio';
 import PlcDevice from './plcDevice';
 import ImgSelect from './imgSelect';
-import UploadFiled from './upload';
+import UploadField from './upload';
 
 export {
-  InputFiled,
+  InputField,
   ColorPicker,
-  InputNumberFiled,
+  InputNumberField,
   Size,
   Position,
   SelectField,
   PlcDevice,
   ImgSelect,
   RadioField,
-  UploadFiled,
+  UploadField,
 };

src/components/Flow/node/fields/input-number.tsx

@@ -11,7 +11,7 @@ interface IProps {
   onChange?: (value: number) => void;
 }
 
-const InputNumberFiled: React.FC<IProps> = (props) => {
+const InputNumberField: React.FC<IProps> = (props) => {
   const { label, value, onChange, min, width ,style} = props;
   return (
     <div className="group" style={style}>
@@ -31,4 +31,4 @@ const InputNumberFiled: React.FC<IProps> = (props) => {
   );
 };
 
-export default InputNumberFiled;
+export default InputNumberField;

src/components/Flow/node/fields/input.tsx

@@ -9,7 +9,7 @@ interface IProps {
   onChange?: (value: string) => void;
 }
 
-const InputFiled: React.FC<IProps> = props => {
+const InputField: React.FC<IProps> = props => {
   const { label = '标签', value, onChange, disabled } = props;
   return (
     <div className="group">
@@ -28,4 +28,4 @@ const InputFiled: React.FC<IProps> = props => {
   );
 };
 
-export default InputFiled;
+export default InputField;

src/components/Flow/node/fields/plcDevice.tsx

@@ -16,7 +16,7 @@ interface IProps {
   onChange?: (value: string) => void;
 }
 
-const InputFiled: React.FC<IProps> = (props) => {
+const InputField: React.FC<IProps> = (props) => {
   const { label = '标签', value, onChange } = props;
   const options = [
     {
@@ -52,4 +52,4 @@ const InputFiled: React.FC<IProps> = (props) => {
   );
 };
 
-export default InputFiled;
+export default InputField;

src/components/Flow/node/fields/upload.tsx

@@ -11,7 +11,7 @@ interface IProps {
   onUploading?: (value: string) => void;
 }
 
-const UploadFiled: React.FC<IProps> = props => {
+const UploadField: React.FC<IProps> = props => {
   const { label = '标签', value, onChange, onUploading, OSSData, beforeUpload } = props;
 
   const uploadProps = {
@@ -36,4 +36,4 @@ const UploadFiled: React.FC<IProps> = props => {
 
 export default connect(({ xflow }) => ({
   OSSData: xflow.OSSData,
-}))(UploadFiled);
+}))(UploadField);

src/components/Flow/node/judgeNode/mapServe.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useMemo } from 'react';
 import { FlowchartFormWrapper } from '@antv/xflow';
-import { Position, Size, ColorPicker, InputNumberFiled, InputFiled, SelectField } from '../fields';
+import { Position, Size, ColorPicker, InputNumberField, InputField, SelectField } from '../fields';
 import { PREFIX } from '../constants';
 import { connect } from "umi";
 import { UnityAction } from '@/utils/utils';
@@ -150,7 +150,7 @@ const Component = (props: any) => {
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
         <h5>内容</h5>
-        <InputFiled
+        <InputField
           label="标题"
           value={nodeConfig.label}
           onChange={value => {
@@ -188,7 +188,7 @@ const Component = (props: any) => {
             onNodeConfigChange('stroke', value);
           }}
         />
-        <InputNumberFiled
+        <InputNumberField
           label="消息数量"
           value={nodeConfig.count}
           onChange={value => {
@@ -196,7 +196,7 @@ const Component = (props: any) => {
           }}
         />
         <div className={`${PREFIX}-node-text-style`}>
-          <InputNumberFiled
+          <InputNumberField
             label="字号"
             value={nodeConfig.fontSize}
             width={68}
@@ -211,7 +211,7 @@ const Component = (props: any) => {
             }}
           />
         </div>
-        <InputNumberFiled
+        <InputNumberField
           label="优先级"
           value={nodeConfig.priority}
           width={68}

src/components/Flow/node/rect/mapServe.tsx

@@ -5,9 +5,9 @@ import {
   Position,
   Size,
   ColorPicker,
-  InputNumberFiled,
-  InputFiled,
-  UploadFiled,
+  InputNumberField,
+  InputField,
+  UploadField,
   RadioField,
 } from '../fields';
 import { PREFIX } from '../constants';
@@ -134,7 +134,7 @@ const Component = (props: any) => {
     <div className={`${PREFIX}-panel-body`}>
       <div className={`${PREFIX}-panel-group`}>
         <h5>内容</h5>
-        <InputFiled
+        <InputField
           label="标题"
           value={nodeConfig.label}
           disabled={meta?.editMode == 2}
@@ -180,7 +180,7 @@ const Component = (props: any) => {
         />
         {nodeConfig.is_start_node == 1 && (
           <>
-            <InputFiled
+            <InputField
               label="模板名称"
               value={nodeConfig.version_name}
               onChange={value => {
@@ -188,7 +188,7 @@ const Component = (props: any) => {
               }}
             />
 
-            {/* <UploadFiled
+            {/* <UploadField
               label="模板"
               onChange={url => onNodeConfigChange('bom_template', url)}
               beforeUpload={beforeUpload}
@@ -247,7 +247,7 @@ const Component = (props: any) => {
               onNodeConfigChange('stroke', value);
             }}
           />
-          <InputNumberFiled
+          <InputNumberField
             label="消息数量"
             value={nodeConfig.count}
             onChange={value => {
@@ -255,7 +255,7 @@ const Component = (props: any) => {
             }}
           />
           <div style={{ display: 'flex' }}>
-            <InputNumberFiled
+            <InputNumberField
               label="字号"
               value={nodeConfig.fontSize}
               width={68}