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

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

@@ -1,7 +1,7 @@
 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 { KtsForm } from 'kts-components';
 import { LifeCycleTypes } from '@formily/antd';
 import Main from '../../';
 import ModalComfirm from '../ModalComfirm'
@@ -9,7 +9,13 @@ 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;
+
 export default () => {
     const history = useHistory();
     const controller = Main.useController();
@@ -19,9 +25,202 @@ export default () => {
     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);
     const [didlist, setDidList] = useState([]);//我司对应DID
+
+    // 动态生成 formItems
+    const formItems: ISearchItemProps[] = useMemo(() => {
+        const items: ISearchItemProps[] = [];
+        const didEnum = didlist.map((item: any) => {
+            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
+        });
+
+        if (type === 1) {
+            // 配置名称
+            items.push({
+                name: "configName",
+                label: "配置名称",
+                children: <SearchXui.Input />,
+            });
+
+            // 单据大类
+            items.push({
+                name: "type",
+                label: "单据大类",
+                children: (
+                    <SearchSelect className="underline" allowClear={true}>
+                        {billEnum.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.label}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 单据子类
+            items.push({
+                name: "profile",
+                label: "单据子类",
+                children: (
+                    <SearchSelect className="underline" allowClear={true}>
+                        {profileEnum.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.name}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 收发角色
+            items.push({
+                name: "attributionList",
+                label: "收发角色",
+                children: (
+                    <SearchSelect className="underline" allowClear={true} mode="multiple">
+                        <Option value={1}>发送方</Option>
+                        <Option value={2}>接收方</Option>
+                    </SearchSelect>
+                ),
+            });
+
+            // 创建时间
+            items.push({
+                name: "createTime",
+                label: "创建时间",
+                children: (
+                    <RangePicker
+                        style={{ width: "100%" }}
+                        format="YYYY-MM-DD"
+                        placeholder={["开始时间", "结束时间"]}
+                        className="underline-datepicker"
+                    />
+                ),
+            });
+
+            // 更新时间
+            items.push({
+                name: "sendTime",
+                label: "更新时间",
+                children: (
+                    <RangePicker
+                        style={{ width: "100%" }}
+                        format="YYYY-MM-DD"
+                        placeholder={["开始时间", "结束时间"]}
+                        className="underline-datepicker"
+                    />
+                ),
+            });
+        } else if (type === 2) {
+            // 配置名称
+            items.push({
+                name: "configName",
+                label: "配置名称",
+                children: <SearchXui.Input />,
+            });
+
+            // 使用标识
+            items.push({
+                name: "effectStatus",
+                label: "使用标识",
+                children: (
+                    <SearchSelect className="underline" allowClear={true}>
+                        <Option value={0}>已失效</Option>
+                        <Option value={1}>使用中</Option>
+                    </SearchSelect>
+                ),
+            });
+
+            // 我的收发角色
+            items.push({
+                name: "attribution",
+                label: "我的收发角色",
+                children: (
+                    <SearchSelect className="underline" allowClear={true}>
+                        <Option value={1}>发送方</Option>
+                        <Option value={2}>接收方</Option>
+                    </SearchSelect>
+                ),
+            });
+
+            // 我司对应DID
+            items.push({
+                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>
+                ),
+            });
+
+            // 接受对象
+            items.push({
+                name: "receiverParticipantId",
+                label: "接受对象",
+                children: <SearchXui.Input />,
+            });
+
+            // 接受对象所属公司
+            items.push({
+                name: "receiverCompany",
+                label: "接受对象所属公司",
+                children: <SearchXui.Input />,
+            });
+
+            // 单据大类
+            items.push({
+                name: "type",
+                label: "单据大类",
+                children: (
+                    <SearchSelect className="underline" allowClear={true}>
+                        {billEnum.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.label}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 单据子类
+            items.push({
+                name: "profile",
+                label: "单据子类",
+                children: (
+                    <SearchSelect className="underline" allowClear={true}>
+                        {profileEnum.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.name}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 发布时间
+            items.push({
+                name: "createTime",
+                label: "发布时间",
+                children: (
+                    <RangePicker
+                        style={{ width: "100%" }}
+                        format="YYYY-MM-DD"
+                        placeholder={["开始时间", "结束时间"]}
+                        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;
@@ -30,6 +229,28 @@ export default () => {
             }
         })()
     }, []);
+
+    // 处理单据子类的动态更新
+    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;
@@ -59,6 +280,51 @@ export default () => {
         })()
     }, [controller])
 
+    // 创建搜索组件
+    const { search, setSearchValues } = 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);
+        },
+        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]),
+        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;
@@ -76,138 +342,6 @@ export default () => {
             s.visible = true;
         })()
     }, [controller]);
-    useEffect(() => {
-        const didEnum = didlist.map((item: any) => {
-            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
-        })
-        if (type === 1) {
-            let obj: any = {
-                type: "object",
-                properties: {
-                    configName: {
-                        type: "string",
-                        title: "配置名称",
-                    },
-                    type: {
-                        type: "string",
-                        title: "单据大类",
-                        enum: billEnum,
-                    },
-                    profile: {
-                        type: "string",
-                        title: "单据子类",
-                        enum: profileEnum,
-                        visible: false
-                    },
-                    attributionList: {
-                        type: "checkbox",
-                        title: "收发角色",
-                        enum: [{
-                            "label": "发送方",
-                            "value": 1
-                        }, {
-                            "label": "接收方",
-                            "value": 2
-                        }],
-                        'x-props': {
-                            mode: "multiple"
-                        }
-                    },
-                    createTime: {
-                        type: "daterange",
-                        title: "创建时间",
-                        'x-props':{
-                            extendsFields: ['beginCreateTime', 'endCreateTime'],
-                        }
-                    },
-                    sendTime: {
-                        type: "daterange",
-                        title: "更新时间",
-                        'x-props':{
-                            extendsFields: ['beginSendTime', 'endSendTime'],
-                        }
-                    },
-                }
-            }
-            setSchema(obj);
-        } else if (type === 2) {
-            let obj: any = {
-                type: "object",
-                properties: {
-                    configName: {
-                        type: "string",
-                        title: "配置名称",
-                    },
-                    effectStatus: {
-                        type: "radio",
-                        title: "使用标识",
-                        enum: [{
-                            "label": "已失效",
-                            "value": 0
-                        }, {
-                            "label": "使用中",
-                            "value": 1
-                        }]
-                    },
-                    attribution: {
-                        type: "radio",
-                        title: "我的收发角色",
-                        enum: [{
-                            "label": "发送方",
-                            "value": 1
-                        }, {
-                            "label": "接收方",
-                            "value": 2
-                        }],
-                    },
-                    // attributionList: {
-                    //     type: "string",
-                    //     title: "发送对象",
-                    //     visible: true
-                    // },
-                    senderParticipantId: {
-                        type: "string",
-                        title: "我司对应DID",
-                        enum: didEnum
-                    },
-                    receiverParticipantId: {
-                        type: "string",
-                        title: "接受对象",
-                    },
-                    receiverCompany: {
-                        type: "string",
-                        title: "接受对象所属公司",
-                    },
-                    type: {
-                        type: "string",
-                        title: "单据大类",
-                        enum: billEnum,
-                    },
-                    profile: {
-                        type: "string",
-                        title: "单据子类",
-                        enum: profileEnum,
-                        visible: false
-                    },
-                    createTime: {
-                        type: "daterange",
-                        title: "发布时间",
-                        'x-props':{
-                            extendsFields: ['beginCreateTime', 'endCreateTime'],
-                        }
-                    },
-                    // '[beginSendTime,endSendTime]': {
-                    //     key: "[beginSendTime,endSendTime]",
-                    //     name: "[beginSendTime,endSendTime]",
-                    //     type: "daterange",
-                    //     title: "更新时间",
-                    // },
-                }
-            }
-            setSchema(obj);
-        }
-
-    }, [billEnum, type, profileEnum, didlist])
     const onCreateType = useCallback((category, record?) => {
         history.push({ pathname: `/rule`, search: `?type=config&profile=${record && record.value || ''}&billtype=${category}` })
     }, [])
@@ -220,58 +354,12 @@ export default () => {
                         <Radio.Button value={2} style={{whiteSpace:'nowrap'}}>发布记录</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={params}
-                        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 style={{ flex: 1 }}>
+                    {search}
+                </div>
             </div>
         );
-    }, [type, schema]);
+    }, [type, search]);
     const menu = useMemo(() => {
         return (
             <Menu>

package/tsconfig.json

@@ -9,6 +9,7 @@
     "sourceMap": true,
     "baseUrl": "./",
     "strict": true,
+    "noImplicitAny": false,
     "paths": {
       "@/*": ["src/*"],
       "@@/*": ["src/.umi/*"]