Merge branch 'master' of https://g.civnet.cn:8443/test/maintenance

src/components/CheckGroup/index.jsx

 import React, { useState, useEffect } from 'react';
-import { Spin, Button, Empty } from 'antd';
+import { Spin, Checkbox, Button, Empty } from 'antd';
 import _ from 'lodash';
 import ListCardItem from './ItemCard';
 import styles from './ItemCard.less';
@@ -60,6 +60,32 @@ const ListCard = props => {
     // console.timeEnd('updateValueList:');
   };
 
+  const checkAll = e => {
+    if (e.target.checked) {
+      const result = dataList.map(item => getAllID(item)).flat(Infinity);
+      setValueList(result);
+      // eslint-disable-next-line no-unused-expressions
+      onChange && onChange(result);
+    } else {
+      setValueList([]);
+      // eslint-disable-next-line no-unused-expressions
+      onChange && onChange([]);
+    }
+  };
+
+  const getAllID = item => {
+    let result = [];
+    const haveChildren =
+      Array.isArray(item.children) && item.children.length > 0;
+    // 统一使用 getId
+    result.push(getId(item));
+    if (haveChildren) {
+      // 每次递归result被置空，所以要另外保存
+      result = [...item.children.map(i => getAllID(i)), ...result];
+    }
+    return result;
+  };
+
   return (
     <div>
       {loading ? (
@@ -77,6 +103,7 @@ const ListCard = props => {
         />
       ) : (
         <>
+          <Checkbox onChange={checkAll}>全选/全不选</Checkbox>
           {dataList && dataList.length > 0 ? (
             dataList
               .filter(d => d.type === 'widgetGroup' || 'widget')

src/pages/user/login/index.js

@@ -59,10 +59,13 @@ const Login = props => {
             }
           }
           if (userMode === USER_MODE.COMMON) {
-            const authority = [AUTHORITY.LOGIN, AUTHORITY.COMMON];
-            setAuthority(authority);
-            setAuth(authority);
-            history.push(`/userCenter/UserManage`);
+            // const authority = [AUTHORITY.LOGIN, AUTHORITY.COMMON];
+            // setAuthority(authority);
+            // setAuth(authority);
+            // history.push(`/userCenter/UserManage`);
+            notification.warning({
+              message: msg || '没有权限！',
+            });
           }
         } else {
           notification.warning({

src/pages/userCenter/UserManage.js

@@ -496,7 +496,7 @@ const UserManage = () => {
   const changePassword = record => {
     setPasswordVisible(true);
     passwordForm.setFieldsValue({
-      oldpassword: record.password,
+      oldPassword: record.password,
       newPassword: '',
       passwordConfirm: '',
     });
@@ -867,7 +867,7 @@ const UserManage = () => {
       });
   // 提交-修改密码
   const submitChangePassword = () => {
-    const password = passwordForm.getFieldValue('password');
+    const oldPassword = passwordForm.getFieldValue('oldPassword');
     const newPassword = passwordForm.getFieldValue('newPassword');
     const passwordConfirm = passwordForm.getFieldValue('passwordConfirm');
     if (
@@ -877,14 +877,13 @@ const UserManage = () => {
       newPassword.length >= 6 &&
       newPassword === passwordConfirm
     ) {
-      updateUserPassword(
-        currentUser.userID,
-        password,
-        newPassword,
-        passwordConfirm,
-      )
+      updateUserPassword({
+        UserId: +currentUser.userID,
+        OldPassWord: oldPassword,
+        NewPassWord: newPassword,
+      })
         .then(res => {
-          if (res.success) {
+          if (res.code === 0) {
             setPasswordVisible(false);
             notification.success({
               message: '提交成功',
@@ -1404,7 +1403,7 @@ const UserManage = () => {
           cancelText="取消"
         >
           <Form form={passwordForm} labelCol={{ span: 4 }}>
-            <Form.Item name="oldpassword" label="原始密码">
+            <Form.Item name="oldPassword" label="原始密码">
               <Input disabled />
             </Form.Item>
             <Form.Item

src/pages/userCenter/UserManage.less

@@ -185,6 +185,7 @@
     .ant-tree-switcher{
         line-height: 1;
         color:#1890FF;
+        margin-right: 0px !important;
     }
     .ant-checkbox-group .ant-checkbox-group-item {
         margin-right: 0px !important;

src/services/userCenter/userManage/api.js

@@ -110,20 +110,8 @@ export const addToOrgs = (userIDs, orgIDs, newOrgID) =>
     newGroupId: newOrgID,
   });
 
-export const updateUserPassword = (
-  userID,
-  oldpassword,
-  newPassword,
-  passwordConfirm,
-) =>
-  get(`/Cityinterface/rest/services/OMS.svc/U_UpdatePassword`, {
-    _version: 9999,
-    _dc: Date.now(),
-    userID,
-    oldpassword,
-    newPassword,
-    passwordConfirm,
-  });
+export const updateUserPassword = params =>
+  post(`${PUBLISH_SERVICE}/UserCenter/UpdateUserPassword`, params);
 
 export const editUser = (userID, loginName, userName, phone, email) =>
   get(`/Cityinterface/rest/services/OMS.svc/U_EditUser`, {