[new]v1.1.1

(cherry picked from commit c6162e80)

src/components/FileUpload/FileUpload.tsx

@@ -17,7 +17,8 @@ const FileUpload = (props: any) => {
     accept:".pdf,",
     action:props.url,
     data: props.data,
-    fileList:fileList,
+    fileList: fileList,
+    showUploadList:false,
     onChange({ file, fileList }) {
       let tmp=fileList
       setFileList(tmp.filter(file => !!file.status))

src/pages/CommunityManagement/CellList/Add.tsx

@@ -10,7 +10,7 @@ const layout = {
   // wrapperCol: { span: 8 },
 };
 
-import { RA } from '@/utils/method';
+import { RA, ResultClear } from '@/utils/method';
 
 const module = "CellList"
 
@@ -54,6 +54,11 @@ const Add = (props:any) => {
         console.log("服务器有问题")
         message.error("服务器有问题，请求失败",5)
       }
+      if (Result.error_code == "0000") {
+       
+        history.go(-1)
+      }
+      ResultClear(module,dispatch)
     }
   }, [Result])
 
@@ -72,30 +77,30 @@ const Add = (props:any) => {
 
       <Form ref={formRef} {...layout} name="nest-messages" onFinish={onFinish} validateMessages={validateMessages}  onValuesChange={onBillChange}>
 
-      <Form.Item name={"residentialName"}    label="小区名" rules={[{required:true}]}><Input style={{width:200}}  /></Form.Item>       
-      <Form.Item   name={"zipcode"} label="邮编" rules={[]}><Input style={{width: 200 }} /></Form.Item>
-      <Form.Item name={"residentialAddress"} label="地址" rules={[]}><Input style={{width: 300}}  /></Form.Item>
+      <Form.Item name={"residentialName"}    label="Community" rules={[{required:true}]}><Input style={{width:200}}  /></Form.Item>       
+      <Form.Item name={"zipcode"} label="Postcode" rules={[{required:true}]}><Input style={{width: 200 }} /></Form.Item>
+      <Form.Item name={"residentialAddress"} label="Address" rules={[{required:true}]}><Input style={{width: 300}}  /></Form.Item>
 
-      <Form.Item label="小区联系方式" style={{marginBottom:0}}> 
-          <Form.Item style={{ display: 'inline-block', width: '200' }} name={"residentialPhone"}  rules={[]}><Input placeholder="小区联系电话" /></Form.Item>
-          <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:20 }} name={"residentialEmail"}  rules={[]}><Input placeholder="小区联系邮箱"/></Form.Item>
+      <Form.Item label="Contact Information" style={{marginBottom:0}}> 
+          <Form.Item style={{ display: 'inline-block', width: '200' }} name={"residentialPhone"}  rules={[{required:true}]}><Input placeholder="Contact Number" /></Form.Item>
+          <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:20 }} name={"residentialEmail"}  rules={[{required:true}]}><Input placeholder="Contact Email"/></Form.Item>
       </Form.Item>   
 
-      <Form.Item name={"residentialManagerUserName"} label="小区管理人员" rules={[]}><Input style={{width:200}}  /></Form.Item>
+      <Form.Item name={"residentialManagerUserName"} label="Community Manager" rules={[{required:true}]}><Input style={{width:200}}  /></Form.Item>
 
         <Line />
-        <Form.Item label="帮助中心" style={{ marginBottom: 0 }}> 
-            <Form.Item style={{ display: 'inline-block', width: '200' }} name={"residentialHotlineName"}  rules={[]}><Input placeholder="热线电话名称"/></Form.Item>
-            <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:20 }} name={"residentialHotline"}      rules={[]}><Input placeholder="热线电话"/></Form.Item>            
+        <Form.Item label="Help center" style={{ marginBottom: 0 }}> 
+            <Form.Item style={{ display: 'inline-block', width: '200' }} name={"residentialHotlineName"}  rules={[]}><Input placeholder="Name Of Hotline"/></Form.Item>
+            <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:20 }} name={"residentialHotline"}      rules={[]}><Input placeholder="Hotline"/></Form.Item>            
         </Form.Item>  
         <Line />
         {
           extend.length>0 ?
             <>
               <Form.Item  wrapperCol={{ ...layout.wrapperCol, offset: 2 }} style={{marginBottom:0}}> 
-                <Form.Item style={{ display: 'inline-block', width: '200' }}                  name={"balouscheduleFile"} ><FileUpload title="楼巴时刻表" url={"/tos/image/upload"} data={{ imageType: "tosCreateCommunity", extends: extend }} reg="name" /></Form.Item>
-                <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:100 }} name={"serviceGuideFile"}><FileUpload title="物业办事指南" url={"/tos/image/upload"} data={{ imageType: "tosCreateCommunity", extends: extend }} reg="name" /></Form.Item>
-                <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:100 }} name={"lifeServiceFile"}><FileUpload title="保质期服务" url={"/tos/image/upload"} data={{ imageType: "tosCreateCommunity", extends:extend }} reg="name" /></Form.Item>
+                <Form.Item style={{ display: 'inline-block', width: '200' }}                  name={"balouscheduleFile"} ><FileUpload title="Bus Timetable" url={"/tos/image/upload"} data={{ imageType: "tosCreateCommunity", extends: extend }} reg="name" /></Form.Item>
+                <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:100 }} name={"serviceGuideFile"}><FileUpload title="Service Guide" url={"/tos/image/upload"} data={{ imageType: "tosCreateCommunity", extends: extend }} reg="name" /></Form.Item>
+                <Form.Item style={{ display: 'inline-block', width: '200', marginLeft:100 }} name={"lifeServiceFile"}><FileUpload title="Life Service" url={"/tos/image/upload"} data={{ imageType: "tosCreateCommunity", extends:extend }} reg="name" /></Form.Item>
               </Form.Item>     
             </> : null
         }

src/pages/CommunityManagement/CellList/CellList.tsx

@@ -21,7 +21,10 @@ const CellList = (props:any) => {
     ["Operation Hours", null, (text: any, record: any) => (<div></div>)],
     ["Office Tel", "residentialPhone"],
     ["Address", "residentialAddress"],    
-    ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a onClick={goToDetail.bind(this,record)}>Detail</a></Space>)],
+    ["Actions", null, (text: any, record: any) => (<Space size="middle">
+      <a onClick={goToDetail.bind(this, record)}>Edit</a>
+      <a onClick={goToDetail.bind(this,record)}>Detail</a>
+    </Space>)],
   ])
   
 
@@ -62,7 +65,7 @@ const CellList = (props:any) => {
           <Table loading={false} rowKey="id" style={{ marginTop: 16 }}
             dataSource={Data.rows}
             columns={columns}
-            pagination={{ current: 1, total: Data.total}} />  
+            pagination={{ defaultCurrent: 1, total: Data.total}} />  
           
         </> : null
     }  

src/pages/CommunityManagement/CellList/Detail.tsx

@@ -10,7 +10,7 @@ import TitleBack from '@/components/TitleBack/TitleBack';
 const module="CellList"
 const Detail = (props:any) => {
 
-  const { dispatch, Data,DataSave} = props;
+  const { dispatch, Data,DataSave,Result} = props;
   const formRef = useRef(null)
 
   useEffect(()=>{
@@ -50,6 +50,7 @@ const Detail = (props:any) => {
     }
   }, [])
   
+
   // 小区名称，
   // 详细地址，
   // 工作时间 休息时间
@@ -117,7 +118,7 @@ const Detail = (props:any) => {
 };
 
 function map(state:any) {
-  const { Data,DataSave} = state[module]
-  return { Data,DataSave}
+  const { Data,DataSave,Result} = state[module]
+  return { Data,DataSave,Result}
 }
 export default connect(map)(Detail);
\ No newline at end of file

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -92,7 +92,8 @@ const Users = (props:any) => {
   useEffect(() => {
     if (Data != null) {
       var tmp = curString
-      tmp.total=Data.total
+      tmp.total = Data.total
+      // message.info("test", 5);
       setCurString(tmp)
     }
   },[Data])
@@ -127,6 +128,10 @@ const Users = (props:any) => {
 
   const CallBackTitleSearch = (comment: any)=>{
     console.log(comment)
+    var tmp = curString
+    tmp.total = 0
+    setCurString(tmp)
+
     RA(12, {
       ownerName: comment.OwnerName,
       communityArray: comment.serviceCommunityList

src/pages/runTest/Template.tsx

@@ -33,7 +33,7 @@ const Guard = (props:any) => {
   return (
     <div className={styles.base}>
     
-        <TitleGet title={"Version 1.1.0"} />
+        <TitleGet title={"Version 1.1.1"} />
         <p>
         token:{page.token}
         name:{getCookie("name")}