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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "1.4.12",
+  "version": "2.0.0",
   "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.2.29",
     "lodash": "^4.17.21",
     "moment": "2.29.1",
     "query-string": "^7.0.1",
@@ -47,7 +47,7 @@
     "@types/lodash": "^4.14.171",
     "@umijs/test": "^3.0.5",
     "dumi": "^1.0.16",
-    "father-build": "^1.17.2",
+    "father-build": "^1.22.5",
     "gh-pages": "^3.0.0",
     "lint-staged": "^10.0.7",
     "prettier": "^2.2.1",

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

@@ -4,7 +4,7 @@ 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.err) {
         return false;
     }

package/src/DocumentWhiteList/ui/UnifiedSearch/index.scss

@@ -0,0 +1,119 @@
+// UnifiedSearch 组件样式 - 控件只有下边框
+.unifiedSearch {
+  :global(.ktsAntX-xui-page-header-foot){
+    box-shadow: none !important;
+  }
+  :global(.ktsAntX-xui-page-header-foot::after) {
+    box-shadow: none !important;
+  }
+  :global(.ktsAntX-xui-page-header-foot .ktsAntX-xui-page-header-operate) {
+    border: none !important;
+  }
+  :global(.ktsAntX-xui-page-header-operate){
+    padding: 0px !important;
+  }
+}
+
+// 按钮容器样式
+.btnBox {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: flex-end;
+  flex: 1;
+  margin-top: 13px;
+  .btn {
+    height:30px;
+    line-height: 30px;
+    background-color:rgba(0,116,255,1);
+    border-radius:15px;
+    border:1px solid rgba(0,116,255,1);
+    font-size:12px;
+    color: #FFFFFF;
+    padding: 0px 28px;
+    cursor: pointer;
+    margin-left: 10px;
+    word-break: keep-all;
+  }
+  .moreBtn {
+    height:30px;
+    line-height: 30px;
+    background-color: #ffffff;
+    border-radius:15px;
+    border:1px solid #0074FF;
+    font-size:12px;
+    color: #0074FF;
+    padding: 0px 28px;
+    cursor: pointer;
+    margin-left: 10px;
+    word-break: keep-all;
+  }
+  .moreBtn:hover {
+    background-color: rgba(0, 116, 255, 0.2);
+  }
+  .refreshBtn {
+    padding: 0 18px;
+    justify-content: center;
+    align-items: center;
+    display: inline-flex;
+    .refreshIcon {
+      height: 18px;
+      width: 18px;
+    }
+  }
+}
+
+// 全局样式 - 所有输入框只显示下边框
+:global(.underline-datepicker) {
+  :global(.ant-input){
+    border: none !important;
+    border-bottom: 1px solid #d9d9d9 !important;
+  }
+}
+:global(.underline){
+  :global(.ktsAntX-select-selector){
+    border: none !important;
+    border-bottom: 1px solid #d9d9d9 !important;
+  }
+}
+// kts-xui 组件全局样式覆盖 - 只显示下边框
+:global(.ktsAntX-xui-input .ant-input) {
+  border: none !important;
+  border-bottom: 1px solid #d9d9d9 !important;
+  border-radius: 0 !important;
+  box-shadow: none !important;
+  background: transparent !important;
+  outline: none !important;
+}
+
+:global(.ktsAntX-xui-input .ant-input:focus),
+:global(.ktsAntX-xui-input .ant-input:hover) {
+  border-bottom: 1px solid #40a9ff !important;
+  box-shadow: none !important;
+}
+
+:global(.ktsAntX-xui-input .ant-input:focus) {
+  border-bottom: 1px solid #1890ff !important;
+}
+
+:global(.ktsAntX-xui-select .ant-select-selector) {
+  border: none !important;
+  border-bottom: 1px solid #d9d9d9 !important;
+  border-radius: 0 !important;
+  box-shadow: none !important;
+  background: transparent !important;
+  outline: none !important;
+}
+
+:global(.ktsAntX-xui-select .ant-select-selector:hover) {
+  border-bottom: 1px solid #40a9ff !important;
+}
+
+:global(.ktsAntX-xui-select.ant-select-focused .ant-select-selector) {
+  border-bottom: 1px solid #1890ff !important;
+  box-shadow: none !important;
+}
+
+:global(.ktsAntX-xui-select .ant-select-arrow) {
+  color: #666;
+}

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

@@ -0,0 +1,146 @@
+import * as React from "react";
+import {
+  ISearchItemProps,
+  Search as SearchXui,
+  searchFormat,
+  searchUnFormat,
+} from "kts-xui";
+import { Select, DatePicker } from "antd";
+import { Select as SearchSelect } from "kts-xui"; 
+
+const { Option } = Select;
+const { RangePicker } = DatePicker;
+
+interface UnifiedSearchProps {
+  searchFormSubmit: (values: any) => void;
+  searchValues: any;
+  right?: any;
+  onRefresh?: () => void;
+  didlist?: any[];
+  labelCol?: number; // 标签列数，默认为 7
+}
+
+export default function UnifiedSearch(props: UnifiedSearchProps) {
+  const {
+    searchFormSubmit,
+    searchValues,
+    right,
+    onRefresh,
+    didlist = [],
+    labelCol = 7,
+  } = props;
+
+  // 动态生成 formItems
+  const formItems: ISearchItemProps[] = React.useMemo(() => {
+    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={true}>
+          {didlist.map((item: any) => (
+            <Option key={item.participantId} value={item.participantId}>
+              {item.remarkName + ':' + item.participantId}
+            </Option>
+          ))}
+        </SearchSelect>
+      ),
+    });
+
+    // 数据状态
+    items.push({
+      name: "dataStatus",
+      label: "数据状态",
+      children: (
+        <SearchSelect className="underline" allowClear={true}>
+          <Option value={1}>使用中</Option>
+          <Option value={2}>停用</Option>
+        </SearchSelect>
+      ),
+    });
+
+    // 创建时间
+    items.push({
+      name: "createTime",
+      label: "创建时间",
+      children: (
+        <RangePicker
+          style={{ width: "100%" }}
+          showTime={true}
+          format="YYYY-MM-DD HH:mm:ss"
+          placeholder={["开始时间", "结束时间"]}
+          className="underline-datepicker"
+        />
+      ),
+    });
+
+    return items;
+  }, [didlist]);
+
+  const { search, inventory, setSearchValues } = SearchXui.useCreate({
+    labelCol,
+    onSubmit: (e) => {
+      if (searchFormSubmit) {
+        // 处理日期字段格式转换
+        const processedValues = {
+          ...e,
+          beginCreateTime: e.createTime && e.createTime[0] ? e.createTime[0].format('YYYY-MM-DD 00:00:00') : undefined,
+          endCreateTime: e.createTime && e.createTime[1] ? e.createTime[1].format('YYYY-MM-DD 23:59:59') : undefined,
+          pageNum: 1,
+          pageSize: 10
+        };
+        // 移除原始的 createTime 字段，因为已经转换了
+        delete processedValues.createTime;
+        searchFormSubmit(processedValues);
+      }
+    },
+    values: React.useMemo(() => {
+      // 将搜索值转换回组件所需的格式
+      const convertedValues = { ...searchValues };
+      if (searchValues.beginCreateTime && searchValues.endCreateTime) {
+        // 如果有处理过的日期字段，需要转换回来
+        // 这里可能需要根据实际需求调整
+        convertedValues.createTime = [searchValues.beginCreateTime, searchValues.endCreateTime];
+      }
+      return searchUnFormat(convertedValues, formItems);
+    }, [searchValues, formItems]),
+    formItems,
+  });
+
+  React.useEffect(() => {
+    const convertedValues = { ...searchValues };
+    if (searchValues.beginCreateTime && searchValues.endCreateTime) {
+      convertedValues.createTime = [searchValues.beginCreateTime, searchValues.endCreateTime];
+    }
+    setSearchValues(searchUnFormat(convertedValues, formItems));
+  }, [formItems, searchValues, setSearchValues]);
+
+  return (
+    <div style={{ width: "100%" }} className={'unifiedSearch'}>
+      <div style={{ display: "flex", alignItems: "flex-start", gap: "16px" }}>
+        <div style={{ flex: 1 }}>{search}</div>
+        {right && (
+          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
+            {right}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}

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

@@ -1,13 +1,10 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Button, PageHeaderFoot } from 'kts-xui';
-import { AdvancedSearch, KtsForm } from 'kts-components';
 import Main from '../../index';
-// import { LifeCycleTypes } from "@formily/antd";
+import UnifiedSearch from '../UnifiedSearch';
 import _ from 'lodash';
-import moment from 'moment';
 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, [])
@@ -16,13 +13,6 @@ export default () => {
     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;
         })()
@@ -33,54 +23,7 @@ export default () => {
     useEffect(() => {
         controller.didList({}) as any;
     }, []);
-    useEffect(() => {
-        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])
+    // UnifiedSearch 组件内部处理字段定义，不需要 schema
     const batchBlockList = useCallback((type: number) => {
         (async () => {
             const res = await controller.enableblacklist({
@@ -106,27 +49,14 @@ export default () => {
     }, []);
     const topExpand = useCallback(() => {
         return (
-            <AdvancedSearch
-                width={380}
-                height={44}
-                compact={true}
-                defaultKey="customerDid"
-                placeholder="输入DID"
+            <UnifiedSearch
                 searchFormSubmit={onSearchFormSubmit}
-            >
-                <KtsForm
-                    labelCol={9}
-                    wrapperCol={15}
-                    labelAlign='left'
-                    compact={true}
-                    schema={schema}
-                    defaultValue={params}
-
-                >
-                </KtsForm>
-            </AdvancedSearch>
+                searchValues={params}
+                didlist={didlist}
+                labelCol={9}
+            />
         );
-    }, [schema, params]);
+    }, [params, didlist]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

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

@@ -1,12 +1,10 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Button, PageHeaderFoot } from 'kts-xui';
-import { AdvancedSearch, KtsForm } from 'kts-components';
 import Main from '../../index';
+import UnifiedSearch from '../UnifiedSearch';
 import _ from 'lodash';
-import moment from 'moment';
 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, [])
@@ -14,13 +12,6 @@ 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;
         })()
@@ -40,55 +31,7 @@ export default () => {
 
 
     }, []);
-    useEffect(() => {
-        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])
+    // UnifiedSearch 组件内部处理字段定义，不需要 schema
     const batchBlockList = useCallback((type: number) => {
         (async () => {
             const res = await controller.enablewhitelist({
@@ -114,26 +57,14 @@ export default () => {
     }, []);
     const topExpand = useCallback(() => {
         return (
-            <AdvancedSearch
-                width={380}
-                height={44}
-                compact={true}
-                defaultKey="customerDid"
-                placeholder="输入DID"
+            <UnifiedSearch
                 searchFormSubmit={onSearchFormSubmit}
-            >
-                <KtsForm
-                    labelCol={9}
-                    wrapperCol={15}
-                    labelAlign='left'
-                    compact={true}
-                    schema={schema}
-                    defaultValue={whiteParams}
-                >
-                </KtsForm>
-            </AdvancedSearch>
+                searchValues={whiteParams}
+                didlist={didlist}
+                labelCol={9}
+            />
         );
-    }, [schema, whiteParams]);
+    }, [whiteParams, didlist]);
     return (
         <div style={{ flex: 'none', position: 'relative', zIndex: 1 }} >
             <PageHeaderFoot

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: React.ReactNode) {
         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;
-}