kts-components-document-access-point 1.1.20 → 1.1.24

package/package.json

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

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

@@ -10,7 +10,14 @@ export default async (s: ControllerState, params?: IParams) => {
         return false;
     }
     if (res.res) {
+        res.res.items = res.res.items.map((item: any, index: any) => {
+            return {
+                ...item,
+                index
+            }
+        })
         s.blacklist = res.res.items || [];
+        return res;
         // s.pageMeta = res.res.pageMeta;
     }
 }

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

@@ -10,7 +10,14 @@ export default async (s: ControllerState, params?: IParams) => {
         return false;
     }
     if (res.res) {
+        res.res.items = res.res.items.map((item: any, index: any) => {
+            return {
+                ...item,
+                index
+            }
+        })
         s.whiteblacklist = res.res.items || [];
+        return res;
         // s.pageMeta = res.res.pageMeta;
     }
 }

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

@@ -7,12 +7,12 @@ import Header from '../pageheader/BlackHeader'
 export default function Rule(props: any) {
     const controller = Main.useController();
     const list = controller.useMemo((s) => s.blacklist, []);
-    const pageMeta = controller.useMemo((s) => s.pageMeta, []);
+    const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
+    const [pageParams, setpageParams] = useState<{ pageSize?: number, pageNum?: number, total?: number }>({ pageSize: 10, pageNum: 1, });
+    // const pageMeta = controller.useMemo((s) => s.pageMeta, []);
     const params = controller.useMemo((s) => s.params, []);
     const onPageChange = (pageNum: any, pageSize: any) => {
-        controller.pipeline(async s => {
-            s.pageMeta = { pageNum, pageSize }
-        })()
+        setpageParams({ pageNum, pageSize });
     }
     const columns = useMemo(() => [
         {
@@ -76,16 +76,24 @@ export default function Rule(props: any) {
                 didList: [record]
             })
             if (res.res) {
-                controller.getBlacklist({ ...params, ...pageMeta });
+                const data = {
+                    ...pageParams
+                }
+                setpageParams(data);
             }
         })()
     }, []);
     useEffect(() => {
-        controller.getBlacklist({ ...params, ...pageMeta });
-    }, [params, pageMeta]);
+        (async () => {
+            const res = await controller.getBlacklist({ ...params, ...pageParams });
+            if (res.res) {
+                setpageMeta(res.res.pageMeta);
+            }
+        })()
+    }, [params, pageParams]);
     const rowSelection = useMemo(() => {
         return {
-            onChange: (selectedRowKeys: any,selectedRows:any) => {
+            onChange: (selectedRowKeys: any, selectedRows: any) => {
                 controller.pipeline(async s => {
                     s.selectedBlackRowKey = selectedRows;
                 })()
@@ -96,7 +104,7 @@ export default function Rule(props: any) {
         <>
             <Header />
             <AutoTableContainer style={{ flex: 1, padding: '0 20px', backgroundColor: '#efefef' }} >
-                <Table rowSelection={rowSelection} columns={columns} rowKey="customerDid" dataSource={list} pagination={false} />
+                <Table rowSelection={rowSelection} columns={columns} rowKey="index" dataSource={list} pagination={false} />
             </AutoTableContainer>
             {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} />}
         </>);

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

@@ -7,12 +7,11 @@ import Header from '../pageheader/WhiteHeader'
 export default function Rule(props: any) {
     const controller = Main.useController();
     const list = controller.useMemo((s) => s.whiteblacklist, []);
-    const pageMeta = controller.useMemo((s) => s.pageMeta, []);
+    const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
+    const [pageParams, setpageParams] = useState<{ pageSize?: number, pageNum?: number, total?: number }>({ pageSize: 10, pageNum: 1, });
     const whiteParams = controller.useMemo((s) => s.whiteParams, []);
     const onPageChange = (pageNum: any, pageSize: any) => {
-        controller.pipeline(async s => {
-            s.pageMeta = { pageNum, pageSize }
-        })()
+        setpageParams({ pageNum, pageSize });
     }
     const columns = useMemo(() => [
         {
@@ -47,7 +46,7 @@ export default function Rule(props: any) {
         {
             title: '最近更新时间',
             dataIndex: 'updateTime',
-            render: (text:any) => moment(text).format('YYYY-MM-DD HH:mm')
+            render: (text: any) => moment(text).format('YYYY-MM-DD HH:mm')
         },
         {
             title: '操作',
@@ -76,16 +75,24 @@ export default function Rule(props: any) {
                 didList: [record]
             })
             if (res.res) {
-                controller.getWhitelist({ ...whiteParams, ...pageMeta });
+                const data = {
+                    ...pageParams
+                }
+                setpageParams(data);
             }
         })()
     }, []);
     useEffect(() => {
-        controller.getWhitelist({ ...whiteParams, ...pageMeta });
-    }, [whiteParams, pageMeta]);
+        (async () => {
+            const res = await controller.getWhitelist({ ...whiteParams, ...pageParams });
+            if (res.res) {
+                setpageMeta(res.res.pageMeta);
+            }
+        })()
+    }, [whiteParams, pageParams]);
     const rowSelection = useMemo(() => {
         return {
-            onChange: (selectedRowKeys: any,selectedRows:any) => {
+            onChange: (selectedRowKeys: any, selectedRows: any) => {
                 controller.pipeline(async s => {
                     s.selectedRowKey = selectedRows;
                 })()
@@ -96,7 +103,7 @@ export default function Rule(props: any) {
         <>
             <Header />
             <AutoTableContainer style={{ flex: 1, padding: '0 20px', backgroundColor: '#efefef' }} >
-                <Table rowSelection={rowSelection} columns={columns} rowKey="customerDid" dataSource={list} pagination={false} />
+                <Table rowSelection={rowSelection} columns={columns} rowKey="index" dataSource={list} pagination={false} />
             </AutoTableContainer>
             {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} />}
         </>);

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

@@ -1,11 +1,17 @@
 import React, { useCallback, useState, useEffect, useMemo } from 'react';
 import { Modal, Form, Input, Button, Select } from 'kts-components-antd-x4';
 import Main from '../..';
+/**
+ * 手动添加黑白名单弹窗
+ * @param 
+ * @returns 
+ */
 export default function modalcomfirm(props: any) {
     const [form] = Form.useForm();
     const [data, setData] = useState();
     const controller = Main.useController();
     const params = controller.useMemo((s) => s.params, []);
+    const whiteParams = controller.useMemo((s) => s.whiteParams, []);
     const pageMeta = controller.useMemo((s) => s.pageMeta, []);
     const listNature = controller.useMemo((s) => s.listNature, []);
     const didlist = controller.useMemo((s) => s.didlist, []);
@@ -47,9 +53,19 @@ export default function modalcomfirm(props: any) {
 
             if (res.res) {
                 if (listNature === '1') {
-                    controller.getWhitelist({ ...params, ...pageMeta });
+                    const data={
+                        ...whiteParams
+                    }
+                    controller.pipeline(async s => {
+                        s.whiteParams = data;
+                    })()
                 } else {
-                    controller.getBlacklist({ ...params, ...pageMeta });
+                    const data={
+                        ...params
+                    }
+                    controller.pipeline(async s => {
+                        s.params = data;
+                    })()
                 }
             }
             handleCancel();

package/src/DocumentsList/index.tsx

@@ -1,5 +1,5 @@
 import React, { createContext } from 'react';
-import PageHeader from './ui/PageHeader'
+// import PageHeader from './ui/PageHeader'
 import RuleTable from './ui/RuleTable'
 import DocumentsListController from './DocumentsListController';
 import SendList from './ui/sendlist'
@@ -21,7 +21,7 @@ const Main = (props: any) => {
   return (
     <DocumentsListContext.Provider value={controller}>
       <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
-        <PageHeader />
+        {/* <PageHeader /> */}
         {
           type === 1 &&
           <RuleTable />

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

@@ -24,7 +24,7 @@ export default function modalcomfirm(props: any) {
             const data = selectItems.map((item: any) => {
                 return {
                     ...item,
-                    sendPartitionId: targetId,
+                    senderPartitionId: targetId,
                     privateList: [],
                     sendPublic: true
                 };
@@ -51,7 +51,7 @@ export default function modalcomfirm(props: any) {
     return (
         <div>
             <Modal
-                title="请选择"
+                title="请选择我司对应DID"
                 visible={true}
                 onOk={handleOk}
                 onCancel={handleCancel}

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

@@ -0,0 +1,230 @@
+import React, { useRef, useState, useEffect, useMemo, useCallback } from 'react';
+import { Radio, Button, Dropdown, PageHeaderFoot } from 'kts-xui';
+import { Menu } from 'kts-components-antd-x4';
+import { AdvancedSearch, KtsForm } from 'kts-components';
+import { LifeCycleTypes } from '@formily/antd';
+import Main from '../..';
+import ModalComfirm from '../ModalComfirm'
+import { DocumentsService } from "../../..";
+import _ from 'lodash';
+import { useHistory } from 'react-router-dom';
+const { SubMenu } = Menu;
+export default () => {
+    const history = useHistory();
+    const controller = Main.useController();
+    const type = controller.useMemo(s => s.type, [])
+    const [billEnum, setBill] = useState([]);
+    const selectedRowKey = controller.useMemo(s => s.selectedRowKey, [])
+    const params = controller.useMemo(s => s.params, [])
+    const visible = controller.useMemo(s => s.visible, []);
+    const [profileEnum, setProfile] = useState([]);
+    const [schema, setSchema] = useState({});
+    const ktsRef = useRef(null);
+    useEffect(() => {
+        (async () => {
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
+            if (res.err) {
+                return false;
+            } else {
+                const list = res.res.map((item: any) => {
+                    return { ...item, label: item.name, value: item.value }
+                })
+                setBill(list);
+            }
+        })()
+    }, []);
+    const onSearchFormSubmit = React.useCallback((value) => {
+        value = {
+            ...value,
+            typeList: value['typeList'] && [value['typeList']]
+        }
+        controller.pipeline(async s => {
+            s.params = value;
+        })()
+    }, [controller])
+
+    const switchType = React.useCallback((e) => {
+        controller.pipeline(async s => {
+            s.type = e.target.value;
+            s.params = {}
+        })()
+    }, [])
+    const handleCancel = React.useCallback(() => {
+        controller.pipeline(async s => {
+            s.visible = false;
+        })()
+    }, []);
+    const batchSend = React.useCallback(() => {
+        controller.pipeline(async s => {
+            s.visible = true;
+        })()
+    }, [controller]);
+    useEffect(() => {
+        let obj: any = {
+            type: "object",
+            properties: {
+                configName: {
+                    type: "string",
+                    title: "配置名称",
+                },
+                attributionList: {
+                    type: "string",
+                    title: "发送对象",
+                    visible: type === 2 ? true : false
+                },
+                type: {
+                    type: "string",
+                    title: "单据大类",
+                    enum: billEnum,
+                },
+                profile: {
+                    type: "string",
+                    title: "单据子类",
+                    enum: profileEnum,
+                    visible: false
+                },
+                attribution: {
+                    type: "string",
+                    title: "单据类型",
+                    enum: [{
+                        "label": "发送方",
+                        "value": '1'
+                    }, {
+                        "label": "接收方",
+                        "value": '0'
+                    }],
+                    'x-props': {
+                        mode: "multiple"
+                    }
+                },
+                '[beginCreateTime,endCreateTime]': {
+                    key: "[beginCreateTime,endCreateTime",
+                    name: "[beginCreateTime,endCreateTime",
+                    type: "daterange",
+                    title: "创建时间",
+                },
+                '[beginSendTime,endSendTime]': {
+                    key: "[beginSendTime,endSendTime",
+                    name: "[beginSendTime,endSendTime",
+                    type: "daterange",
+                    title: "更新时间",
+                },
+            }
+        }
+        setSchema(obj);
+    }, [billEnum, type, profileEnum])
+    const onCreateType = useCallback((category, record?) => {
+        history.push({ pathname: `/rule`, search: `?type=config&profile=${record && record.value || ''}&billtype=${category}` })
+    }, [])
+    const topExpand = useCallback(() => {
+        return (
+            <div style={{ display: 'flex' }}>
+                <div style={{ marginRight: 10 }}>
+                    <Radio.Group value={type} onChange={switchType}>
+                        <Radio.Button value={1}>单据校验规则配置</Radio.Button>
+                        <Radio.Button value={2}>发布记录</Radio.Button>
+                    </Radio.Group>
+                </div>
+                <AdvancedSearch
+                    width={480}
+                    height={44}
+                    compact={true}
+                    defaultKey="configName"
+                    placeholder="输入配置名称"
+                    searchFormSubmit={onSearchFormSubmit}
+                >
+                    <KtsForm
+                        ref={ktsRef}
+                        labelCol={9}
+                        wrapperCol={15}
+                        labelAlign='left'
+                        compact={true}
+                        schema={schema}
+                        defaultValue={_.pick(params, ['configName', 'type', 'profile', 'attributionList', 'attribution', '[beginCreateTime,endCreateTime]', '[beginSendTime,endSendTime]'])}
+                        effects={($: any, actions: any) => {
+                            $(LifeCycleTypes.ON_FIELD_VALUE_CHANGE, 'type',).subscribe((fieldState: any) => {
+                                if (fieldState.value) {
+                                    const target: any = billEnum.find((item: any) => item.value === fieldState.value);
+                                    if (target && target.profileList) {
+                                        actions.setFieldState('profile', (state: any) => {
+                                            state.visible = true;
+                                        });
+                                        const list = target.profileList.map((item: any) => {
+                                            return {
+                                                label: item.name,
+                                                value: item.value
+                                            }
+                                        })
+                                        setProfile(list);
+                                    } else {
+                                        actions.setFieldState('profile', (state: any) => {
+                                            state.visible = false;
+                                        });
+                                        setProfile([])
+                                    }
+                                } else {
+                                    actions.setFieldState('profile', (state: any) => {
+                                        state.visible = false;
+                                    });
+                                    setProfile([])
+                                }
+                            });
+                        }}
+                    >
+                    </KtsForm>
+                </AdvancedSearch>
+                
+            </div>
+        );
+    }, [type,schema]);
+    const menu = useMemo(() => {
+        return (
+            <Menu>
+                {billEnum && billEnum.map((item: any, key) => {
+                    if (item.profileList) {
+                        return (
+                            <SubMenu key={key} title={item.label}>
+                                {
+                                    item.profileList.map((element: any) => {
+                                        return (
+                                            <Menu.Item key={element.value} onClick={() => { onCreateType(item.value, element); }}>
+                                                <a >
+                                                    {element.name}
+                                                </a>
+                                            </Menu.Item>
+                                        )
+                                    })
+                                }
+                            </SubMenu>
+                        )
+                    } else {
+                        return (
+                            <Menu.Item key={item.value} onClick={() => { onCreateType(item.value); }}>
+                                <a >
+                                    {item.label}
+                                </a>
+                            </Menu.Item>
+                        )
+                    }
+                })}
+
+            </Menu>);
+    }, [billEnum]);
+    return (
+        <div style={{ flex: 'none', position: 'relative', zIndex: 1 }}>
+            <PageHeaderFoot
+                expandLeft={topExpand()}
+                expandRight={[
+                    type === 1 && <Button key="1" onClick={batchSend} style={{ marginRight: 10 }}>批量发布</Button>,
+                    <Dropdown key="2" overlay={menu}>
+                        <Button type="primary" >创建配置</Button>
+                    </Dropdown>
+                ]}
+            >
+            </PageHeaderFoot>
+            {
+                visible && <ModalComfirm handleCancel={handleCancel} list={selectedRowKey} />
+            }
+        </div>
+    );
+};