kts-components-document-access-point 1.2.10 → 1.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "1.2.10",
+  "version": "1.2.14",
   "private": false,
   "scripts": {
     "start": "dumi dev",
@@ -31,7 +31,7 @@
     "@formily/antd-components": "^1.3.17",
     "@types/uuid": "^8.3.1",
     "antd": "3.26.20",
-    "grey-react-box": "^0.2.13",
+    "grey-react-box": "^0.2.15",
     "kts-component-service": "^1.0.4",
     "kts-components": "^1.2.20",
     "kts-components-antd-x4": "^4.0.3",

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

@@ -4,7 +4,7 @@ import { IParams } from '../../../interface'
 
 
 
-export default async (s: ControllerState, params?: IParams) => {
+export default async (s: ControllerState, params?:IParams) => {
     const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/queryWhiteListPage', data: params, type: 'post' }) as any;
     if (res.err) {
         return false;

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

@@ -11,11 +11,16 @@ export interface IBillType {
 }
 export interface IWhitelist {
     customerDidNote: string;
-    createTime: string;
+    createTime: number;
     dataStatus: number;
-    listNature: number;
+    listNature?: number;
     customerDid: string;
-    updateTime: string;
+    updateTime: number;
+    companyDid: string,
+    companyDidNote: string | null;
+    customerName: string;
+    id: string;
+    subId: string;
 }
 interface IClient {
     buttonName?: string;

package/src/DocumentWhiteList/index.tsx

@@ -1,5 +1,5 @@
 
-import React, { createContext } from 'react';
+import React, { createContext, useEffect } from 'react';
 import Controller from './control';
 import RulePage from './ui/main'
 import WhiteModal from './ui/whitemodal'

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

@@ -51,7 +51,7 @@ export default function modalcomfirm(props: any) {
                 },
                 companyDid: {
                     type: "string",
-                    title: "对应我的DID",
+                    title: "我司对应DID",
                     enum: didEnum
                 },
                 customerDidNote: {
@@ -83,7 +83,7 @@ export default function modalcomfirm(props: any) {
             width: 200
         },
         {
-            title: '对应我的DID',
+            title: '我司对应DID',
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
@@ -115,7 +115,12 @@ export default function modalcomfirm(props: any) {
     }, [])
     const onSubmit = useCallback(() => {
         (async () => {
-            const res = await controller.addWhite(selectedRowKeys) as any;
+            let res;
+            if (listNature === '1') {
+                res = await controller.addWhite(selectedRowKeys) as any;
+            } else {
+                res = await controller.addBlack(selectedRowKeys) as any;
+            }
             if (res.res) {
 
                 if (listNature === '1') {

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

@@ -35,10 +35,17 @@ export default function Rule(props: any) {
             title: '数据状态',
             dataIndex: 'dataStatus',
             width: 100,
-            render: (text: any) => dataStatusEnum[text]
+            render: (text: any) => {
+                if (text === 2) {
+                    return <span>停用</span>
+                }
+                if (text === 1) {
+                    return <span style={{ color: '#0074ff' }}>使用中</span>
+                }
+            }
         },
         {
-            title: '对应我的DID',
+            title: '我司对应DID',
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
@@ -51,15 +58,15 @@ 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',
+            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,
@@ -100,6 +107,9 @@ export default function Rule(props: any) {
             const res = await controller.getBlacklist({ ...params, ...pageParams });
             if (res.res) {
                 setpageMeta(res.res.pageMeta);
+                await controller.pipeline(async s => {
+                    s.blacklist = res.res.items || [];
+                })()
             }
         })()
     }, [params, pageParams]);

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

@@ -12,7 +12,7 @@ export default function Rule(props: any) {
     const whiteParams = controller.useMemo((s) => s.whiteParams, []);
     const onPageChange = (pageNum: any, pageSize: any) => {
         setpageParams({ pageNum, pageSize });
-    }
+    };
     const columns = useMemo(() => [
         {
             title: 'DID',
@@ -34,10 +34,17 @@ export default function Rule(props: any) {
             title: '数据状态',
             dataIndex: 'dataStatus',
             width: 100,
-            render: (text: any) => dataStatusEnum[text]
+            render: (text: any) => {
+                if (text === 2) {
+                    return <span>停用</span>
+                }
+                if (text === 1) {
+                    return <span style={{ color: '#0074ff' }}>使用中</span>
+                }
+            }
         },
         {
-            title: '对应我的DID',
+            title: '我司对应DID',
             dataIndex: 'companyDid',
             render: (text: any, record: any) => {
                 if (text) {
@@ -50,19 +57,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,
+            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,
+            width: 80,
             render: (text: any, record: any) => (
                 <span>
                     {/* {
@@ -99,9 +106,13 @@ export default function Rule(props: any) {
             const res = await controller.getWhitelist({ ...whiteParams, ...pageParams });
             if (res.res) {
                 setpageMeta(res.res.pageMeta);
+                
+                // await controller.pipeline(async s => {
+                //     s.whiteblacklist = res.res.items || [];
+                // })()
             }
         })()
-    }, [whiteParams, pageParams]);
+    }, [whiteParams]);
     const rowSelection = useMemo(() => {
         return {
             onChange: (selectedRowKeys: any, selectedRows: any) => {

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

@@ -45,7 +45,7 @@ export default () => {
                 },
                 companyDid: {
                     type: "string",
-                    title: "对应我的DID",
+                    title: "我司对应DID",
                     enum: didEnum
                 },
                 dataStatus: {

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

@@ -25,8 +25,6 @@ export default () => {
         controller.checkclient();
     }, []);
     useEffect(() => {
-        // console.log(controller);
-        // controller.pipeline(controller.didList)({})
         (async () => {
             const res = await controller.didList({}) as any;
             if (!res.err) {
@@ -35,7 +33,7 @@ export default () => {
                 })()
             }
         })();
-
+        
 
     }, []);
     useEffect(() => {
@@ -56,7 +54,7 @@ export default () => {
                 },
                 companyDid: {
                     type: "string",
-                    title: "对应我的DID",
+                    title: "我司对应DID",
                     enum: didEnum
                 },
                 dataStatus: {

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

@@ -121,7 +121,7 @@ export default function modalcomfirm(props: any) {
                         <Input maxLength={100} placeholder="最多输入100个字符" />
                     </Form.Item>
                     <Form.Item
-                        label="对应我的DID"
+                        label="我司对应DID"
                         name="companyDid"
                         rules={[{ required: true, message: '请输入必填项' }]}
                     >

package/src/DocumentsDemo/Controller/index.tsx

@@ -0,0 +1,15 @@
+import GreyReactBox from "grey-react-box";
+import getWhitelist from './whitelist';
+
+
+export class ControllerState{
+
+}
+
+export default class Controller extends GreyReactBox<ControllerState> {
+  constructor(){
+      super(new ControllerState)
+  }
+
+  getWhitelist = this.pipeline(getWhitelist);
+}

package/src/DocumentsDemo/Controller/whitelist.ts

@@ -0,0 +1,23 @@
+import { ControllerState } from '.';
+import { DocumentsService } from "../../";
+
+export default async (s: any) => {
+    
+    console.log('DocumentsService.instance.service ===>', DocumentsService.instance.service);
+    const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/queryWhiteListPage', data: { pageSize: 10, pageNum: 1 }, type: 'post' }) as any;
+    
+    if (res.err) {
+        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/DocumentsDemo/Text.tsx

@@ -0,0 +1,23 @@
+
+import { Button } from 'kts-components-antd-x4';
+import React from 'react';
+import DocumentsDemo from './'
+
+export default (props: any) => {
+
+    const controller = DocumentsDemo.useController()
+
+    const whiteblacklist = controller.useMemo((s: any) => s.whiteblacklist, [])
+
+    console.log(whiteblacklist);
+
+    React.useEffect(() => {
+        controller.getWhitelist()
+    }, [])
+
+    return (
+        <div>
+            <Button>发送</Button>
+        </div>
+    );
+};

package/src/DocumentsDemo/___demo___/base/index.tsx

@@ -0,0 +1,8 @@
+import { DocumentsDemo } from "../../../";
+import React from "react";
+
+export default () => {
+  return (
+    <DocumentsDemo />
+  );
+};

package/src/DocumentsDemo/index.md

@@ -0,0 +1,6 @@
+# DocumentsDemo
+
+## 基础用法
+<code src="./___demo___/base/index.tsx" ></code>
+
+

package/src/DocumentsDemo/index.tsx

@@ -0,0 +1,36 @@
+
+import React from 'react';
+import Controller from './Controller'
+import Text from './Text'
+import { DocumentsService } from "../";
+import { ComponentServicePlatform } from "kts-component-service";
+
+// 解决前端跨越问题，此代码跨越忽悠
+window.document.domain = window.location.host.split('.').slice(-2).join('.').split(':')[0];
+
+// 设置 sdk 
+DocumentsService.instance.service = new ComponentServicePlatform((window.top as any)['$$_kxl_sdk']);
+
+// 设置上下文
+DocumentsService.instance.service.context = '/dap/web';
+
+
+export const DocumentsEditContext = React.createContext<any>(undefined as any);
+
+export default class DocumentsCont extends React.Component<any> {
+
+  static useController = () => React.useContext(DocumentsEditContext);
+
+  render = () => <Main {...this.props} />
+}
+
+const Main = (props: any) => {
+
+  const controller = React.useMemo(() => new Controller(), []);
+
+  return (
+    <DocumentsEditContext.Provider value={controller}>
+      <Text />
+    </DocumentsEditContext.Provider>
+  );
+};

package/src/DocumentsList/index.tsx

@@ -1,6 +1,5 @@
 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'

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

@@ -2,9 +2,11 @@ import React, { useCallback, useState, useEffect, useMemo } from 'react';
 import { Radio, message, Tooltip } from 'kts-components-antd-x4';
 import { Modal } from 'kts-xui';
 import Main from '../../';
+import { useHistory } from 'react-router-dom';
 import { DocumentsService } from "../../../";
 export default function modalcomfirm(props: any) {
     const selectItems = props.list;
+    const history = useHistory();
     const controller = Main.useController();
     const targetId = controller.useMemo(s => s.targetId, [])
     const [targetList, setTargetList] = useState([]);
@@ -31,11 +33,21 @@ export default function modalcomfirm(props: any) {
             });
             const res = await DocumentsService.instance.service?.call({ url: '/schema/config/batchSend', data: data, type: 'post' }) as any;
             if (res.res) {
+                gotoSendlist();
                 message.success('操作成功');
                 props.handleCancel()
             }
         })()
     }, [targetId]);
+    const gotoSendlist=useCallback(()=>{
+        controller.pipeline(async s => {
+            s.type = 2;
+            if(selectItems.length===1){
+                s.params = { configNumber: selectItems[0].configNumber }
+            }
+            history.push({ pathname: `/rulelist`, state: { type: 2 } })
+        })()
+    },[]);
     const targetSelect = useCallback((e) => {
         controller.pipeline(async s => {
             s.targetId = e.target.value;
@@ -43,9 +55,9 @@ export default function modalcomfirm(props: any) {
     }, []);
     const radioStyle = useMemo(() => {
         return {
-            alignItems:'center',
-            marginBottom:10,
-            lineHeight:1.2
+            alignItems: 'center',
+            marginBottom: 10,
+            lineHeight: 1.2
         };
     }, [])
     return (
@@ -60,12 +72,12 @@ export default function modalcomfirm(props: any) {
                     {
                         targetList.map((item: any, key) => {
                             return <Radio style={radioStyle as any} key={key} value={item.participantId} >
-                                <Tooltip title={item.participantId}>
-                                    <div style={{ display: 'flex', flexDirection:'column',alignContent:'flex-start'}}>
-                                        <span>{item.remarkName}2</span>
-                                        <span style={{ maxWidth: 460, overflow: 'hidden', textOverflow: 'ellipsis', display: 'block' }}>{item.participantId}</span>
-                                    </div>
-                                </Tooltip></Radio>
+
+                                <div style={{ display: 'flex', flexDirection: 'column', alignContent: 'flex-start' }}>
+                                    <span>{item.remarkName}2</span>
+                                    <span style={{ maxWidth: 460, overflow: 'hidden', textOverflow: 'ellipsis', display: 'block' }}>{item.participantId}</span>
+                                </div>
+                            </Radio>
                         })
                     }
                 </Radio.Group>

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

@@ -20,6 +20,15 @@ export default () => {
     const [profileEnum, setProfile] = useState([]);
     const [schema, setSchema] = useState({});
     const ktsRef = useRef(null);
+    const [didlist, setDidList] = useState([]);//我司对应DID
+    useEffect(() => {
+        (async () => {
+            const res = await DocumentsService.instance.service?.call({ url: '/participant/listBySubjectId', data: {}, type: 'get' }) as any;
+            if (res.res) {
+                setDidList(res.res);
+            }
+        })()
+    }, []);
     useEffect(() => {
         (async () => {
             const res = await DocumentsService.instance.service?.call({ url: '/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
@@ -61,6 +70,9 @@ export default () => {
         })()
     }, [controller]);
     useEffect(() => {
+        const didEnum = didlist.map((item: any) => {
+            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
+        })
         if (type === 1) {
             let obj: any = {
                 type: "object",
@@ -86,14 +98,14 @@ export default () => {
                         visible: false
                     },
                     attribution: {
-                        type: "string",
-                        title: "单据类型",
+                        type: "radio",
+                        title: "收发角色",
                         enum: [{
                             "label": "发送方",
-                            "value": '1'
+                            "value": 1
                         }, {
                             "label": "接收方",
-                            "value": '0'
+                            "value": 0
                         }],
                         'x-props': {
                             mode: "multiple"
@@ -138,10 +150,10 @@ export default () => {
                         title: "我的收发角色",
                         enum: [{
                             "label": "发送方",
-                            "value": '1'
+                            "value": 1
                         }, {
                             "label": "接收方",
-                            "value": '0'
+                            "value": 0
                         }],
                         'x-props': {
                             mode: "multiple"
@@ -152,15 +164,16 @@ export default () => {
                         title: "发送对象",
                         visible: true
                     },
-                    did: {
+                    senderParticipantId: {
                         type: "string",
                         title: "我司对应DID",
+                        enum: didEnum
                     },
-                    duixiang: {
+                    receiverParticipantId: {
                         type: "string",
                         title: "接受对象",
                     },
-                    duixianggongsi: {
+                    receiverCompany: {
                         type: "string",
                         title: "接受对象所属公司",
                     },
@@ -175,7 +188,7 @@ export default () => {
                         enum: profileEnum,
                         visible: false
                     },
-                    
+
                     '[beginCreateTime,endCreateTime]': {
                         key: "[beginCreateTime,endCreateTime",
                         name: "[beginCreateTime,endCreateTime",
@@ -193,7 +206,7 @@ export default () => {
             setSchema(obj);
         }
 
-    }, [billEnum, type, profileEnum])
+    }, [billEnum, type, profileEnum, didlist])
     const onCreateType = useCallback((category, record?) => {
         history.push({ pathname: `/rule`, search: `?type=config&profile=${record && record.value || ''}&billtype=${category}` })
     }, [])

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

@@ -157,6 +157,9 @@ export default function Rule(props: any) {
                         setRecord(res.res);
                         if (publish) {
                             onSendCheck();
+                           
+                        }else{
+                            history.push({ pathname: `/rulelist`, state: { type: 1 } })
                         }
                     }
                 }
@@ -175,6 +178,7 @@ export default function Rule(props: any) {
             if (res.res) {
                 setVisible(true);
                 setList(res.res);
+                
             }
         })()
     }, []);
@@ -187,10 +191,10 @@ export default function Rule(props: any) {
                 sendPublic: true
             }
             const res = await controller.batchsend([data]);
-            // const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/batchSend', data: [data], type: 'post' }) as any;
             if (res.res) {
                 message.success('操作成功');
                 handleCancel()
+                history.push({ pathname: `/rulelist`, state: { type: 2 } })
             }
         })()
     }, [targetId, record]);
@@ -327,12 +331,11 @@ export default function Rule(props: any) {
             <Radio.Group onChange={targetSelect} value={targetId}>
                 {targetList.map((item: any, key) => {
                     return <Radio style={radioStyle as any} key={key} value={item.participantId}>
-                        <Tooltip title={item.participantId}>
-                            <div style={{ display: 'flex', flexDirection: 'column', alignContent: 'flex-start' }}>
-                                <span>{item.remarkName}</span>
-                                <span style={{ maxWidth: 460, overflow: 'hidden', textOverflow: 'ellipsis', display: 'block' }}>{item.participantId}</span>
-                            </div>
-                        </Tooltip>
+
+                        <div style={{ display: 'flex', flexDirection: 'column', alignContent: 'flex-start' }}>
+                            <span>{item.remarkName}</span>
+                            <span style={{ maxWidth: 460, overflow: 'hidden', textOverflow: 'ellipsis', display: 'block' }}>{item.participantId}</span>
+                        </div>
                     </Radio>
                 })}
             </Radio.Group>

package/src/index.ts

@@ -6,3 +6,4 @@ export { default as DocumentsService } from './DocumentsService';
 export { default as DocumentsCont } from './DocumentsCont';
 export { default as DocumentsRule } from './DocumentsRule';
 export { default as DocumentWhiteList } from './DocumentWhiteList';
+export { default as DocumentsDemo } from './DocumentsDemo';