@gm-pc/business 1.24.9-beta.11 → 1.24.9-beta.13

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './data_category_tree'
-export * from './data_gegraphic_label'
-export * from './code_input'
-export * from './table_list'
+export * from './data_category_tree'
+export * from './data_gegraphic_label'
+export * from './code_input'
+export * from './table_list'

package/src/stories.tsx

@@ -1,27 +1,27 @@
-import React from 'react'
-import sha256 from 'crypto-js/sha256'
-import { Token } from 'gm_api/src/oauth'
-
-export const ComLogin = () => {
-  return (
-    <div>
-      <button
-        onClick={() => {
-          Token({
-            grant_type: 'password',
-            username: 'admin',
-            group_id: '328775773546610712',
-            password: sha256('123456').toString(),
-            client_id: '1',
-          })
-        }}
-      >
-        login
-      </button>
-    </div>
-  )
-}
-
-export default {
-  title: 'Business/ceres login',
-}
+import React from 'react'
+import sha256 from 'crypto-js/sha256'
+import { Token } from 'gm_api/src/oauth'
+
+export const ComLogin = () => {
+  return (
+    <div>
+      <button
+        onClick={() => {
+          Token({
+            grant_type: 'password',
+            username: 'admin',
+            group_id: '328775773546610712',
+            password: sha256('123456').toString(),
+            client_id: '1',
+          })
+        }}
+      >
+        login
+      </button>
+    </div>
+  )
+}
+
+export default {
+  title: 'Business/ceres login',
+}

package/src/table_list/index.ts

@@ -1,2 +1,2 @@
-export * from './table_list'
-export * from './types'
+export * from './table_list'
+export * from './types'

package/src/table_list/table_list.tsx

@@ -1,110 +1,110 @@
-/*
- * @Description: 业务列表、半自动请求
- */
-import React, { useState, useImperativeHandle } from 'react'
-import { BoxTable, BoxTableInfo } from '@gm-pc/react'
-import { Table, TableProps, SortsType, useTableRef } from '@gm-pc/table-x'
-
-import { usePagination, useUpdateEffect } from '@gm-common/hooks'
-
-import TableTotalText from './table_total_text'
-
-import { TableListProps } from './types'
-import { handleParams } from './util'
-
-export function TableList<D extends object = any>({
-  totalTextData,
-  filter,
-  filterProp,
-  isPagination = true,
-  info,
-  action,
-  headerProps,
-  isUpdateEffect,
-  isHeaderSort,
-  isFilterSpread = true,
-  paginationOptions,
-  tableRef,
-  pagination,
-  service,
-  formatData = (data) => data.data,
-  ...res
-}: TableListProps<D>) {
-  const {
-    paging,
-    loading,
-    data = {},
-    runChangePaging,
-    run,
-    refresh,
-    refreshAfterDelete,
-  } = usePagination<any>(service, { ...paginationOptions }, false)
-
-  const [sorts, setSorts] = useState<SortsType>({})
-  const _tableRef = useTableRef()
-
-  let tableData = formatData(data)
-  if (!Array.isArray(tableData)) {
-    tableData = []
-  }
-
-  useUpdateEffect(
-    () => {
-      // 如果没传service，则return
-      if (!service) {
-        return
-      }
-      const params = handleParams({
-        filter,
-        filterProp,
-        isFilterSpread,
-        isHeaderSort,
-        sorts,
-      })
-      run(params)
-    },
-    [filter, filterProp, sorts, isHeaderSort, isFilterSpread, service],
-    isUpdateEffect
-  )
-
-  const onHeadersSort: TableProps['onHeadersSort'] = (sorts) => {
-    setSorts(sorts)
-  }
-
-  const boxTableProps = {
-    pagination:
-      pagination || (isPagination ? { paging, onChange: runChangePaging } : undefined),
-
-    info:
-      info ??
-      (totalTextData ? (
-        <BoxTableInfo>
-          <TableTotalText data={totalTextData} />
-        </BoxTableInfo>
-      ) : undefined),
-    action,
-    headerProps,
-  }
-
-  const tableProps = ({
-    data: tableData,
-    loading,
-    onHeadersSort,
-    ...res,
-    tableRef: _tableRef,
-  } as unknown) as TableProps<D>
-
-  useImperativeHandle(tableRef, () => ({
-    ..._tableRef.current,
-    refresh,
-    run,
-    refreshAfterDelete: (delNum = 1) => {
-      return refreshAfterDelete(tableProps.data, delNum)
-    },
-  }))
-  return (
-    <BoxTable {...boxTableProps}>
-      <Table {...tableProps} />
-    </BoxTable>
-  )
-}
+/*
+ * @Description: 业务列表、半自动请求
+ */
+import React, { useState, useImperativeHandle } from 'react'
+import { BoxTable, BoxTableInfo } from '@gm-pc/react'
+import { Table, TableProps, SortsType, useTableRef } from '@gm-pc/table-x'
+
+import { usePagination, useUpdateEffect } from '@gm-common/hooks'
+
+import TableTotalText from './table_total_text'
+
+import { TableListProps } from './types'
+import { handleParams } from './util'
+
+export function TableList<D extends object = any>({
+  totalTextData,
+  filter,
+  filterProp,
+  isPagination = true,
+  info,
+  action,
+  headerProps,
+  isUpdateEffect,
+  isHeaderSort,
+  isFilterSpread = true,
+  paginationOptions,
+  tableRef,
+  pagination,
+  service,
+  formatData = (data) => data.data,
+  ...res
+}: TableListProps<D>) {
+  const {
+    paging,
+    loading,
+    data = {},
+    runChangePaging,
+    run,
+    refresh,
+    refreshAfterDelete,
+  } = usePagination<any>(service, { ...paginationOptions }, false)
+
+  const [sorts, setSorts] = useState<SortsType>({})
+  const _tableRef = useTableRef()
+
+  let tableData = formatData(data)
+  if (!Array.isArray(tableData)) {
+    tableData = []
+  }
+
+  useUpdateEffect(
+    () => {
+      // 如果没传service，则return
+      if (!service) {
+        return
+      }
+      const params = handleParams({
+        filter,
+        filterProp,
+        isFilterSpread,
+        isHeaderSort,
+        sorts,
+      })
+      run(params)
+    },
+    [filter, filterProp, sorts, isHeaderSort, isFilterSpread, service],
+    isUpdateEffect
+  )
+
+  const onHeadersSort: TableProps['onHeadersSort'] = (sorts) => {
+    setSorts(sorts)
+  }
+
+  const boxTableProps = {
+    pagination:
+      pagination || (isPagination ? { paging, onChange: runChangePaging } : undefined),
+
+    info:
+      info ??
+      (totalTextData ? (
+        <BoxTableInfo>
+          <TableTotalText data={totalTextData} />
+        </BoxTableInfo>
+      ) : undefined),
+    action,
+    headerProps,
+  }
+
+  const tableProps = ({
+    data: tableData,
+    loading,
+    onHeadersSort,
+    ...res,
+    tableRef: _tableRef,
+  } as unknown) as TableProps<D>
+
+  useImperativeHandle(tableRef, () => ({
+    ..._tableRef.current,
+    refresh,
+    run,
+    refreshAfterDelete: (delNum = 1) => {
+      return refreshAfterDelete(tableProps.data, delNum)
+    },
+  }))
+  return (
+    <BoxTable {...boxTableProps}>
+      <Table {...tableProps} />
+    </BoxTable>
+  )
+}

package/src/table_list/table_total_text.tsx

@@ -1,36 +1,36 @@
-import React, { ComponentType, ReactNode, FC } from 'react'
-import { Flex } from '@gm-pc/react'
-import _ from 'lodash'
-
-/*
-data: [{label: '', content: ''},...]
- */
-export interface TotalTextOptions {
-  label: string | ComponentType | ReactNode
-  content: string | ComponentType | ReactNode
-  hide?: boolean
-}
-
-const TableTotalText: FC<{ data: TotalTextOptions[] }> = ({ data }) => {
-  const list = _.filter(data, (v) => !v.hide)
-
-  return (
-    <Flex row wrap>
-      {_.map(list, (item, index) => {
-        return (
-          <Flex alignCenter key={index} wrap>
-            {item.label}：
-            <span className='gm-text-primary gm-text-14 gm-text-bold'>
-              {item.content}
-            </span>
-            {index < list.length - 1 && (
-              <span className='gm-padding-lr-10 gm-text-desc'>|</span>
-            )}
-          </Flex>
-        )
-      })}
-    </Flex>
-  )
-}
-
-export default TableTotalText
+import React, { ComponentType, ReactNode, FC } from 'react'
+import { Flex } from '@gm-pc/react'
+import _ from 'lodash'
+
+/*
+data: [{label: '', content: ''},...]
+ */
+export interface TotalTextOptions {
+  label: string | ComponentType | ReactNode
+  content: string | ComponentType | ReactNode
+  hide?: boolean
+}
+
+const TableTotalText: FC<{ data: TotalTextOptions[] }> = ({ data }) => {
+  const list = _.filter(data, (v) => !v.hide)
+
+  return (
+    <Flex row wrap>
+      {_.map(list, (item, index) => {
+        return (
+          <Flex alignCenter key={index} wrap>
+            {item.label}：
+            <span className='gm-text-primary gm-text-14 gm-text-bold'>
+              {item.content}
+            </span>
+            {index < list.length - 1 && (
+              <span className='gm-padding-lr-10 gm-text-desc'>|</span>
+            )}
+          </Flex>
+        )
+      })}
+    </Flex>
+  )
+}
+
+export default TableTotalText

package/src/table_list/types.ts

@@ -1,51 +1,51 @@
-import { RefObject } from 'react'
-import { TableProps, Column, TableInstance, SortsType } from '@gm-pc/table-x'
-import { UsePaginationOptions } from '@gm-common/hooks'
-import { PagingRes } from '@gm-common/hooks/src/types'
-import { TotalTextOptions } from './table_total_text'
-
-export type BaseTableListType = Pick<TableProps, 'tableRef'>
-export interface FilterProps {
-  onExport: (...arg: any) => Promise<any>
-}
-
-export type TableListColumn<D extends object = any> = Column<D>
-
-export type FormatDataType = (data: { paging: PagingRes; data: any[] }) => any[]
-export type TableListInstance = TableInstance & {
-  refresh(): Promise<any>
-  /** 对应删除的刷新，如果当前页有10条数据，一次性删除了10条，那么会调用run跳到第一条，否则调用refresh刷新当前页 */
-  refreshAfterDelete(delNum?: number): Promise<any>
-  run(): Promise<any>
-}
-export type TableListRef = RefObject<TableListInstance>
-export interface TableListProps<D extends object = any>
-  extends Omit<TableProps<D>, 'tableRef' | 'data'> {
-  data?: TableProps<D>['data']
-  tableRef?: TableListRef
-  /** 列表汇总 */
-  totalTextData?: TotalTextOptions[]
-  /** 列表筛选参数, 请保证不可变性 */
-  filter?: any
-  /** 回传给service的参数中对应的filter的key名，默认为filter */
-  filterProp?: string
-  paginationOptions?: UsePaginationOptions<any, any>
-  /** 表头是否排序 */
-  isHeaderSort?: boolean
-  /** didMount的时候时候请求数据 */
-  isUpdateEffect?: boolean
-  /** filter run回传的时候是否展开 */
-  isFilterSpread?: boolean
-  /** 列表请求接口 请保证不可变性 */
-  service(...args: any): Promise<any>
-  /** 列表接口响应数据格式化，返回值为数组 */
-  formatData?: FormatDataType
-}
-
-export interface HandleParamsProps
-  extends Pick<
-    TableListProps,
-    'filter' | 'filterProp' | 'isHeaderSort' | 'isFilterSpread'
-  > {
-  sorts: SortsType
-}
+import { RefObject } from 'react'
+import { TableProps, Column, TableInstance, SortsType } from '@gm-pc/table-x'
+import { UsePaginationOptions } from '@gm-common/hooks'
+import { PagingRes } from '@gm-common/hooks/src/types'
+import { TotalTextOptions } from './table_total_text'
+
+export type BaseTableListType = Pick<TableProps, 'tableRef'>
+export interface FilterProps {
+  onExport: (...arg: any) => Promise<any>
+}
+
+export type TableListColumn<D extends object = any> = Column<D>
+
+export type FormatDataType = (data: { paging: PagingRes; data: any[] }) => any[]
+export type TableListInstance = TableInstance & {
+  refresh(): Promise<any>
+  /** 对应删除的刷新，如果当前页有10条数据，一次性删除了10条，那么会调用run跳到第一条，否则调用refresh刷新当前页 */
+  refreshAfterDelete(delNum?: number): Promise<any>
+  run(): Promise<any>
+}
+export type TableListRef = RefObject<TableListInstance>
+export interface TableListProps<D extends object = any>
+  extends Omit<TableProps<D>, 'tableRef' | 'data'> {
+  data?: TableProps<D>['data']
+  tableRef?: TableListRef
+  /** 列表汇总 */
+  totalTextData?: TotalTextOptions[]
+  /** 列表筛选参数, 请保证不可变性 */
+  filter?: any
+  /** 回传给service的参数中对应的filter的key名，默认为filter */
+  filterProp?: string
+  paginationOptions?: UsePaginationOptions<any, any>
+  /** 表头是否排序 */
+  isHeaderSort?: boolean
+  /** didMount的时候时候请求数据 */
+  isUpdateEffect?: boolean
+  /** filter run回传的时候是否展开 */
+  isFilterSpread?: boolean
+  /** 列表请求接口 请保证不可变性 */
+  service(...args: any): Promise<any>
+  /** 列表接口响应数据格式化，返回值为数组 */
+  formatData?: FormatDataType
+}
+
+export interface HandleParamsProps
+  extends Pick<
+    TableListProps,
+    'filter' | 'filterProp' | 'isHeaderSort' | 'isFilterSpread'
+  > {
+  sorts: SortsType
+}

package/src/table_list/util.ts

@@ -1,16 +1,16 @@
-import { HandleParamsProps } from './types'
-
-const handleParams = ({
-  filter,
-  filterProp = 'filter',
-  isHeaderSort,
-  isFilterSpread,
-  sorts,
-}: HandleParamsProps) => {
-  const params = isFilterSpread ? { ...filter } : { [filterProp]: filter }
-  if (isHeaderSort) {
-    Object.assign(params, { sorts })
-  }
-  return params
-}
-export { handleParams }
+import { HandleParamsProps } from './types'
+
+const handleParams = ({
+  filter,
+  filterProp = 'filter',
+  isHeaderSort,
+  isFilterSpread,
+  sorts,
+}: HandleParamsProps) => {
+  const params = isFilterSpread ? { ...filter } : { [filterProp]: filter }
+  if (isHeaderSort) {
+    Object.assign(params, { sorts })
+  }
+  return params
+}
+export { handleParams }