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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "private": false,
   "scripts": {
     "start": "dumi dev",
@@ -35,7 +35,7 @@
     "kts-component-service": "^1.0.4",
     "kts-components": "1.3.9",
     "kts-components-antd-x4": "5.0.0",
-    "kts-xui": "^2.2.29",
+    "kts-xui": "2.1.77",
     "lodash": "^4.17.21",
     "moment": "2.29.1",
     "query-string": "^7.0.1",
@@ -47,10 +47,10 @@
     "@types/lodash": "^4.14.171",
     "@umijs/test": "^3.0.5",
     "dumi": "^1.0.16",
-    "father-build": "^1.22.5",
+    "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
     "lint-staged": "^10.0.7",
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   }
-}
+}

package/src/DocumentWhiteList/control/actions/blacklist/index.ts

@@ -6,6 +6,9 @@ import { IParams } from '../../../interface'
 
 export default async (s: ControllerState, params?: IParams) => {
     const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/queryBlackListPage', data: params, type: 'post' }) as any;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/control/actions/checkclient/index.ts

@@ -4,7 +4,10 @@ import { DocumentsService } from "../../../..";
 
 
 export default async (s: ControllerState,) => {
-    const res = await DocumentsService.instance.service!.call({ url: '/whiteblacklist/config/showButton', data: {}, type: 'post' }) as any;
+    const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/showButton', data: {}, type: 'post' }) as any;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/control/actions/didilist/index.ts

@@ -7,6 +7,9 @@ import { IParams } from '../../../interface'
 export default async (s: ControllerState, params?: IParams) => {
     const res = await DocumentsService.instance.service?.call({ url: '/participant/list', data: params, type: 'post' }) as any;
     // return res;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/control/actions/enableblacklist/index.ts

@@ -8,6 +8,9 @@ export interface IParams{
 
 export default async (s: ControllerState, params?: IParams,) => {
     const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/enableOrDisableBlackList?status=' + params?.flag, data: params?.didList, type: 'post' }) as any;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/control/actions/enablelist/index.ts

@@ -9,6 +9,9 @@ export interface IParams{
 
 export default async (s: ControllerState, params?: IParams,) => {
     const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/enableList?status=' + params?.status, data: params?.didList, type: 'post' }) as any;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/control/actions/enablewhitelist/index.ts

@@ -8,6 +8,9 @@ export interface IParams{
 
 export default async (s: ControllerState, params?: IParams,) => {
     const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/enableOrDisableWhiteList?status=' + params?.flag, data: params?.didList, type: 'post' }) as any;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/control/actions/synclist/index.ts

@@ -11,6 +11,9 @@ export interface IParams {
 
 export default async (s: ControllerState, params?: IParams) => {
     const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/querySyncPage', data: params, type: 'post' }) as any;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/control/actions/whitelist/index.ts

@@ -6,6 +6,9 @@ import { IParams } from '../../../interface'
 
 export default async (s: ControllerState, params?:IParams) => {
     const res = await DocumentsService.instance.service?.call({ url: '/whiteblacklist/config/queryWhiteListPage', data: params, type: 'post' }) as any;
+    if (!res) { 
+        return false;
+    }
     if (res.err) {
         return false;
     }

package/src/DocumentWhiteList/ui/pageheader/BlackHeader.tsx

@@ -1,8 +1,15 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Button, PageHeaderFoot } from 'kts-xui';
+import { Search as SearchXui, searchUnFormat, ISearchItemProps } from 'kts-xui';
+import { Select as SearchSelect } from 'kts-xui';
+import { Select, DatePicker } from 'antd';
 import Main from '../../index';
-import UnifiedSearch from '../UnifiedSearch';
+// import { LifeCycleTypes } from "@formily/antd";
 import _ from 'lodash';
+import moment from 'moment';
+import css from './index.less';
+const { Option } = Select;
+const { RangePicker } = DatePicker;
 export default () => {
     const controller = Main.useController();
     const pageMeta = controller.useMemo((s) => s.pageMeta, []);
@@ -11,8 +18,14 @@ export default () => {
     const selectedRowKey = controller.useMemo(s => s.selectedBlackRowKey, [])
     const disabled = selectedRowKey.length > 0 ? false : true
     const didlist = controller.useMemo((s) => s.didlist, []);
-    const [companyDidNote, setNote] = useState('');
     const onSearchFormSubmit = React.useCallback((value) => {
+        value = {
+            ...value,
+            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'),
+            pageNum: 1,
+            pageSize: 10
+        }
         controller.pipeline(async s => {
             s.params = value;
         })()
@@ -23,7 +36,58 @@ export default () => {
     useEffect(() => {
         controller.didList({}) as any;
     }, []);
-    // UnifiedSearch 组件内部处理字段定义，不需要 schema
+    // 动态生成 formItems
+    const formItems: ISearchItemProps[] = React.useMemo(() => {
+        const didEnum = didlist?.map(item => {
+            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
+        });
+
+        const items: ISearchItemProps[] = [];
+
+        // DID
+        items.push({
+            name: "customerDid",
+            label: "DID",
+            children: <SearchXui.Input />,
+        });
+
+        // 所属公司
+        items.push({
+            name: "customerName",
+            label: "所属公司",
+            children: <SearchXui.Input />,
+        });
+
+        // 我司对应DID
+        items.push({
+            name: "companyDid",
+            label: "我司对应DID",
+            children: (
+                <SearchSelect className={"underline"} allowClear options={didEnum} />
+            ),
+        });
+
+        // 数据状态
+        items.push({
+            name: "dataStatus",
+            label: "数据状态",
+            children: (
+                <SearchSelect className={"underline"} allowClear options={[
+                    { label: '使用中', value: 1 },
+                    { label: '停用', value: 2 },
+                ]} />
+            ),
+        });
+
+        // 创建时间
+        items.push({
+            name: "createTime",
+            label: "创建时间",
+            children: <RangePicker className={"underline-datepicker"} />,
+        });
+
+        return items;
+    }, [didlist]);
     const batchBlockList = useCallback((type: number) => {
         (async () => {
             const res = await controller.enableblacklist({
@@ -47,16 +111,29 @@ export default () => {
             s.listNature = '2';
         })()
     }, []);
+    // 创建搜索组件
+    const { search, inventory } = SearchXui.useCreate({
+        labelCol: 9,
+        onSubmit: (e) => {
+            onSearchFormSubmit(e);
+        },
+        values: React.useMemo(() => {
+            return searchUnFormat(params, formItems);
+        }, [params, formItems]),
+        formItems,
+    });
+
     const topExpand = useCallback(() => {
         return (
-            <UnifiedSearch
-                searchFormSubmit={onSearchFormSubmit}
-                searchValues={params}
-                didlist={didlist}
-                labelCol={9}
-            />
+            <div style={{ width: "100%" }}>
+                <div style={{ display: "flex", alignItems: "flex-start", gap: "16px",padding: '10px 0px' }}>
+                    <div style={{ flex: 1 }}>{search}</div>
+                </div>
+                {/* 搜索条件标签 */}
+                {inventory}
+            </div>
         );
-    }, [params, didlist]);
+    }, [search, inventory]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

package/src/DocumentWhiteList/ui/pageheader/WhiteHeader.tsx

@@ -1,8 +1,15 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Button, PageHeaderFoot } from 'kts-xui';
+import { Search as SearchXui, searchUnFormat, ISearchItemProps } from 'kts-xui';
+import { Select as SearchSelect } from 'kts-xui';
+import { Select, DatePicker } from 'antd';
 import Main from '../../index';
-import UnifiedSearch from '../UnifiedSearch';
 import _ from 'lodash';
+import moment from 'moment';
+import css from './index.less';
+
+const { Option } = Select;
+const { RangePicker } = DatePicker;
 export default () => {
     const controller = Main.useController();
     const pageMeta = controller.useMemo((s) => s.pageMeta, []);
@@ -12,6 +19,13 @@ export default () => {
     const disabled = selectedRowKey.length > 0 ? false : true
     const didlist = controller.useMemo((s) => s.didlist, []);
     const onSearchFormSubmit = React.useCallback((value) => {
+        value = {
+            ...value,
+            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'),
+            pageNum: 1,
+            pageSize: 10
+        }
         controller.pipeline(async s => {
             s.whiteParams = value;
         })()
@@ -31,7 +45,58 @@ export default () => {
 
 
     }, []);
-    // UnifiedSearch 组件内部处理字段定义，不需要 schema
+    // 动态生成 formItems
+    const formItems: ISearchItemProps[] = React.useMemo(() => {
+        const didEnum = didlist?.map(item => {
+            return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
+        });
+
+        const items: ISearchItemProps[] = [];
+
+        // DID
+        items.push({
+            name: "customerDid",
+            label: "DID",
+            children: <SearchXui.Input />,
+        });
+
+        // 所属公司
+        items.push({
+            name: "customerName",
+            label: "所属公司",
+            children: <SearchXui.Input />,
+        });
+
+        // 我司对应DID
+        items.push({
+            name: "companyDid",
+            label: "我司对应DID",
+            children: (
+                <SearchSelect className={"underline"} allowClear options={didEnum} />
+            ),
+        });
+
+        // 数据状态
+        items.push({
+            name: "dataStatus",
+            label: "数据状态",
+            children: (
+                <SearchSelect className={"underline"} allowClear options={[
+                    { label: '使用中', value: 1 },
+                    { label: '停用', value: 2 },
+                ]} />
+            ),
+        });
+
+        // 创建时间
+        items.push({
+            name: "createTime",
+            label: "创建时间",
+            children: <RangePicker className={"underline-datepicker"}/>,
+        });
+
+        return items;
+    }, [didlist]);
     const batchBlockList = useCallback((type: number) => {
         (async () => {
             const res = await controller.enablewhitelist({
@@ -55,16 +120,31 @@ export default () => {
             s.listNature = '1';
         })()
     }, []);
+    // 创建搜索组件
+    const { search, inventory } = SearchXui.useCreate({
+        labelCol: 9,
+        onSubmit: (e) => {
+            onSearchFormSubmit(e);
+        },
+        values: React.useMemo(() => {
+            return searchUnFormat(whiteParams, formItems);
+        }, [whiteParams, formItems]),
+        formItems,
+    });
+
     const topExpand = useCallback(() => {
         return (
-            <UnifiedSearch
-                searchFormSubmit={onSearchFormSubmit}
-                searchValues={whiteParams}
-                didlist={didlist}
-                labelCol={9}
-            />
+            <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>
+                </div>
+                {/* 搜索条件标签 */}
+                {inventory}
+            </div>
         );
-    }, [whiteParams, didlist]);
+    }, [search, inventory]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

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

@@ -13,7 +13,7 @@ export default function algorithmFormComponent(operator: IOperator, ruleProperti
 
     const info = ruleProperties.items ? ruleProperties.items : ruleProperties;
 
-    function renderFormItem(child: React.ReactNode) {
+    function renderFormItem(child: any) {
         return (
             <Form.Item key={`algorithmForm_${operator.name}`} {...operator}>
                 {child}

package/src/DocumentsList/DocumentsListController/DocumentsListControllerState/index.ts

@@ -29,6 +29,10 @@ export interface ISelectedRowKey {
      *单据类型
      */
     type?: string;
+    /**
+     * 单据子类
+     */
+    profile?: string;
 }
 export interface IBillEnum {
     name: string;