kts-components-document-access-point 1.3.8 → 1.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "1.3.8",
+  "version": "1.3.12",
   "private": false,
   "scripts": {
     "start": "dumi dev",
@@ -33,7 +33,7 @@
     "antd": "3.26.20",
     "grey-react-box": "^0.2.15",
     "kts-component-service": "^1.0.4",
-    "kts-components": "^1.2.24",
+    "kts-components": "^1.2.25",
     "kts-components-antd-x4": "^4.0.3",
     "kts-xui": "^1.0.6",
     "lodash": "^4.17.21",

package/src/DocumentWhiteList/control/state/index.ts

@@ -33,8 +33,8 @@ export default class ControllerState {
     selectedBlackRowKey: string[] = [];
     billEnum: IBillEnum[] = [];
     pageMeta: IPageMeta = { pageSize: 10, pageNum: 1 };
-    params: IFilter = {};
-    whiteParams: IFilter = {};
+    params: IFilter = {pageNum: 1, pageSize: 10 };
+    whiteParams: IFilter = { pageNum: 1, pageSize: 10 };
     visible: boolean = false;
     schema: any;
     targetId: string = '';

package/src/DocumentWhiteList/interface/index.ts

@@ -18,6 +18,8 @@ export interface IFilter {
      * 名单性质
      */
     listNature?: string;
+    pageNum?: number;
+    pageSize?: number;
 }
 export interface IPageMeta {
     pageNum?: number;

package/src/DocumentWhiteList/ui/main/black.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState, useMemo } from 'react';
-import { Table, AutoTableContainer, Pagination } from 'kts-xui';
+import { Table, AutoTableContainer, Pagination, message } from 'kts-xui';
 import { dataStatusEnum, listNatureEnum } from '../../util/ConfigEnum';
 import Main from '../..';
 import moment from 'moment';
@@ -8,11 +8,13 @@ export default function Rule(props: any) {
     const controller = Main.useController();
     const list = controller.useMemo((s) => s.blacklist, []);
     const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
-    const [pageParams, setpageParams] = useState<{ pageSize?: number, pageNum?: number, total?: number }>({ pageSize: 10, pageNum: 1, });
+    // const [pageParams, setpageParams] = useState<{ pageSize?: number, pageNum?: number, total?: number }>({ pageSize: 10, pageNum: 1, });
     // const pageMeta = controller.useMemo((s) => s.pageMeta, []);
     const params = controller.useMemo((s) => s.params, []);
     const onPageChange = (pageNum: any, pageSize: any) => {
-        setpageParams({ pageNum, pageSize });
+        controller.pipeline(async s => {
+            s.params = { ...s.params, pageNum, pageSize };
+        })()
     }
     const columns = useMemo(() => [
         {
@@ -95,24 +97,17 @@ export default function Rule(props: any) {
                 didList: [record]
             })
             if (res.res) {
-                const data = {
-                    ...pageParams
-                }
-                setpageParams(data);
             }
         })()
     }, []);
     useEffect(() => {
         (async () => {
-            const res = await controller.getBlacklist({ ...params, ...pageParams });
+            const res = await controller.getBlacklist(params);
             if (res.res) {
                 setpageMeta(res.res.pageMeta);
-                await controller.pipeline(async s => {
-                    s.blacklist = res.res.items || [];
-                })()
             }
         })()
-    }, [params, pageParams]);
+    }, [params]);
     const rowSelection = useMemo(() => {
         return {
             onChange: (selectedRowKeys: any, selectedRows: any) => {

package/src/DocumentWhiteList/ui/main/index.tsx

@@ -14,15 +14,15 @@ export default function Rule(props: any) {
         controller.pipeline(async s => {
             s.selectedRowKey = [];
             s.selectedBlackRowKey = [];
-            s.params = {};
-            s.whiteParams = {}
+            s.params = { pageNum: 1, pageSize: 10 };
+            s.whiteParams = { pageNum: 1, pageSize: 10 }
         })()
     }, [])
     // const onSubmit = useCallback((data) => {
     //     setValues(data);
     // }, []);
     const onClickHandler = useCallback(() => {
-        controller.setmode({status:mode});
+        controller.setmode({ status: mode });
     }, [mode]);
     return (
         <>
@@ -44,7 +44,7 @@ export default function Rule(props: any) {
             }
             {
                 activeKey === '/switchmode' &&
-                <SwitchMode  />
+                <SwitchMode />
             }
         </>);
 }

package/src/DocumentWhiteList/ui/main/white.tsx

@@ -4,15 +4,18 @@ import { dataStatusEnum, listNatureEnum } from '../../util/ConfigEnum';
 import Main from '../..';
 import moment from 'moment';
 import Header from '../pageheader/WhiteHeader'
+import { message } from 'kts-components-antd-x4';
 export default function Rule(props: any) {
     const controller = Main.useController();
     const list = controller.useMemo((s) => s.whiteblacklist, []);
     const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
-    const [pageParams, setpageParams] = useState<{ pageSize?: number, pageNum?: number, total?: number }>({ pageSize: 10, pageNum: 1, });
+    // const [pageParams, setpageParams] = useState<{ pageSize?: number, pageNum?: number, total?: number }>({ pageSize: 10, pageNum: 1, });
     const whiteParams = controller.useMemo((s) => s.whiteParams, []);
-    const onPageChange = (pageNum: any, pageSize: any) => {
-        setpageParams({ pageNum, pageSize });
-    };
+    const onPageChange = useCallback((pageNum: any, pageSize: any) => {
+        controller.pipeline(async s => {
+            s.whiteParams = { ...s.whiteParams, pageNum, pageSize };
+        })()
+    }, []);
     const columns = useMemo(() => [
         {
             title: 'DID',
@@ -94,22 +97,14 @@ export default function Rule(props: any) {
                 didList: [record]
             })
             if (res.res) {
-                const data = {
-                    ...pageParams
-                }
-                setpageParams(data);
             }
         })()
     }, []);
     useEffect(() => {
         (async () => {
-            const res = await controller.getWhitelist({ ...whiteParams, ...pageParams });
+            const res = await controller.getWhitelist(whiteParams);
             if (res.res) {
                 setpageMeta(res.res.pageMeta);
-                
-                // await controller.pipeline(async s => {
-                //     s.whiteblacklist = res.res.items || [];
-                // })()
             }
         })()
     }, [whiteParams]);

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

@@ -17,6 +17,8 @@ export default () => {
     const onSearchFormSubmit = React.useCallback((value) => {
         value = {
             ...value,
+            pageNum: 1,
+            pageSize: 10
         }
         controller.pipeline(async s => {
             s.params = value;

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

@@ -15,10 +15,11 @@ export default () => {
     const onSearchFormSubmit = React.useCallback((value) => {
         value = {
             ...value,
+            pageNum: 1,
+            pageSize: 10
         }
         controller.pipeline(async s => {
             s.whiteParams = value;
-
         })()
     }, [controller])
     useEffect(() => {
@@ -33,7 +34,7 @@ export default () => {
                 })()
             }
         })();
-        
+
 
     }, []);
     useEffect(() => {

package/src/DocumentsEdit/ui/EditRule/ui/AddRuleButton/index.tsx

@@ -22,7 +22,7 @@ export default () => {
         rules.forEach(e => {
             if (e._index > sum) sum = e._index
         })
-        return sum;
+        return parseInt(`${sum}`);
     }, [])
 
     const onClick = React.useCallback(() => {

package/src/DocumentsEdit/ui/EditRule/ui/DelRuleButton/index.tsx

@@ -17,18 +17,19 @@ export default (props: { index: number }) => {
         controller.pipeline(async s => {
             if (!s.ruleState.ruleProperties) return;
 
-            const rules = (s.ruleState.ruleProperties.ref.items?.rules ?? s.ruleState.ruleProperties.ref.rules) || [];
-
-            rules.splice(props.index, 1);
-
-            s.ruleState.ruleProperties.ref.rules = rules.slice();
+            if (s.ruleState.ruleProperties.ref.items) {
+                s.ruleState.ruleProperties.ref.items.rules?.splice(props.index, 1);
+                s.ruleState.ruleProperties.ref.items.rules = s.ruleState.ruleProperties.ref.items.rules?.slice() ?? [];
+            } else {
+                s.ruleState.ruleProperties.ref.rules?.splice(props.index, 1);
+                s.ruleState.ruleProperties.ref.rules = s.ruleState.ruleProperties.ref.rules?.slice() ?? [];
+            }
         })()
     }, [controller, props.index])
 
     if (readOnly) return <></>
 
     return (
-        // <Button className="ktsAntX-btn-dangerous" danger type="link" onClick={onClick} >删除</Button>
         <span className="ktsAntX-btn-dangerous ktsAntX-btn-link" onClick={onClick} >删除</span>
     );
 };

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

@@ -39,8 +39,8 @@ export interface IParams extends ISelectedRowKey {
     pageNum?: number;
 }
 export interface IBillType {
-    lable:string;
-    value:string;
+    lable: string;
+    value: string;
 }
 export default class DocumentsListControllerState {
 
@@ -48,9 +48,9 @@ export default class DocumentsListControllerState {
     type: number = 1;
     selectedRowKey: ISelectedRowKey[] = [];
     billEnum: IBillEnum[] = [];
-    params: IParams = {  };
+    params: IParams = { pageSize: 10, pageNum: 1 };
     visible: boolean = false;
     schema: any;
     targetId: string = '';
-    billTypes:IBillType[]=[];
+    billTypes: IBillType[] = [];
 }

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

@@ -47,6 +47,7 @@ export default function modalcomfirm(props: any) {
             s.type = 2;
             if (selectItems.length === 1) {
                 s.params = { configNumber: selectItems[0].configNumber }
+                s.selectedRowKey=[];
             }
             history.push({ pathname: `/rulelist`, state: { type: 2 } })
         })()

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

@@ -45,7 +45,9 @@ export default () => {
     const onSearchFormSubmit = React.useCallback((value) => {
         value = {
             ...value,
-            typeList: value['typeList'] && [value['typeList']]
+            typeList: value['typeList'] && [value['typeList']],
+            pageNum: 1,
+            pageSize: 10
         }
         controller.pipeline(async s => {
             s.params = value;
@@ -55,7 +57,7 @@ export default () => {
     const switchType = React.useCallback((e) => {
         controller.pipeline(async s => {
             s.type = e.target.value;
-            s.params = {}
+            s.params = { pageNum: 1, pageSize: 10 }
             history.push({ pathname: '/rulelist', state: { type: e.target.value } })
         })()
     }, [])
@@ -81,11 +83,6 @@ export default () => {
                         type: "string",
                         title: "配置名称",
                     },
-                    // attributionList: {
-                    //     type: "string",
-                    //     title: "发送对象",
-                    //     visible: false
-                    // },
                     type: {
                         type: "string",
                         title: "单据大类",
@@ -306,7 +303,7 @@ export default () => {
             <PageHeaderFoot
                 expandLeft={topExpand()}
                 expandRight={[
-                    type === 1 && <Button key="1" onClick={batchSend} style={{ marginRight: 10 }}>发布</Button>,
+                    type === 1 && <Button disabled={selectedRowKey.length === 0} key="1" onClick={batchSend} style={{ marginRight: 10 }}>发布</Button>,
                     type === 1 && <Dropdown key="2" overlay={menu}>
                         <Button type="primary" >创建配置</Button>
                     </Dropdown>

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

@@ -13,14 +13,14 @@ export default function validaterule(props: any) {
     const history = useHistory();
     const params = controller.useMemo(s => s.params, [])
     const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
-    const [pageParams, setpageParams] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1 });
+    // const [pageParams, setpageParams] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1 });
     const [list, setList] = useState([]);
     const [bill, setConfig] = useState<{ [key: string]: string }>({});
     const [billEnum, setBill] = useState<any[]>([]);
     useEffect(() => {
         (async () => {
             const res = await DocumentsService.instance.service?.call({
-                url: '/schema/config/queryConfigSchemaPage', data: { ...params, ...pageParams }, type: 'post'
+                url: '/schema/config/queryConfigSchemaPage', data: params, type: 'post'
             }) as any;
 
             if (res.err) {
@@ -31,7 +31,7 @@ export default function validaterule(props: any) {
                 setpageMeta(res.res.pageMeta);
             }
         })()
-    }, [params, pageParams]);
+    }, [params]);
     useEffect(() => {
         (async () => {
 
@@ -64,7 +64,9 @@ export default function validaterule(props: any) {
         })()
     }, []);
     const onPageChange = (pageNum: any, pageSize: any) => {
-        setpageParams({ pageNum, pageSize });
+        controller.pipeline(async s => {
+            s.params = { ...s.params, pageNum, pageSize };
+        })()
     }
     const columns = [
         {

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

@@ -12,12 +12,12 @@ export default function validaterule(props: any) {
     const params = controller.useMemo(s => s.params, [])
     const [billEnum, setBill] = useState([]);
     const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
-    const [pageParams, setpageParams] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, });
+    // const [pageParams, setpageParams] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, });
     const [list, setList] = useState([]);
     const [bill, setConfig] = useState<{ [key: string]: string }>({});
     useEffect(() => {
         (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/schema/config/querySendRecordPage', data: { ...params, ...pageParams }, type: 'post' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/schema/config/querySendRecordPage', data:  params , type: 'post' }) as any;
             if (res.err) {
                 return false;
             }
@@ -26,7 +26,7 @@ export default function validaterule(props: any) {
                 setpageMeta(res.res.pageMeta);
             }
         })()
-    }, [params, pageParams]);
+    }, [params]);
     useEffect(() => {
         (async () => {
             const res = await DocumentsService.instance.service?.call({ url: '/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
@@ -51,7 +51,10 @@ export default function validaterule(props: any) {
         history.push({ pathname: `/rule`, search: `?id=${id}&type=record` })
     }, []);
     const onPageChange = useCallback((pageNum, pageSize) => {
-        setpageParams({ pageNum, pageSize });
+        // setpageParams({ pageNum, pageSize });
+        controller.pipeline(async s => {
+            s.params = { ...s.params, pageNum, pageSize };
+        })()
     }, []);
     const columns = useMemo(() => [
         {