Skip to content

X
xform
Commit 3fcf458a authored by 田翔's avatar 田翔
Browse files
Options

fix: 关联表单增加可编辑状态与台账导入

parent bcc1f503
Expand all Show whitespace changes
Inline Side-by-side
Showing with 292 additions and 23 deletions
package.json
View file @ 3fcf458a
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "5.0.6", "version": "5.0.7",
"description": "5.0.6 详情状态下只读取值不读取配置", "description": "5.0.7 关联表单增加可编辑状态与台账导入",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
src/core/Account/components/TablePack/index.js
View file @ 3fcf458a
import React, { useMemo, useState, forwardRef, useImperativeHandle, useRef } from 'react' import React, { useMemo, useState, forwardRef, useImperativeHandle, useRef } from 'react'
import { Table, Button, Popconfirm, Input, Space, Tag, Popover, Checkbox } from 'antd' import { Table, Button, Popconfirm, Input, Space, Tag, Popover, Checkbox, Form } from 'antd'
import { TweenOneGroup } from 'rc-tween-one' import { TweenOneGroup } from 'rc-tween-one'
import styles from './index.less' import styles from './index.less'
import { SearchOutlined, FormOutlined } from '@ant-design/icons' import { SearchOutlined, FormOutlined } from '@ant-design/icons'
...@@ -19,7 +19,7 @@ const TablePack = (props, ref) => { ...@@ -19,7 +19,7 @@ const TablePack = (props, ref) => {
fileColumns, fileColumns,
})) }))
const { notUse, config, fieldList, loading, dataSource, rowSelection, onRow, tableChange, btnsClick } = props const { notUse, config, fieldList, loading, dataSource, sourceChange, rowSelection, onRow, tableChange, btnsClick, isEdit } = props
const { accountFieids, webShowFieldGroup, formJson, parent } = config const { accountFieids, webShowFieldGroup, formJson, parent } = config
const [fieldResize, setFieldResize] = useState({}) const [fieldResize, setFieldResize] = useState({})
const [filteredInfo, setFilteredInfo] = useState({}) const [filteredInfo, setFilteredInfo] = useState({})
...@@ -27,6 +27,7 @@ const TablePack = (props, ref) => { ...@@ -27,6 +27,7 @@ const TablePack = (props, ref) => {
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
const [checks, setChecks] = useState([]) const [checks, setChecks] = useState([])
const searchInput = useRef(null) const searchInput = useRef(null)
const [form] = Form.useForm()
const filtered = useMemo(() => { const filtered = useMemo(() => {
let array = [] let array = []
...@@ -126,7 +127,7 @@ const TablePack = (props, ref) => { ...@@ -126,7 +127,7 @@ const TablePack = (props, ref) => {
setFieldResize({ ...fieldResize, [fieldName]: props?.size?.width }) setFieldResize({ ...fieldResize, [fieldName]: props?.size?.width })
}, },
}), }),
render: (value, r) => { render: (value, record) => {
let props = { ...json[fieldName], value } let props = { ...json[fieldName], value }
if (widget === 'FileUpload') { if (widget === 'FileUpload') {
return <FileView {...props} /> return <FileView {...props} />
...@@ -143,7 +144,7 @@ const TablePack = (props, ref) => { ...@@ -143,7 +144,7 @@ const TablePack = (props, ref) => {
} }
//关联表单表头 //关联表单表头
const getRelevanceColumnProps = (json, field) => { const getRelevanceColumnProps = (json, field, isEdit = false) => {
const { fieldName, columnWidth, isSort, accurateSearch } = field const { fieldName, columnWidth, isSort, accurateSearch } = field
const { widget } = json?.[fieldName] || {} const { widget } = json?.[fieldName] || {}
let searchProps = {} let searchProps = {}
...@@ -226,7 +227,12 @@ const TablePack = (props, ref) => { ...@@ -226,7 +227,12 @@ const TablePack = (props, ref) => {
setFieldResize({ ...fieldResize, [fieldName]: props?.size?.width }) setFieldResize({ ...fieldResize, [fieldName]: props?.size?.width })
}, },
}), }),
render: (value, r) => { render: (value, record) => {
if (isEdit) {
return (
<Input onChange={(e) => btnsClick({ type: '变化', row: { ...record, [fieldName]: e.target.value } })} value={value} />
)
} else {
let props = { ...json[fieldName], value } let props = { ...json[fieldName], value }
if (widget === 'FileUpload') { if (widget === 'FileUpload') {
return <FileView {...props} /> return <FileView {...props} />
...@@ -239,6 +245,7 @@ const TablePack = (props, ref) => { ...@@ -239,6 +245,7 @@ const TablePack = (props, ref) => {
} }
return <Text text={value} /> return <Text text={value} />
} }
},
} }
} }
...@@ -282,13 +289,13 @@ const TablePack = (props, ref) => { ...@@ -282,13 +289,13 @@ const TablePack = (props, ref) => {
let array = [] let array = []
showField.forEach((v, i) => { showField.forEach((v, i) => {
if (parent === '关联表单') { if (parent === '关联表单') {
array.push(getRelevanceColumnProps(json, v)) array.push(getRelevanceColumnProps(json, v, isEdit))
} else { } else {
array.push(getColumnProps(json, v)) array.push(getColumnProps(json, v))
} }
}) })
return array return array
}, [parent, formJson, showField, fieldResize, filteredInfo, sortedInfo]) }, [parent, formJson, showField, fieldResize, filteredInfo, sortedInfo, isEdit, dataSource])
const showColumns = useMemo(() => { const showColumns = useMemo(() => {
return fileColumns.filter(v => checks.includes(v.dataIndex)) return fileColumns.filter(v => checks.includes(v.dataIndex))
...@@ -328,7 +335,7 @@ const TablePack = (props, ref) => { ...@@ -328,7 +335,7 @@ const TablePack = (props, ref) => {
if (btns.length) { if (btns.length) {
columns.push( columns.push(
{ {
title: ( title: isEdit ? '操作' : (
<div className={styles.operation}> <div className={styles.operation}>
<span>操作</span> <span>操作</span>
<span className={styles.operationSpan}> <span className={styles.operationSpan}>
...@@ -355,7 +362,7 @@ const TablePack = (props, ref) => { ...@@ -355,7 +362,7 @@ const TablePack = (props, ref) => {
</span> </span>
</div> </div>
), ),
width: btns.length * 35 + 30, width: isEdit ? 75 : btns.length * 35 + 30,
align: 'center', align: 'center',
filteredValue: null, filteredValue: null,
fixed: 'right', fixed: 'right',
...@@ -363,7 +370,7 @@ const TablePack = (props, ref) => { ...@@ -363,7 +370,7 @@ const TablePack = (props, ref) => {
return ( return (
<div style={{ display: 'flex', justifyContent: 'center' }}> <div style={{ display: 'flex', justifyContent: 'center' }}>
{ {
btns.map(v => { (isEdit ? [{ title: '删除', icon: <IconPack.ShanChu /> }] : btns).map(v => {
if (v.title === '删除') { if (v.title === '删除') {
return ( return (
<Popconfirm <Popconfirm
...@@ -405,7 +412,7 @@ const TablePack = (props, ref) => { ...@@ -405,7 +412,7 @@ const TablePack = (props, ref) => {
return fileColumns return fileColumns
} }
return columns return columns
}, [parent, btns, dataSource, fileColumns, checks, open]) }, [parent, btns, dataSource, fileColumns, checks, open, isEdit])
const onChange = (page, filters, sorter) => { const onChange = (page, filters, sorter) => {
setFilteredInfo(filters) setFilteredInfo(filters)
...@@ -476,6 +483,7 @@ const TablePack = (props, ref) => { ...@@ -476,6 +483,7 @@ const TablePack = (props, ref) => {
</div> </div>
) : null ) : null
} }
<Form form={form} component={false}>
<Table <Table
size='small' size='small'
rowKey='ID' rowKey='ID'
...@@ -491,9 +499,10 @@ const TablePack = (props, ref) => { ...@@ -491,9 +499,10 @@ const TablePack = (props, ref) => {
components={{ components={{
header: { header: {
cell: ResizeableTitle cell: ResizeableTitle
} },
}} }}
/> />
</Form>
</div> </div>
) )
......
src/core/FormDesigner/config/settings.js
View file @ 3fcf458a
...@@ -2583,11 +2583,19 @@ const advancedWidgets = [ ...@@ -2583,11 +2583,19 @@ const advancedWidgets = [
displayType: 'row', displayType: 'row',
labelWidth: 80, labelWidth: 80,
}, },
// otherAccount: { isEdit: {
// title: '数据来源', title: '表格可编辑',
// type: 'string', description: '表格字段变为可编辑与添加字段集',
// widget: 'OtherAccount', type: 'boolean',
// }, widget: 'BooleanSwitch',
default: false,
},
otherSource: {
title: '数据来源',
type: 'object',
widget: 'OtherSource',
dependencies: ['台账名称']
},
disabled: { disabled: {
title: '只读', title: '只读',
type: 'boolean', type: 'boolean',
......
src/core/widgets/advanced/RelationForm/index.less
View file @ 3fcf458a
...@@ -6,11 +6,52 @@ ...@@ -6,11 +6,52 @@
height: 45px; height: 45px;
line-height: 45px; line-height: 45px;
position: relative; position: relative;
.text {
text-align: center; text-align: center;
.headerBtn { }
.btns {
position: absolute; position: absolute;
top: 0;
right: 0; right: 0;
top: 7px; }
}
.content {
width: 100%;
height: 100%;
position: relative;
padding-bottom: 40px;
.top {
width: 100%;
height: 50px;
}
.bottom {
width: 100%;
height: calc(100% - 50px);
.@{ant-prefix}-table-wrapper {
height: 100%;
.@{ant-prefix}-spin-nested-loading {
height: 100%;
}
.@{ant-prefix}-spin-container {
height: 100%;
}
.@{ant-prefix}-table {
height: 100%;
.@{ant-prefix}-table-container {
height: 100%;
}
}
}
}
.footer {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 40px;
display: flex;
align-items: center;
justify-content: space-between;
} }
} }
} }
\ No newline at end of file
src/core/widgets/business/AccountSelector/index.js
View file @ 3fcf458a
...@@ -22,10 +22,22 @@ const initConfig = { ...@@ -22,10 +22,22 @@ const initConfig = {
const AccountSelector = (props) => { const AccountSelector = (props) => {
const userID = window?.globalConfig?.userInfo?.OID || 1 const userID = window?.globalConfig?.userInfo?.OID || 1
const codes = window?.pandaXform?.codes || { 工单编号: '', 事件编号: '', }
const { value, onChange, schema, addons } = props const { value, onChange, schema, addons } = props
const { disabled, accountName, fieldshine, siteFilter, sql, isMultiple, presetValue, placeholder, fieldList } = schema const { disabled, accountName, fieldshine, siteFilter, sql, isMultiple, presetValue, placeholder, fieldList } = schema
const initParams = { user: userID, accountName, sortFields: '录入时间', direction: 'desc', total: 0, pageIndex: 1, pageSize: 100, siteFilter } const initParams = {
user: userID,
accountName,
extendQuery: {
caseNo: codes['工单编号']
},
sortFields: '录入时间',
direction: 'desc',
total: 0,
pageIndex: 1,
pageSize: 100,
siteFilter
}
const [params, setParams] = useState(initParams) const [params, setParams] = useState(initParams)
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [dataSource, setDataSource] = useState([]) const [dataSource, setDataSource] = useState([])
......
src/core/widgets/settings/groupSource/OtherSource/index.js 0 → 100644
View file @ 3fcf458a
import React, { useState } from 'react'
import { Form, Input, Select, Space, Button, TreeSelect } from 'antd'
import styles from './index.less'
import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons'
import Drag from '../../../../components/Drag'
import { LoadLedgers, QueryFields, ReloadTableFields } from '../../../../../apis/process'
const { TreeNode } = TreeSelect
const OtherSource = (props) => {
const { addons, onChange, value } = props
const { '台账名称': accountName } = addons?.formData || {}
const [visible, setVisible] = useState(false)
const [options, setOptions] = useState([])
const [fromField, setFromField] = useState([])
const [toField, setToField] = useState([])
const [form] = Form.useForm()
const toFieldFocus = async () => {
const { code, data } = await QueryFields(accountName)
if (code === 0) {
setToField(data)
}
}
const fromFieldFocus = async () => {
const { accountName } = form.getFieldsValue()
const { code, data } = await QueryFields(accountName)
if (code === 0) {
setFromField(data)
}
}
const focusSelect = async () => {
const { code, data, msg } = await LoadLedgers()
if (code === 0) {
if (Array.isArray(data.root)) {
setOptions(data.root)
} else {
setOptions([])
}
} else {
message.error(msg)
}
}
const onOk = () => {
setVisible(true)
const values = form.getFieldsValue()
onChange(values)
setVisible(false)
}
const inputClick = () => {
setVisible(true)
form.setFieldsValue(value)
}
return (
<div className={styles.otherSource}>
<Input value={value ? JSON.stringify(value) : ''} onClick={inputClick} />
<Drag
onOk={onOk}
onCancel={() => setVisible(false)}
title={'数据来源'}
visible={visible}
>
<Form form={form} autoComplete='off'>
<Form.Item
label={'台账名称'}
name={'accountName'}
>
<Select showSearch allowClear onFocus={focusSelect} onChange={() => form.setFieldsValue({ ...form.getFieldsValue(), field: [] })}>
{
options.map(v => {
return (
<Select.Option key={v.name} value={v.name}>{v.name}</Select.Option>
)
})
}
</Select>
</Form.Item>
<Form.List name="field" label='字段映射'>
{(value, { add, remove }) => (
<>
{value.map(({ key, name, ...restField }, index) => (
<Space
key={key}
style={{
display: 'flex',
marginBottom: '5px',
justifyContent: 'center',
position: 'relative',
left: index === 0 ? '-11px' : '',
}}
align='baseline'
>
<Form.Item
{...restField}
name={[name, 'fromField']}
rules={[
{
required: true,
message: '来源字段必填',
}
]}
>
<TreeSelect
showSearch
style={{ width: '180px' }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
placeholder="请选择字段名 "
allowClear
treeDefaultExpandAll
showCheckedStrategy
onFocus={fromFieldFocus}
>
{fromField.map(s => <TreeNode value={s} title={s} key={s} />)}
</TreeSelect>
</Form.Item>
<div className={styles.centerImg}></div>
<Form.Item
{...restField}
name={[name, 'toField']}
rules={[
{
required: true,
message: '目标字段必填',
},
{
validator: (rules, value, callback) => {
const { field } = form.getFieldsValue()
let toFields = Array.from(new Set([...field.map(v => v.toField)]))
if (toFields.length !== field.length) {
return Promise.reject('目标字段不能重复！')
}
return Promise.resolve()
}
}
]}
>
<TreeSelect
showSearch
style={{ width: '180px' }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
placeholder="请选择字段名 "
allowClear
treeDefaultExpandAll
showCheckedStrategy
onFocus={toFieldFocus}
>
{toField.map(s => <TreeNode value={s} title={s} key={s} />)}
</TreeSelect>
</Form.Item>
<Form.Item
hidden={true}
{...restField}
name={[name, 'layerName']}
>
<Input />
</Form.Item>
<MinusCircleOutlined onClick={() => remove(name)} />
</Space>
))}
<Form.Item style={{ padding: '0 10px' }}>
<Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
添加映射
</Button>
</Form.Item>
</>
)}
</Form.List>
</Form>
</Drag>
</div>
)
}
export default OtherSource
\ No newline at end of file
src/core/widgets/settings/groupSource/OtherSource/index.less 0 → 100644
View file @ 3fcf458a
@imgSrc: '../../../../../assets/images/settting';
.otherSource {
.centerImg {
width: 24px;
height: 24px;
background: url('@{imgSrc}/值映射.png');
background-size: 100% 100%;
position: relative;
top: 7px;
}
}
\ No newline at end of file
src/core/widgets/settings/groupSource/SqlFilter/index.js
View file @ 3fcf458a
...@@ -8,6 +8,7 @@ const fnList = [ ...@@ -8,6 +8,7 @@ const fnList = [
{ label: '本人ID', value: '$本人ID' }, { label: '本人ID', value: '$本人ID' },
{ label: '本人部门', value: '$本人部门' }, { label: '本人部门', value: '$本人部门' },
{ label: '本人部门ID', value: '$本人部门ID' }, { label: '本人部门ID', value: '$本人部门ID' },
{ label: '本表单工单编号', value: '$本表单工单编号' },
] ]
const SqlFilter = (props) => { const SqlFilter = (props) => {
......
src/core/widgets/settings/groupSource/index.js
View file @ 3fcf458a
...@@ -14,6 +14,7 @@ import AddressSync from './AddressSync' ...@@ -14,6 +14,7 @@ import AddressSync from './AddressSync'
import CoordSync from './CoordSync' import CoordSync from './CoordSync'
import SimpleList from './SimpleList' import SimpleList from './SimpleList'
import SqlFilter from './SqlFilter' import SqlFilter from './SqlFilter'
import OtherSource from './OtherSource'
const groupSource = { const groupSource = {
Dictionary, Dictionary,
...@@ -32,6 +33,7 @@ const groupSource = { ...@@ -32,6 +33,7 @@ const groupSource = {
CoordSync, CoordSync,
SimpleList, SimpleList,
SqlFilter, SqlFilter,
OtherSource,
} }
export default groupSource export default groupSource
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment