kts-components-document-access-point 2.0.0 → 2.0.2

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

@@ -1,21 +1,19 @@
 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 { KtsForm } from 'kts-components';
-import { LifeCycleTypes } from '@formily/antd';
+import { Search as SearchXui, searchUnFormat, ISearchItemProps } from 'kts-xui';
+import { Select as SearchSelect } from 'kts-xui';
+import { Select, DatePicker, Radio as AntRadio, Checkbox } from 'antd';
 import Main from '../../';
 import ModalComfirm from '../ModalComfirm'
 import { DocumentsService } from "../../../";
 import _ from 'lodash';
 import { useHistory } from 'react-router-dom';
 import moment from 'moment';
-import { Search as SearchXui, searchFormat, searchUnFormat, ISearchItemProps } from 'kts-xui';
-import { Select as SearchSelect, DatePicker } from 'kts-xui';
-import { Select } from 'antd';
-const { SubMenu } = Menu;
-const { Option } = Select;
 const { RangePicker } = DatePicker;
-
+const { Group: RadioGroup } = AntRadio;
+const { Group: CheckboxGroup } = Checkbox;
+const { SubMenu } = Menu;
 export default () => {
     const history = useHistory();
     const controller = Main.useController();
@@ -24,17 +22,90 @@ export default () => {
     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 [profileEnum, setProfileEnum] = useState<any[]>([]); 
     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){
+                return false;
+            }
+            if (res.res) {
+                setDidList(res.res);
+            }
+        })()
+    }, []);
+    useEffect(() => {
+        (async () => {
+            const res = await DocumentsService.instance.service?.call({ url: '/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
+            if(!res){
+                return false;
+            }
+            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']],
+            beginCreateTime: value['beginCreateTime'] && moment(value['beginCreateTime']).format('YYYY-MM-DD 00:00:00'),
+            endCreateTime: value['endCreateTime'] && moment(value['endCreateTime']).format('YYYY-MM-DD 23:59:59'),
+            beginSendTime: value['beginSendTime'] && moment(value['beginSendTime']).format('YYYY-MM-DD 00:00:00'),
+            endSendTime: value['endSendTime'] && moment(value['endSendTime']).format('YYYY-MM-DD 23:59:59'),
+            pageNum: 1,
+            pageSize: 10
+        }
+        controller.pipeline(async s => {
+            s.params = value;
+        })()
+    }, [controller])
 
+    // 处理单据大类变化
+    const handleTypeChange = useCallback((value: any) => {
+        const target: any = billEnum.find((item: any) => item.value === value);
+        const newProfileEnum = target?.profileList?.map((item: any) => ({
+            label: item.name,
+            value: item.value,
+        })) || [];
+        setProfileEnum(newProfileEnum); 
+        form?.setFieldsValue({ profile: undefined });
+    }, [billEnum, controller]);
+
+    const switchType = React.useCallback((e) => {
+        controller.pipeline(async s => {
+            s.type = e.target.value;
+            s.params = { pageNum: 1, pageSize: 10 }
+            history.push({ pathname: '/rulelist', state: { type: e.target.value } })
+        })()
+        // 切换类型时也清空单据子类的值并重新创建表单
+        setProfileEnum([]); 
+    }, [])
+    const handleCancel = React.useCallback(() => {
+        controller.pipeline(async s => {
+            s.visible = false;
+        })()
+    }, []);
+    const batchSend = React.useCallback(() => {
+        controller.pipeline(async s => {
+            s.visible = true;
+        })()
+    }, [controller]);
     // 动态生成 formItems
     const formItems: ISearchItemProps[] = useMemo(() => {
-        const items: ISearchItemProps[] = [];
         const didEnum = didlist.map((item: any) => {
             return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
         });
 
+        const items: ISearchItemProps[] = [];
+
         if (type === 1) {
             // 配置名称
             items.push({
@@ -48,28 +119,22 @@ export default () => {
                 name: "type",
                 label: "单据大类",
                 children: (
-                    <SearchSelect className="underline" allowClear={true}>
-                        {billEnum.map((item: any) => (
-                            <Option key={item.value} value={item.value}>
-                                {item.label}
-                            </Option>
-                        ))}
-                    </SearchSelect>
+                    <SearchSelect className={"underline"} allowClear onChange={handleTypeChange} options={billEnum} />
                 ),
             });
 
             // 单据子类
             items.push({
-                name: "profile",
-                label: "单据子类",
+                name: 'profile',
+                label: '单据子类',
+                hidden: profileEnum.length === 0,
                 children: (
-                    <SearchSelect className="underline" allowClear={true}>
-                        {profileEnum.map((item: any) => (
-                            <Option key={item.value} value={item.value}>
-                                {item.name}
-                            </Option>
-                        ))}
-                    </SearchSelect>
+                    <SearchSelect
+                        key={`profile-${params?.type || 'none'}`}
+                        className={"underline"}
+                        allowClear
+                        options={profileEnum}
+                    />
                 ),
             });
 
@@ -78,10 +143,12 @@ export default () => {
                 name: "attributionList",
                 label: "收发角色",
                 children: (
-                    <SearchSelect className="underline" allowClear={true} mode="multiple">
-                        <Option value={1}>发送方</Option>
-                        <Option value={2}>接收方</Option>
-                    </SearchSelect>
+                    <CheckboxGroup
+                        options={[
+                            { label: "发送方", value: 1 },
+                            { label: "接收方", value: 2 }
+                        ]}
+                    />
                 ),
             });
 
@@ -89,28 +156,14 @@ export default () => {
             items.push({
                 name: "createTime",
                 label: "创建时间",
-                children: (
-                    <RangePicker
-                        style={{ width: "100%" }}
-                        format="YYYY-MM-DD"
-                        placeholder={["开始时间", "结束时间"]}
-                        className="underline-datepicker"
-                    />
-                ),
+                children: <RangePicker className={"underline-datepicker"} />,
             });
 
             // 更新时间
             items.push({
                 name: "sendTime",
                 label: "更新时间",
-                children: (
-                    <RangePicker
-                        style={{ width: "100%" }}
-                        format="YYYY-MM-DD"
-                        placeholder={["开始时间", "结束时间"]}
-                        className="underline-datepicker"
-                    />
-                ),
+                children: <RangePicker className={"underline-datepicker"} />,
             });
         } else if (type === 2) {
             // 配置名称
@@ -125,11 +178,15 @@ export default () => {
                 name: "effectStatus",
                 label: "使用标识",
                 children: (
-                    <SearchSelect className="underline" allowClear={true}>
-                        <Option value={0}>已失效</Option>
-                        <Option value={1}>使用中</Option>
-                    </SearchSelect>
+                    <RadioGroup>
+                        <AntRadio value={0}>已失效</AntRadio>
+                        <AntRadio value={1}>使用中</AntRadio>
+                    </RadioGroup>
                 ),
+                // options: [
+                //     { label: '已失效', value: 0 },
+                //     { label: '使用中', value: 1 },
+                // ],
             });
 
             // 我的收发角色
@@ -137,11 +194,15 @@ export default () => {
                 name: "attribution",
                 label: "我的收发角色",
                 children: (
-                    <SearchSelect className="underline" allowClear={true}>
-                        <Option value={1}>发送方</Option>
-                        <Option value={2}>接收方</Option>
-                    </SearchSelect>
+                    <RadioGroup>
+                        <AntRadio value={1}>发送方</AntRadio>
+                        <AntRadio value={2}>接收方</AntRadio>
+                    </RadioGroup>
                 ),
+                // options: [
+                //     { label: '发送方', value: 1 },
+                //     { label: '接收方', value: 2 },
+                // ],
             });
 
             // 我司对应DID
@@ -149,13 +210,7 @@ export default () => {
                 name: "senderParticipantId",
                 label: "我司对应DID",
                 children: (
-                    <SearchSelect className="underline" allowClear={true}>
-                        {didEnum.map((item: any) => (
-                            <Option key={item.value} value={item.value}>
-                                {item.label}
-                            </Option>
-                        ))}
-                    </SearchSelect>
+                    <SearchSelect className="underline" allowClear options={didEnum} />
                 ),
             });
 
@@ -178,28 +233,21 @@ export default () => {
                 name: "type",
                 label: "单据大类",
                 children: (
-                    <SearchSelect className="underline" allowClear={true}>
-                        {billEnum.map((item: any) => (
-                            <Option key={item.value} value={item.value}>
-                                {item.label}
-                            </Option>
-                        ))}
-                    </SearchSelect>
+                    <SearchSelect className={"underline"} allowClear onChange={handleTypeChange} options={billEnum} />
                 ),
             });
 
             // 单据子类
             items.push({
-                name: "profile",
-                label: "单据子类",
+                name: 'profile',
+                label: '单据子类',
+                hidden: profileEnum.length === 0,
                 children: (
-                    <SearchSelect className="underline" allowClear={true}>
-                        {profileEnum.map((item: any) => (
-                            <Option key={item.value} value={item.value}>
-                                {item.name}
-                            </Option>
-                        ))}
-                    </SearchSelect>
+                    <SearchSelect 
+                        className={"underline"}
+                        allowClear
+                        options={profileEnum}
+                    />
                 ),
             });
 
@@ -207,159 +255,40 @@ export default () => {
             items.push({
                 name: "createTime",
                 label: "发布时间",
-                children: (
-                    <RangePicker
-                        style={{ width: "100%" }}
-                        format="YYYY-MM-DD"
-                        placeholder={["开始时间", "结束时间"]}
-                        className="underline-datepicker"
-                    />
-                ),
+                children: <RangePicker className={"underline-datepicker"} />,
             });
         }
 
         return items;
-    }, [billEnum, type, profileEnum, didlist]);
-
-    useEffect(() => {
-        (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/participant/listBySubjectId', data: {}, type: 'get' }) as any;
-            if (res.res) {
-                setDidList(res.res);
-            }
-        })()
-    }, []);
-
-    // 处理单据子类的动态更新
-    useEffect(() => {
-        const selectedType = (params as any).type;
-        if (selectedType) {
-            const target: any = billEnum.find((item: any) => item.value === selectedType);
-            if (target && target.profileList) {
-                const list = target.profileList.map((item: any) => {
-                    return {
-                        label: item.name,
-                        value: item.value
-                    }
-                })
-                setProfile(list);
-            } else {
-                setProfile([])
-            }
-        } else {
-            setProfile([])
-        }
-    }, [billEnum, params]);
-
-    useEffect(() => {
-        (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/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']],
-            beginCreateTime: value['beginCreateTime'] && moment(value['beginCreateTime']).format('YYYY-MM-DD 00:00:00'),
-            endCreateTime: value['endCreateTime'] && moment(value['endCreateTime']).format('YYYY-MM-DD 23:59:59'),
-            beginSendTime: value['beginSendTime'] && moment(value['beginSendTime']).format('YYYY-MM-DD 00:00:00'),
-            endSendTime: value['endSendTime'] && moment(value['endSendTime']).format('YYYY-MM-DD 23:59:59'),
-            pageNum: 1,
-            pageSize: 10
-        }
-        controller.pipeline(async s => {
-            s.params = value;
-        })()
-    }, [controller])
-
+    }, [billEnum, type, didlist, profileEnum]);
+    const onCreateType = useCallback((category, record?) => {
+        history.push({ pathname: `/rule`, search: `?type=config&profile=${record && record.value || ''}&billtype=${category}` })
+    }, [])
     // 创建搜索组件
-    const { search, setSearchValues } = SearchXui.useCreate({
+    const { search, inventory, form } = SearchXui.useCreate({
         labelCol: 9,
         onSubmit: (e) => {
-            const processedValues = {
-                ...e,
-                beginCreateTime: e.createTime && e.createTime[0] ? e.createTime[0].format('YYYY-MM-DD 00:00:00') : undefined,
-                endCreateTime: e.createTime && e.createTime[1] ? e.createTime[1].format('YYYY-MM-DD 23:59:59') : undefined,
-                beginSendTime: e.sendTime && e.sendTime[0] ? e.sendTime[0].format('YYYY-MM-DD 00:00:00') : undefined,
-                endSendTime: e.sendTime && e.sendTime[1] ? e.sendTime[1].format('YYYY-MM-DD 23:59:59') : undefined,
-                pageNum: 1,
-                pageSize: 10
-            };
-            // 移除原始的日期字段
-            delete processedValues.createTime;
-            delete processedValues.sendTime;
-            onSearchFormSubmit(processedValues);
+            onSearchFormSubmit(e);
         },
         values: React.useMemo(() => {
-            // 转换搜索值格式
-            const convertedValues = { ...params } as any;
-            const paramsAny = params as any;
-            if (paramsAny.beginCreateTime && paramsAny.endCreateTime) {
-                convertedValues.createTime = [paramsAny.beginCreateTime, paramsAny.endCreateTime];
-            }
-            if (paramsAny.beginSendTime && paramsAny.endSendTime) {
-                convertedValues.sendTime = [paramsAny.beginSendTime, paramsAny.endSendTime];
-            }
-            return searchUnFormat(convertedValues, formItems);
-        }, [params, formItems]),
+            return searchUnFormat(params, formItems);
+        }, [params, formItems]), 
         formItems,
     });
 
-    useEffect(() => {
-        const convertedValues = { ...params } as any;
-        const paramsAny = params as any;
-        if (paramsAny.beginCreateTime && paramsAny.endCreateTime) {
-            convertedValues.createTime = [paramsAny.beginCreateTime, paramsAny.endCreateTime];
-        }
-        if (paramsAny.beginSendTime && paramsAny.endSendTime) {
-            convertedValues.sendTime = [paramsAny.beginSendTime, paramsAny.endSendTime];
-        }
-        setSearchValues(searchUnFormat(convertedValues, formItems));
-    }, [formItems, params, setSearchValues]);
-
-    const switchType = React.useCallback((e) => {
-        controller.pipeline(async s => {
-            s.type = e.target.value;
-            s.params = { pageNum: 1, pageSize: 10 }
-            history.push({ pathname: '/rulelist', state: { type: e.target.value } })
-        })()
-    }, [])
-    const handleCancel = React.useCallback(() => {
-        controller.pipeline(async s => {
-            s.visible = false;
-        })()
-    }, []);
-    const batchSend = React.useCallback(() => {
-        controller.pipeline(async s => {
-            s.visible = true;
-        })()
-    }, [controller]);
-    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} style={{whiteSpace:'nowrap'}}>单据校验规则配置</Radio.Button>
-                        <Radio.Button value={2} style={{whiteSpace:'nowrap'}}>发布记录</Radio.Button>
-                    </Radio.Group>
-                </div>
-                <div style={{ flex: 1 }}>
-                    {search}
+            <div style={{ width: "100%" }}>
+               <div className={'unifiedSearch'}>
+                    <div style={{ display: "flex", alignItems: "flex-start", gap: "16px", padding: '10px 0px' }}>
+                        <div style={{ flex: 1 }}>{search}</div>
+                    </div>
+                    {/* 搜索条件标签 */}
+                    {inventory}
                 </div>
             </div>
         );
-    }, [type, search]);
+    }, [type, search, inventory]);
     const menu = useMemo(() => {
         return (
             <Menu>
@@ -394,6 +323,13 @@ export default () => {
             </Menu>);
     }, [billEnum]);
     return (
+        <>  
+        <div style={{padding:"16px 20px",    borderBottom: "1px solid rgb(240, 240, 240)" }}>
+            <Radio.Group value={type} onChange={switchType}>
+                <Radio.Button value={1} style={{whiteSpace:'nowrap'}}>单据校验规则配置</Radio.Button>
+                <Radio.Button value={2} style={{whiteSpace:'nowrap'}}>发布记录</Radio.Button>
+            </Radio.Group>
+        </div>   
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }}>
             <PageHeaderFoot
                 expandLeft={topExpand()}
@@ -409,5 +345,6 @@ export default () => {
                 visible && <ModalComfirm handleCancel={handleCancel} list={selectedRowKey} />
             }
         </div>
+        </>
     );
 };

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

@@ -22,7 +22,9 @@ export default function validaterule(props: any) {
             const res = await DocumentsService.instance.service?.call({
                 url: '/schema/config/queryConfigSchemaPage', data: params, type: 'post'
             }) as any;
-
+            if(!res){
+                return false;
+            }
             if (res.err) {
                 return false;
             }
@@ -33,9 +35,11 @@ export default function validaterule(props: any) {
         })()
     }, [params]);
     useEffect(() => {
-        (async () => {
-
+        (async () => { 
             const res = await DocumentsService.instance.service?.call({ url: '/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
+            if(!res){
+                return false;
+            }
             if (res.err) {
                 return false;
             } else {

package/dist/DocumentWhiteList/ui/UnifiedSearch/index.d.ts

@@ -1,11 +0,0 @@
-import * as React from "react";
-interface UnifiedSearchProps {
-    searchFormSubmit: (values: any) => void;
-    searchValues: any;
-    right?: any;
-    onRefresh?: () => void;
-    didlist?: any[];
-    labelCol?: number;
-}
-export default function UnifiedSearch(props: UnifiedSearchProps): React.JSX.Element;
-export {};

package/src/DocumentWhiteList/ui/UnifiedSearch/index.scss

@@ -1,119 +0,0 @@
-// UnifiedSearch 组件样式 - 控件只有下边框
-.unifiedSearch {
-  :global(.ktsAntX-xui-page-header-foot){
-    box-shadow: none !important;
-  }
-  :global(.ktsAntX-xui-page-header-foot::after) {
-    box-shadow: none !important;
-  }
-  :global(.ktsAntX-xui-page-header-foot .ktsAntX-xui-page-header-operate) {
-    border: none !important;
-  }
-  :global(.ktsAntX-xui-page-header-operate){
-    padding: 0px !important;
-  }
-}
-
-// 按钮容器样式
-.btnBox {
-  display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-  justify-content: flex-end;
-  flex: 1;
-  margin-top: 13px;
-  .btn {
-    height:30px;
-    line-height: 30px;
-    background-color:rgba(0,116,255,1);
-    border-radius:15px;
-    border:1px solid rgba(0,116,255,1);
-    font-size:12px;
-    color: #FFFFFF;
-    padding: 0px 28px;
-    cursor: pointer;
-    margin-left: 10px;
-    word-break: keep-all;
-  }
-  .moreBtn {
-    height:30px;
-    line-height: 30px;
-    background-color: #ffffff;
-    border-radius:15px;
-    border:1px solid #0074FF;
-    font-size:12px;
-    color: #0074FF;
-    padding: 0px 28px;
-    cursor: pointer;
-    margin-left: 10px;
-    word-break: keep-all;
-  }
-  .moreBtn:hover {
-    background-color: rgba(0, 116, 255, 0.2);
-  }
-  .refreshBtn {
-    padding: 0 18px;
-    justify-content: center;
-    align-items: center;
-    display: inline-flex;
-    .refreshIcon {
-      height: 18px;
-      width: 18px;
-    }
-  }
-}
-
-// 全局样式 - 所有输入框只显示下边框
-:global(.underline-datepicker) {
-  :global(.ant-input){
-    border: none !important;
-    border-bottom: 1px solid #d9d9d9 !important;
-  }
-}
-:global(.underline){
-  :global(.ktsAntX-select-selector){
-    border: none !important;
-    border-bottom: 1px solid #d9d9d9 !important;
-  }
-}
-// kts-xui 组件全局样式覆盖 - 只显示下边框
-:global(.ktsAntX-xui-input .ant-input) {
-  border: none !important;
-  border-bottom: 1px solid #d9d9d9 !important;
-  border-radius: 0 !important;
-  box-shadow: none !important;
-  background: transparent !important;
-  outline: none !important;
-}
-
-:global(.ktsAntX-xui-input .ant-input:focus),
-:global(.ktsAntX-xui-input .ant-input:hover) {
-  border-bottom: 1px solid #40a9ff !important;
-  box-shadow: none !important;
-}
-
-:global(.ktsAntX-xui-input .ant-input:focus) {
-  border-bottom: 1px solid #1890ff !important;
-}
-
-:global(.ktsAntX-xui-select .ant-select-selector) {
-  border: none !important;
-  border-bottom: 1px solid #d9d9d9 !important;
-  border-radius: 0 !important;
-  box-shadow: none !important;
-  background: transparent !important;
-  outline: none !important;
-}
-
-:global(.ktsAntX-xui-select .ant-select-selector:hover) {
-  border-bottom: 1px solid #40a9ff !important;
-}
-
-:global(.ktsAntX-xui-select.ant-select-focused .ant-select-selector) {
-  border-bottom: 1px solid #1890ff !important;
-  box-shadow: none !important;
-}
-
-:global(.ktsAntX-xui-select .ant-select-arrow) {
-  color: #666;
-}