Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

pyt

2025-02-27 cb429a55a72f46bc8b749e0870b4a006fd066c78

 management/src/pages/setting/user/index.jsx

@@ -256,9 +256,8 @@
        return (
          <Space>
            {record.roleId != 1 && (
              <Access accessible={access['/system_setting/role_management/edit']}>
              <Access accessible={access['/system_setting/people_management/edit']}>
                <a
                  type="link"
                  onClick={() => {
                    addViewRef.current.refreshData(record);
                    handleModalVisibles(true);
@@ -269,9 +268,8 @@
              </Access>
            )}
            {record.roleId != 1 && (
              <Access accessible={access['/system_setting/role_management/del']}>
              <Access accessible={access['/system_setting/people_management/del']}>
                <a
                  type="link"
                  onClick={() => {
                    showDelConfirm(async () => {
                      let status = await sendRequest(del, record.id);
@@ -285,9 +283,8 @@
                </a>
              </Access>
            )}
            <Access accessible={access['/system_setting/role_management/edit'] || false}>
            <Access accessible={access['/system_setting/people_management/detail'] || false}>
              <a
                type="link"
                onClick={() => {
                  addViewRef.current.refreshData(record, true);
                  handleModalVisibles(true);
@@ -298,7 +295,6 @@
            </Access>
            <Access accessible={access['/system_setting/role_management/edit'] || false}>
              <a
                type="link"
                onClick={() => {
                  showDelConfirm(async () => {
                    let status = await sendRequest(
@@ -385,7 +381,7 @@
              return buildProTableDataSource(getList, obj);
            }}
            toolBarRender={(action, selectRows) => [
              <Access accessible={access['/system_setting/role_management/add']}>
              <Access accessible={access['/system_setting/people_management/add']}>
                <Space>
                  <Button
                    type="primary"