kts-components-document-access-point 1.2.13 → 1.2.18

package/dist/index.esm.js

@@ -318,6 +318,16 @@ var RuleState = function RuleState() {
     type: 'string',
     label: '非空',
     operator: ['notBlank']
+  }, {
+    name: 'exclude',
+    type: 'string',
+    label: '不包含',
+    operator: ['exclude']
+  }, {
+    name: 'include',
+    type: 'string',
+    label: '包含',
+    operator: ['include']
   }, // integer/number -----------------------------------------------------------------------------------
   {
     name: 'enumNumber',
@@ -446,10 +456,20 @@ var RuleState = function RuleState() {
       }]
     },
     enum: {
-      label: '枚举',
+      label: '值',
       type: 'array',
       name: 'enum'
     },
+    exclude: {
+      label: '值',
+      type: 'array',
+      name: 'exclude'
+    },
+    include: {
+      label: '值',
+      type: 'array',
+      name: 'include'
+    },
     const: {
       label: '固定值',
       type: 'string',
@@ -740,9 +760,11 @@ var delProperties = /*#__PURE__*/(function () {
           case 2:
             properties = ((_s$propertyTableState = s.propertyTableState.current) === null || _s$propertyTableState === void 0 ? void 0 : _s$propertyTableState.items) ? (_s$propertyTableState2 = s.propertyTableState.current) === null || _s$propertyTableState2 === void 0 ? void 0 : _s$propertyTableState2.items.properties : (_s$propertyTableState3 = s.propertyTableState.current) === null || _s$propertyTableState3 === void 0 ? void 0 : _s$propertyTableState3.properties; // 删除必填
 
-            options.required = options.required.filter(function (e) {
-              return e !== options.value.$name;
-            }); // 删除引用
+            (function () {
+              var p = options.required.indexOf(options.value.$name);
+              options.required.splice(p, 1);
+            })(); // 删除引用
+
 
             if (properties) {
               _context.next = 6;
@@ -1994,7 +2016,7 @@ function algorithmFormComponent(operator, ruleProperties, readOnly) {
       }), /*#__PURE__*/React.createElement(Input, {
         readOnly: readOnly,
         suffix: /*#__PURE__*/React.createElement(Tooltip, {
-          title: "\u4E0B\u62C9\u5217\u8868\u91CC\u7684\u679A\u4E3E\u503C\u8BF7\u4F7F\u7528\u82F1\u6587\u9017\u53F7\u201C,\u201D\u9694\u5F00\u3002"
+          title: "\u82E5\u6709\u591A\u4E2A\u503C\uFF0C\u8BF7\u4F7F\u7528\u82F1\u6587\u9017\u53F7\u201C,\u201D\u9694\u5F00\u3002"
         }, /*#__PURE__*/React.createElement(Icon, {
           component: SvgIcon,
           style: {
@@ -2756,26 +2778,30 @@ function modalcomfirm(props) {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var _DocumentsService$ins2;
 
-      var data, res;
+      var note, data, res;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              note = targetList.find(function (item) {
+                return item.participantId === targetId;
+              });
               data = selectItems.map(function (item) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
-                  senderPartitionId: targetId,
+                  senderParticipantId: targetId,
                   privateList: [],
-                  sendPublic: true
+                  sendPublic: true,
+                  senderParticipantNote: note && note.remarkName
                 });
               });
-              _context2.next = 3;
+              _context2.next = 4;
               return (_DocumentsService$ins2 = DocumentsService.instance.service) === null || _DocumentsService$ins2 === void 0 ? void 0 : _DocumentsService$ins2.call({
                 url: '/schema/config/batchSend',
                 data: data,
                 type: 'post'
               });
 
-            case 3:
+            case 4:
               res = _context2.sent;
 
               if (res.res) {
@@ -2784,7 +2810,7 @@ function modalcomfirm(props) {
                 props.handleCancel();
               }
 
-            case 5:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -2875,7 +2901,7 @@ function modalcomfirm(props) {
         flexDirection: 'column',
         alignContent: 'flex-start'
       }
-    }, /*#__PURE__*/React.createElement("span", null, item.remarkName, "2"), /*#__PURE__*/React.createElement("span", {
+    }, /*#__PURE__*/React.createElement("span", null, item.remarkName), /*#__PURE__*/React.createElement("span", {
       style: {
         maxWidth: 460,
         overflow: 'hidden',
@@ -3136,10 +3162,10 @@ var PageHeader = (function () {
             title: "收发角色",
             enum: [{
               "label": "发送方",
-              "value": '1'
+              "value": 1
             }, {
               "label": "接收方",
-              "value": '0'
+              "value": 0
             }],
             'x-props': {
               mode: "multiple"
@@ -3184,10 +3210,10 @@ var PageHeader = (function () {
             title: "我的收发角色",
             enum: [{
               "label": "发送方",
-              "value": '1'
+              "value": 1
             }, {
               "label": "接收方",
-              "value": '0'
+              "value": 0
             }],
             'x-props': {
               mode: "multiple"
@@ -3198,16 +3224,16 @@ var PageHeader = (function () {
             title: "发送对象",
             visible: true
           },
-          did: {
+          senderParticipantId: {
             type: "string",
             title: "我司对应DID",
             enum: didEnum
           },
-          duixiang: {
+          receiverParticipantId: {
             type: "string",
             title: "接受对象"
           },
-          duixianggongsi: {
+          receiverCompany: {
             type: "string",
             title: "接受对象所属公司"
           },
@@ -3643,9 +3669,7 @@ function validaterule(props) {
   }, []);
   var onSendCheck = useCallback(function (record) {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-      var _DocumentsService$ins3;
-
-      var data, res;
+      var data;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
@@ -3674,21 +3698,9 @@ function validaterule(props) {
                   return _ref6.apply(this, arguments);
                 };
               }())();
-              _context6.next = 4;
-              return (_DocumentsService$ins3 = DocumentsService.instance.service) === null || _DocumentsService$ins3 === void 0 ? void 0 : _DocumentsService$ins3.call({
-                url: '/participant/listBySubjectId',
-                data: {},
-                type: 'get'
-              });
+              handleCancel(true);
 
-            case 4:
-              res = _context6.sent;
-
-              if (res.res) {
-                handleCancel(true);
-              }
-
-            case 6:
+            case 3:
             case "end":
               return _context6.stop();
           }
@@ -5058,20 +5070,24 @@ function Rule(props) {
   }, []);
   var handleOk = useCallback(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
-      var data, res;
+      var note, data, res;
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
+              note = targetList.find(function (item) {
+                return item.participantId === targetId;
+              });
               data = _objectSpread2(_objectSpread2({}, record), {}, {
-                senderPartitionId: targetId,
+                senderParticipantId: targetId,
                 privateList: [],
-                sendPublic: true
+                sendPublic: true,
+                senderParticipantNote: note && note.remarkName
               });
-              _context7.next = 3;
+              _context7.next = 4;
               return controller.batchsend([data]);
 
-            case 3:
+            case 4:
               res = _context7.sent;
 
               if (res.res) {
@@ -5085,7 +5101,7 @@ function Rule(props) {
                 });
               }
 
-            case 5:
+            case 6:
             case "end":
               return _context7.stop();
           }

package/dist/index.js

@@ -332,6 +332,16 @@ var RuleState = function RuleState() {
     type: 'string',
     label: '非空',
     operator: ['notBlank']
+  }, {
+    name: 'exclude',
+    type: 'string',
+    label: '不包含',
+    operator: ['exclude']
+  }, {
+    name: 'include',
+    type: 'string',
+    label: '包含',
+    operator: ['include']
   }, // integer/number -----------------------------------------------------------------------------------
   {
     name: 'enumNumber',
@@ -460,10 +470,20 @@ var RuleState = function RuleState() {
       }]
     },
     enum: {
-      label: '枚举',
+      label: '值',
       type: 'array',
       name: 'enum'
     },
+    exclude: {
+      label: '值',
+      type: 'array',
+      name: 'exclude'
+    },
+    include: {
+      label: '值',
+      type: 'array',
+      name: 'include'
+    },
     const: {
       label: '固定值',
       type: 'string',
@@ -754,9 +774,11 @@ var delProperties = /*#__PURE__*/(function () {
           case 2:
             properties = ((_s$propertyTableState = s.propertyTableState.current) === null || _s$propertyTableState === void 0 ? void 0 : _s$propertyTableState.items) ? (_s$propertyTableState2 = s.propertyTableState.current) === null || _s$propertyTableState2 === void 0 ? void 0 : _s$propertyTableState2.items.properties : (_s$propertyTableState3 = s.propertyTableState.current) === null || _s$propertyTableState3 === void 0 ? void 0 : _s$propertyTableState3.properties; // 删除必填
 
-            options.required = options.required.filter(function (e) {
-              return e !== options.value.$name;
-            }); // 删除引用
+            (function () {
+              var p = options.required.indexOf(options.value.$name);
+              options.required.splice(p, 1);
+            })(); // 删除引用
+
 
             if (properties) {
               _context.next = 6;
@@ -2008,7 +2030,7 @@ function algorithmFormComponent(operator, ruleProperties, readOnly) {
       }), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
         readOnly: readOnly,
         suffix: /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Tooltip, {
-          title: "\u4E0B\u62C9\u5217\u8868\u91CC\u7684\u679A\u4E3E\u503C\u8BF7\u4F7F\u7528\u82F1\u6587\u9017\u53F7\u201C,\u201D\u9694\u5F00\u3002"
+          title: "\u82E5\u6709\u591A\u4E2A\u503C\uFF0C\u8BF7\u4F7F\u7528\u82F1\u6587\u9017\u53F7\u201C,\u201D\u9694\u5F00\u3002"
         }, /*#__PURE__*/React__default['default'].createElement(Icon__default['default'], {
           component: SvgIcon,
           style: {
@@ -2770,26 +2792,30 @@ function modalcomfirm(props) {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var _DocumentsService$ins2;
 
-      var data, res;
+      var note, data, res;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              note = targetList.find(function (item) {
+                return item.participantId === targetId;
+              });
               data = selectItems.map(function (item) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
-                  senderPartitionId: targetId,
+                  senderParticipantId: targetId,
                   privateList: [],
-                  sendPublic: true
+                  sendPublic: true,
+                  senderParticipantNote: note && note.remarkName
                 });
               });
-              _context2.next = 3;
+              _context2.next = 4;
               return (_DocumentsService$ins2 = DocumentsService.instance.service) === null || _DocumentsService$ins2 === void 0 ? void 0 : _DocumentsService$ins2.call({
                 url: '/schema/config/batchSend',
                 data: data,
                 type: 'post'
               });
 
-            case 3:
+            case 4:
               res = _context2.sent;
 
               if (res.res) {
@@ -2798,7 +2824,7 @@ function modalcomfirm(props) {
                 props.handleCancel();
               }
 
-            case 5:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -2889,7 +2915,7 @@ function modalcomfirm(props) {
         flexDirection: 'column',
         alignContent: 'flex-start'
       }
-    }, /*#__PURE__*/React__default['default'].createElement("span", null, item.remarkName, "2"), /*#__PURE__*/React__default['default'].createElement("span", {
+    }, /*#__PURE__*/React__default['default'].createElement("span", null, item.remarkName), /*#__PURE__*/React__default['default'].createElement("span", {
       style: {
         maxWidth: 460,
         overflow: 'hidden',
@@ -3150,10 +3176,10 @@ var PageHeader = (function () {
             title: "收发角色",
             enum: [{
               "label": "发送方",
-              "value": '1'
+              "value": 1
             }, {
               "label": "接收方",
-              "value": '0'
+              "value": 0
             }],
             'x-props': {
               mode: "multiple"
@@ -3198,10 +3224,10 @@ var PageHeader = (function () {
             title: "我的收发角色",
             enum: [{
               "label": "发送方",
-              "value": '1'
+              "value": 1
             }, {
               "label": "接收方",
-              "value": '0'
+              "value": 0
             }],
             'x-props': {
               mode: "multiple"
@@ -3212,16 +3238,16 @@ var PageHeader = (function () {
             title: "发送对象",
             visible: true
           },
-          did: {
+          senderParticipantId: {
             type: "string",
             title: "我司对应DID",
             enum: didEnum
           },
-          duixiang: {
+          receiverParticipantId: {
             type: "string",
             title: "接受对象"
           },
-          duixianggongsi: {
+          receiverCompany: {
             type: "string",
             title: "接受对象所属公司"
           },
@@ -3657,9 +3683,7 @@ function validaterule(props) {
   }, []);
   var onSendCheck = React.useCallback(function (record) {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-      var _DocumentsService$ins3;
-
-      var data, res;
+      var data;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
@@ -3688,21 +3712,9 @@ function validaterule(props) {
                   return _ref6.apply(this, arguments);
                 };
               }())();
-              _context6.next = 4;
-              return (_DocumentsService$ins3 = DocumentsService.instance.service) === null || _DocumentsService$ins3 === void 0 ? void 0 : _DocumentsService$ins3.call({
-                url: '/participant/listBySubjectId',
-                data: {},
-                type: 'get'
-              });
+              handleCancel(true);
 
-            case 4:
-              res = _context6.sent;
-
-              if (res.res) {
-                handleCancel(true);
-              }
-
-            case 6:
+            case 3:
             case "end":
               return _context6.stop();
           }
@@ -5072,20 +5084,24 @@ function Rule(props) {
   }, []);
   var handleOk = React.useCallback(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
-      var data, res;
+      var note, data, res;
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
+              note = targetList.find(function (item) {
+                return item.participantId === targetId;
+              });
               data = _objectSpread2(_objectSpread2({}, record), {}, {
-                senderPartitionId: targetId,
+                senderParticipantId: targetId,
                 privateList: [],
-                sendPublic: true
+                sendPublic: true,
+                senderParticipantNote: note && note.remarkName
               });
-              _context7.next = 3;
+              _context7.next = 4;
               return controller.batchsend([data]);
 
-            case 3:
+            case 4:
               res = _context7.sent;
 
               if (res.res) {
@@ -5099,7 +5115,7 @@ function Rule(props) {
                 });
               }
 
-            case 5:
+            case 6:
             case "end":
               return _context7.stop();
           }

package/package.json

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

package/src/DocumentsEdit/DocumentsEditController/DocumentsEditControllerState/RuleState/index.ts

@@ -67,6 +67,18 @@ export default class RuleState {
             label: '非空',
             operator: ['notBlank'],
         },
+        {
+            name: 'exclude',
+            type: 'string',
+            label: '不包含',
+            operator: ['exclude'],
+        },
+        {
+            name: 'include',
+            type: 'string',
+            label: '包含',
+            operator: ['include'],
+        },
 
         // integer/number -----------------------------------------------------------------------------------
         {
@@ -201,11 +213,23 @@ export default class RuleState {
         },
 
         enum: {
-            label: '枚举',
+            label: '值',
             type: 'array',
             name: 'enum',
         },
 
+        exclude: {
+            label: '值',
+            type: 'array',
+            name: 'exclude',
+        },
+
+        include: {
+            label: '值',
+            type: 'array',
+            name: 'include',
+        },
+
         const: {
             label: '固定值',
             type: 'string',

package/src/DocumentsEdit/DocumentsEditController/actions/delProperties/index.ts

@@ -3,13 +3,16 @@ import DocumentsEditControllerState, { IDataSource } from '../../DocumentsEditCo
 
 export default async (s: DocumentsEditControllerState, options?: IDataSource) => {
     if (!options) return;
-    
+
     const properties = s.propertyTableState.current?.items
         ? s.propertyTableState.current?.items.properties
-        : s.propertyTableState.current?.properties
+        : s.propertyTableState.current?.properties;
 
     // 删除必填
-    options.required = options.required.filter(e => e !== options.value.$name);
+    (() => {
+        const p = options.required.indexOf(options.value.$name);
+        options.required.splice(p, 1);
+    })()
 
     // 删除引用
     if (!properties) return;

package/src/DocumentsEdit/ui/EditRule/ui/RuleForm/fn/algorithmFormComponent/index.tsx

@@ -90,7 +90,7 @@ export default function algorithmFormComponent(operator: IOperator, ruleProperti
                     <Input
                         readOnly={readOnly}
                         suffix={
-                            <Tooltip title="下拉列表里的枚举值请使用英文逗号“,”隔开。">
+                            <Tooltip title="若有多个值，请使用英文逗号“,”隔开。">
                                 <Icon component={IconSvg} style={{ color: 'rgba(0,0,0,.45)' }} />
                             </Tooltip>
                         }

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

@@ -4,12 +4,13 @@ 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([]);
+    const [targetList, setTargetList] = useState<any[]>([]);
     useEffect(() => {
         (async () => {
             const res = await DocumentsService.instance.service?.call({ url: '/participant/listBySubjectId', data: {}, type: 'get' }) as any;
@@ -23,12 +24,14 @@ export default function modalcomfirm(props: any) {
     }, [])
     const handleOk = useCallback(() => {
         (async () => {
+            const note = targetList.find(item => item.participantId === targetId)
             const data = selectItems.map((item: any) => {
                 return {
                     ...item,
-                    senderPartitionId: targetId,
+                    senderParticipantId: targetId,
                     privateList: [],
-                    sendPublic: true
+                    sendPublic: true,
+                    senderParticipantNote: note && note.remarkName
                 };
             });
             const res = await DocumentsService.instance.service?.call({ url: '/schema/config/batchSend', data: data, type: 'post' }) as any;
@@ -39,16 +42,17 @@ export default function modalcomfirm(props: any) {
             }
         })()
     }, [targetId]);
-    const gotoSendlist=useCallback(()=>{
+    const gotoSendlist = useCallback(() => {
         controller.pipeline(async s => {
             s.type = 2;
-            if(selectItems.length===1){
+            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;
         })()
@@ -74,7 +78,7 @@ export default function modalcomfirm(props: any) {
                             return <Radio style={radioStyle as any} key={key} value={item.participantId} >
 
                                 <div style={{ display: 'flex', flexDirection: 'column', alignContent: 'flex-start' }}>
-                                    <span>{item.remarkName}2</span>
+                                    <span>{item.remarkName}</span>
                                     <span style={{ maxWidth: 460, overflow: 'hidden', textOverflow: 'ellipsis', display: 'block' }}>{item.participantId}</span>
                                 </div>
                             </Radio>

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

@@ -164,16 +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: "接受对象所属公司",
                     },

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

@@ -143,10 +143,7 @@ export default function validaterule(props: any) {
             controller.pipeline(async s => {
                 s.selectedRowKey = data;
             })()
-            const res = await DocumentsService.instance.service?.call({ url: '/participant/listBySubjectId', data: {}, type: 'get' }) as any;
-            if (res.res) {
-                handleCancel(true);
-            }
+            handleCancel(true);
         })()
     }, []);
     const handleCancel = useCallback((value: boolean = false) => {

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

@@ -15,7 +15,7 @@ export default function Rule(props: any) {
     const [form] = Form.useForm();
     const [visible, setVisible] = useState(false);
     const [targetId, setTarget] = useState();
-    const [targetList, setList] = useState([]);
+    const [targetList, setList] = useState<any[]>([]);
     // const [status, setStatus] = useState(0);
     // const [first, setFirst] = useState(true);
     const [hasChange, setChange] = useState(false);
@@ -157,8 +157,8 @@ export default function Rule(props: any) {
                         setRecord(res.res);
                         if (publish) {
                             onSendCheck();
-                           
-                        }else{
+
+                        } else {
                             history.push({ pathname: `/rulelist`, state: { type: 1 } })
                         }
                     }
@@ -178,17 +178,19 @@ export default function Rule(props: any) {
             if (res.res) {
                 setVisible(true);
                 setList(res.res);
-                
+
             }
         })()
     }, []);
     const handleOk = useCallback(() => {
         (async () => {
+            const note = targetList.find(item => item.participantId === targetId)
             const data = {
                 ...record,
-                senderPartitionId: targetId,
+                senderParticipantId: targetId,
                 privateList: [],
-                sendPublic: true
+                sendPublic: true,
+                senderParticipantNote: note && note.remarkName
             }
             const res = await controller.batchsend([data]);
             if (res.res) {