fix: 文件结构调整

src/core/Account/components/TablePack/index.js

-import React, { useMemo } from 'react'
-import { Table, Tooltip } from 'antd'
+import React, { useMemo, useRef } from 'react'
+import { Table, Tooltip, Button, Popconfirm, Input, Space } from 'antd'
+import { SearchOutlined } from '@ant-design/icons'
 import FileView from './components/FileView'
 import CoordView from './components/CoordView'
 import SelectView from './components/SelectView'
+import IconPack from '../../../components/IconPack'
+import { isJson, isObject } from '../../../../utils'
+
+const getFileInfo = (formJson) => {
+  let obj = {}
+  let parent = formJson?.properties
+  if (isObject(parent)) {
+    for (let v in parent) {
+      let child = parent[v]?.properties
+      if (isObject(child)) {
+        for (let s in child) {
+          obj[s] = child[s]
+        }
+      }
+    }
+  }
+  return obj
+}
 
 const TablePack = (props) => {
 
-  const { value, widget } = props
+  const { readOnly, config, loading, dataSource, tableChange, btnsClick } = props
+  const searchInput = useRef(null)
+
+  const handleReset = (clearFilters, confirm) => {
+    clearFilters()
+    confirm({ closeDropdown: true })
+  }
 
+  const getColumnSearchProps = (dataIndex) => ({
+    filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters, close }) => (
+      <div
+        style={{ padding: 8 }}
+        onKeyDown={(e) => e.stopPropagation()}
+      >
+        <Input
+          ref={searchInput}
+          placeholder={`搜索 ${dataIndex}`}
+          value={selectedKeys[0]}
+          onChange={e => setSelectedKeys(e.target.value ? [e.target.value] : [])}
+          onPressEnter={() => confirm({ closeDropdown: true })}
+          style={{
+            marginBottom: 8,
+            display: 'block',
+            width: '280px',
+          }}
+        />
+        <Space>
+          <Button
+            type="primary"
+            onClick={() => confirm({ closeDropdown: true })}
+            icon={<SearchOutlined />}
+            size="small"
+            style={{ width: 90 }}
+          >
+            搜索
+          </Button>
+          <Button
+            onClick={() => handleReset(clearFilters, confirm)}
+            size="small"
+            style={{ width: 90 }}
+          >
+            重置
+          </Button>
+        </Space>
+      </div>
+    ),
+    filterIcon: (filtered) => (
+      <SearchOutlined
+        style={{
+          color: filtered ? '#1890ff' : undefined,
+        }}
+      />
+    ),
+  })
+
+  const btns = useMemo(() => {
+    if (readOnly) {
+      return [
+        {
+          title: '详情',
+          icon: <IconPack.XiangQing />,
+        },
+      ]
+    }
+    return [
+      {
+        title: '详情',
+        icon: <IconPack.XiangQing />,
+      },
+      {
+        title: '编辑',
+        icon: <IconPack.BianJi />,
+      },
+      {
+        title: '删除',
+        icon: <IconPack.ShanChu />,
+      }
+    ]
+  }, [readOnly])
+
+  const fileColumns = useMemo(() => {
+    const { webShowFieldGroup, formJson } = config
+    let showField = webShowFieldGroup ? webShowFieldGroup.split(',').filter(v => v) : []
+    let json = getFileInfo(formJson)
+    let array = []
+    showField.forEach(v => {
+      array.push({
+        title: json[v]?.title || v,
+        dataIndex: v,
+        width: 120,
+        ellipsis: true,
+        sorter: true,
+        filterSearch: true,
+        ...getColumnSearchProps(v),
+        render: (value, r) => {
+          let props = { ...json[v], value }
+          const { widget } = props
           if (widget === 'FileUpload') {
             return <FileView {...props} />
           }
-
           if (['Coordinate', 'Device', 'DrawPath', 'DrawArea'].includes(widget)) {
             return <CoordView {...props} />
           }
-
           if (['RadioButton', 'CheckBox'].includes(widget)) {
             return <SelectView {...props} />
           }
-
           return (
             <div>{value}</div>
           )
+        }
+      })
+    })
+    return array
+  }, [config])
+
+  const columns = useMemo(() => {
+    return [
+      {
+        title: '序号',
+        dataIndex: 'r',
+        key: 'r',
+        width: 50,
+        align: 'center',
+        fixed: 'left',
+      },
+      ...fileColumns,
+      {
+        title: '操作',
+        width: btns.length * 35 + 30,
+        align: 'center',
+        fixed: 'right',
+        render: (r) => {
+          return (
+            <div style={{ display: 'flex', justifyContent: 'center' }}>
+              {
+                btns.map(v => {
+                  if (v.title === '删除') {
+                    return (
+                      <Popconfirm
+                        key={v.title}
+                        title='确定要删除数据吗？'
+                        onConfirm={() => btnsClick(v.title, r.ID)}
+                        okText='确定'
+                        cancelText='取消'
+                      >
+                        <Button
+                          type='link'
+                          title='删除'
+                          style={{ padding: '0 7px' }}
+                          icon={v.icon}
+                        />
+                      </Popconfirm>
+                    )
+                  }
+                  return (
+                    <Button
+                      key={v.title}
+                      type='link'
+                      title={v.title}
+                      icon={v.icon}
+                      style={{ padding: '0 7px' }}
+                      onClick={() => btnsClick(v.title, r.ID)}
+                    >
+                    </Button>
+                  )
+                })
+              }
+            </div>
+          )
+        }
+      }
+    ]
+  }, [btns, fileColumns])
+
+  return (
+    <Table
+      size='small'
+      rowKey='ID'
+      bordered
+      loading={loading}
+      columns={columns}
+      dataSource={dataSource}
+      pagination={false}
+      scroll={{ y: 'calc(100% - 40px)' }}
+      onChange={tableChange}
+    />
+  )
 
 }
 

src/core/Account/index.js

 import React, { useEffect, useMemo, useRef, useState } from 'react'
 import styles from './index.less'
 import { Table, Tooltip, message, Button, Pagination, Popconfirm, Space, Input } from 'antd'
-import { SearchOutlined } from '@ant-design/icons'
 import SearchGroup from './components/SearchGroup'
 import TablePack from './components/TablePack'
 import {
@@ -15,25 +14,8 @@ import {
   DeleteTableDataInfo,
 } from '../../apis/process'
 import { isJson, isObject } from '../../utils/index'
-import IconPack from '../widgets/IconPack'
 import FormRender from '../FormRender'
 
-const getFileInfo = (formJson) => {
-  let obj = {}
-  let parent = formJson?.properties
-  if (isObject(parent)) {
-    for (let v in parent) {
-      let child = parent[v]?.properties
-      if (isObject(child)) {
-        for (let s in child) {
-          obj[s] = child[s]
-        }
-      }
-    }
-  }
-  return obj
-}
-
 const Account = (props) => {
 
   const userID = window?.globalConfig?.userInfo?.OID || 1
@@ -55,168 +37,6 @@ const Account = (props) => {
   const [submitLoading, setSubmitLoading] = useState(false)
   const [operation, setOperation] = useState({ id: null, state: '添加' })
   const formRenderRef = useRef()
-  const searchInput = useRef(null)
-
-  const handleReset = (clearFilters, confirm) => {
-    clearFilters()
-    confirm({ closeDropdown: true })
-  }
-
-  const getColumnSearchProps = (dataIndex) => ({
-    filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters, close }) => (
-      <div
-        style={{ padding: 8 }}
-        onKeyDown={(e) => e.stopPropagation()}
-      >
-        <Input
-          ref={searchInput}
-          placeholder={`搜索 ${dataIndex}`}
-          value={selectedKeys[0]}
-          onChange={e => setSelectedKeys(e.target.value ? [e.target.value] : [])}
-          onPressEnter={() => confirm({ closeDropdown: true })}
-          style={{
-            marginBottom: 8,
-            display: 'block',
-            width: '280px',
-          }}
-        />
-        <Space>
-          <Button
-            type="primary"
-            onClick={() => confirm({ closeDropdown: true })}
-            icon={<SearchOutlined />}
-            size="small"
-            style={{ width: 90 }}
-          >
-            搜索
-          </Button>
-          <Button
-            onClick={() => handleReset(clearFilters, confirm)}
-            size="small"
-            style={{ width: 90 }}
-          >
-            重置
-          </Button>
-        </Space>
-      </div>
-    ),
-    filterIcon: (filtered) => (
-      <SearchOutlined
-        style={{
-          color: filtered ? '#1890ff' : undefined,
-        }}
-      />
-    ),
-  })
-
-  const fileColumns = useMemo(() => {
-    const { webShowFieldGroup, formJson } = config
-    let showField = webShowFieldGroup ? webShowFieldGroup.split(',').filter(v => v) : []
-    let json = getFileInfo(formJson)
-    let array = []
-    showField.forEach(v => {
-      array.push({
-        title: json[v]?.title || v,
-        dataIndex: v,
-        width: 120,
-        ellipsis: true,
-        sorter: true,
-        filterSearch: true,
-        ...getColumnSearchProps(v),
-        render: (value, r) => {
-          let props = { ...json[v], value }
-          return (
-            <TablePack {...props} />
-          )
-        }
-      })
-    })
-    return array
-  }, [config])
-
-  const btns = useMemo(() => {
-    if (readOnly) {
-      return [
-        {
-          title: '详情',
-          icon: <IconPack.XiangQing />,
-        },
-      ]
-    }
-    return [
-      {
-        title: '详情',
-        icon: <IconPack.XiangQing />,
-      },
-      {
-        title: '编辑',
-        icon: <IconPack.BianJi />,
-      },
-      {
-        title: '删除',
-        icon: <IconPack.ShanChu />,
-      }
-    ]
-  }, [readOnly])
-
-  const columns = useMemo(() => {
-    return [
-      {
-        title: '序号',
-        dataIndex: 'r',
-        key: 'r',
-        width: 50,
-        align: 'center',
-        fixed: 'left',
-      },
-      ...fileColumns,
-      {
-        title: '操作',
-        width: btns.length * 35 + 30,
-        align: 'center',
-        fixed: 'right',
-        render: (r) => {
-          return (
-            <div style={{ display: 'flex', justifyContent: 'center' }}>
-              {
-                btns.map(v => {
-                  if (v.title === '删除') {
-                    return (
-                      <Popconfirm
-                        key={v.title}
-                        title='确定要删除数据吗？'
-                        onConfirm={() => btnsClick(v.title, r.ID)}
-                        okText='确定'
-                        cancelText='取消'
-                      >
-                        <Button
-                          type='link'
-                          title='删除'
-                          style={{ padding: '0 7px' }}
-                          icon={v.icon}
-                        />
-                      </Popconfirm>
-                    )
-                  }
-                  return (
-                    <Button
-                      key={v.title}
-                      type='link'
-                      title={v.title}
-                      icon={v.icon}
-                      style={{ padding: '0 7px' }}
-                      onClick={() => btnsClick(v.title, r.ID)}
-                    >
-                    </Button>
-                  )
-                })
-              }
-            </div>
-          )
-        }
-      }
-    ]
-  }, [btns, fileColumns])
 
   const btnsClick = async (type, id) => {
     const { addFieldGroup, editFieldGroup, formJson } = config
@@ -296,7 +116,7 @@ const Account = (props) => {
     if (type === '编辑') {
       const { code, data } = await EditTableDataInfo({ accountTable: accountName, id: operation.id, values: formValue })
       if (code === 0) {
-        message.success('修改!')
+        message.success('修改成功!')
         setSubmitLoading(false)
         setDetailShow(false)
         getDataSource()
@@ -311,9 +131,8 @@ const Account = (props) => {
 
   const getConfig = async () => {
     const { code, data } = await GetAccountConfigInfo(accountName)
-    const res = await GetTableJson(accountName)
-    if (code === 0 && res.code === 0) {
-      setConfig({ ...data, formJson: isJson(res.data) ? JSON.parse(res.data) : {} })
+    if (code === 0) {
+      setConfig({ ...data, formJson: isJson(data.formJson) ? JSON.parse(data.formJson) : {} })
     }
   }
 
@@ -371,16 +190,13 @@ const Account = (props) => {
             />
           </div>
           <div className={styles.bottom}>
-            <Table
-              size='small'
-              rowKey='ID'
-              bordered
+            <TablePack
               loading={loading}
-              columns={columns}
+              readOnly={readOnly}
+              config={config}
               dataSource={dataSource}
-              pagination={false}
-              scroll={{ y: 'calc(100% - 50px)' }}
-              onChange={tableChange}
+              btnsClick={btnsClick}
+              tableChange={tableChange}
             />
           </div>
         </div>

src/core/Account/index.less

@@ -5,7 +5,7 @@
   .tableRender {
     width: 100%;
     height: 100%;
-    padding-bottom: 50px;
+    padding-bottom: 40px;
     position: relative;
     .content {
       width: 100%;
@@ -37,9 +37,7 @@
           .ant-table-header>table {
             border-top: 1px solid #dbe7fb;
           }
-        } // .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {
-        //   border-top: 1px solid #dbe7fb;
-        // }
+        }
         .@{ant-prefix}-table-thead>tr {
           height: 40px;
           th {
@@ -69,9 +67,7 @@
               background: rgb(237, 242, 255)!important;
             }
           }
-        } // .ant-table-tbody > tr > td:last-child {
-        //   border-left: 1px solid #dbe7fb;
-        // }
+        }
         .@{ant-prefix}-table-body {
           overflow-x: scroll;
           &::-webkit-scrollbar {
@@ -79,11 +75,10 @@
             height: 12px;
           }
           &::-webkit-scrollbar {
-            width: 0; // height: 12px;
+            width: 0;
             height: 6px;
           }
           &::-webkit-scrollbar-thumb {
-            // background: #c8c8c8;
             background: rgb(41, 166, 255);
           }
           &::-webkit-scrollbar-track {
@@ -99,7 +94,7 @@
       left: 0;
       padding: 0 20px;
       width: 100%;
-      height: 50px;
+      height: 40px;
       display: flex;
       align-items: center;
       justify-content: space-between;

src/core/FormDesigner/config/settings.js

 import React from 'react'
 import { commonSettings, switchSettings, elementSettings } from './otherSettings'
 import { GroupOutlined } from '@ant-design/icons'
-import IconPack from '../../widgets/IconPack'
+import IconPack from '../../components/IconPack'
 
 const disabled = '{{formData.tableTypeParent === "物联设备表" && formData.IsSystemField}}'
 
@@ -208,8 +208,6 @@ const textWidgets = [
         title: '前置标签',
         type: 'string',
         widget: 'InputAddon',
-        displayType: 'row',
-        labelWidth: 80,
         disabled: disabled,
         dependencies: ['presetValue', 'tableTypeParent', 'IsSystemField'],
       },
@@ -217,8 +215,6 @@ const textWidgets = [
         title: '后置标签',
         type: 'string',
         widget: 'InputAddon',
-        displayType: 'row',
-        labelWidth: 80,
         disabled: disabled,
         dependencies: ['tableTypeParent', 'IsSystemField'],
       },

src/core/widgets/coord/Coordinate/index.js

 import React, { useState, useEffect } from 'react'
 import { Input, Button } from 'antd'
 import { CompassOutlined } from '@ant-design/icons'
-import IconPack from '../../IconPack'
+import IconPack from '../../../components/IconPack'
 import {
   ArcGISSceneMap,
   AutoCompleteSearch,

src/core/widgets/coord/DrawArea/index.js

 import React, { useState, useEffect, useRef } from 'react'
 import { Input, Button } from 'antd'
 import { CompassOutlined } from '@ant-design/icons'
-import IconPack from '../../IconPack'
+import IconPack from '../../../components/IconPack'
 import {
   ArcGISSceneMap,
   AutoCompleteSearch,

src/core/widgets/coord/DrawPath/index.js

 import React, { useState, useEffect, useRef } from 'react'
 import { Input, Button } from 'antd'
 import { CompassOutlined } from '@ant-design/icons'
-import IconPack from '../../IconPack'
+import IconPack from '../../../components/IconPack'
 import {
   ArcGISSceneMap,
   AutoCompleteSearch,