kts-components-document-access-point 1.2.5 → 1.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "1.2.5",
+  "version": "1.2.9",
   "private": false,
   "scripts": {
     "start": "dumi dev",

package/src/DocumentWhiteList/control/actions/didilist/index.ts

@@ -6,10 +6,14 @@ import { IParams } from '../../../interface'
 
 export default async (s: ControllerState, params?: IParams) => {
     const res = await DocumentsService.instance.service?.call({ url: '/participant/list', data: params, type: 'post' }) as any;
+    // return res;
     if (res.err) {
         return false;
     }
     if (res.res) {
-        s.didlist = res.res ;
+        
+        s.didlist = res.res;
+        return res;
+        // console.log(s.didlist);
     }
 }

package/src/DocumentWhiteList/control/state/index.ts

@@ -1,5 +1,5 @@
 
-import { IParams, IPageMeta, IFilter } from '../../interface'
+import { IPageMeta, IFilter } from '../../interface'
 
 export interface IBillEnum {
     name: string;

package/src/DocumentWhiteList/index.tsx

@@ -26,7 +26,6 @@ const Main = (props: any) => {
   return (
     <MainContext.Provider value={controller}>
       <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
-        {/* <Header /> */}
         <RulePage />
         {
           visible &&

package/src/DocumentWhiteList/ui/clientmodal/index.tsx

@@ -1,5 +1,6 @@
 import React, { useCallback, useState, useEffect, useMemo } from 'react';
-import { Button, Modal, Table } from 'kts-components-antd-x4';
+import { Button, Modal } from 'kts-components-antd-x4';
+import { Table, Pagination } from 'kts-xui';
 import { AdvancedSearch, KtsForm } from 'kts-components';
 import Main from '../..';
 import PageUI from '../pageui';
@@ -11,15 +12,14 @@ export default function modalcomfirm(props: any) {
     const [params, setParams] = useState({});
     const whiteParams = controller.useMemo(s => s.whiteParams, [])
     const blackParams = controller.useMemo(s => s.params, [])
-    const [pageMeta, setPage] = useState({ pageNum: 1, pageSize: 10 });
+    const [pageMeta, setPage] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageNum: 1, pageSize: 10, total: 0, });
     const [selectedRowKeys, setKey] = useState([]);
     const [list, setList] = useState([]);
     const didlist = controller.useMemo((s) => s.didlist, []);
     const listNature = controller.useMemo((s) => s.listNature, []);
-    const [companyDidNote, setNote] = useState('');
     useEffect(() => {
         (async () => {
-            const res = await controller.synclist({ ...params, type:listNature, ...pageMeta })
+            const res = await controller.synclist({ ...params, type: listNature, ...pageMeta })
             if (res.res) {
                 setList(res.res.items);
             }
@@ -69,17 +69,25 @@ export default function modalcomfirm(props: any) {
         {
             title: 'DID',
             dataIndex: 'customerDid',
+            render: (text: any, record: any) => {
+                if (text) {
+                    return <div><div>{record.customerDidNote}</div>{text}</div>
+                } else {
+                    return ''
+                }
+            }
         },
         {
             title: '所属公司',
             dataIndex: 'customerName',
+            width: 200
         },
         {
             title: '对应我的DID',
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
-                    return <span>{record.companyDidNote}:{text}</span>
+                    return <div><div>{record.companyDidNote}</div>{text}</div>
                 } else {
                     return ''
                 }
@@ -109,7 +117,7 @@ export default function modalcomfirm(props: any) {
         (async () => {
             const res = await controller.addWhite(selectedRowKeys) as any;
             if (res.res) {
-               
+
                 if (listNature === '1') {
                     const data = {
                         ...whiteParams,
@@ -134,9 +142,9 @@ export default function modalcomfirm(props: any) {
                 visible={true}
                 footer={null}
                 onCancel={handleCancel}
-                width={800}
+                width={1000}
             >
-                <div style={{ marginBottom: 24 }}>
+                <div style={{ marginBottom: 24, display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
                     <AdvancedSearch
                         width={480}
                         height={44}
@@ -155,12 +163,16 @@ export default function modalcomfirm(props: any) {
                         >
                         </KtsForm>
                     </AdvancedSearch>
+                    <div>
+                        <Button onClick={handleCancel} style={{ marginRight: 20 }}>取消</Button>
+                        <Button disabled={selectedRowKeys.length > 0 ? false : true} type="primary" onClick={onSubmit}>提交</Button>
+                    </div>
                 </div>
                 <p>{clientInfo.noticeMessage}</p>
                 <Table rowSelection={rowSelection} columns={columns} rowKey="customerDid" dataSource={list} pagination={false} />
-                {pageMeta && <PageUI data={pageMeta} onChange={onPageChange} />}
-                <Button onClick={handleCancel} style={{ marginRight: 20 }}>取消</Button>
-                <Button type="primary" onClick={onSubmit}>提交</Button>
+                {/* {pageMeta && <PageUI data={pageMeta} onChange={onPageChange} />} */}
+                {pageMeta && <Pagination onChange={onPageChange} style={{ padding: '16px 0', flex: 'none', background: 'white', textAlign: 'center' }} total={pageMeta.total} pageSize={pageMeta.pageSize} current={pageMeta.pageNum} showSizeChanger={true} />}
+
             </Modal>
         </div >
 

package/src/DocumentWhiteList/ui/main/black.tsx

@@ -18,14 +18,23 @@ export default function Rule(props: any) {
         {
             title: 'DID',
             dataIndex: 'customerDid',
+            render: (text: any, record: any) => {
+                if (text) {
+                    return <div><div>{record.customerDidNote}</div>{text}</div>
+                } else {
+                    return ''
+                }
+            }
         },
         {
             title: '所属公司',
+            width: 200,
             dataIndex: 'customerName',
         },
         {
-            title: '本条数据状态',
+            title: '数据状态',
             dataIndex: 'dataStatus',
+            width: 100,
             render: (text: any) => dataStatusEnum[text]
         },
         {
@@ -33,7 +42,7 @@ export default function Rule(props: any) {
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
-                    return <span>{record.customerDidNote}:{text}</span>
+                    return <div><div>{record.companyDidNote}</div>{text}</div>
                 } else {
                     return ''
                 }
@@ -42,15 +51,18 @@ export default function Rule(props: any) {
         {
             title: '加入时间',
             dataIndex: 'createTime',
+            width:200,
             render: (text: any) => moment(text).format('YYYY-MM-DD HH:mm')
         },
         {
             title: '最近更新时间',
+            width:200,
             dataIndex: 'updateTime',
             render: (text: any) => moment(text).format('YYYY-MM-DD HH:mm')
         },
         {
             title: '操作',
+            width: 80,
             dataIndex: 'console',
             render: (text: any, record: any) => (
                 <span>

package/src/DocumentWhiteList/ui/main/index.tsx

@@ -26,29 +26,6 @@ export default function Rule(props: any) {
     }, [mode]);
     return (
         <>
-            {/* <PageHeaderTop
-                activeKey={activeKey}
-                onChange={tabsOnChange}
-                tabs={[
-                    {
-                        tab: <div>
-                            <span>白名单设置</span>
-                        </div>, tabKey: '/whitelist'
-                    },
-                    {
-                        tab: <div>
-                            <span>黑名单设置</span>
-                        </div>, tabKey: '/blacklist'
-                    },
-                    {
-                        tab: <div>
-                            <span>切换过滤方式</span>
-                        </div>, tabKey: '/switchmode'
-                    },
-
-                ]}
-            >
-            </PageHeaderTop> */}
             <div style={{ padding: '16px 20px', display: 'flex', justifyContent: "space-between", borderBottom: '1px solid #f0f0f0' }}>
                 <Radio.Group defaultValue="/whitelist" onChange={tabsOnChange}>
                     <Radio.Button value="/whitelist">白名单设置</Radio.Button>

package/src/DocumentWhiteList/ui/main/white.tsx

@@ -17,14 +17,23 @@ export default function Rule(props: any) {
         {
             title: 'DID',
             dataIndex: 'customerDid',
+            render: (text: any, record: any) => {
+                if (text) {
+                    return <div><div>{record.customerDidNote}</div>{text}</div>
+                } else {
+                    return ''
+                }
+            }
         },
         {
             title: '所属公司',
             dataIndex: 'customerName',
+            width: 200
         },
         {
-            title: '本条数据状态',
+            title: '数据状态',
             dataIndex: 'dataStatus',
+            width: 100,
             render: (text: any) => dataStatusEnum[text]
         },
         {
@@ -32,7 +41,7 @@ export default function Rule(props: any) {
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
-                    return <span>{record.customerDidNote}:{text}</span>
+                    return <div><div>{record.companyDidNote}</div>{text}</div>
                 } else {
                     return ''
                 }
@@ -41,16 +50,19 @@ export default function Rule(props: any) {
         {
             title: '加入时间',
             dataIndex: 'createTime',
+            width:200,
             render: (text: any) => moment(text).format('YYYY-MM-DD HH:mm')
         },
         {
             title: '最近更新时间',
             dataIndex: 'updateTime',
+            width:200,
             render: (text: any) => moment(text).format('YYYY-MM-DD HH:mm')
         },
         {
             title: '操作',
             dataIndex: 'console',
+            width:80,
             render: (text: any, record: any) => (
                 <span>
                     {/* {

package/src/DocumentWhiteList/ui/pageheader/BlackHeader.tsx

@@ -50,7 +50,7 @@ export default () => {
                 },
                 dataStatus: {
                     type: "string",
-                    title: "名单性质",
+                    title: "数据状态",
                     enum: [{
                         "label": "使用中",
                         "value": 1

package/src/DocumentWhiteList/ui/pageheader/WhiteHeader.tsx

@@ -25,12 +25,24 @@ export default () => {
         controller.checkclient();
     }, []);
     useEffect(() => {
-        controller.didList({});
+        // console.log(controller);
+        // controller.pipeline(controller.didList)({})
+        (async () => {
+            const res = await controller.didList({}) as any;
+            if (!res.err) {
+                controller.pipeline(async s => {
+                    s.didlist = res.res;
+                })()
+            }
+        })();
+
+
     }, []);
     useEffect(() => {
         const didEnum = didlist.map(item => {
             return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
         })
+
         let obj: any = {
             type: "object",
             properties: {
@@ -49,7 +61,7 @@ export default () => {
                 },
                 dataStatus: {
                     type: "string",
-                    title: "名单性质",
+                    title: "数据状态",
                     enum: [{
                         "label": "使用中",
                         "value": 1

package/src/DocumentWhiteList/ui/whitemodal/index.tsx

@@ -104,21 +104,21 @@ export default function modalcomfirm(props: any) {
                         name="customerDid"
                         rules={[{ required: true, message: '请输入必填项' }]}
                     >
-                        <Input maxLength={200} placeholder="最多输入200个字符" />
+                        <Input maxLength={60} placeholder="最多输入60个字符" />
                     </Form.Item>
                     <Form.Item
                         label="DID备注名称"
                         name="customerDidNote"
                         rules={[{ required: true, message: '请输入必填项' }]}
                     >
-                        <Input maxLength={200} placeholder="最多输入200个字符" />
+                        <Input maxLength={20} placeholder="最多输入20个字符" />
                     </Form.Item>
                     <Form.Item
                         label="所属公司"
                         name="customerName"
                         rules={[{ required: true, message: '请输入必填项' }]}
                     >
-                        <Input maxLength={500} placeholder="最多输入500个字符" />
+                        <Input maxLength={100} placeholder="最多输入100个字符" />
                     </Form.Item>
                     <Form.Item
                         label="对应我的DID"

package/src/DocumentsList/index.tsx

@@ -1,5 +1,6 @@
 import React, { createContext, useEffect } from 'react';
 // import PageHeader from './ui/PageHeader'
+import qs from 'query-string';
 import RuleTable from './ui/RuleTable'
 import DocumentsListController from './DocumentsListController';
 import SendList from './ui/sendlist'
@@ -21,10 +22,12 @@ const Main = (props: any) => {
   const controller = React.useMemo(() => new DocumentsListController(), []);
   const type = controller.useMemo(s => s.type, []);
   useEffect(() => {
-    const params = props.location.query && props.location.query.type;
-    if (params) {
+    const params = props.location.state;
+    const tab = params && params.type;
+    console.log(tab)
+    if (tab) {
       controller.pipeline(async s => {
-        s.type = Number(params);
+        s.type = Number(tab);
       })()
     }
   }, [type]);

package/src/DocumentsList/ui/PageHeader/index.tsx

@@ -47,6 +47,7 @@ export default () => {
         controller.pipeline(async s => {
             s.type = e.target.value;
             s.params = {}
+            history.push({ pathname: '/rulelist', state: { type: e.target.value } })
         })()
     }, [])
     const handleCancel = React.useCallback(() => {
@@ -295,7 +296,7 @@ export default () => {
                 expandLeft={topExpand()}
                 expandRight={[
                     type === 1 && <Button key="1" onClick={batchSend} style={{ marginRight: 10 }}>发布</Button>,
-                    <Dropdown key="2" overlay={menu}>
+                    type === 1 && <Dropdown key="2" overlay={menu}>
                         <Button type="primary" >创建配置</Button>
                     </Dropdown>
                 ]}

package/src/DocumentsRule/ui/main/index.tsx

@@ -94,32 +94,32 @@ export default function Rule(props: any) {
     const handleCancel = useCallback(() => {
         setVisible(false);
     }, [])
-    const autoSave = useCallback(() => {
-        (async () => {
-            // let url = '/schema/config/save';
-            let data: any = { ...schema };
-            const formValue = form.getFieldsValue();
-            let res;
-            if (record && record.id) {
-                // url = '/schema/config/update';
-                data = { ...record, schemaContent: JSON.stringify(data), ...formValue }
-                res = await controller.configupdate(data);
-            } else {
-                data = { schemaContent: JSON.stringify(data), ...formValue }
-                res = await controller.configsave(data);
-            }
-            // const res = await DocumentsService.instance.service?.call({ url, data, type: 'post' }) as any;
-            if (res.err) {
-                return false;
-            } else {
-                if (res.res) {
-                    message.success('保存成功');
-                    setChange(false);
-                    setRecord(res.res);
-                }
-            }
-        })()
-    }, [record, schema]);
+    // const autoSave = useCallback(() => {
+    //     (async () => {
+    //         // let url = '/schema/config/save';
+    //         let data: any = { ...schema };
+    //         const formValue = form.getFieldsValue();
+    //         let res;
+    //         if (record && record.id) {
+    //             // url = '/schema/config/update';
+    //             data = { ...record, schemaContent: JSON.stringify(data), ...formValue }
+    //             res = await controller.configupdate(data);
+    //         } else {
+    //             data = { schemaContent: JSON.stringify(data), ...formValue }
+    //             res = await controller.configsave(data);
+    //         }
+    //         // const res = await DocumentsService.instance.service?.call({ url, data, type: 'post' }) as any;
+    //         if (res.err) {
+    //             return false;
+    //         } else {
+    //             if (res.res) {
+    //                 message.success('保存成功');
+    //                 setChange(false);
+    //                 setRecord(res.res);
+    //             }
+    //         }
+    //     })()
+    // }, [record, schema]);
     // useEffect(() => {
     //     if (status !== 0 && !disabled && first === false) {
     //         autoSave();
@@ -134,13 +134,44 @@ export default function Rule(props: any) {
     /**
      * 手动保存
      */
-    const onSave = useCallback(() => {
-        autoSave();
+    const onSave = useCallback((publish: boolean = false) => {
+        (async () => {
+            form.validateFields().then(async values => {
+                let data: any = { ...schema };
+                // const formValue = form.getFieldsValue();
+                let res;
+                if (record && record.id) {
+                    data = { ...record, schemaContent: JSON.stringify(data), ...values }
+                    res = await controller.configupdate(data);
+                } else {
+                    data = { schemaContent: JSON.stringify(data), ...values }
+                    res = await controller.configsave(data);
+                }
+                if (res.err) {
+                    message.error('保存失败');
+                    return false;
+                } else {
+                    if (res.res) {
+                        message.success('保存成功');
+                        setChange(false);
+                        setRecord(res.res);
+                        if (publish) {
+                            onSendCheck();
+                        }
+                    }
+                }
+            }).catch(errorInfo => {
+                message.error('请输入必填内容！');
+            });
+
+        })()
     }, [record, schema]);
+    /**
+     * 保存并发布
+     */
     const onSendCheck = useCallback(() => {
         (async () => {
             const res = await controller.listbysubjectid({});
-            // const res = await DocumentsService.instance.service?.call({ url: '/dap/web/participant/listBySubjectId', data: null, type: 'get' }) as any;
             if (res.res) {
                 setVisible(true);
                 setList(res.res);
@@ -170,7 +201,7 @@ export default function Rule(props: any) {
         return {
             alignItems: 'center',
             marginBottom: 10,
-            lineHeight:1.2
+            lineHeight: 1.2
         };
     }, [])
     const updateSchema = useCallback((e) => {
@@ -192,9 +223,9 @@ export default function Rule(props: any) {
     }, [hasChange]);
     const goBack = useCallback(() => {
         if (type === 'record') {
-            history.push({ pathname: `/rulelist`, search: `?type=2` })
+            history.push({ pathname: `/rulelist`, state: { type: 2 } })
         } else {
-            history.goBack();
+            history.push({ pathname: `/rulelist`, state: { type: 1 } })
         }
     }, []);
     return <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
@@ -203,8 +234,8 @@ export default function Rule(props: any) {
                 style={{ flex: 1 }}
                 title="配置"
                 extra={[
-                    <Button key="2" style={{ display: type === 'record' ? 'none' : '' }} onClick={onSave}>保存</Button>,
-                    <Button key="3" style={{ display: type === 'record' ? 'none' : '' }} onClick={onSendCheck}>发送</Button>,
+                    <Button key="2" style={{ display: type === 'record' ? 'none' : '' }} onClick={() => { onSave(); }}>保存</Button>,
+                    <Button key="3" style={{ display: type === 'record' ? 'none' : '' }} onClick={() => { onSave(true); }}>保存并发布</Button>,
                     <Button key="1" type="primary" onClick={onQuit}>
                         退出
                     </Button>,