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

package/dist/index.js

@@ -2753,7 +2753,7 @@ function modalcomfirm(props) {
             case 0:
               data = selectItems.map(function (item) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
-                  sendPartitionId: targetId,
+                  senderPartitionId: targetId,
                   privateList: [],
                   sendPublic: true
                 });
@@ -2811,7 +2811,7 @@ function modalcomfirm(props) {
     };
   }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(ktsXui.Modal, {
-    title: "\u8BF7\u9009\u62E9",
+    title: "\u8BF7\u9009\u62E9\u6211\u53F8\u5BF9\u5E94DID",
     visible: true,
     onOk: handleOk,
     onCancel: handleCancel
@@ -2997,62 +2997,129 @@ var PageHeader = (function () {
     }())();
   }, [controller]);
   React.useEffect(function () {
-    var obj = {
-      type: "object",
-      properties: {
-        // configNumber: {
-        //     type: "string",
-        //     title: "配置编号",
-        // },
-        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"
+    if (type === 1) {
+      var obj = {
+        type: "object",
+        properties: {
+          configName: {
+            type: "string",
+            title: "配置名称"
+          },
+          attributionList: {
+            type: "string",
+            title: "发送对象",
+            visible: 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: "更新时间"
           }
-        },
-        '[beginCreateTime,endCreateTime]': {
-          key: "[beginCreateTime,endCreateTime",
-          name: "[beginCreateTime,endCreateTime",
-          type: "daterange",
-          title: "创建时间"
-        },
-        '[beginSendTime,endSendTime]': {
-          key: "[beginSendTime,endSendTime",
-          name: "[beginSendTime,endSendTime",
-          type: "daterange",
-          title: "更新时间"
         }
-      }
-    };
-    setSchema(obj);
+      };
+      setSchema(obj);
+    } else if (type === 2) {
+      var _obj = {
+        type: "object",
+        properties: {
+          configName: {
+            type: "string",
+            title: "配置名称"
+          },
+          biaoshi: {
+            type: "string",
+            title: "标识"
+          },
+          attributionList: {
+            type: "string",
+            title: "发送对象",
+            visible: true
+          },
+          did: {
+            type: "string",
+            title: "我司对应DID"
+          },
+          duixiang: {
+            type: "string",
+            title: "接受对象"
+          },
+          duixianggongsi: {
+            type: "string",
+            title: "接受对象所属公司"
+          },
+          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]);
   var onCreateType = React.useCallback(function (category, record) {
     history.push({
@@ -3076,7 +3143,7 @@ var PageHeader = (function () {
       value: 1
     }, "\u5355\u636E\u6821\u9A8C\u89C4\u5219\u914D\u7F6E"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Radio.Button, {
       value: 2
-    }, "\u53D1\u9001\u8BB0\u5F55"))), /*#__PURE__*/React__default['default'].createElement(ktsComponents.AdvancedSearch, {
+    }, "\u53D1\u5E03\u8BB0\u5F55"))), /*#__PURE__*/React__default['default'].createElement(ktsComponents.AdvancedSearch, {
       width: 480,
       height: 44,
       compact: true,
@@ -3090,16 +3157,15 @@ var PageHeader = (function () {
       labelAlign: 'left',
       compact: true,
       schema: schema,
-      defaultValue: ___default['default'].pick(params, ['configNumber', 'configName', 'type', 'profile', 'attributionList', 'attribution', '[beginCreateTime,endCreateTime]', '[beginSendTime,endSendTime]']),
+      defaultValue: ___default['default'].pick(params, ['configName', 'type', 'profile', 'attributionList', 'attribution', '[beginCreateTime,endCreateTime]', '[beginSendTime,endSendTime]']),
       effects: function effects($, actions) {
         $(antd.LifeCycleTypes.ON_FIELD_VALUE_CHANGE, 'type').subscribe(function (fieldState) {
           if (fieldState.value) {
-            var value = fieldState.value;
             var target = billEnum.find(function (item) {
-              return item.value === value;
+              return item.value === fieldState.value;
             });
 
-            if (target.profileList) {
+            if (target && target.profileList) {
               actions.setFieldState('profile', function (state) {
                 state.visible = true;
               });
@@ -3125,7 +3191,7 @@ var PageHeader = (function () {
         });
       }
     })));
-  }, [type]);
+  }, [type, schema]);
   var menu = React.useMemo(function () {
     return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Menu, null, billEnum && billEnum.map(function (item, key) {
       if (item.profileList) {
@@ -3164,7 +3230,7 @@ var PageHeader = (function () {
       style: {
         marginRight: 10
       }
-    }, "\u6279\u91CF\u53D1\u9001"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Dropdown, {
+    }, "\u6279\u91CF\u53D1\u5E03"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Dropdown, {
       key: "2",
       overlay: menu
     }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Button, {
@@ -3411,12 +3477,12 @@ function validaterule(props) {
         onClick: function onClick() {
           onSendCheck(record);
         }
-      }, "\u53D1\u9001"), /*#__PURE__*/React__default['default'].createElement("a", {
+      }, "\u53D1\u5E03"), record.publishStatus === 1 && /*#__PURE__*/React__default['default'].createElement("a", {
         className: "tabel-action",
         onClick: function onClick() {
           onBillSendList(record);
         }
-      }, "\u53D1\u9001\u8BB0\u5F55"));
+      }, "\u53D1\u5E03\u8BB0\u5F55"));
     }
   }];
   var rowSelection = React.useMemo(function () {
@@ -3529,7 +3595,7 @@ function validaterule(props) {
       };
     }())();
   }, []);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ktsXui.AutoTableContainer, {
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(PageHeader, null), /*#__PURE__*/React__default['default'].createElement(ktsXui.AutoTableContainer, {
     style: {
       flex: 1,
       padding: '0 20px',
@@ -3762,7 +3828,10 @@ function validaterule$1(props) {
       title: '配置名称',
       dataIndex: 'configName'
     }, {
-      title: '单据大类',
+      title: '使用标识',
+      dataIndex: 'biaoshi'
+    }, {
+      title: '单据类型',
       dataIndex: 'type',
       render: function render(text) {
         return bill[text];
@@ -3782,11 +3851,29 @@ function validaterule$1(props) {
         }
       }
     }, {
-      title: '收发角色',
+      title: '我的收发角色',
       dataIndex: 'attribution',
       render: function render(text) {
         return attributionEnum[text];
       }
+    }, {
+      title: '我司对应DID',
+      dataIndex: 'did',
+      render: function render(text) {
+        return attributionEnum[text];
+      }
+    }, {
+      title: '接受对象',
+      dataIndex: 'object',
+      render: function render(text) {
+        return attributionEnum[text];
+      }
+    }, {
+      title: '接受对象所属公司',
+      dataIndex: 'objectCompany',
+      render: function render(text) {
+        return attributionEnum[text];
+      }
     }, // {
     //     title: '发送对象',
     //     dataIndex: 'sender',
@@ -3795,18 +3882,20 @@ function validaterule$1(props) {
     //     }
     // },
     {
-      title: '创建时间',
+      title: '发布时间',
       dataIndex: 'createAt',
       render: function render(text) {
         return moment__default['default'](text).format('YYYY-MM-DD hh:mm');
       }
     }, {
-      title: '最近更新时间',
-      dataIndex: 'updateAt',
-      render: function render(text) {
-        return moment__default['default'](text).format('YYYY-MM-DD hh:mm');
-      }
-    }, {
+      title: '详细内容',
+      dataIndex: 'neirong'
+    }, // {
+    //     title: '最近更新时间',
+    //     dataIndex: 'updateAt',
+    //     render: (text: any) => moment(text).format('YYYY-MM-DD hh:mm')
+    // },
+    {
       title: '操作',
       dataIndex: 'console',
       render: function render(text, record) {
@@ -3819,7 +3908,7 @@ function validaterule$1(props) {
       }
     }];
   }, [bill]);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ktsXui.AutoTableContainer, {
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(PageHeader, null), /*#__PURE__*/React__default['default'].createElement(ktsXui.AutoTableContainer, {
     style: {
       flex: 1,
       padding: '0 20px',
@@ -3894,7 +3983,7 @@ var Main$1 = function Main(props) {
       display: 'flex',
       flexDirection: 'column'
     }
-  }, /*#__PURE__*/React__default['default'].createElement(PageHeader, null), type === 1 && /*#__PURE__*/React__default['default'].createElement(validaterule, null), type === 2 && /*#__PURE__*/React__default['default'].createElement(validaterule$1, null)));
+  }, type === 1 && /*#__PURE__*/React__default['default'].createElement(validaterule, null), type === 2 && /*#__PURE__*/React__default['default'].createElement(validaterule$1, null)));
 };
 
 var DocumentsService = /*#__PURE__*/function () {
@@ -4366,7 +4455,7 @@ function Rule(props) {
           switch (_context6.prev = _context6.next) {
             case 0:
               data = _objectSpread2(_objectSpread2({}, record), {}, {
-                sendPartitionId: targetId,
+                senderPartitionId: targetId,
                 privateList: [],
                 sendPublic: true
               });

package/package.json

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

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>
+    );
+};