update

admin-frontend/src/component/subscribeCard.tsx

@@ -1,55 +1,62 @@
 import {CopyOutlined, DeleteOutlined} from '@ant-design/icons';
 import {Card, Col, Form, message, Popconfirm, Select, Tag, Tooltip} from 'antd';
-import React, {ReactNode, useContext, useState} from "react";
+import Modal from 'antd/lib/modal/Modal';
+import React, {useContext, useState} from "react";
 import {addSubscribe, delSubscribe} from 'src/api/config';
 import {GlobalConfContext} from "src/utils/context";
 import {PlatformConfig, SubscribeConfig, SubscribeResp} from 'src/utils/type';
 
-interface TargetGroupSelectionProp {
+interface CopyModalProp {
+  setShowModal: (modalShow: boolean) => void
+  showModal: boolean
   config: SubscribeConfig,
   groups: SubscribeResp
-  children: ReactNode
+  currentGroupNumber: string
+  reload: () => void
 }
-
-function TargetGroupSelection({ config, groups, children }: TargetGroupSelectionProp) {
-  let [ selectedGroups, setSelectGroups ] = useState<Array<string>>([]);
-  const submitCopy = () => {
-    let promise = null
-    for (let selectGroup of selectedGroups) {
-      if (! promise) {
-        promise = addSubscribe(selectGroup, config)
-      } else {
-        promise = promise.then(() => addSubscribe(selectGroup, config))
-      }
+function CopyModal({setShowModal,config,
+    currentGroupNumber,groups,showModal,reload}: CopyModalProp) {
+  const [confirmLoading, setConfirmLoading] = useState(false)
+  const [ selectedGroups, setSelectGroups ] = useState<Array<string>>([]);
+  const postReqs = async (selectedGroups: Array<string>, config: SubscribeConfig) => {
+    for(let selectedGroup of selectedGroups) {
+      await addSubscribe(selectedGroup, config);
     }
-    if (promise) {
-      promise.then(() => message.success("复制订阅成功"))
-    }
-    return promise;
   }
-  return <>
-    <Popconfirm title={
-        <Select mode="multiple" onChange={(value: Array<string>) => setSelectGroups(value)}>
+  const handleOk = () => {
+    if (selectedGroups.length === 0) {
+      message.error("请至少选择一个目标群");
+    } else{
+      setConfirmLoading(true)
+      postReqs(selectedGroups, config).then(() => {
+        setConfirmLoading(false)
+        return reload() 
+      })
+    }
+  }
+  return <Modal title="复制订阅" visible={showModal} confirmLoading={confirmLoading}
+    onCancel={() => setShowModal(false)} onOk={handleOk}>
+        <Select mode="multiple" onChange={(value: Array<string>) => setSelectGroups(value)} 
+          style={{width: '80%'}}>
           {
-            Object.keys(groups).map((groupNumber) => 
+            Object.keys(groups).filter(groupNumber => groupNumber != currentGroupNumber)
+              .map((groupNumber) =>
               <Select.Option value={groupNumber} key={groupNumber}>
                 {`${groupNumber} - ${groups[groupNumber].name}`}
               </Select.Option>)
             }
         </Select>
-      } onConfirm={submitCopy} >
-      { children }
-    </Popconfirm>
-  </>
+    </Modal>
 }
 interface SubscribeCardProp {
   groupNumber: string
   config: SubscribeConfig
   groupSubscribes: SubscribeResp
-  reload: () => null
+  reload: () => void
 }
 export function SubscribeCard({groupNumber, config, reload, groupSubscribes}: SubscribeCardProp) {
   const globalConf = useContext(GlobalConfContext);
+  const [showModal, setShowModal] = useState(false)
   const platformConf = globalConf.platformConf[config.platformName] as PlatformConfig;
   const handleDelete = (groupNumber: string, platformName: string, target: string) => () => {
     delSubscribe(groupNumber, platformName, target).then(() => {
@@ -64,9 +71,9 @@ export function SubscribeCard({groupNumber, config, reload, groupSubscribes}: Su
           onConfirm={handleDelete(groupNumber, config.platformName, config.target || 'default')}>
           <Tooltip title="删除" ><DeleteOutlined /></Tooltip>
         </Popconfirm>, 
-        <TargetGroupSelection config={config} groups={groupSubscribes}>
-          <Tooltip title="添加到其他群"><CopyOutlined /></Tooltip>
-        </TargetGroupSelection>
+        <Tooltip title="添加到其他群">
+          <CopyOutlined onClick={()=>{setShowModal(state => !state)}}/>
+        </Tooltip>
         ]}>
       <Form labelCol={{ span: 6 }}>
       <Form.Item label="订阅类型">
@@ -80,6 +87,8 @@ export function SubscribeCard({groupNumber, config, reload, groupSubscribes}: Su
       </Form.Item>
       </Form>
     </Card>
+    <CopyModal setShowModal={setShowModal} reload={reload} currentGroupNumber={groupNumber}
+      showModal={showModal} config={config} groups={groupSubscribes}/>
   </Col>
   )
 }

admin-frontend/src/pages/admin/configPage/AddSubsModal.tsx

@@ -0,0 +1,150 @@
+import { Form, Input, Modal, Select, Tag } from 'antd';
+import React, { useContext, useState } from "react";
+import { addSubscribe, getTargetName } from 'src/api/config';
+import { InputTag } from 'src/component/inputTag';
+import { GlobalConfContext } from "src/utils/context";
+import { CategoryConfig } from 'src/utils/type';
+
+interface InputTagCustomProp {
+  value?: Array<string>,
+  onChange?: (value: Array<string>) => void,
+  disabled?: boolean
+}
+function InputTagCustom(prop: InputTagCustomProp) {
+  const [value, setValue] = useState(prop.value || []);
+  const handleSetValue = (newVal: Array<string>) => {
+    setValue(() => newVal);
+    if (prop.onChange) {
+      prop.onChange(newVal);
+    }
+  }
+  return (
+    <>
+      {
+        prop.disabled ? <Tag color="red">不支持标签</Tag>: 
+        <>
+        {value.length === 0 &&
+          <Tag color="green">全部标签</Tag>
+        }
+        <InputTag color="blue" addText="添加标签" value={value} onChange={handleSetValue} />
+      </>
+      } 
+    </>
+  )
+}
+
+interface AddModalProp {
+  showModal: boolean,
+  groupNumber: string,
+  setShowModal: (s: boolean) => void,
+  refresh: () => void
+}
+export function AddModal(prop: AddModalProp) {
+  const [ confirmLoading, setConfirmLoading ] = useState<boolean>(false);
+  const { platformConf } = useContext(GlobalConfContext);
+  const [ hasTarget, setHasTarget ] = useState(false);
+  const [ categories, setCategories ] = useState({} as CategoryConfig);
+  const [ enabledTag, setEnableTag ] = useState(false);
+  const [ form ] = Form.useForm();
+  const changePlatformSelect = (platform: string) => {
+    setHasTarget(_ => platformConf[platform].hasTarget);
+    setCategories(_ => platformConf[platform].categories);
+    setEnableTag(platformConf[platform].enabledTag)
+    if (! platformConf[platform].hasTarget) {
+      getTargetName(platform, 'default')
+        .then(res => {
+          console.log(res)
+          form.setFieldsValue({
+            targetName: res.targetName,
+            target: ''
+          })
+        })
+    } else {
+      form.setFieldsValue({
+        targetName: '',
+        target: ''
+      })
+    }
+  }
+  const handleSubmit = (value: any) => {
+    let newVal = Object.assign({}, value)
+    if (typeof newVal.tags != 'object') {
+      newVal.tags = []
+    }
+    if (newVal.target === '') {
+      newVal.target = 'default'
+    }
+    addSubscribe(prop.groupNumber, newVal)
+    .then(() => {
+      setConfirmLoading(false);
+      prop.setShowModal(false);
+      prop.refresh();
+      });
+  }
+  const handleModleFinish = () => {
+    form.submit();
+    setConfirmLoading(() => true);
+  }
+
+  return <Modal title="添加订阅" visible={prop.showModal} 
+    confirmLoading={confirmLoading} onCancel={() => prop.setShowModal(false)}
+    onOk={handleModleFinish}>
+    <Form form={form} labelCol={{ span: 6 }} name="b" onFinish={handleSubmit}
+      initialValues={{tags: [], cats: []}}>
+      <Form.Item label="平台" name="platformName" rules={[]}>
+        <Select style={{ width: '80%' }} onChange={changePlatformSelect}>
+          {Object.keys(platformConf).map(platformName => 
+            <Select.Option key={platformName} value={platformName}>{platformConf[platformName].name}</Select.Option>
+            )}
+        </Select>
+      </Form.Item>
+      <Form.Item label="账号" name="target" rules={[
+        {required: hasTarget, message: "请输入账号"},
+        {validator: async (_, value) => {
+          try {
+            const res = await getTargetName(form.getFieldValue('platformName'), value);
+            if (res.targetName) {
+                form.setFieldsValue({
+                  targetName: res.targetName
+                })
+                return Promise.resolve()
+            } else {
+                form.setFieldsValue({
+                  targetName: ''
+                })
+              return Promise.reject("账号不正确，请重新检查账号")
+            }
+          } catch {
+            return Promise.reject('服务器错误，请稍后再试')
+          }
+        }
+        }
+      ]}>
+        <Input placeholder={hasTarget ? "获取方式见文档" : "此平台不需要账号"} 
+          disabled={! hasTarget} style={{ width: "80%" }}/>
+      </Form.Item>
+      <Form.Item label="账号名称" name="targetName">
+        <Input style={{ width: "80%" }} disabled />
+      </Form.Item>
+      <Form.Item label="订阅分类" name="cats" rules={[
+        {required: Object.keys(categories).length > 0, message: "请至少选择一个分类进行订阅"}
+      ]}>
+        <Select style={{ width: '80%' }} mode="multiple" 
+          disabled={Object.keys(categories).length === 0}
+          placeholder={Object.keys(categories).length > 0 ?
+            "请选择要订阅的分类" : "本平台不支持分类"}>
+          {Object.keys(categories).length > 0 &&
+            Object.keys(categories).map((indexStr) => 
+              <Select.Option key={indexStr} value={parseInt(indexStr)}>
+                {categories[parseInt(indexStr)]}
+              </Select.Option>
+            )
+          }
+        </Select>
+      </Form.Item>
+      <Form.Item label="订阅Tag" name="tags">
+        <InputTagCustom disabled={!enabledTag}/>
+      </Form.Item>
+    </Form>
+    </Modal>
+}

admin-frontend/src/pages/admin/configPage/index.tsx

@@ -1,10 +1,9 @@
-import {CopyOutlined, DeleteOutlined} from '@ant-design/icons';
-import {Button, Card, Col, Collapse, Empty, Form, Input, message, Modal, Popconfirm, Row, Select, Tag, Tooltip} from 'antd';
-import React, {ReactElement, ReactNode, useContext, useEffect, useState} from "react";
-import {addSubscribe, delSubscribe, getSubscribe, getTargetName} from 'src/api/config';
-import {InputTag} from 'src/component/inputTag';
-import {GlobalConfContext} from "src/utils/context";
-import {CategoryConfig, PlatformConfig, SubscribeConfig, SubscribeResp} from 'src/utils/type';
+import {Button, Collapse, Empty, Row} from 'antd';
+import React, {ReactElement, useEffect, useState} from "react";
+import {getSubscribe} from 'src/api/config';
+import {SubscribeCard} from 'src/component/subscribeCard';
+import {SubscribeResp} from 'src/utils/type';
+import {AddModal} from './AddSubsModal';
 
 interface ConfigPageProp {
   tab: string
@@ -13,7 +12,6 @@ export function ConfigPage(prop: ConfigPageProp) {
   const [ configData, setConfigData ] = useState<SubscribeResp>({});
   const [ showModal, setShowModal ] = useState<boolean>(false);
   const [ currentAddingGroupNumber, setCurrentAddingGroupNumber ] = useState('');
-  const globalConf = useContext(GlobalConfContext);
   const loadData = () => {
     getSubscribe()
       .then(res => {
@@ -40,7 +38,9 @@ export function ConfigPage(prop: ConfigPageProp) {
           <span>{`${key} - ${value.name}`}<Button style={{float: "right"}} onClick={clickNew(key)}>添加</Button></span>
           } key={key}>
           <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }} align="middle">
-            {value.subscribes.map(genCard(key))}
+            {value.subscribes.map((subs) => <SubscribeCard
+              groupNumber={key} config={subs} groupSubscribes={configData} reload={loadData}
+              />)}
           </Row>
         </Collapse.Panel>
         )
@@ -58,144 +58,3 @@ export function ConfigPage(prop: ConfigPageProp) {
 }
 
 
-interface InputTagCustomProp {
-  value?: Array<string>,
-  onChange?: (value: Array<string>) => void,
-  disabled?: boolean
-}
-function InputTagCustom(prop: InputTagCustomProp) {
-  const [value, setValue] = useState(prop.value || []);
-  const handleSetValue = (newVal: Array<string>) => {
-    setValue(() => newVal);
-    if (prop.onChange) {
-      prop.onChange(newVal);
-    }
-  }
-  return (
-    <>
-      {
-        prop.disabled ? <Tag color="red">不支持标签</Tag>: 
-        <>
-        {value.length === 0 &&
-          <Tag color="green">全部标签</Tag>
-        }
-        <InputTag color="blue" addText="添加标签" value={value} onChange={handleSetValue} />
-      </>
-      } 
-    </>
-  )
-}
-
-interface AddModalProp {
-  showModal: boolean,
-  groupNumber: string,
-  setShowModal: (s: boolean) => void,
-  refresh: () => void
-}
-function AddModal(prop: AddModalProp) {
-  const [ confirmLoading, setConfirmLoading ] = useState<boolean>(false);
-  const { platformConf } = useContext(GlobalConfContext);
-  const [ hasTarget, setHasTarget ] = useState(false);
-  const [ categories, setCategories ] = useState({} as CategoryConfig);
-  const [ enabledTag, setEnableTag ] = useState(false);
-  const [ form ] = Form.useForm();
-  const changePlatformSelect = (platform: string) => {
-    setHasTarget(_ => platformConf[platform].hasTarget);
-    setCategories(_ => platformConf[platform].categories);
-    setEnableTag(platformConf[platform].enabledTag)
-    if (! platformConf[platform].hasTarget) {
-      getTargetName(platform, 'default')
-        .then(res => {
-          console.log(res)
-          form.setFieldsValue({
-            targetName: res.targetName,
-            target: ''
-          })
-        })
-    } else {
-      form.setFieldsValue({
-        targetName: '',
-        target: ''
-      })
-    }
-  }
-  const handleSubmit = (value: any) => {
-    let newVal = Object.assign({}, value)
-    if (typeof newVal.tags != 'object') {
-      newVal.tags = []
-    }
-    if (newVal.target === '') {
-      newVal.target = 'default'
-    }
-    addSubscribe(prop.groupNumber, newVal)
-    .then(() => {
-      setConfirmLoading(false);
-      prop.setShowModal(false);
-      prop.refresh();
-      });
-  }
-  const handleModleFinish = () => {
-    form.submit();
-    setConfirmLoading(() => true);
-  }
-
-  return <Modal title="添加订阅" visible={prop.showModal} 
-    confirmLoading={confirmLoading} onCancel={() => prop.setShowModal(false)}
-    onOk={handleModleFinish}>
-    <Form form={form} labelCol={{ span: 6 }} name="b" onFinish={handleSubmit}
-      initialValues={{tags: [], categories: []}}>
-      <Form.Item label="平台" name="platformName" rules={[]}>
-        <Select style={{ width: '80%' }} onChange={changePlatformSelect}>
-          {Object.keys(platformConf).map(platformName => 
-            <Select.Option key={platformName} value={platformName}>{platformConf[platformName].name}</Select.Option>
-            )}
-        </Select>
-      </Form.Item>
-      <Form.Item label="账号" name="target" rules={[
-        {required: hasTarget, message: "请输入账号"},
-        {validator: async (_, value) => {
-          try {
-            const res = await getTargetName(form.getFieldValue('platformName'), value);
-            if (res.targetName) {
-                form.setFieldsValue({
-                  targetName: res.targetName
-                })
-                return Promise.resolve()
-            } else {
-                form.setFieldsValue({
-                  targetName: ''
-                })
-              return Promise.reject("账号不正确，请重新检查账号")
-            }
-          } catch {
-            return Promise.reject('服务器错误，请稍后再试')
-          }
-        }
-        }
-      ]}>
-        <Input placeholder={hasTarget ? "获取方式见文档" : "此平台不需要账号"} 
-          disabled={! hasTarget} style={{ width: "80%" }}/>
-      </Form.Item>
-      <Form.Item label="账号名称" name="targetName">
-        <Input style={{ width: "80%" }} disabled />
-      </Form.Item>
-      <Form.Item label="订阅分类" name="categories">
-        <Select style={{ width: '80%' }} mode="multiple" 
-          disabled={Object.keys(categories).length === 0}
-          placeholder={Object.keys(categories).length > 0 ?
-            "请选择要订阅的分类" : "本平台不支持分类"}>
-          {Object.keys(categories).length > 0 &&
-            Object.keys(categories).map((indexStr) => 
-              <Select.Option key={indexStr} value={parseInt(indexStr)}>
-                {categories[parseInt(indexStr)]}
-              </Select.Option>
-            )
-          }
-        </Select>
-      </Form.Item>
-      <Form.Item label="订阅Tag" name="tags">
-        <InputTagCustom disabled={!enabledTag}/>
-      </Form.Item>
-    </Form>
-    </Modal>
-}