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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "1.4.12",
+  "version": "2.0.1",
   "private": false,
   "scripts": {
     "start": "dumi dev",
@@ -33,9 +33,9 @@
     "antd": "3.26.20",
     "grey-react-box": "0.2.15",
     "kts-component-service": "^1.0.4",
-    "kts-components": "^1.2.26",
-    "kts-components-antd-x4": "^4.0.3",
-    "kts-xui": "^1.0.31",
+    "kts-components": "1.3.9",
+    "kts-components-antd-x4": "5.0.0",
+    "kts-xui": "2.1.77",
     "lodash": "^4.17.21",
     "moment": "2.29.1",
     "query-string": "^7.0.1",
@@ -53,4 +53,4 @@
     "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

@@ -5,6 +5,9 @@ import { DocumentsService } from "../../../..";
 
 export default async (s: ControllerState,) => {
     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,20 +1,23 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Button, PageHeaderFoot } from 'kts-xui';
-import { AdvancedSearch, KtsForm } from 'kts-components';
+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 { 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 [schema, setSchema] = useState({});
     const pageMeta = controller.useMemo((s) => s.pageMeta, []);
     const params = controller.useMemo(s => s.params, [])
     const clientInfo = controller.useMemo(s => s.clientInfo, [])
     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,
@@ -33,54 +36,64 @@ export default () => {
     useEffect(() => {
         controller.didList({}) as any;
     }, []);
-    useEffect(() => {
-        const didEnum = didlist.map(item => {
+    // 动态生成 formItems
+    const formItems: ISearchItemProps[] = React.useMemo(() => {
+        const didEnum = didlist?.map(item => {
             return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
-        })
-        let obj: any = {
-            type: "object",
-            properties: {
-                customerDid: {
-                    type: "string",
-                    title: "DID",
-                },
-                customerName: {
-                    type: "string",
-                    title: "所属公司",
-                },
-                companyDid: {
-                    type: "string",
-                    title: "我司对应DID",
-                    enum: didEnum
-                },
-                dataStatus: {
-                    type: "string",
-                    title: "数据状态",
-                    enum: [{
-                        "label": "使用中",
-                        "value": 1
-                    }, {
-                        "label": "停用",
-                        "value": 2
-                    }],
-                },
-                createTime: {
-                    type: "daterange",
-                    title: "创建时间",
-                    'x-props':{
-                        extendsFields: ['beginCreateTime', 'endCreateTime'],
-                    }
-                },
-                // '[beginUpdateTime,endUpdateTime]': {
-                //     key: "[beginUpdateTime,endUpdateTime]",
-                //     name: "[beginUpdateTime,endUpdateTime]",
-                //     type: "daterange",
-                //     title: "更新时间",
-                // },
-            }
-        }
-        setSchema(obj);
-    }, [didlist])
+        });
+
+        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={css.underline} allowClear>
+                    {didEnum?.map(item => (
+                        <Option key={item.value} value={item.value}>
+                            {item.label}
+                        </Option>
+                    ))}
+                </SearchSelect>
+            ),
+        });
+
+        // 数据状态
+        items.push({
+            name: "dataStatus",
+            label: "数据状态",
+            children: (
+                <SearchSelect className={css.underline} allowClear>
+                    <Option value={1}>使用中</Option>
+                    <Option value={2}>停用</Option>
+                </SearchSelect>
+            ),
+        });
+
+        // 创建时间
+        items.push({
+            name: "createTime",
+            label: "创建时间",
+            children: <RangePicker className={css.underline} />,
+        });
+
+        return items;
+    }, [didlist]);
     const batchBlockList = useCallback((type: number) => {
         (async () => {
             const res = await controller.enableblacklist({
@@ -104,29 +117,27 @@ export default () => {
             s.listNature = '2';
         })()
     }, []);
+    // 创建搜索组件
+    const { search } = SearchXui.useCreate({
+        labelCol: 9,
+        onSubmit: (e) => {
+            onSearchFormSubmit(e);
+        },
+        values: React.useMemo(() => {
+            return searchUnFormat(params, formItems);
+        }, [params, formItems]),
+        formItems,
+    });
+
     const topExpand = useCallback(() => {
         return (
-            <AdvancedSearch
-                width={380}
-                height={44}
-                compact={true}
-                defaultKey="customerDid"
-                placeholder="输入DID"
-                searchFormSubmit={onSearchFormSubmit}
-            >
-                <KtsForm
-                    labelCol={9}
-                    wrapperCol={15}
-                    labelAlign='left'
-                    compact={true}
-                    schema={schema}
-                    defaultValue={params}
-
-                >
-                </KtsForm>
-            </AdvancedSearch>
+            <div style={{ width: "100%" }}>
+                <div style={{ display: "flex", alignItems: "flex-start", gap: "16px" }}>
+                    <div style={{ flex: 1 }}>{search}</div>
+                </div>
+            </div>
         );
-    }, [schema, params]);
+    }, [search]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

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

@@ -1,12 +1,17 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Button, PageHeaderFoot } from 'kts-xui';
-import { AdvancedSearch, KtsForm } from 'kts-components';
+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 _ from 'lodash';
 import moment from 'moment';
+import css from './index.less';
+
+const { Option } = Select;
+const { RangePicker } = DatePicker;
 export default () => {
     const controller = Main.useController();
-    const [schema, setSchema] = useState({});
     const pageMeta = controller.useMemo((s) => s.pageMeta, []);
     const whiteParams = controller.useMemo(s => s.whiteParams, [])
     const clientInfo = controller.useMemo(s => s.clientInfo, [])
@@ -40,55 +45,64 @@ export default () => {
 
 
     }, []);
-    useEffect(() => {
-        const didEnum = didlist.map(item => {
+    // 动态生成 formItems
+    const formItems: ISearchItemProps[] = React.useMemo(() => {
+        const didEnum = didlist?.map(item => {
             return { label: item.remarkName + ':' + item.participantId, value: item.participantId };
-        })
+        });
 
-        let obj: any = {
-            type: "object",
-            properties: {
-                customerDid: {
-                    type: "string",
-                    title: "DID",
-                },
-                customerName: {
-                    type: "string",
-                    title: "所属公司",
-                },
-                companyDid: {
-                    type: "string",
-                    title: "我司对应DID",
-                    enum: didEnum
-                },
-                dataStatus: {
-                    type: "string",
-                    title: "数据状态",
-                    enum: [{
-                        "label": "使用中",
-                        "value": 1
-                    }, {
-                        "label": "停用",
-                        "value": 2
-                    }],
-                },
-                createTime: {
-                    type: "daterange",
-                    title: "创建时间",
-                    'x-props':{
-                        extendsFields: ['beginCreateTime', 'endCreateTime'],
-                    }
-                },
-                // '[beginUpdateTime,endUpdateTime]': {
-                //     key: "[beginUpdateTime,endUpdateTime]",
-                //     name: "[beginUpdateTime,endUpdateTime]",
-                //     type: "daterange",
-                //     title: "更新时间",
-                // },
-            }
-        }
-        setSchema(obj);
-    }, [didlist])
+        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={css.underline} allowClear>
+                    {didEnum?.map(item => (
+                        <Option key={item.value} value={item.value}>
+                            {item.label}
+                        </Option>
+                    ))}
+                </SearchSelect>
+            ),
+        });
+
+        // 数据状态
+        items.push({
+            name: "dataStatus",
+            label: "数据状态",
+            children: (
+                <SearchSelect className={css.underline} allowClear>
+                    <Option value={1}>使用中</Option>
+                    <Option value={2}>停用</Option>
+                </SearchSelect>
+            ),
+        });
+
+        // 创建时间
+        items.push({
+            name: "createTime",
+            label: "创建时间",
+            children: <RangePicker className={css.underline}/>,
+        });
+
+        return items;
+    }, [didlist]);
     const batchBlockList = useCallback((type: number) => {
         (async () => {
             const res = await controller.enablewhitelist({
@@ -112,28 +126,27 @@ export default () => {
             s.listNature = '1';
         })()
     }, []);
+    // 创建搜索组件
+    const { search } = SearchXui.useCreate({
+        labelCol: 9,
+        onSubmit: (e) => {
+            onSearchFormSubmit(e);
+        },
+        values: React.useMemo(() => {
+            return searchUnFormat(whiteParams, formItems);
+        }, [whiteParams, formItems]),
+        formItems,
+    });
+
     const topExpand = useCallback(() => {
         return (
-            <AdvancedSearch
-                width={380}
-                height={44}
-                compact={true}
-                defaultKey="customerDid"
-                placeholder="输入DID"
-                searchFormSubmit={onSearchFormSubmit}
-            >
-                <KtsForm
-                    labelCol={9}
-                    wrapperCol={15}
-                    labelAlign='left'
-                    compact={true}
-                    schema={schema}
-                    defaultValue={whiteParams}
-                >
-                </KtsForm>
-            </AdvancedSearch>
+            <div style={{ width: "100%" }} className={'unifiedSearch'}>
+                <div style={{ display: "flex", alignItems: "flex-start", gap: "16px" }}>
+                    <div style={{ flex: 1 }}>{search}</div>
+                </div>
+            </div>
         );
-    }, [schema, whiteParams]);
+    }, [search]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

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

@@ -0,0 +1,10 @@
+.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/DocumentsEdit/constant/propertyColumns/index.tsx

@@ -46,7 +46,7 @@ const propertyColumns: ColumnType<any>[] = [
   },
 ]
 
-class MySpan extends React.Component {
+class MySpan extends React.Component<any> {
   render() {
     return (
       <span style={{ padding: '0 8px' }}>

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.ReactChild) {
+    function renderFormItem(child: any) {
         return (
             <Form.Item key={`algorithmForm_${operator.name}`} {...operator}>
                 {child}
@@ -109,7 +109,7 @@ const MyDatePickerTime = (props: { value?: any, disabled?: boolean, onChange?: (
         props.onChange && props.onChange(e ? e.format('YYYY-MM-DDTHH:mm:ss') : undefined)
     }, [props.onChange])
     const value = React.useMemo(() => props.value ? moment(props.value) : undefined, [props.value])
-    return <DatePicker disabled={props.disabled} value={value} onChange={onChange} showTime />
+    return <DatePicker disabled={props.disabled} value={value as any} onChange={onChange} showTime />
 }
 
 const MyDatePicker = (props: { value?: any, disabled?: boolean, onChange?: (e: any) => void }) => {
@@ -117,7 +117,7 @@ const MyDatePicker = (props: { value?: any, disabled?: boolean, onChange?: (e: a
         props.onChange && props.onChange(e ? e.format('YYYY-MM-DD') : undefined)
     }, [props.onChange])
     const value = React.useMemo(() => props.value ? moment(props.value) : undefined, [props.value])
-    return <DatePicker disabled={props.disabled} value={value} onChange={onChange} />
+    return <DatePicker disabled={props.disabled} value={value as any} onChange={onChange} />
 }
 
 const MyArray = (props: { readOnly?: boolean, value?: string[] | string, onChange?: (e: string) => void }) => {

package/src/DocumentsList/index.less

@@ -1,23 +0,0 @@
-.header{
-    padding:10px 0px;
-    display: flex;
-    align-items: center;
-    .buttonGroup{
-        margin-right: 20px;
-        white-space: nowrap;
-    }
-    .buttons{
-        text-align: right;
-        flex: 1;
-        white-space: nowrap;
-    }
-}
-.tabel-action{
-    padding: 0 5px;
-    font-size: 12px;
-    font-family: PingFangSC-Regular,PingFang SC;
-    font-weight: 400;
-    color: #0074ff;
-    white-space: nowrap;
-    cursor: pointer;
-}

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

@@ -0,0 +1,10 @@
+.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;
+  } 
+}