@bit-sun/business-component 4.2.0-alpha.5 → 4.2.0-alpha.6.1

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -38,14 +38,14 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     } | {
         title: string;
         dataIndex: string;
-        render: (text: any, record: any) => React.JSX.Element;
+        render: (text: any, record: any) => JSX.Element;
         className?: undefined;
         width?: undefined;
     } | {
         title: string;
         dataIndex: string;
         className: string;
-        render: () => React.JSX.Element;
+        render: () => JSX.Element;
         width?: undefined;
     })[];
     showModal: () => void;
@@ -53,13 +53,13 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
     handleTableHeadHidden: (title: string) => void;
     onSortEnd: ({ oldIndex, newIndex }: any) => void;
-    DraggableContainer: (props: any) => React.JSX.Element;
-    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
+    DraggableContainer: (props: any) => JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
     handleResetSetting: () => Promise<unknown>;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export default TableColumnSetting;

package/dist/utils/TableUtils.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import moment from 'moment';
 type mediaListType = {
     type: number;
@@ -49,24 +48,24 @@ declare const updateGuanDate: (requestParams: any, dateKeyParams?: any) => {
     };
     submit: any;
 };
-declare const textIcon: (type: string | number, text?: string) => React.JSX.Element | undefined;
-declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
-declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
-declare const handleTextOverflow: (text: string | undefined, width?: number) => React.JSX.Element;
-declare const handleTextLineFeed: (text: string | undefined, width?: number) => React.JSX.Element;
-declare const handleTextTooltip: (text: any) => React.JSX.Element;
-declare const handleTextBreakSpaces: (text: any) => React.JSX.Element;
-declare const handleStatusBadge: (text: any, color: any) => React.JSX.Element;
-declare const HandleTotalCount: (totalParams: any) => React.JSX.Element;
+declare const textIcon: (type: string | number, text?: string) => JSX.Element | undefined;
+declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
+declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
+declare const handleTextOverflow: (text: string | undefined, width?: number) => JSX.Element;
+declare const handleTextLineFeed: (text: string | undefined, width?: number) => JSX.Element;
+declare const handleTextTooltip: (text: any) => JSX.Element;
+declare const handleTextBreakSpaces: (text: any) => JSX.Element;
+declare const handleStatusBadge: (text: any, color: any) => JSX.Element;
+declare const HandleTotalCount: (totalParams: any) => JSX.Element;
 declare const handleCommonTimeRender: (text: any, format?: any) => any;
-declare const handleTooltip: (text: any, timeTrue?: boolean) => React.JSX.Element;
-declare const handleTooltipHours: (text: any, timeTrue?: boolean) => React.JSX.Element;
+declare const handleTooltip: (text: any, timeTrue?: boolean) => JSX.Element;
+declare const handleTooltipHours: (text: any, timeTrue?: boolean) => JSX.Element;
 type tableColumnsImageType = {
     width?: number | string;
     height?: number | string;
     [key: string]: any;
 };
-declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => React.JSX.Element;
+declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => JSX.Element;
 interface ColumnsEditInterfave {
     text?: string;
     record?: any;
@@ -82,7 +81,7 @@ interface ColumnsEditInterfave {
     };
     [key: string]: any;
 }
-declare const ColumnsEdit: (props: ColumnsEditInterfave) => React.JSX.Element;
+declare const ColumnsEdit: (props: ColumnsEditInterfave) => JSX.Element;
 type UserColumnsType = {
     name: string;
     department?: string;
@@ -90,13 +89,13 @@ type UserColumnsType = {
     company?: string;
     avatar?: string;
 };
-declare const userColumns: (props: UserColumnsType) => React.JSX.Element;
-declare const userInfoCard: (props: any) => React.JSX.Element;
+declare const userColumns: (props: UserColumnsType) => JSX.Element;
+declare const userInfoCard: (props: any) => JSX.Element;
 declare const getItemDefaultWidth: (item: any) => number;
-declare const sulaTableRenderTooltip: ({ text }: any) => React.JSX.Element;
+declare const sulaTableRenderTooltip: ({ text }: any) => JSX.Element;
 declare const renderNumberText: ({ text }: any) => any;
 declare const renderFixed2: (text: any) => any;
-declare const handleTextWarpCustom: (text: any, style?: {}) => React.JSX.Element;
+declare const handleTextWarpCustom: (text: any, style?: {}) => JSX.Element;
 declare const calculateValidPeriod: (start: any, end: any) => string;
-declare const handleTextWarp: (text: any) => React.JSX.Element;
+declare const handleTextWarp: (text: any) => JSX.Element;
 export { getSkuImg, updateGuanDate, textIcon, handleTextDoubleOrId, handleTextDouble, handleTextOverflow, handleTextLineFeed, handleTextTooltip, handleTextBreakSpaces, handleStatusBadge, HandleTotalCount, handleTooltip, handleCommonTimeRender, handleTooltipHours, tableColumnsImage, ColumnsEdit, userColumns, userInfoCard, getItemDefaultWidth, renderNumberText, sulaTableRenderTooltip, renderFixed2, handleTextWarpCustom, handleTextWarp, calculateValidPeriod };

package/dist/utils/utils.d.ts

@@ -31,3 +31,44 @@ export declare const randomString: (len?: any) => string;
 export declare const createUniqID: (length: any) => string;
 export declare const handleConvertResponse: (items: any, total: number) => object;
 export declare const noEmptyArray: (targetObj: any) => boolean;
+export declare const formContainerAndItemLayout: (type: string, title: any, name: string) => {
+    container: {
+        type: string;
+        props: {
+            title: any;
+            id: number;
+            level: number;
+            name: string;
+            bordered?: undefined;
+            isWhiteCard?: undefined;
+        };
+    };
+    itemLayout: {
+        span: number;
+        labelCol: {
+            span: number;
+        };
+        wrapperCol: {
+            span: number;
+        };
+    };
+} | {
+    container: {
+        type: string;
+        props: {
+            title: any;
+            id: number;
+            level: number;
+            bordered: null;
+            isWhiteCard: boolean;
+            name: string;
+        };
+    };
+    itemLayout: {
+        wrapperCol: {
+            span: number;
+        };
+        span?: undefined;
+        labelCol?: undefined;
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -1944,7 +1944,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
       formatSource(x,0, 3, tableSearchForm);
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {

package/src/components/Business/SystemLog/index.md

@@ -0,0 +1,37 @@
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 业务组件
+  order: 1
+title: 日志组件
+order: 1
+---
+
+# SystemLog
+
+
+## 日志业务组件
+
+```tsx
+import React, { useState } from 'react';
+import { SystemLog } from '../../../index.ts';
+
+export default () => {
+  const [modeType, setModeType] = useState('view');
+  const renderLogRef = useRef<any>();
+
+  return {
+   fields: [
+      SystemLog({
+        modeType,
+        code: '123',
+        containerName: 'Test_Log_Info',
+        renderLogRef,
+        extraParams: {},
+      })
+    ],
+  };
+};
+```

package/src/components/Business/SystemLog/index.tsx

@@ -0,0 +1,87 @@
+import { handleCommonTimeRender } from '@/utils/TableUtils';
+import { formContainerAndItemLayout, handleConvertResponse } from '@/utils/utils';
+import { Table as BsTable } from 'bssula';
+import React from 'react';
+
+//操作日志
+const SystemLog = ({
+  modeType,
+  code,
+  containerName,
+  renderLogRef = {},
+  extraParams = {},
+}: {
+  modeType: string,
+  code: any
+  containerName: string,
+  renderLogRef: object,
+  extraParams?: object,
+}) => {
+  return {
+    ...formContainerAndItemLayout('table', '操作日志', containerName),
+    initialVisible: modeType != 'create',
+    fields: [
+      {
+        name: 'table',
+        label: false,
+        itemLayout: {
+          span: 24,
+          labelCol: {
+            span: 0,
+          },
+          wrapperCol: {
+            span: 24,
+          },
+        },
+        field: (ctx: any) => {
+          return code && <BsTable
+            remoteDataSource={{
+              url: `/oms-ops/logInfo?qp-businessCode-eq=${code}`,
+              convertParams: ({ params }: any) => {
+                return {
+                  pageSize: params.pageSize,
+                  currentPage: params.current,
+                  ...extraParams,
+                };
+              },
+              converter: ({ data }: any) => {
+                return {
+                  ...handleConvertResponse(data.list, data.total || data.totalCount),
+                };
+              },
+            }}
+            columns={[
+              {
+                title: '操作人',
+                dataIndex: 'handlerName',
+              },
+              {
+                title: '操作名称',
+                dataIndex: 'handlerType',
+              },
+              {
+                title: '操作时间',
+                dataIndex: 'handlerTime',
+                render: ({ text }: { text: any }) => handleCommonTimeRender(text)
+              },
+              {
+                title: '操作内容',
+                dataIndex: 'logcontent',
+              },
+            ]}
+            style={{ width: '100%', marginTop: '-16px', padding: '0px' }}
+            rowKey="id"
+            scroll={{ x: 'max-content' }}
+            pagination={{
+              showTotal: (total: any) => `共 ${total} 条`,
+              showQuickJumper: true,
+              hideOnSinglePage: true,
+            }}
+            ref={renderLogRef}
+          />
+        },
+      },
+    ],
+  }
+}
+export default SystemLog

package/src/index.ts

@@ -48,3 +48,5 @@ export { default as RuleSetter} from './components/Solution/RuleSetter';
 export { default as ExtendedCollapse } from './components/Common/ExtendedCollapse';
 export { default as Section } from './components/Common/Section';
 export { default as ParagraphCopier } from './components/Common/ParagraphCopier';
+
+export { default as SystemLog } from './components/Business/SystemLog';

package/src/utils/utils.ts

@@ -267,4 +267,44 @@ export const handleConvertResponse = (items: any, total: number): object => {
 
 export const noEmptyArray = (targetObj: any) => {
   return Array.isArray(targetObj) && targetObj.length !== 0;
-};
+};
+
+export const formContainerAndItemLayout = (type: string, title: any, name: string) => {
+  return type === 'form' ? {
+    container: {
+      type: 'card',
+      props: {
+        title,
+        id: Math.random(),
+        level: 1,
+        name
+      },
+    },
+    itemLayout: {
+      span: 8, // span表示每项所占的栅格数
+      labelCol: {
+        span: 8,
+      },
+      wrapperCol: {
+        span: 18,
+      },
+    },
+  } : {
+    container: {
+      type: 'card',
+      props: {
+        title,
+        id: Math.random(),
+        level: 1,
+        bordered: null,
+        isWhiteCard: true,
+        name
+      },
+    },
+    itemLayout: {
+      wrapperCol: {
+        span: 0,
+      },
+    },
+  }
+}