feat: remove loading from model and use DvaModel instead of redundant types such as kAModelType (#47)

* feat: use DvaModel instead of redundant types such as kAModelType

* feat: set the type for registerServer

* feat: remove loading from model

web/src/pages/add-knowledge/components/knowledge-file/createEFileModal.tsx

@@ -1,79 +1,73 @@
-import React from 'react'
-import { connect, Dispatch } from 'umi';
-import i18n from 'i18next';
-import { useTranslation, Trans } from 'react-i18next'
-import { Input, Modal, Form } from 'antd'
-import styles from './index.less';
-import type { kFModelState } from './model'
+import { Form, Input, Modal } from 'antd';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'umi';
 
 type FieldType = {
-    name?: string;
+  name?: string;
 };
 interface kFProps {
-    dispatch: Dispatch;
-    kFModel: kFModelState;
-    getKfList: () => void;
-    kb_id: string
+  getKfList: () => void;
+  kb_id: string;
 }
-const Index: React.FC<kFProps> = ({ kFModel, dispatch, getKfList, kb_id }) => {
-    const { isShowCEFwModal } = kFModel
-    const { t } = useTranslation()
-    const handleCancel = () => {
-        dispatch({
-            type: 'kFModel/updateState',
-            payload: {
-                isShowCEFwModal: false
-            }
-        });
-    };
-    const [form] = Form.useForm()
-    const handleOk = async () => {
-        try {
-            const values = await form.validateFields();
-            dispatch({
-                type: 'kFModel/document_create',
-                payload: {
-                    name: values.name,
-                    kb_id
-                },
-                callback: () => {
-                    dispatch({
-                        type: 'kFModel/updateState',
-                        payload: {
-                            isShowCEFwModal: false
-                        }
-                    });
-                    getKfList && getKfList()
-                }
-            });
 
-        } catch (errorInfo) {
-            console.log('Failed:', errorInfo);
-        }
-    };
+const FileCreatingModal: React.FC<kFProps> = ({ getKfList, kb_id }) => {
+  const dispatch = useDispatch();
+  const kFModel = useSelector((state: any) => state.kFModel);
+  const { isShowCEFwModal } = kFModel;
+  const [form] = Form.useForm();
+  const { t } = useTranslation();
 
-    return (
-        <Modal title="Basic Modal" open={isShowCEFwModal} onOk={handleOk} onCancel={handleCancel}>
-            <Form
-                form={form}
-                name="validateOnly"
-                labelCol={{ span: 8 }}
-                wrapperCol={{ span: 16 }}
-                style={{ maxWidth: 600 }}
-                autoComplete="off"
-            >
-                <Form.Item<FieldType>
-                    label="文件名"
-                    name="name"
-                    rules={[{ required: true, message: 'Please input value!' }]}
-                >
-                    <Input />
-                </Form.Item>
+  const handleCancel = () => {
+    dispatch({
+      type: 'kFModel/updateState',
+      payload: {
+        isShowCEFwModal: false,
+      },
+    });
+  };
+  const handleOk = async () => {
+    try {
+      const values = await form.validateFields();
+      const retcode = await dispatch<any>({
+        type: 'kFModel/document_create',
+        payload: {
+          name: values.name,
+          kb_id,
+        },
+      });
+      if (retcode === 0) {
+        getKfList && getKfList();
+      }
+    } catch (errorInfo) {
+      console.log('Failed:', errorInfo);
+    }
+  };
 
-            </Form>
-        </Modal >
-
-
-    );
-}
-export default connect(({ kFModel, loading }) => ({ kFModel, loading }))(Index);
+  return (
+    <Modal
+      title="Basic Modal"
+      open={isShowCEFwModal}
+      onOk={handleOk}
+      onCancel={handleCancel}
+    >
+      <Form
+        form={form}
+        name="validateOnly"
+        labelCol={{ span: 8 }}
+        wrapperCol={{ span: 16 }}
+        style={{ maxWidth: 600 }}
+        autoComplete="off"
+      >
+        <Form.Item<FieldType>
+          label="文件名"
+          name="name"
+          rules={[{ required: true, message: 'Please input value!' }]}
+        >
+          <Input />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+export default FileCreatingModal;

web/src/pages/add-knowledge/components/knowledge-file/index.tsx

@@ -1,228 +1,273 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { connect, Dispatch, useNavigate } from 'umi'
-import { Space, Table, Input, Button, Switch, Dropdown, } from 'antd';
+import { getOneNamespaceEffectsLoading } from '@/utils/stroreUtil';
+import { DownOutlined } from '@ant-design/icons';
 import type { MenuProps } from 'antd';
-import { DownOutlined } from '@ant-design/icons'
-import { debounce } from 'lodash';
+import { Button, Dropdown, Input, Space, Switch, Table } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import UploadFile from './upload'
-import CreateEPModal from './createEFileModal'
-import SegmentSetModal from './segmentSetModal'
-import styles from './index.less'
-import type { kFModelState } from './model'
+import { debounce } from 'lodash';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useDispatch, useNavigate, useSelector } from 'umi';
+import CreateEPModal from './createEFileModal';
+import styles from './index.less';
+import SegmentSetModal from './segmentSetModal';
+import UploadFile from './upload';
 
 interface DataType {
-    name: string;
-    chunk_num: string;
-    token_num: number;
-    update_date: string;
-    size: string;
-    status: string;
-    id: string;
-    parser_id: string
+  name: string;
+  chunk_num: string;
+  token_num: number;
+  update_date: string;
+  size: string;
+  status: string;
+  id: string;
+  parser_id: string;
 }
 
-interface kFProps {
-    dispatch: Dispatch;
-    kFModel: kFModelState;
-    kb_id: string
+interface KFProps {
+  kb_id: string;
 }
 
-const Index: React.FC<kFProps> = ({ kFModel, dispatch, kb_id }) => {
-    const { data, loading } = kFModel
-    const [inputValue, setInputValue] = useState('')
-    const [doc_id, setDocId] = useState('0')
-    const [parser_id, setParserId] = useState('0')
-    let navigate = useNavigate();
-    const getKfList = (keywords?: string) => {
-        const payload = {
-            kb_id,
-            keywords
-        }
-        if (!keywords) {
-            delete payload.keywords
-        }
-        dispatch({
-            type: 'kFModel/getKfList',
-            payload
-        });
-    }
-    useEffect(() => {
-        if (kb_id) {
-            getKfList()
-        }
-    }, [kb_id])
-    const debounceChange = debounce(getKfList, 300)
-    const debounceCallback = useCallback((value: string) => debounceChange(value), [])
-    const handleInputChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
-        const value = e.target.value
-        setInputValue(value)
-        debounceCallback(e.target.value)
+const KnowledgeFile: React.FC<KFProps> = ({ kb_id }) => {
+  const dispatch = useDispatch();
+  const kFModel = useSelector((state: any) => state.kFModel);
+  const effects = useSelector((state: any) => state.loading.effects);
+  const { data } = kFModel;
+  const loading = getOneNamespaceEffectsLoading('kFModel', effects, [
+    'getKfList',
+    'updateDocumentStatus',
+  ]);
+  const [inputValue, setInputValue] = useState('');
+  const [doc_id, setDocId] = useState('0');
+  const [parser_id, setParserId] = useState('0');
+  let navigate = useNavigate();
 
-    }
-    const onChangeStatus = (e: boolean, doc_id: string) => {
-        dispatch({
-            type: 'kFModel/updateDocumentStatus',
-            payload: {
-                doc_id,
-                status: Number(e)
-            },
-            callback() {
-                getKfList()
-            }
-        });
-    }
-    const onRmDocument = () => {
-        dispatch({
-            type: 'kFModel/document_rm',
-            payload: {
-                doc_id
-            },
-            callback() {
-                getKfList()
-            }
-        });
-
-    }
-    const showCEFModal = () => {
-        dispatch({
-            type: 'kFModel/updateState',
-            payload: {
-                isShowCEFwModal: true
-            }
-        });
+  const getKfList = (keywords?: string) => {
+    const payload = {
+      kb_id,
+      keywords,
     };
-
-    const showSegmentSetModal = () => {
-        dispatch({
-            type: 'kFModel/updateState',
-            payload: {
-                isShowSegmentSetModal: true
-            }
-        });
-    };
-    const actionItems: MenuProps['items'] = useMemo(() => {
-        return [
-            {
-                key: '1',
-                label: (
-                    <div>
-                        <UploadFile kb_id={kb_id} getKfList={getKfList} />
-                    </div>
-
-                ),
-            },
-            {
-                key: '2',
-                label: (
-                    <div>
-                        <Button type="link" onClick={showCEFModal}> 导入虚拟文件</Button>
-                    </div>
-                ),
-                // disabled: true,
-            },
-        ]
-    }, [kb_id]);
-    const chunkItems: MenuProps['items'] = [
-        {
-            key: '1',
-            label: (
-                <div>
-
-                    <Button type="link" onClick={showSegmentSetModal}> 分段设置</Button>
-                </div>
-
-            ),
-        },
-        {
-            key: '2',
-            label: (
-                <div>
-                    <Button type="link" onClick={onRmDocument}> 删除</Button>
-                </div>
-            ),
-            // disabled: true,
-        },
-    ]
-    const toChunk = (id: string) => {
-        console.log(id)
-        navigate(`/knowledge/add/setting?activeKey=file&id=${kb_id}&doc_id=${id}`);
+    if (!keywords) {
+      delete payload.keywords;
     }
-    const columns: ColumnsType<DataType> = [
-        {
-            title: '名称',
-            dataIndex: 'name',
-            key: 'name',
-            render: (text: any, { id }) => <div className={styles.tochunks} onClick={() => toChunk(id)}><img className={styles.img} src='https://gw.alipayobjects.com/zos/antfincdn/efFD%24IOql2/weixintupian_20170331104822.jpg' alt="" />{text}</div>,
-            className: `${styles.column}`
-        },
-        {
-            title: '数据总量',
-            dataIndex: 'chunk_num',
-            key: 'chunk_num',
-            className: `${styles.column}`
-        },
-        {
-            title: 'Tokens',
-            dataIndex: 'token_num',
-            key: 'token_num',
-            className: `${styles.column}`
-        },
-        {
-            title: '文件大小',
-            dataIndex: 'size',
-            key: 'size',
-            className: `${styles.column}`
-        },
-        {
-            title: '状态',
-            key: 'status',
-            dataIndex: 'status',
-            className: `${styles.column}`,
-            render: (_, { status: string, id }) => (
-                <>
-                    <Switch defaultChecked={status === '1'} onChange={(e) => {
-                        onChangeStatus(e, id)
-                    }} />
-                </>
-            ),
-        },
-        {
-            title: 'Action',
-            key: 'action',
-            className: `${styles.column}`,
-            render: (_, record) => (
-                <Space size="middle">
-                    <Dropdown menu={{ items: chunkItems }} trigger={['click']}>
-                        <a onClick={() => {
-                            setDocId(record.id)
-                            setParserId(record.parser_id)
-                        }}>
-                            分段设置 <DownOutlined />
-                        </a>
-                    </Dropdown>
-                </Space>
-            ),
-        },
+    dispatch({
+      type: 'kFModel/getKfList',
+      payload,
+    });
+  };
+
+  useEffect(() => {
+    if (kb_id) {
+      getKfList();
+    }
+  }, [kb_id]);
+
+  const debounceChange = debounce(getKfList, 300);
+  const debounceCallback = useCallback(
+    (value: string) => debounceChange(value),
+    [],
+  );
+  const handleInputChange = (
+    e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
+  ) => {
+    const value = e.target.value;
+    setInputValue(value);
+    debounceCallback(e.target.value);
+  };
+  const onChangeStatus = (e: boolean, doc_id: string) => {
+    dispatch({
+      type: 'kFModel/updateDocumentStatus',
+      payload: {
+        doc_id,
+        status: Number(e),
+        kb_id,
+      },
+    });
+  };
+  const onRmDocument = () => {
+    dispatch({
+      type: 'kFModel/document_rm',
+      payload: {
+        doc_id,
+        kb_id,
+      },
+    });
+  };
+  const showCEFModal = () => {
+    dispatch({
+      type: 'kFModel/updateState',
+      payload: {
+        isShowCEFwModal: true,
+      },
+    });
+  };
+
+  const showSegmentSetModal = () => {
+    dispatch({
+      type: 'kFModel/updateState',
+      payload: {
+        isShowSegmentSetModal: true,
+      },
+    });
+  };
+  const actionItems: MenuProps['items'] = useMemo(() => {
+    return [
+      {
+        key: '1',
+        label: (
+          <div>
+            <UploadFile kb_id={kb_id} getKfList={getKfList} />
+          </div>
+        ),
+      },
+      {
+        key: '2',
+        label: (
+          <div>
+            <Button type="link" onClick={showCEFModal}>
+              {' '}
+              导入虚拟文件
+            </Button>
+          </div>
+        ),
+        // disabled: true,
+      },
     ];
-    return <>
-        <div className={styles.filter}>
-            <div className="search">
-                <Input placeholder="搜索" value={inputValue} style={{ width: 220 }} allowClear onChange={handleInputChange} />
-            </div>
-            <div className="operate">
-                <Dropdown menu={{ items: actionItems }} trigger={['click']} >
-                    <a>
-                        导入文件 <DownOutlined />
-                    </a>
-                </Dropdown>
-
-            </div>
+  }, [kb_id]);
+  const chunkItems: MenuProps['items'] = [
+    {
+      key: '1',
+      label: (
+        <div>
+          <Button type="link" onClick={showSegmentSetModal}>
+            {' '}
+            分段设置
+          </Button>
         </div>
-        <Table rowKey='id' columns={columns} dataSource={data} loading={loading} pagination={false} scroll={{ scrollToFirstRowOnChange: true, x: true }} />
-        <CreateEPModal getKfList={getKfList} kb_id={kb_id} />
-        <SegmentSetModal getKfList={getKfList} parser_id={parser_id} doc_id={doc_id} />
+      ),
+    },
+    {
+      key: '2',
+      label: (
+        <div>
+          <Button type="link" onClick={onRmDocument}>
+            {' '}
+            删除
+          </Button>
+        </div>
+      ),
+      // disabled: true,
+    },
+  ];
+  const toChunk = (id: string) => {
+    console.log(id);
+    navigate(`/knowledge/add/setting?activeKey=file&id=${kb_id}&doc_id=${id}`);
+  };
+  const columns: ColumnsType<DataType> = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+      render: (text: any, { id }) => (
+        <div className={styles.tochunks} onClick={() => toChunk(id)}>
+          <img
+            className={styles.img}
+            src="https://gw.alipayobjects.com/zos/antfincdn/efFD%24IOql2/weixintupian_20170331104822.jpg"
+            alt=""
+          />
+          {text}
+        </div>
+      ),
+      className: `${styles.column}`,
+    },
+    {
+      title: '数据总量',
+      dataIndex: 'chunk_num',
+      key: 'chunk_num',
+      className: `${styles.column}`,
+    },
+    {
+      title: 'Tokens',
+      dataIndex: 'token_num',
+      key: 'token_num',
+      className: `${styles.column}`,
+    },
+    {
+      title: '文件大小',
+      dataIndex: 'size',
+      key: 'size',
+      className: `${styles.column}`,
+    },
+    {
+      title: '状态',
+      key: 'status',
+      dataIndex: 'status',
+      className: `${styles.column}`,
+      render: (_, { status: string, id }) => (
+        <>
+          <Switch
+            defaultChecked={status === '1'}
+            onChange={(e) => {
+              onChangeStatus(e, id);
+            }}
+          />
+        </>
+      ),
+    },
+    {
+      title: 'Action',
+      key: 'action',
+      className: `${styles.column}`,
+      render: (_, record) => (
+        <Space size="middle">
+          <Dropdown menu={{ items: chunkItems }} trigger={['click']}>
+            <a
+              onClick={() => {
+                setDocId(record.id);
+                setParserId(record.parser_id);
+              }}
+            >
+              分段设置 <DownOutlined />
+            </a>
+          </Dropdown>
+        </Space>
+      ),
+    },
+  ];
+  return (
+    <>
+      <div className={styles.filter}>
+        <div className="search">
+          <Input
+            placeholder="搜索"
+            value={inputValue}
+            style={{ width: 220 }}
+            allowClear
+            onChange={handleInputChange}
+          />
+        </div>
+        <div className="operate">
+          <Dropdown menu={{ items: actionItems }} trigger={['click']}>
+            <a>
+              导入文件 <DownOutlined />
+            </a>
+          </Dropdown>
+        </div>
+      </div>
+      <Table
+        rowKey="id"
+        columns={columns}
+        dataSource={data}
+        loading={loading}
+        pagination={false}
+        scroll={{ scrollToFirstRowOnChange: true, x: true }}
+      />
+      <CreateEPModal getKfList={getKfList} kb_id={kb_id} />
+      <SegmentSetModal
+        getKfList={getKfList}
+        parser_id={parser_id}
+        doc_id={doc_id}
+      />
     </>
+  );
 };
 
-export default connect(({ kFModel, loading }) => ({ kFModel, loading }))(Index);
+export default KnowledgeFile;

web/src/pages/add-knowledge/components/knowledge-file/model.ts

@@ -1,57 +1,47 @@
 import kbService from '@/services/kbService';
 import { message } from 'antd';
-import { Effect, Reducer, Subscription } from 'umi';
+import pick from 'lodash/pick';
+import { DvaModel } from 'umi';
 
-export interface kFModelState {
+export interface KFModelState {
   isShowCEFwModal: boolean;
   isShowTntModal: boolean;
   isShowSegmentSetModal: boolean;
-  loading: boolean;
   tenantIfo: any;
   data: any[];
 }
-export interface kFModelType {
-  namespace: 'kFModel';
-  state: kFModelState;
-  effects: {
-    createKf: Effect;
-    updateKf: Effect;
-    getKfDetail: Effect;
-    getKfList: Effect;
-    updateDocumentStatus: Effect;
-    document_rm: Effect;
-    document_create: Effect;
-    document_change_parser: Effect;
-  };
-  reducers: {
-    updateState: Reducer<kFModelState>;
-  };
-  subscriptions: { setup: Subscription };
-}
-const Model: kFModelType = {
+
+const model: DvaModel<KFModelState> = {
   namespace: 'kFModel',
   state: {
     isShowCEFwModal: false,
     isShowTntModal: false,
     isShowSegmentSetModal: false,
-    loading: false,
     tenantIfo: {},
     data: [],
   },
+  reducers: {
+    updateState(state, { payload }) {
+      return {
+        ...state,
+        ...payload,
+      };
+    },
+  },
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {});
     },
   },
   effects: {
-    *createKf({ payload = {}, callback }, { call, put }) {
+    *createKf({ payload = {} }, { call, put }) {
       const { data, response } = yield call(kbService.createKb, payload);
       const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
         message.success('创建成功！');
       }
     },
-    *updateKf({ payload = {}, callback }, { call, put }) {
+    *updateKf({ payload = {} }, { call, put }) {
       const { data, response } = yield call(kbService.updateKb, payload);
       const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
@@ -67,23 +57,12 @@ const Model: kFModelType = {
       }
     },
     *getKfList({ payload = {} }, { call, put }) {
-      yield put({
-        type: 'updateState',
-        payload: {
-          loading: true,
-        },
-      });
       const { data, response } = yield call(
         kbService.get_document_list,
         payload,
       );
       const { retcode, data: res, retmsg } = data;
-      yield put({
-        type: 'updateState',
-        payload: {
-          loading: false,
-        },
-      });
+
       if (retcode === 0) {
         yield put({
           type: 'updateState',
@@ -93,64 +72,64 @@ const Model: kFModelType = {
         });
       }
     },
-    *updateDocumentStatus({ payload = {}, callback }, { call, put }) {
-      yield put({
-        type: 'updateState',
-        payload: {
-          loading: true,
-        },
-      });
+    *updateDocumentStatus({ payload = {} }, { call, put }) {
       const { data, response } = yield call(
         kbService.document_change_status,
-        payload,
+        pick(payload, ['doc_id', 'status']),
       );
       const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
         message.success('修改成功！');
-        yield put({
-          type: 'updateState',
-          payload: {
-            loading: false,
-          },
+        put({
+          type: 'getKfList',
+          payload: { kb_id: payload.kb_id },
         });
-        callback && callback();
       }
     },
-    *document_rm({ payload = {}, callback }, { call, put }) {
-      const { data, response } = yield call(kbService.document_rm, payload);
+    *document_rm({ payload = {} }, { call, put }) {
+      const { data, response } = yield call(kbService.document_rm, {
+        doc_id: payload.doc_id,
+      });
       const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
         message.success('删除成功！');
-        callback && callback();
+        put({
+          type: 'getKfList',
+          payload: { kb_id: payload.kb_id },
+        });
       }
     },
-    *document_create({ payload = {}, callback }, { call, put }) {
+    *document_create({ payload = {} }, { call, put }) {
       const { data, response } = yield call(kbService.document_create, payload);
       const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
+        put({
+          type: 'kFModel/updateState',
+          payload: {
+            isShowCEFwModal: false,
+          },
+        });
         message.success('创建成功！');
-        callback && callback();
       }
+      return retcode;
     },
-    *document_change_parser({ payload = {}, callback }, { call, put }) {
+    *document_change_parser({ payload = {} }, { call, put }) {
       const { data, response } = yield call(
         kbService.document_change_parser,
         payload,
       );
       const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
+        put({
+          type: 'updateState',
+          payload: {
+            isShowSegmentSetModal: false,
+          },
+        });
         message.success('修改成功！');
-        callback && callback();
       }
-    },
-  },
-  reducers: {
-    updateState(state, { payload }) {
-      return {
-        ...state,
-        ...payload,
-      };
+      return retcode;
     },
   },
 };
-export default Model;
+export default model;

web/src/pages/add-knowledge/components/knowledge-file/segmentSetModal.tsx

@@ -1,91 +1,87 @@
-import React from 'react';
-import { connect, Dispatch } from 'umi';
-import i18n from 'i18next';
-import { useTranslation, } from 'react-i18next'
-import { Modal, Tag, Space } from 'antd'
-import { useEffect, useState } from 'react';
+import { Modal, Space, Tag } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'umi';
 import styles from './index.less';
-import type { kFModelState } from './model'
-import type { settingModelState } from '@/pages/setting/model'
 const { CheckableTag } = Tag;
 interface kFProps {
-    dispatch: Dispatch;
-    kFModel: kFModelState;
-    settingModel: settingModelState;
-    getKfList: () => void;
-    parser_id: string;
-    doc_id: string;
+  getKfList: () => void;
+  parser_id: string;
+  doc_id: string;
 }
-const Index: React.FC<kFProps> = ({ kFModel, settingModel, dispatch, getKfList, parser_id, doc_id }) => {
-    const [selectedTag, setSelectedTag] = useState('')
-    const { tenantIfo = {} } = settingModel
-    const { parser_ids = '' } = tenantIfo
-    useEffect(() => {
-        dispatch({
-            type: 'settingModel/getTenantInfo',
-            payload: {
-            }
-        });
-        setSelectedTag(parser_id)
-    }, [parser_id])
-    const { isShowSegmentSetModal } = kFModel
-    const { t } = useTranslation()
-    const handleCancel = () => {
-        dispatch({
-            type: 'kFModel/updateState',
-            payload: {
-                isShowSegmentSetModal: false
-            }
-        });
-    };
-    const handleOk = () => {
-        console.log(1111, selectedTag)
-        dispatch({
-            type: 'kFModel/document_change_parser',
-            payload: {
-                parser_id: selectedTag,
-                doc_id
-            },
-            callback: () => {
-                dispatch({
-                    type: 'kFModel/updateState',
-                    payload: {
-                        isShowSegmentSetModal: false
-                    }
-                });
-                getKfList && getKfList()
-            }
-        });
-    };
+const SegmentSetModal: React.FC<kFProps> = ({
+  getKfList,
+  parser_id,
+  doc_id,
+}) => {
+  const dispatch = useDispatch();
+  const kFModel = useSelector((state: any) => state.kFModel);
+  const settingModel = useSelector((state: any) => state.settingModel);
+  const [selectedTag, setSelectedTag] = useState('');
+  const { tenantIfo = {} } = settingModel;
+  const { parser_ids = '' } = tenantIfo;
+  const { isShowSegmentSetModal } = kFModel;
+  const { t } = useTranslation();
 
-    const handleChange = (tag: string, checked: boolean) => {
-        const nextSelectedTag = checked
-            ? tag
-            : selectedTag;
-        console.log('You are interested in: ', nextSelectedTag);
-        setSelectedTag(nextSelectedTag);
-    };
+  useEffect(() => {
+    dispatch({
+      type: 'settingModel/getTenantInfo',
+      payload: {},
+    });
+    setSelectedTag(parser_id);
+  }, [parser_id]);
 
-    return (
-        <Modal title="Basic Modal" open={isShowSegmentSetModal} onOk={handleOk} onCancel={handleCancel}>
-            <Space size={[0, 8]} wrap>
-                <div className={styles.tags}>
-                    {
-                        parser_ids.split(',').map((tag: string) => {
-                            return (<CheckableTag
-                                key={tag}
-                                checked={selectedTag === tag}
-                                onChange={(checked) => handleChange(tag, checked)}
-                            >
-                                {tag}
-                            </CheckableTag>)
-                        })
-                    }
-                </div>
-            </Space>
-        </Modal >
+  const handleCancel = () => {
+    dispatch({
+      type: 'kFModel/updateState',
+      payload: {
+        isShowSegmentSetModal: false,
+      },
+    });
+  };
 
+  const handleOk = async () => {
+    console.log(1111, selectedTag);
+    const retcode = await dispatch<any>({
+      type: 'kFModel/document_change_parser',
+      payload: {
+        parser_id: selectedTag,
+        doc_id,
+      },
+    });
 
-    );
-}
-export default connect(({ kFModel, settingModel, loading }) => ({ kFModel, settingModel, loading }))(Index);
+    retcode === 0 && getKfList && getKfList();
+  };
+
+  const handleChange = (tag: string, checked: boolean) => {
+    const nextSelectedTag = checked ? tag : selectedTag;
+    console.log('You are interested in: ', nextSelectedTag);
+    setSelectedTag(nextSelectedTag);
+  };
+
+  return (
+    <Modal
+      title="Basic Modal"
+      open={isShowSegmentSetModal}
+      onOk={handleOk}
+      onCancel={handleCancel}
+    >
+      <Space size={[0, 8]} wrap>
+        <div className={styles.tags}>
+          {parser_ids.split(',').map((tag: string) => {
+            return (
+              <CheckableTag
+                key={tag}
+                checked={selectedTag === tag}
+                onChange={(checked) => handleChange(tag, checked)}
+              >
+                {tag}
+              </CheckableTag>
+            );
+          })}
+        </div>
+      </Space>
+    </Modal>
+  );
+};
+export default SegmentSetModal;

web/src/pages/add-knowledge/components/knowledge-file/upload.tsx

@@ -1,33 +1,39 @@
-import React from 'react';
-import { connect } from 'umi'
+import uploadService from '@/services/uploadService';
 import type { UploadProps } from 'antd';
 import { Button, Upload } from 'antd';
-import uploadService from '@/services/uploadService'
+import React from 'react';
 interface PropsType {
-    kb_id: string;
-    getKfList: () => void
+  kb_id: string;
+  getKfList: () => void;
 }
+
 type UploadRequestOption = Parameters<
-    NonNullable<UploadProps["customRequest"]>
+  NonNullable<UploadProps['customRequest']>
 >[0];
-const Index: React.FC<PropsType> = ({ kb_id, getKfList }) => {
-    const createRequest: (props: UploadRequestOption) => void = async function ({ file, onSuccess, onError }) {
-        const { retcode, data } = await uploadService.uploadFile(file, kb_id);
-        if (retcode === 0) {
-            onSuccess && onSuccess(data, file);
 
-        } else {
-            onError && onError(data);
-        }
-        getKfList && getKfList()
-    };
-    const uploadProps: UploadProps = {
-        customRequest: createRequest,
-        showUploadList: false,
-    };
-    return (<Upload {...uploadProps} >
-        <Button type="link">导入文件</Button>
-    </Upload>)
-}
+const FileUpload: React.FC<PropsType> = ({ kb_id, getKfList }) => {
+  const createRequest: (props: UploadRequestOption) => void = async function ({
+    file,
+    onSuccess,
+    onError,
+  }) {
+    const { retcode, data } = await uploadService.uploadFile(file, kb_id);
+    if (retcode === 0) {
+      onSuccess && onSuccess(data, file);
+    } else {
+      onError && onError(data);
+    }
+    getKfList && getKfList();
+  };
+  const uploadProps: UploadProps = {
+    customRequest: createRequest,
+    showUploadList: false,
+  };
+  return (
+    <Upload {...uploadProps}>
+      <Button type="link">导入文件</Button>
+    </Upload>
+  );
+};
 
-export default connect(({ kFModel, settingModel, loading }) => ({ kFModel, settingModel, loading }))(Index);
+export default FileUpload;