kts-components-document-access-point 1.2.1 → 1.2.6

package/dist/index.js

@@ -1309,7 +1309,7 @@ var AddChildPropertyButton = (function (props) {
   return visible ? /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
     onClick: onClick,
     type: "link"
-  }, readOnly ? '查看字字段' : '添加子字段') : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+  }, readOnly ? '查看子字段' : '添加子字段') : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
 });
 
 var EditPropertyButton = (function (props) {
@@ -1362,11 +1362,18 @@ var AddRuleButton = (function (props) {
   var readOnly = controller.useMemo(function (s) {
     return s.readOnly;
   }, []);
+  /** 是否可以显示 */
+
   var visible = React__default['default'].useMemo(function () {
     return algorithm.filter(function (e) {
       return e.type === getPropertiesType(properties);
     }).length > 0;
   }, [properties, algorithm]);
+  /** 是否有规则 */
+
+  var isHivRules = React__default['default'].useMemo(function () {
+    return !!(properties.ref.rules && properties.ref.rules.length > 0);
+  }, [properties]);
   var onClick = React__default['default'].useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
@@ -1388,16 +1395,27 @@ var AddRuleButton = (function (props) {
         return _ref.apply(this, arguments);
       };
     }())();
-  }, [properties, controller]);
-  return visible ? /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
-    onClick: onClick,
-    type: "link"
-  }, function () {
-    var _properties$ref$rules, _properties$ref$rules2;
+  }, [properties, controller]); // 查看规则
 
-    if (readOnly) return '查看规则';
-    return ((_properties$ref$rules = (_properties$ref$rules2 = properties.ref.rules) === null || _properties$ref$rules2 === void 0 ? void 0 : _properties$ref$rules2.length) !== null && _properties$ref$rules !== void 0 ? _properties$ref$rules : 0 > 0) ? "编辑验证规则" : "添加验证规则";
-  }()) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+  if (readOnly) {
+    if (isHivRules) {
+      return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
+        onClick: onClick,
+        type: "link"
+      }, "\u67E5\u770B\u89C4\u5219");
+    } else {
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+    }
+  } else {
+    if (visible) {
+      return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
+        onClick: onClick,
+        type: "link"
+      }, isHivRules ? "编辑验证规则" : "添加验证规则");
+    } else {
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+    }
+  }
 });
 
 function getPropertiesType(ruleProperties) {
@@ -2810,9 +2828,9 @@ function modalcomfirm(props) {
   }, []);
   var radioStyle = React.useMemo(function () {
     return {
-      display: 'block',
-      height: '30px',
-      lineHeight: '30px'
+      alignItems: 'center',
+      marginBottom: 10,
+      lineHeight: 1.2
     };
   }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(ktsXui.Modal, {
@@ -2828,7 +2846,22 @@ function modalcomfirm(props) {
       style: radioStyle,
       key: key,
       value: item.participantId
-    }, " ", item.participantId, " ");
+    }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Tooltip, {
+      title: item.participantId
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        display: 'flex',
+        flexDirection: 'column',
+        alignContent: 'flex-start'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("span", null, item.remarkName, "2"), /*#__PURE__*/React__default['default'].createElement("span", {
+      style: {
+        maxWidth: 460,
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        display: 'block'
+      }
+    }, item.participantId))));
   }))));
 }
 
@@ -3064,13 +3097,13 @@ var PageHeader = (function () {
             title: "配置名称"
           },
           effectStatus: {
-            type: "string",
-            title: "标识",
+            type: "radio",
+            title: "使用标识",
             enum: [{
-              "label": "未生效",
+              "label": "已失效",
               "value": 0
             }, {
-              "label": "已生效",
+              "label": "使用中",
               "value": 1
             }]
           },
@@ -3103,7 +3136,7 @@ var PageHeader = (function () {
             visible: false
           },
           attribution: {
-            type: "string",
+            type: "radio",
             title: "我的收发角色",
             enum: [{
               "label": "发送方",
@@ -3242,7 +3275,7 @@ var PageHeader = (function () {
       style: {
         marginRight: 10
       }
-    }, "\u6279\u91CF\u53D1\u5E03"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Dropdown, {
+    }, "\u53D1\u5E03"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Dropdown, {
       key: "2",
       overlay: menu
     }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Button, {
@@ -3848,7 +3881,11 @@ function validaterule$1(props) {
         }
 
         if (text === 1) {
-          return /*#__PURE__*/React__default['default'].createElement("span", null, "\u4F7F\u7528\u4E2D");
+          return /*#__PURE__*/React__default['default'].createElement("span", {
+            style: {
+              color: '#0074ff'
+            }
+          }, "\u4F7F\u7528\u4E2D");
         }
       }
     }, {
@@ -3991,6 +4028,32 @@ var Main$1 = function Main(props) {
   var type = controller.useMemo(function (s) {
     return s.type;
   }, []);
+  React.useEffect(function () {
+    var params = props.location.query && props.location.query.type;
+
+    if (params) {
+      controller.pipeline( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  s.type = Number(params);
+
+                case 1:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }())();
+    }
+  }, [type]);
   return /*#__PURE__*/React__default['default'].createElement(DocumentsListContext.Provider, {
     value: controller
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -4892,9 +4955,9 @@ function Rule(props) {
   }, []);
   var radioStyle = React.useMemo(function () {
     return {
-      display: 'block',
-      height: '30px',
-      lineHeight: '30px'
+      alignItems: 'center',
+      marginBottom: 10,
+      lineHeight: 1.2
     };
   }, []);
   var updateSchema = React.useCallback(function (e) {
@@ -4907,13 +4970,23 @@ function Rule(props) {
       confirm({
         title: '您当前有内容未保存，是否退出?',
         onOk: function onOk() {
-          history.goBack();
+          goBack();
         }
       });
     } else {
-      history.goBack();
+      goBack();
     }
   }, [hasChange]);
+  var goBack = React.useCallback(function () {
+    if (type === 'record') {
+      history.push({
+        pathname: "/rulelist",
+        search: "?type=2"
+      });
+    } else {
+      history.goBack();
+    }
+  }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       height: '100%',
@@ -5067,7 +5140,22 @@ function Rule(props) {
       style: radioStyle,
       key: key,
       value: item.participantId
-    }, item.participantId);
+    }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Tooltip, {
+      title: item.participantId
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        display: 'flex',
+        flexDirection: 'column',
+        alignContent: 'flex-start'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("span", null, item.remarkName), /*#__PURE__*/React__default['default'].createElement("span", {
+      style: {
+        maxWidth: 460,
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        display: 'block'
+      }
+    }, item.participantId))));
   }))));
 }
 
@@ -5851,7 +5939,7 @@ var Header = (function () {
         },
         dataStatus: {
           type: "string",
-          title: "名单性质",
+          title: "数据状态",
           enum: [{
             "label": "使用中",
             "value": 1
@@ -6050,7 +6138,7 @@ function Rule$1(props) {
       title: '所属公司',
       dataIndex: 'customerName'
     }, {
-      title: '本条数据状态',
+      title: '数据状态',
       dataIndex: 'dataStatus',
       render: function render(text) {
         return dataStatusEnum[text];
@@ -6286,7 +6374,7 @@ var Header$1 = (function () {
         },
         dataStatus: {
           type: "string",
-          title: "名单性质",
+          title: "数据状态",
           enum: [{
             "label": "使用中",
             "value": 1
@@ -6482,7 +6570,7 @@ function Rule$2(props) {
       title: '所属公司',
       dataIndex: 'customerName'
     }, {
-      title: '本条数据状态',
+      title: '数据状态',
       dataIndex: 'dataStatus',
       render: function render(text) {
         return dataStatusEnum[text];
@@ -7145,6 +7233,13 @@ function modalcomfirm$2(props) {
       params = _useState2[0],
       setParams = _useState2[1];
 
+  var whiteParams = controller.useMemo(function (s) {
+    return s.whiteParams;
+  }, []);
+  var blackParams = controller.useMemo(function (s) {
+    return s.params;
+  }, []);
+
   var _useState3 = React.useState({
     pageNum: 1,
     pageSize: 10
@@ -7184,7 +7279,7 @@ function modalcomfirm$2(props) {
             case 0:
               _context.next = 2;
               return controller.synclist(_objectSpread2(_objectSpread2({}, params), {}, {
-                listNature: listNature
+                type: listNature
               }, pageMeta));
 
             case 2:
@@ -7302,7 +7397,8 @@ function modalcomfirm$2(props) {
   }, []);
   var onSubmit = React.useCallback(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-      var res, data;
+      var res, data, _data;
+
       return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -7314,14 +7410,16 @@ function modalcomfirm$2(props) {
               res = _context3.sent;
 
               if (res.res) {
-                data = _objectSpread2(_objectSpread2({}, params), {}, {
-                  type: listNature
-                });
-
                 if (listNature === '1') {
+                  data = _objectSpread2(_objectSpread2({}, whiteParams), {}, {
+                    type: listNature
+                  });
                   controller.getWhitelist(data);
                 } else {
-                  controller.getBlacklist(data);
+                  _data = _objectSpread2(_objectSpread2({}, blackParams), {}, {
+                    type: listNature
+                  });
+                  controller.getBlacklist(_data);
                 }
               }
 
@@ -7346,7 +7444,7 @@ function modalcomfirm$2(props) {
       marginBottom: 24
     }
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponents.AdvancedSearch, {
-    width: 400,
+    width: 480,
     height: 44,
     compact: true,
     defaultKey: "customerDid",

package/package.json

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

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

@@ -6,7 +6,7 @@ export interface IParams {
     pageNum: number;
     pageSize: number;
     customerDid?: string;
-    listNature: number | string;
+    type: number | string;
 }
 
 export default async (s: ControllerState, params?: IParams) => {

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

@@ -9,6 +9,8 @@ export default function modalcomfirm(props: any) {
     const controller = Main.useController();
     const clientInfo = controller.useMemo(s => s.clientInfo, [])
     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 [selectedRowKeys, setKey] = useState([]);
     const [list, setList] = useState([]);
@@ -17,7 +19,7 @@ export default function modalcomfirm(props: any) {
     const [companyDidNote, setNote] = useState('');
     useEffect(() => {
         (async () => {
-            const res = await controller.synclist({ ...params, listNature, ...pageMeta })
+            const res = await controller.synclist({ ...params, type:listNature, ...pageMeta })
             if (res.res) {
                 setList(res.res.items);
             }
@@ -107,13 +109,18 @@ export default function modalcomfirm(props: any) {
         (async () => {
             const res = await controller.addWhite(selectedRowKeys) as any;
             if (res.res) {
-                const data = {
-                    ...params,
-                    type: listNature
-                }
+               
                 if (listNature === '1') {
+                    const data = {
+                        ...whiteParams,
+                        type: listNature
+                    }
                     controller.getWhitelist(data);
                 } else {
+                    const data = {
+                        ...blackParams,
+                        type: listNature
+                    }
                     controller.getBlacklist(data);
                 }
             }
@@ -131,7 +138,7 @@ export default function modalcomfirm(props: any) {
             >
                 <div style={{ marginBottom: 24 }}>
                     <AdvancedSearch
-                        width={400}
+                        width={480}
                         height={44}
                         compact={true}
                         defaultKey="customerDid"

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

@@ -24,7 +24,7 @@ export default function Rule(props: any) {
             dataIndex: 'customerName',
         },
         {
-            title: '本条数据状态',
+            title: '数据状态',
             dataIndex: 'dataStatus',
             render: (text: any) => dataStatusEnum[text]
         },

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

@@ -23,7 +23,7 @@ export default function Rule(props: any) {
             dataIndex: 'customerName',
         },
         {
-            title: '本条数据状态',
+            title: '数据状态',
             dataIndex: 'dataStatus',
             render: (text: any) => dataStatusEnum[text]
         },

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

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

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

@@ -3,6 +3,6 @@ import React from "react";
 
 export default () => {
   return (
-    <DocumentsCont path=''/>
+    <DocumentsCont path='/billwhiteliest'/>
   );
 };

package/src/DocumentsEdit/ui/PropertyTable/hooks/useTableProps/ui/AddChildPropertyButton/index.tsx

@@ -28,7 +28,7 @@ export default (props: { properties: IDataSource }) => {
     return (
         visible
             ? (
-                <Button onClick={onClick} type="link" >{readOnly ? '查看字字段' : '添加子字段'}</Button>
+                <Button onClick={onClick} type="link" >{readOnly ? '查看子字段' : '添加子字段'}</Button>
             )
             : <></>
     )

package/src/DocumentsEdit/ui/PropertyTable/hooks/useTableProps/ui/AddRuleButton/index.tsx

@@ -16,30 +16,40 @@ export default (props: { properties: IDataSource }) => {
     /** 只读模式 */
     const readOnly = controller.useMemo(s => s.readOnly, []);
 
+    /** 是否可以显示 */
     const visible = React.useMemo(() => {
         return algorithm.filter(e => {
             return e.type === getPropertiesType(properties);
         }).length > 0
     }, [properties, algorithm])
 
+    /** 是否有规则 */
+    const isHivRules = React.useMemo(() => {
+        return !!(properties.ref.rules && properties.ref.rules.length > 0)
+    }, [properties])
+
     const onClick = React.useCallback(() => {
         controller.pipeline(async s => { s.ruleState.ruleProperties = JSON.parse(JSON.stringify(properties)) })()
     }, [properties, controller])
 
-    return (
-        visible
-            ? (
+    // 查看规则
+    if (readOnly) {
+        if (isHivRules) {
+            return <Button onClick={onClick} type="link" >查看规则</Button>
+        } else {
+            return <></>
+        }
+    } else {
+        if (visible) {
+            return (
                 <Button onClick={onClick} type="link" >
-                    {(() => {
-                        if (readOnly) return '查看规则';
-                        return properties.ref.rules?.length ?? 0 > 0
-                            ? "编辑验证规则"
-                            : "添加验证规则"
-                    })()}
+                    {isHivRules ? "编辑验证规则" : "添加验证规则"}
                 </Button>
             )
-            : <></>
-    )
+        } else {
+            return <></>
+        }
+    }
 }
 
 function getPropertiesType(ruleProperties?: IDataSource) {

package/src/DocumentsList/DocumentsListController/DocumentsListControllerState/index.ts

@@ -45,7 +45,7 @@ export interface IBillType {
 export default class DocumentsListControllerState {
 
     demo: string = 'demo';
-    type: 1 | 2 = 1;
+    type: number = 1;
     selectedRowKey: ISelectedRowKey[] = [];
     billEnum: IBillEnum[] = [];
     params: IParams = {  };

package/src/DocumentsList/index.tsx

@@ -1,4 +1,4 @@
-import React, { createContext } from 'react';
+import React, { createContext, useEffect } from 'react';
 // import PageHeader from './ui/PageHeader'
 import RuleTable from './ui/RuleTable'
 import DocumentsListController from './DocumentsListController';
@@ -20,6 +20,14 @@ 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) {
+      controller.pipeline(async s => {
+        s.type = Number(params);
+      })()
+    }
+  }, [type]);
   return (
     <DocumentsListContext.Provider value={controller}>
       <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>

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

@@ -1,5 +1,5 @@
 import React, { useCallback, useState, useEffect, useMemo } from 'react';
-import { Radio, message } from 'kts-components-antd-x4';
+import { Radio, message, Tooltip } from 'kts-components-antd-x4';
 import { Modal } from 'kts-xui';
 import Main from '../../';
 import { DocumentsService } from "../../../";
@@ -43,9 +43,9 @@ export default function modalcomfirm(props: any) {
     }, []);
     const radioStyle = useMemo(() => {
         return {
-            display: 'block',
-            height: '30px',
-            lineHeight: '30px',
+            alignItems:'center',
+            marginBottom:10,
+            lineHeight:1.2
         };
     }, [])
     return (
@@ -59,7 +59,13 @@ export default function modalcomfirm(props: any) {
                 <Radio.Group onChange={targetSelect} value={targetId} >
                     {
                         targetList.map((item: any, key) => {
-                            return <Radio style={radioStyle} key={key} value={item.participantId} > {item.participantId} </Radio>
+                            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>
                         })
                     }
                 </Radio.Group>

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

@@ -84,7 +84,7 @@ export default () => {
                     visible: false
                 },
                 attribution: {
-                    type: "string",
+                    type: "radio",
                     title: "收发角色",
                     enum: [{
                         "label": "发送方",

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

@@ -122,13 +122,13 @@ export default () => {
                         title: "配置名称",
                     },
                     effectStatus: {
-                        type: "string",
-                        title: "标识",
+                        type: "radio",
+                        title: "使用标识",
                         enum: [{
-                            "label": "未生效",
+                            "label": "已失效",
                             "value": 0
                         }, {
-                            "label": "已生效",
+                            "label": "使用中",
                             "value": 1
                         }]
                     },
@@ -161,7 +161,7 @@ export default () => {
                         visible: false
                     },
                     attribution: {
-                        type: "string",
+                        type: "radio",
                         title: "我的收发角色",
                         enum: [{
                             "label": "发送方",
@@ -294,7 +294,7 @@ export default () => {
             <PageHeaderFoot
                 expandLeft={topExpand()}
                 expandRight={[
-                    type === 1 && <Button key="1" onClick={batchSend} style={{ marginRight: 10 }}>批量发布</Button>,
+                    type === 1 && <Button key="1" onClick={batchSend} style={{ marginRight: 10 }}>发布</Button>,
                     <Dropdown key="2" overlay={menu}>
                         <Button type="primary" >创建配置</Button>
                     </Dropdown>

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

@@ -66,7 +66,7 @@ export default function validaterule(props: any) {
                     return <span>已失效</span>
                 }
                 if (text === 1) {
-                    return <span>使用中</span>
+                    return <span style={{ color: '#0074ff' }}>使用中</span>
                 }
             }
         },
@@ -97,18 +97,18 @@ export default function validaterule(props: any) {
             title: '我司对应DID',
             dataIndex: 'senderParticipantId',
             render: (text: any, record: any) => {
-                if(record.senderParticipantNote){
+                if (record.senderParticipantNote) {
                     return <span>{record.senderParticipantNote}:{text}</span>
-                }else{
+                } else {
                     return <span>{text}</span>
                 }
-                
+
             }
         },
         {
             title: '接受对象',
             dataIndex: 'receiverParticipantId',
-            
+
         },
         {
             title: '接受对象所属公司',