Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

config/config.js

@@ -479,7 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.84:8080/',
+      target: 'http://localhost:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/SelectButton/BuildSelect.jsx

@@ -1,10 +1,18 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Select } from 'antd';
 
 import request from '../../utils/request'
 
 const { Option } = Select;
 
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
 /**
  *
  *
@@ -13,7 +21,12 @@ const { Option } = Select;
  */
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
-  const [ value, setValue ] = useState(props.value)
+  const [ value, setValue ] = useState('')
+  const preProps = usePrevious(props)
+  
+  if ((!preProps || !preProps.value) && props.value && !value) {
+    setValue(props.value)
+  }
 
   useEffect(() => {
     getCityList();

src/models/login.js

@@ -50,7 +50,7 @@ const Model = {
     *logout(_, { put, call }) {
       const { redirect } = getPageQuery(); // redirect
 
-      yield call(signout, { logout: true });
+      yield call(signout);
 
       if (window.location.pathname !== '/user/login' && !redirect) {
         yield put(

src/pages/building/list/add/components/base.jsx

@@ -79,6 +79,7 @@ function AddBuilding(props) {
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(() => {
       openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -119,10 +119,7 @@ class ProjectTypeBody extends React.Component {
   }
 
   onSuccess = (values, item) => {
-    console.log('values: ', values)
-    console.log('data: ', this.state.data, 'item: ', item)
     const newData = this.getNewProjectType(values)
-    console.log('newData: ', newData)
     this.setState({ data: newData })
     if (typeof this.props.onChange === 'function') {
       this.props.onChange(newData)
@@ -130,14 +127,13 @@ class ProjectTypeBody extends React.Component {
   }
 
   onCheckboxChange = checkedValues => {
+      // console.log('checkedValues: ', checkedValues)
       const checked = (`${checkedValues}` || '').split(',')
       const { projectType } = this.state
       const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
 
-      // 这里会把值替换掉
-
       const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
-      const updateProjectDate = this.updateProjectType(checkedValues)
+      const updateProjectDate = this.updateProjectType(tempDate)
       console.log('updateProjectDate: ', updateProjectDate)
       this.setState({ data: updateProjectDate })
   }
@@ -145,7 +141,6 @@ class ProjectTypeBody extends React.Component {
   onClose = e => {
     const { data } = this.state
     const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
-    console.log('buildingType: ', buildingType)
     this.setState({ data: buildingType })
     this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
   }
@@ -153,7 +148,6 @@ class ProjectTypeBody extends React.Component {
   getNewProjectType = values => {
     const data = []
     this.state.data.map(item => {
-      console.log('item: ', item)
       if (item.buildingTypeId === values.buildingTypeId) {
         data.push(values)
       } else {
@@ -165,18 +159,22 @@ class ProjectTypeBody extends React.Component {
   }
 
   updateProjectType = values => {
-    const data = []
-    this.state.data.map(item => {
-      values.map(va => {
-        if (item.buildingTypeId === va.buildingTypeId) {
-          data.push(va)
-        } else {
-          data.push(item)
-        }
-      })
-    })
+    // 获取所有复选框选中的id
+    const valueIdArray = values.map(item => item.buildingTypeId)
+    // console.log('valueIdArray: ', valueIdArray)
 
-    return data
+    // 获取 data 中已经赋值的数据  交集
+    const valueData = this.state.data.filter(item => valueIdArray.includes(item.buildingTypeId))
+    // console.log('valueData: ', valueData)
+
+    // 获取 非 data中数据(也就是没有赋值)，交集
+    const trueValueArr = valueData.map(item => item.buildingTypeId)
+    const trueValueData = values.filter(item => !trueValueArr.includes(item.buildingTypeId))
+
+    // console.log('trueValueData: ', trueValueData)
+
+    // 把两个 数组的值，合并返回
+    return valueData.concat(trueValueData)
   }
 
   getList = params => {
@@ -196,11 +194,7 @@ class ProjectTypeBody extends React.Component {
       tempData = value
       tempCheckboxValue = tempData.map(item => item.buildingTypeId)
       this.setState({ defaultCheckboxValue: tempCheckboxValue })
-      this.setState({ data: tempData }, () => {
-        console.log("state: ", this.state.data)
-      })
-
-      console.log("tempData: ", tempData, "tempCheckboxValue: ", tempCheckboxValue, "value: ", value)
+      this.setState({ data: tempData })
     }
   }
 
@@ -229,17 +223,6 @@ class ProjectTypeBody extends React.Component {
   }
 
   render () {
-
-    // let tempData = []
-    // let tempCheckboxValue = []
-    // const { value } = this.props
-    // if (value !== undefined && value !== null) {
-    //   tempData = value
-    // } else {
-    //   tempData = this.state.data
-    // }
-
-    // tempCheckboxValue = tempData.map(item => item.buildingTypeId)
     return (
       <>
         <Button type="primary" icon="plus" size="large" onClick={() => this.showMadel()} />

src/pages/staff/list/editStaff.jsx

@@ -26,8 +26,6 @@ const Edit = (props) => {
   const [userData, setUserData] = useState({})
   const [tagData, setTagData] = useState([])
 
-  console.log(userData,"user----》")
-
   const getTagList = () => {
     request({
       url: '/api/admin/taTags',
@@ -61,7 +59,6 @@ const Edit = (props) => {
   }
 
   const handleSubmit = val => {
-    window.console.log('submit data --->', val)
     if(userId){
       request({
         url: '/api/admin/taUser/' + userId,
@@ -148,10 +145,7 @@ const Edit = (props) => {
       label: '授权项目',
       name: 'buildingId',
       render: <BuildSelect />,
-      value: userData.buildingId,
-      rules: [
-        { required: true, message: '请选择所属项目' },
-      ],
+      value: userData.buildingId
     },
     {
       label: '图片',
@@ -180,11 +174,9 @@ const Edit = (props) => {
     },
   ]
 
-  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
-
-
-
+  console.log('--------->', fields)
 
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
 }
 
 

src/services/apis.js

@@ -19,10 +19,12 @@ export default {
     signin: {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
+      login: true
     },
     signout: {
       method: 'POST',
       url: `${prefix}/taUser/signout`,
+      logout: true
     },
   },
   building: {

src/utils/request.js

@@ -33,15 +33,16 @@ const replaceURLParams = (url, params = {}) => {
 }
 
 request.interceptors.request.use((url, options) => {
-  const { urlData, headers = {}, logout = false, data, ...opts } = options
+  const { urlData, headers = {}, logout = false, login = false, data, ...opts } = options
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
   const token = mixStr(window.localStorage.getItem('test-foobar'))
-  const authHeader = token ? { Authorization: `Bearer ${token}` } : {}
 
-  if (logout) {
+  if (login || logout) {
     window.localStorage.removeItem('test-foobar')
   }
 
+  const authHeader = !login ? { Authorization: `Bearer ${token}` } : {}
+
   return (
     {
       url: apiURL,