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

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

@@ -10,9 +10,6 @@ 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;
@@ -25,8 +22,7 @@ export default () => {
     const selectedRowKey = controller.useMemo(s => s.selectedRowKey, [])
     const params = controller.useMemo(s => s.params, [])
     const visible = controller.useMemo(s => s.visible, []);
-    const profileEnumRef = useRef<any[]>([]);
-    const [, forceUpdate] = useState({});
+    const [profileEnum, setProfileEnum] = useState<any[]>([]); 
     const ktsRef = useRef(null);
     const [didlist, setDidList] = useState([]);//我司对应DID
     useEffect(() => {
@@ -75,12 +71,13 @@ export default () => {
     // 处理单据大类变化
     const handleTypeChange = useCallback((value: any) => {
         const target: any = billEnum.find((item: any) => item.value === value);
-        profileEnumRef.current = target?.profileList?.map((item: any) => ({
+        const newProfileEnum = target?.profileList?.map((item: any) => ({
             label: item.name,
             value: item.value,
         })) || [];
-        forceUpdate({});
-    }, [billEnum]);
+        setProfileEnum(newProfileEnum); 
+        form?.setFieldsValue({ profile: undefined });
+    }, [billEnum, controller]);
 
     const switchType = React.useCallback((e) => {
         controller.pipeline(async s => {
@@ -88,6 +85,8 @@ export default () => {
             s.params = { pageNum: 1, pageSize: 10 }
             history.push({ pathname: '/rulelist', state: { type: e.target.value } })
         })()
+        // 切换类型时也清空单据子类的值并重新创建表单
+        setProfileEnum([]); 
     }, [])
     const handleCancel = React.useCallback(() => {
         controller.pipeline(async s => {
@@ -120,13 +119,7 @@ export default () => {
                 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>
+                    <SearchSelect className={"underline"} allowClear onChange={handleTypeChange} options={billEnum} />
                 ),
             });
 
@@ -134,15 +127,14 @@ export default () => {
             items.push({
                 name: 'profile',
                 label: '单据子类',
-                hidden: profileEnumRef.current.length === 0,
+                hidden: profileEnum.length === 0,
                 children: (
-                    <SearchSelect className={css.underline} allowClear>
-                        {profileEnumRef.current.map((item: any) => (
-                            <Option key={item.value} value={item.value}>
-                                {item.label}
-                            </Option>
-                        ))}
-                    </SearchSelect>
+                    <SearchSelect
+                        key={`profile-${params?.type || 'none'}`}
+                        className={"underline"}
+                        allowClear
+                        options={profileEnum}
+                    />
                 ),
             });
 
@@ -164,14 +156,14 @@ export default () => {
             items.push({
                 name: "createTime",
                 label: "创建时间",
-                children: <RangePicker className={css.underline} />,
+                children: <RangePicker className={"underline-datepicker"} />,
             });
 
             // 更新时间
             items.push({
                 name: "sendTime",
                 label: "更新时间",
-                children: <RangePicker className={css.underline} />,
+                children: <RangePicker className={"underline-datepicker"} />,
             });
         } else if (type === 2) {
             // 配置名称
@@ -191,6 +183,10 @@ export default () => {
                         <AntRadio value={1}>使用中</AntRadio>
                     </RadioGroup>
                 ),
+                // options: [
+                //     { label: '已失效', value: 0 },
+                //     { label: '使用中', value: 1 },
+                // ],
             });
 
             // 我的收发角色
@@ -203,6 +199,10 @@ export default () => {
                         <AntRadio value={2}>接收方</AntRadio>
                     </RadioGroup>
                 ),
+                // options: [
+                //     { label: '发送方', value: 1 },
+                //     { label: '接收方', value: 2 },
+                // ],
             });
 
             // 我司对应DID
@@ -210,13 +210,7 @@ export default () => {
                 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>
+                    <SearchSelect className="underline" allowClear options={didEnum} />
                 ),
             });
 
@@ -239,13 +233,7 @@ export default () => {
                 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>
+                    <SearchSelect className={"underline"} allowClear onChange={handleTypeChange} options={billEnum} />
                 ),
             });
 
@@ -253,15 +241,13 @@ export default () => {
             items.push({
                 name: 'profile',
                 label: '单据子类',
-                hidden: profileEnumRef.current.length === 0,
+                hidden: profileEnum.length === 0,
                 children: (
-                    <SearchSelect className={css.underline} allowClear>
-                        {profileEnumRef.current.map((item: any) => (
-                            <Option key={item.value} value={item.value}>
-                                {item.label}
-                            </Option>
-                        ))}
-                    </SearchSelect>
+                    <SearchSelect 
+                        className={"underline"}
+                        allowClear
+                        options={profileEnum}
+                    />
                 ),
             });
 
@@ -269,44 +255,40 @@ export default () => {
             items.push({
                 name: "createTime",
                 label: "发布时间",
-                children: <RangePicker className={css.underline} />,
+                children: <RangePicker className={"underline-datepicker"} />,
             });
         }
 
         return items;
-    }, [billEnum, type, didlist]);
+    }, [billEnum, type, didlist, profileEnum]);
     const onCreateType = useCallback((category, record?) => {
         history.push({ pathname: `/rule`, search: `?type=config&profile=${record && record.value || ''}&billtype=${category}` })
     }, [])
     // 创建搜索组件
-    const { search } = SearchXui.useCreate({
+    const { search, inventory, form } = SearchXui.useCreate({
         labelCol: 9,
         onSubmit: (e) => {
             onSearchFormSubmit(e);
         },
         values: React.useMemo(() => {
             return searchUnFormat(params, formItems);
-        }, [params, formItems]),
+        }, [params, formItems]), 
         formItems,
     });
 
     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={{ width: "100%", paddingTop: '10px' }}>
-                    <div style={{ display: "flex", alignItems: "flex-start", gap: "16px" }}>
+            <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>
@@ -341,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()}
@@ -356,5 +345,6 @@ export default () => {
                 visible && <ModalComfirm handleCancel={handleCancel} list={selectedRowKey} />
             }
         </div>
+        </>
     );
 };

package/src/DocumentWhiteList/ui/pageheader/index.less

@@ -1,10 +0,0 @@
-.underline{ 
-  :global(.ktsAntX-select-selector){
-    border: none !important;
-    border-bottom: 1px solid #d9d9d9 !important;
-  } 
-  :global(.ant-input){
-    border: none !important;
-    border-bottom: 1px solid #d9d9d9 !important;
-  } 
-}

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

@@ -1,10 +0,0 @@
-.underline{ 
-  :global(.ktsAntX-select-selector){
-    border: none !important;
-    border-bottom: 1px solid #d9d9d9 !important;
-  } 
-  :global(.ant-input){
-    border: none !important;
-    border-bottom: 1px solid #d9d9d9 !important;
-  } 
-}