fix: 11

src/pages/Customer/Company/components/CompanyDetail/index.jsx

@@ -26,7 +26,7 @@ const CompanyDetail = props => {
     software: {},
     client: {}
   })
-  const initData = async id => {
+  const initData = async (id = dataId) => {
     setState({ ...state, loading: true })
     const {
       data: { customer = {}, log = [], software = {}, client = {} },

src/pages/ListTableList/components/CreateForm.jsx

@@ -1,19 +0,0 @@
-import React from 'react'
-import { Modal } from 'antd'
-
-const CreateForm = (props) => {
-  const { modalVisible, onCancel } = props
-  return (
-    <Modal
-      destroyOnClose
-      title="新建规则"
-      visible={modalVisible}
-      onCancel={() => onCancel()}
-      footer={null}
-    >
-      {props.children}
-    </Modal>
-  )
-}
-
-export default CreateForm

src/pages/ListTableList/components/UpdateForm.jsx

@@ -1,134 +0,0 @@
-import React from 'react'
-import { Modal } from 'antd'
-import {
-  ProFormSelect,
-  ProFormText,
-  ProFormTextArea,
-  StepsForm,
-  ProFormRadio,
-  ProFormDateTimePicker
-} from '@ant-design/pro-form'
-
-const UpdateForm = (props) => (
-  <StepsForm
-    stepsProps={{
-      size: 'small'
-    }}
-    stepsFormRender={(dom, submitter) => {
-      return (
-        <Modal
-          width={640}
-          bodyStyle={{
-            padding: '32px 40px 48px'
-          }}
-          destroyOnClose
-          title="规则配置"
-          visible={props.updateModalVisible}
-          footer={submitter}
-          onCancel={() => props.onCancel()}
-        >
-          {dom}
-        </Modal>
-      )
-    }}
-    onFinish={props.onSubmit}
-  >
-    <StepsForm.StepForm
-      initialValues={{
-        name: props.values.name,
-        desc: props.values.desc
-      }}
-      title="基本信息"
-    >
-      <ProFormText
-        name="name"
-        label="规则名称"
-        rules={[
-          {
-            required: true,
-            message: '请输入规则名称！'
-          }
-        ]}
-      />
-      <ProFormTextArea
-        name="desc"
-        label="规则描述"
-        placeholder="请输入至少五个字符"
-        rules={[
-          {
-            required: true,
-            message: '请输入至少五个字符的规则描述！',
-            min: 5
-          }
-        ]}
-      />
-    </StepsForm.StepForm>
-    <StepsForm.StepForm
-      initialValues={{
-        target: '0',
-        template: '0'
-      }}
-      title="配置规则属性"
-    >
-      <ProFormSelect
-        name="target"
-        label="监控对象"
-        valueEnum={{
-          0: '表一',
-          1: '表二'
-        }}
-      />
-      <ProFormSelect
-        name="template"
-        label="规则模板"
-        valueEnum={{
-          0: '规则模板一',
-          1: '规则模板二'
-        }}
-      />
-      <ProFormRadio.Group
-        name="type"
-        label="规则类型"
-        options={[
-          {
-            value: '0',
-            label: '强'
-          },
-          {
-            value: '1',
-            label: '弱'
-          }
-        ]}
-      />
-    </StepsForm.StepForm>
-    <StepsForm.StepForm
-      initialValues={{
-        type: '1',
-        frequency: 'month'
-      }}
-      title="设定调度周期"
-    >
-      <ProFormDateTimePicker
-        name="time"
-        label="开始时间"
-        rules={[
-          {
-            required: true,
-            message: '请选择开始时间！'
-          }
-        ]}
-      />
-      <ProFormSelect
-        name="frequency"
-        label="监控对象"
-        width="xs"
-        valueEnum={{
-          month: '月',
-          week: '周'
-        }}
-      />
-    </StepsForm.StepForm>
-  </StepsForm>
-)
-
-export default UpdateForm

src/pages/ListTableList/index.jsx

@@ -1,292 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons'
-import { Button, Divider, message, Input, Drawer } from 'antd'
-import React, { useState, useRef } from 'react'
-import { PageContainer, FooterToolbar } from '@ant-design/pro-layout'
-import ProTable from '@ant-design/pro-table'
-import ProDescriptions from '@ant-design/pro-descriptions'
-import CreateForm from './components/CreateForm'
-import UpdateForm from './components/UpdateForm'
-import { queryRule, updateRule, addRule, removeRule } from './service'
-/**
- * 添加节点
- * @param fields
- */
-
-const handleAdd = async (fields) => {
-  const hide = message.loading('正在添加')
-
-  try {
-    await addRule({ ...fields })
-    hide()
-    message.success('添加成功')
-    return true
-  } catch (error) {
-    hide()
-    message.error('添加失败请重试！')
-    return false
-  }
-}
-/**
- * 更新节点
- * @param fields
- */
-
-const handleUpdate = async (fields) => {
-  const hide = message.loading('正在配置')
-
-  try {
-    await updateRule({
-      name: fields.name,
-      desc: fields.desc,
-      key: fields.key
-    })
-    hide()
-    message.success('配置成功')
-    return true
-  } catch (error) {
-    hide()
-    message.error('配置失败请重试！')
-    return false
-  }
-}
-/**
- *  删除节点
- * @param selectedRows
- */
-
-const handleRemove = async (selectedRows) => {
-  const hide = message.loading('正在删除')
-  if (!selectedRows) return true
-
-  try {
-    await removeRule({
-      key: selectedRows.map((row) => row.key)
-    })
-    hide()
-    message.success('删除成功，即将刷新')
-    return true
-  } catch (error) {
-    hide()
-    message.error('删除失败，请重试')
-    return false
-  }
-}
-
-const TableList = () => {
-  const [ createModalVisible, handleModalVisible ] = useState(false)
-  const [ updateModalVisible, handleUpdateModalVisible ] = useState(false)
-  const [ stepFormValues, setStepFormValues ] = useState({})
-  const actionRef = useRef()
-  const [ row, setRow ] = useState()
-  const [ selectedRowsState, setSelectedRows ] = useState([])
-  const columns = [
-    {
-      title: '规则名称',
-      dataIndex: 'name',
-      tip: '规则名称是唯一的 key',
-      formItemProps: {
-        rules: [
-          {
-            required: true,
-            message: '规则名称为必填项'
-          }
-        ]
-      },
-      render: (dom, entity) => {
-        return <a onClick={() => setRow(entity)}>{dom}</a>
-      }
-    },
-    {
-      title: '描述',
-      dataIndex: 'desc',
-      valueType: 'textarea'
-    },
-    {
-      title: '服务调用次数',
-      dataIndex: 'callNo',
-      sorter: true,
-      hideInForm: true,
-      renderText: (val) => `${val} 万`
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      hideInForm: true,
-      valueEnum: {
-        0: {
-          text: '关闭',
-          status: 'Default'
-        },
-        1: {
-          text: '运行中',
-          status: 'Processing'
-        },
-        2: {
-          text: '已上线',
-          status: 'Success'
-        },
-        3: {
-          text: '异常',
-          status: 'Error'
-        }
-      }
-    },
-    {
-      title: '上次调度时间',
-      dataIndex: 'updatedAt',
-      sorter: true,
-      valueType: 'dateTime',
-      hideInForm: true,
-      renderFormItem: (item, { defaultRender, ...rest }, form) => {
-        const status = form.getFieldValue('status')
-
-        if (`${status}` === '0') {
-          return false
-        }
-
-        if (`${status}` === '3') {
-          return <Input {...rest} placeholder="请输入异常原因！" />
-        }
-
-        return defaultRender(item)
-      }
-    },
-    {
-      title: '操作',
-      dataIndex: 'option',
-      valueType: 'option',
-      render: (_, record) => (
-        <>
-          <a
-            onClick={() => {
-              handleUpdateModalVisible(true)
-              setStepFormValues(record)
-            }}
-          >
-            配置
-          </a>
-          <Divider type="vertical" />
-          <a href="">订阅警报</a>
-        </>
-      )
-    }
-  ]
-  return (
-    <PageContainer>
-      <ProTable
-        headerTitle="查询表格"
-        actionRef={actionRef}
-        rowKey="key"
-        search={{
-          labelWidth: 120
-        }}
-        toolBarRender={() => [
-          <Button type="primary" onClick={() => handleModalVisible(true)}>
-            <PlusOutlined /> 新建
-          </Button>
-        ]}
-        request={(params, sorter, filter) => queryRule({ ...params, sorter, filter })}
-        columns={columns}
-        rowSelection={{
-          onChange: (_, selectedRows) => setSelectedRows(selectedRows)
-        }}
-      />
-      {selectedRowsState?.length > 0 && (
-        <FooterToolbar
-          extra={
-            <div>
-              已选择{' '}
-              <a
-                style={{
-                  fontWeight: 600
-                }}
-              >
-                {selectedRowsState.length}
-              </a>{' '}
-              项&nbsp;&nbsp;
-              <span>
-                服务调用次数总计 {selectedRowsState.reduce((pre, item) => pre + item.callNo, 0)} 万
-              </span>
-            </div>
-          }
-        >
-          <Button
-            onClick={async () => {
-              await handleRemove(selectedRowsState)
-              setSelectedRows([])
-              actionRef.current?.reloadAndRest?.()
-            }}
-          >
-            批量删除
-          </Button>
-          <Button type="primary">批量审批</Button>
-        </FooterToolbar>
-      )}
-      <CreateForm onCancel={() => handleModalVisible(false)} modalVisible={createModalVisible}>
-        <ProTable
-          onSubmit={async (value) => {
-            const success = await handleAdd(value)
-
-            if (success) {
-              handleModalVisible(false)
-
-              if (actionRef.current) {
-                actionRef.current.reload()
-              }
-            }
-          }}
-          rowKey="key"
-          type="form"
-          columns={columns}
-        />
-      </CreateForm>
-      {stepFormValues && Object.keys(stepFormValues).length ? (
-        <UpdateForm
-          onSubmit={async (value) => {
-            const success = await handleUpdate(value)
-
-            if (success) {
-              handleUpdateModalVisible(false)
-              setStepFormValues({})
-
-              if (actionRef.current) {
-                actionRef.current.reload()
-              }
-            }
-          }}
-          onCancel={() => {
-            handleUpdateModalVisible(false)
-            setStepFormValues({})
-          }}
-          updateModalVisible={updateModalVisible}
-          values={stepFormValues}
-        />
-      ) : null}
-
-      <Drawer
-        width={600}
-        visible={!!row}
-        onClose={() => {
-          setRow(undefined)
-        }}
-        closable={false}
-      >
-        {row?.name && (
-          <ProDescriptions
-            column={2}
-            title={row?.name}
-            request={async () => ({
-              data: row || {}
-            })}
-            params={{
-              id: row?.name
-            }}
-            columns={columns}
-          />
-        )}
-      </Drawer>
-    </PageContainer>
-  )
-}
-
-export default TableList

src/pages/ListTableList/service.js

@@ -1,25 +0,0 @@
-import request from '@/basic/utils/request'
-
-export async function queryRule(params) {
-  return request('/api/rule', {
-    params
-  })
-}
-export async function removeRule(params) {
-  return request('/api/rule', {
-    method: 'POST',
-    data: { ...params, method: 'delete' }
-  })
-}
-export async function addRule(params) {
-  return request('/api/rule', {
-    method: 'POST',
-    data: { ...params, method: 'post' }
-  })
-}
-export async function updateRule(params) {
-  return request('/api/rule', {
-    method: 'POST',
-    data: { ...params, method: 'update' }
-  })
-}