From 65b04f2b51929879b15182c79f348804a369694d Mon Sep 17 00:00:00 2001
From: zhangminghua <zhang.minghua@free-sun.com.cn>
Date: Wed, 15 Mar 2023 14:26:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=9B=86=E3=80=81=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE-=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/tagSetModal.js                 |  4 ++--
 .../containers/tagManagement.js               | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/client/src/sections/metadataManagement/components/tagSetModal.js b/web/client/src/sections/metadataManagement/components/tagSetModal.js
index e9d06eb..6ccc794 100644
--- a/web/client/src/sections/metadataManagement/components/tagSetModal.js
+++ b/web/client/src/sections/metadataManagement/components/tagSetModal.js
@@ -50,14 +50,14 @@ const TagSetModal = (props) => {
     }
     return (
         <Modal title={editData.title} visible={true} destroyOnClose
-            okText='保存' width={800}
+            okText='确定' width={800}
             onOk={() => handleOk(null)}
             onCancel={onCancel}>
             <Form form={form} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }} initialValues={editData || {}}>
                 <Form.Item
                     label={editData.label}
                     name='name'
-                    rules={[{ required: true, message: '' }, { max: 50, message: `${editData.label}不超过50个字` },
+                    rules={[{ required: true, message: '' }, { max: 50, message: `${editData.label}不超过50个字符` },
                     ({ getFieldValue, validateFields }) => ({
                         validator(_, value) { return validatorNull(_, value, getFieldValue, validateFields) }
                     })]}>
diff --git a/web/client/src/sections/metadataManagement/containers/tagManagement.js b/web/client/src/sections/metadataManagement/containers/tagManagement.js
index 26f74e0..3fe187c 100644
--- a/web/client/src/sections/metadataManagement/containers/tagManagement.js
+++ b/web/client/src/sections/metadataManagement/containers/tagManagement.js
@@ -41,10 +41,12 @@ const TagManagement = (props) => {
                 setEditData({ setEditData: true, title: '编辑标签集', label: '标签集名称', name: ts.tagSetName, id: ts.tagSetId });
                 setModalVisible(true);
             }} />
-            <Popconfirm placement="top" title={'确定删除该标签集吗？'} onConfirm={() => { }} okText="确定" cancelText="取消">
+            <Popconfirm placement="top" title={'确定删除该标签集吗？存在的标签将会一并删除！'} onConfirm={() => {
+                dispatch(metadataManagement.delTagSets(ts.tagSetId)).then(() => { initData(true); });
+            }} okText="确定" cancelText="取消">
                 <CloseOutlined style={{ marginLeft: 10 }} />
             </Popconfirm>
-        </div>
+        </div >
     }
     const tag = (t, tagSetId) => {
         if (t)
@@ -53,7 +55,9 @@ const TagManagement = (props) => {
                     setEditData({ setEditData: false, title: '编辑标签', label: '标签名称', name: t.name, id: t.id });
                     setModalVisible(true);
                 }} />
-                <Popconfirm placement="top" title={'确定删除该标签吗？'} onConfirm={() => { }} okText="确定" cancelText="取消">
+                <Popconfirm placement="top" title={'确定删除该标签吗？'} onConfirm={() => {
+                    dispatch(metadataManagement.delTags(t.id)).then(() => { initData(true); });
+                }} okText="确定" cancelText="取消">
                     <CloseOutlined style={{ marginLeft: 10 }} />
                 </Popconfirm>
             </div>
@@ -61,7 +65,7 @@ const TagManagement = (props) => {
             return <div style={{ cursor: 'pointer' }} onClick={() => {
                 setEditData({ setEditData: false, title: '新建标签', label: '标签名称', tagSetId: tagSetId });
                 setModalVisible(true);
-            }}><PlusOutlined style={{ margin: '0px 10px' }} /></div>
+            }}><PlusOutlined style={{ margin: '0px 10px', fontSize: 16 }} /></div>
     }
     const onSearch = () => {
         let data = [];
@@ -110,13 +114,12 @@ const TagManagement = (props) => {
         }
     }
     return <Spin spinning={isRequesting}>
-        <div style={{ marginBottom: 12 }}>
-            {/* <Button type='primary' onClick={() => { }}>刷新</Button> */}
-            <Button type='primary' style={{ marginLeft: 16 }} onClick={() => {
+        <div style={{ marginBottom: 16 }}>
+            <Button type='primary' onClick={() => {
                 setEditData({ setEditData: true, title: '新建标签集', label: '标签集名称' });
                 setModalVisible(true);
             }}>新建标签集</Button>
-            <Button type='primary' style={{ marginLeft: 16, float: 'right' }} onClick={onSearch}>查询</Button>
+            <Button type='primary' style={{ marginLeft: 16, float: 'right' }} onClick={onSearch}>搜索</Button>
             <Input style={{ width: 220, float: 'right' }} placeholder="输入标签或标签集名称"
                 allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
         </div>