You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/08/09 09:14:05 UTC
[inlong] branch master updated: [INLONG-5421][Dashboard] Optimize the approval management list (#5425)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new eabf60e7d [INLONG-5421][Dashboard] Optimize the approval management list (#5425)
eabf60e7d is described below
commit eabf60e7d51f4107c15410dae2456b671962ade9
Author: Lizhen <88...@users.noreply.github.com>
AuthorDate: Tue Aug 9 17:14:01 2022 +0800
[INLONG-5421][Dashboard] Optimize the approval management list (#5425)
---
inlong-dashboard/src/locales/cn.json | 8 +++---
inlong-dashboard/src/locales/en.json | 4 +--
.../src/pages/ApprovalManagement/config.tsx | 30 ++++++++++++++--------
.../src/pages/ApprovalManagement/index.tsx | 2 +-
.../src/pages/UserManagement/DetailModal.tsx | 4 +--
.../src/pages/UserManagement/config.tsx | 2 +-
6 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/inlong-dashboard/src/locales/cn.json b/inlong-dashboard/src/locales/cn.json
index bcbd72c18..872a08d27 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -508,9 +508,7 @@
"pages.ApprovalManagement.ProcessName": "流程名称",
"pages.ApprovalManagement.TaskName": "任务名称",
"pages.ApprovalManagement.Approvers": "审批者",
- "pages.ApprovalManagement.Creator": "创建者",
- "pages.ApprovalManagement.Modifier": "修改者",
- "pages.ApprovalManagement.CreateTime": "创建时间",
- "pages.ApprovalManagement.ModifyTime": "修改时间",
- "pages.ApprovalManagement.CreateResponsible": "新建责任人"
+ "pages.ApprovalManagement.Creator": "创建人",
+ "pages.ApprovalManagement.Modifier": "修改人",
+ "pages.ApprovalManagement.CreateProcess": "新建流程"
}
diff --git a/inlong-dashboard/src/locales/en.json b/inlong-dashboard/src/locales/en.json
index 4870e99a1..16d70c1c9 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -510,7 +510,5 @@
"pages.ApprovalManagement.Approvers": "Approvers",
"pages.ApprovalManagement.Creator": "Creator Name",
"pages.ApprovalManagement.Modifier": "Modifier Name",
- "pages.ApprovalManagement.CreateTime": "Create Time",
- "pages.ApprovalManagement.ModifyTime": "Modify Time",
- "pages.ApprovalManagement.CreateResponsible": "Create Responsible"
+ "pages.ApprovalManagement.CreateProcess": "Create Process"
}
diff --git a/inlong-dashboard/src/pages/ApprovalManagement/config.tsx b/inlong-dashboard/src/pages/ApprovalManagement/config.tsx
index 69153e13f..25bdcfe6d 100644
--- a/inlong-dashboard/src/pages/ApprovalManagement/config.tsx
+++ b/inlong-dashboard/src/pages/ApprovalManagement/config.tsx
@@ -18,7 +18,7 @@
*/
import React from 'react';
-import { Button } from 'antd';
+import { Button, Space } from 'antd';
import i18n from '@/i18n';
import { timestampFormat } from '@/utils';
@@ -46,20 +46,28 @@ export const getColumns = ({ onEdit, onDelete }) => {
{
title: i18n.t('pages.ApprovalManagement.Creator'),
dataIndex: 'creator',
+ render: (text, record) => (
+ <Space size="middle">
+ <div>
+ {text}
+ <br></br>
+ {record.createTime && timestampFormat(record.createTime)}
+ </div>
+ </Space>
+ ),
},
{
title: i18n.t('pages.ApprovalManagement.Modifier'),
dataIndex: 'modifier',
- },
- {
- title: i18n.t('pages.ApprovalManagement.CreateTime'),
- dataIndex: 'createTime',
- render: text => text && timestampFormat(text),
- },
- {
- title: i18n.t('pages.ApprovalManagement.ModifyTime'),
- dataIndex: 'modifyTime',
- render: text => text && timestampFormat(text),
+ render: (text, record) => (
+ <Space size="middle">
+ <div>
+ {text}
+ <br></br>
+ {record.modifyTime && timestampFormat(record.modifyTime)}
+ </div>
+ </Space>
+ ),
},
{
title: i18n.t('basic.Operating'),
diff --git a/inlong-dashboard/src/pages/ApprovalManagement/index.tsx b/inlong-dashboard/src/pages/ApprovalManagement/index.tsx
index 4bf92b5af..b47eee545 100644
--- a/inlong-dashboard/src/pages/ApprovalManagement/index.tsx
+++ b/inlong-dashboard/src/pages/ApprovalManagement/index.tsx
@@ -100,7 +100,7 @@ const Comp: React.FC = () => {
<HighTable
suffix={
<Button type="primary" onClick={() => setCreateModal({ visible: true })}>
- {t('pages.ApprovalManagement.CreateResponsible')}
+ {t('pages.ApprovalManagement.CreateProcess')}
</Button>
}
filterForm={{
diff --git a/inlong-dashboard/src/pages/UserManagement/DetailModal.tsx b/inlong-dashboard/src/pages/UserManagement/DetailModal.tsx
index 9d377e7ab..559318eaa 100644
--- a/inlong-dashboard/src/pages/UserManagement/DetailModal.tsx
+++ b/inlong-dashboard/src/pages/UserManagement/DetailModal.tsx
@@ -32,7 +32,7 @@ const content = [
{
type: 'radio',
label: i18n.t('pages.UserManagement.config.AccountRole'),
- name: 'type',
+ name: 'accountType',
initialValue: 1,
rules: [{ required: true }],
props: {
@@ -51,7 +51,7 @@ const content = [
{
type: 'input',
label: i18n.t('pages.UserManagement.config.UserName'),
- name: 'username',
+ name: 'name',
rules: [{ required: true }],
},
{
diff --git a/inlong-dashboard/src/pages/UserManagement/config.tsx b/inlong-dashboard/src/pages/UserManagement/config.tsx
index cf8929d24..0902a8240 100644
--- a/inlong-dashboard/src/pages/UserManagement/config.tsx
+++ b/inlong-dashboard/src/pages/UserManagement/config.tsx
@@ -46,7 +46,7 @@ export const getColumns = ({ onEdit, onDelete }) => {
},
{
title: i18n.t('pages.UserManagement.config.Creator'),
- dataIndex: 'createBy',
+ dataIndex: 'creator',
},
{
title: i18n.t('pages.UserManagement.config.CreateTime'),