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

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

@@ -1,14 +1,21 @@
 import React, { useRef, useState, useEffect, useMemo, useCallback } from 'react';
 import { Radio, Button, Dropdown, PageHeaderFoot } from 'kts-xui';
 import { Menu } from 'kts-components-antd-x4';
-import { AdvancedSearch, KtsForm } from 'kts-components';
-import { LifeCycleTypes } from '@formily/antd';
+import { 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 css from './index.less';
+
+const { Option } = Select;
+const { RangePicker } = DatePicker;
+const { Group: RadioGroup } = AntRadio;
+const { Group: CheckboxGroup } = Checkbox;
 const { SubMenu } = Menu;
 export default () => {
     const history = useHistory();
@@ -18,13 +25,16 @@ 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 [schema, setSchema] = useState({});
+    const profileEnumRef = useRef<any[]>([]);
+    const [, forceUpdate] = useState({});
     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);
             }
@@ -33,6 +43,9 @@ export default () => {
     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 {
@@ -59,6 +72,16 @@ export default () => {
         })()
     }, [controller])
 
+    // 处理单据大类变化
+    const handleTypeChange = useCallback((value: any) => {
+        const target: any = billEnum.find((item: any) => item.value === value);
+        profileEnumRef.current = target?.profileList?.map((item: any) => ({
+            label: item.name,
+            value: item.value,
+        })) || [];
+        forceUpdate({});
+    }, [billEnum]);
+
     const switchType = React.useCallback((e) => {
         controller.pipeline(async s => {
             s.type = e.target.value;
@@ -76,141 +99,197 @@ export default () => {
             s.visible = true;
         })()
     }, [controller]);
-    useEffect(() => {
+    // 动态生成 formItems
+    const formItems: ISearchItemProps[] = useMemo(() => {
         const didEnum = didlist.map((item: any) => {
             return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
-        })
+        });
+
+        const items: ISearchItemProps[] = [];
+
         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);
+            // 配置名称
+            items.push({
+                name: "configName",
+                label: "配置名称",
+                children: <SearchXui.Input />,
+            });
+
+            // 单据大类
+            items.push({
+                name: "type",
+                label: "单据大类",
+                children: (
+                    <SearchSelect className={css.underline} allowClear onChange={handleTypeChange}>
+                        {billEnum.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.label}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 单据子类
+            items.push({
+                name: 'profile',
+                label: '单据子类',
+                hidden: profileEnumRef.current.length === 0,
+                children: (
+                    <SearchSelect className={css.underline} allowClear>
+                        {profileEnumRef.current.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.label}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 收发角色
+            items.push({
+                name: "attributionList",
+                label: "收发角色",
+                children: (
+                    <CheckboxGroup
+                        options={[
+                            { label: "发送方", value: 1 },
+                            { label: "接收方", value: 2 }
+                        ]}
+                    />
+                ),
+            });
+
+            // 创建时间
+            items.push({
+                name: "createTime",
+                label: "创建时间",
+                children: <RangePicker className={css.underline} />,
+            });
+
+            // 更新时间
+            items.push({
+                name: "sendTime",
+                label: "更新时间",
+                children: <RangePicker className={css.underline} />,
+            });
         } 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);
+            // 配置名称
+            items.push({
+                name: "configName",
+                label: "配置名称",
+                children: <SearchXui.Input />,
+            });
+
+            // 使用标识
+            items.push({
+                name: "effectStatus",
+                label: "使用标识",
+                children: (
+                    <RadioGroup>
+                        <AntRadio value={0}>已失效</AntRadio>
+                        <AntRadio value={1}>使用中</AntRadio>
+                    </RadioGroup>
+                ),
+            });
+
+            // 我的收发角色
+            items.push({
+                name: "attribution",
+                label: "我的收发角色",
+                children: (
+                    <RadioGroup>
+                        <AntRadio value={1}>发送方</AntRadio>
+                        <AntRadio value={2}>接收方</AntRadio>
+                    </RadioGroup>
+                ),
+            });
+
+            // 我司对应DID
+            items.push({
+                name: "senderParticipantId",
+                label: "我司对应DID",
+                children: (
+                    <SearchSelect className={css.underline} allowClear>
+                        {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={css.underline} allowClear onChange={handleTypeChange}>
+                        {billEnum.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.label}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 单据子类
+            items.push({
+                name: 'profile',
+                label: '单据子类',
+                hidden: profileEnumRef.current.length === 0,
+                children: (
+                    <SearchSelect className={css.underline} allowClear>
+                        {profileEnumRef.current.map((item: any) => (
+                            <Option key={item.value} value={item.value}>
+                                {item.label}
+                            </Option>
+                        ))}
+                    </SearchSelect>
+                ),
+            });
+
+            // 发布时间
+            items.push({
+                name: "createTime",
+                label: "发布时间",
+                children: <RangePicker className={css.underline} />,
+            });
         }
 
-    }, [billEnum, type, profileEnum, didlist])
+        return items;
+    }, [billEnum, type, didlist]);
     const onCreateType = useCallback((category, record?) => {
         history.push({ pathname: `/rule`, search: `?type=config&profile=${record && record.value || ''}&billtype=${category}` })
     }, [])
+    // 创建搜索组件
+    const { search } = SearchXui.useCreate({
+        labelCol: 9,
+        onSubmit: (e) => {
+            onSearchFormSubmit(e);
+        },
+        values: React.useMemo(() => {
+            return searchUnFormat(params, formItems);
+        }, [params, formItems]),
+        formItems,
+    });
+
     const topExpand = useCallback(() => {
         return (
             <div style={{ display: 'flex' }}>
@@ -220,58 +299,14 @@ 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={{ width: "100%", paddingTop: '10px' }}>
+                    <div style={{ display: "flex", alignItems: "flex-start", gap: "16px" }}>
+                        <div style={{ flex: 1 }}>{search}</div>
+                    </div>
+                </div>
             </div>
         );
-    }, [type, schema]);
+    }, [type, search]);
     const menu = useMemo(() => {
         return (
             <Menu>

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/tsconfig.json

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