fix: 字段名称防止重复

package.json

 {
     "name": "panda-xform",
-    "version": "1.5.8",
-    "description": "1.5.8: 人员选择器，部门选择器支持ID存储",
+    "version": "1.5.9",
+    "description": "1.5.9: 字段名称防止重复",
     "keywords": [
         "panda-xform"
     ],

src/core/FormDesigner/config/settings.js

@@ -633,9 +633,33 @@ const textWidgets = [
         displayType: 'row',
         labelWidth: 55,
       },
-      ...groupStyle,
+      groupStyle: {
+        title: '控件样式',
+        type: 'object',
+        properties: {}
+      },
+      labelWidth: {
+        title: '标签宽度',
+        description: '默认值110',
+        default: 110,
+        type: 'number',
+        widget: 'slider',
+        max: 400,
+        props: {
+          hideNumber: true,
+        },
+      },
     },
   },
+  {
+    text: '编码',
+    name: '编码',
+    schema: {
+      title: '编码',
+      type: 'string',
+      widget: 'RichText',
+    },
+  }
 ]
 
 const selectWidgets = [
@@ -1274,9 +1298,6 @@ const selectWidgets = [
       ...groupStyle,
     }
   },
-]
-
-const businessWidgets = [
   {
     text: '级联选择',
     name: '级联选择',
@@ -1400,6 +1421,9 @@ const businessWidgets = [
       },
     }
   },
+]
+
+const businessWidgets = [
   {
     text: '人员选择器',
     name: '人员选择器',

src/core/FormDesigner/index.js

@@ -5,11 +5,10 @@ import { settings, baseSettings, globalSettings } from './config'
 import widgets from '../widgets'
 import { saveTableConfig, GetTableConfigJson } from '../../apis/process'
 import FormRender from '../FormRender'
+import { isObject } from '../../utils'
 
 export const GlobalStore = createContext(null)
 
-console.log('defaultSettings', defaultSettings)
-
 const FormDesigner = (props, ref) => {
 
   const { tableName } = props
@@ -85,9 +84,25 @@ const FormDesigner = (props, ref) => {
     }
   ]
 
-  const fieldRender = (schema, widgetProps, children, originNode) => {
-    console.log(schema, widgetProps, children, originNode)
-    return originNode
+  const getFields = (schema) => {
+    let fields = []
+    let parent = schema?.properties
+    if (isObject(parent)) {
+      for (let v in parent) {
+        let child = parent[v]?.properties
+        if (isObject(child)) {
+          for (let s in child) {
+            fields.push(s)
+          }
+        }
+      }
+    }
+    return fields
+  }
+
+  const onSchemaChange = (schema) => {
+    let fields = getFields(schema)
+    window.sessionStorage.setItem('designerRef', fields)
   }
 
   const testSubmit = async () => {
@@ -113,7 +128,7 @@ const FormDesigner = (props, ref) => {
           settings={settingsParent}
           commonSettings={baseSettings}
           globalSettings={globalSettings}
-        // fieldRender={fieldRender}
+          onSchemaChange={onSchemaChange}
         />
         <Modal
           title={tableName}

src/core/widgets/advanced/RelationForm/index.js

@@ -353,7 +353,7 @@ const RelationForm = (props) => {
   }, [])
 
   return (
-    <div className={styles.relationForm} style={{ display: show ? 'block' : 'none' }}>
+    <div className={styles.relationForm} style={{ display: (!addons || show) ? 'block' : 'none' }}>
       <div className={styles.header}>
         <span className='account-header-title'>{titleShow}</span>
         {disabled ? null : <Button className={styles.headerBtn} type='primary' size='middle' icon={<PlusOutlined />} onClick={addClick}>添加</Button>}

src/core/widgets/select/RelevanceSelect/index.js

@@ -11,7 +11,9 @@ const RelevanceSelect = (props) => {
   const [options, setOptions] = useState([])
 
   const selectChange = (value) => {
-    console.log('value', value)
+    if (addons) {
+      onChange(value)
+    }
   }
 
   const onfocus = async () => {
@@ -32,7 +34,6 @@ const RelevanceSelect = (props) => {
             })
           }
         })
-        console.log('filterKey', data, filterKey, fieldParent)
         if (filterKey) {
           setOptions(data.filter(v => v.nodeName === filterKey))
         } else {
@@ -42,7 +43,6 @@ const RelevanceSelect = (props) => {
     } else {
       message.error(msg)
     }
-    console.log('data', data)
   }
 
   return (

src/core/widgets/settings/CascadeField/index.js

-import React from 'react'
-import { Input } from 'antd'
-
-const CascadeField = (props) => {
-
-  const { value, onChange } = props
-
-  // console.log('关联字段', props)
-
-  return (
-    <Input value={value ? value[0] : ''} onChange={(e) => onChange([e.target.value])} />
-  )
-
-}
-
-export default CascadeField
\ No newline at end of file

src/core/widgets/settings/DataSource/index.js

-import React, { useMemo, useState } from 'react'
-import { Button, Form, Input, Select, Space, Modal } from 'antd'
-import { LoadLedgers } from '../../../../apis/process'
-
-const DataSource = (props) => {
-
-  const { value, onChange } = props
-  const { formData } = props.addons
-  const { widget } = formData
-
-  const [visible, setVisible] = useState(false)
-  const [options, setOptions] = useState({ accountName: [] })
-  const [form] = Form.useForm()
-
-  const formItems = useMemo(() => {
-    switch (widget) {
-      case 'RelationForm':
-        return [
-          {
-            name: '台账名称',
-            label: '台账名称',
-            rules: [
-              {
-                required: true,
-                message: '请选择台账名称',
-              }
-            ],
-            options: options.accountName,
-            onFocus: () => {
-              getAccountName()
-            }
-          },
-        ]
-      case '':
-        return []
-      default: []
-    }
-    return []
-  }, [widget, options])
-
-  const valueShow = useMemo(() => {
-    return value
-  }, [value])
-
-  const getAccountName = async () => {
-    const { code, data } = await LoadLedgers()
-    if (code === 0) {
-      let accountName = data.root.map(v => {
-        return {
-          label: v.name,
-          value: v.name,
-        }
-      })
-      setOptions({ ...options, accountName })
-    }
-  }
-
-  const onFocus = () => {
-    setVisible(true)
-  }
-
-  const inputChange = (e) => {
-    console.log('e', e)
-  }
-
-  const onOk = () => {
-    onChange(JSON.stringify(form.getFieldsValue()))
-    setVisible(false)
-  }
-
-  return (
-    <>
-      <Modal
-        title={`【${formData.$id}】数据来源`}
-        width='500px'
-        visible={visible}
-        onOk={onOk}
-        onCancel={() => setVisible(false)}
-      >
-        <Form
-          form={form}
-        >
-          {
-            formItems.map((v, i) => {
-              return (
-                <Form.Item
-                  name={v.name}
-                  label={v.label}
-                  rules={v.rules}
-                  key={i}
-                >
-                  <Select onFocus={v.onFocus} options={v.options} />
-                </Form.Item>
-              )
-            })
-          }
-        </Form>
-      </Modal>
-      <Input value={valueShow} onChange={inputChange} style={{ width: '100%' }} onClick={onFocus} />
-    </>
-  )
-
-}
-
-export default DataSource
\ No newline at end of file

src/core/widgets/settings/EnumOptions/index.js

-import React from 'react'
-import { Input } from 'antd'
-
-const EnumOptions = (props) => {
-
-  const { value, onChange } = props
-
-  return (
-    <div className=''>
-      <Input value={value} onChange={e => onChange(e.target.value)} />
-    </div>
-  )
-}
-
-export default EnumOptions
\ No newline at end of file

src/core/widgets/settings/InputAddon/index.js

@@ -13,10 +13,6 @@ const InputAddon = (props) => {
   const [visible, setVisible] = useState(false)
   const [icon, setIcon] = useState()
 
-  // const valueShow = useMemo(() => {
-  //   return value ? value : ''
-  // }, [value])
-
   const inputChange = (e) => {
     onChange(e.target.value)
   }

src/core/widgets/settings/MultiSelect/index.js

-import React from 'react'
-import { Select } from 'antd'
-
-const MultiSelect = (props) => {
-
-  return (
-    <Select />
-  )
-
-}
-
-export default MultiSelect
\ No newline at end of file

src/core/widgets/settings/groupBase/FieldNames/index.js

@@ -4,11 +4,15 @@ import { LoadTableFields, ReloadTableFields } from '../../../../../apis/process'
 
 const FieldNames = (props) => {
 
+  let fields = window.sessionStorage.getItem('designerRef') || []
   const { value, onChange, addons } = props
   const { tableNameParent, name } = addons.formData
-
   const [fieldName, setFieldName] = useState([])
 
+  const options = useMemo(() => {
+    return fieldName.filter(v => !fields.includes(v.name))
+  }, [fieldName])
+
   const selectChange = (value) => {
     if (name !== '关联表单') {
       addons.setValueByPath('title', value)
@@ -47,10 +51,21 @@ const FieldNames = (props) => {
       showSearch
       optionFilterProp='children'
       value={value}
+      fieldNames={{ label: 'name', value: 'name' }}
+      options={options}
     >
-      {
-        fieldName.map(v => <Select.Option key={v.name} value={v.name}>{v.name}</Select.Option>)
-      }
+      {/* {
+        options.map(v => {
+          return (
+            <Select.Option key={v.name} value={v.name}>
+              <div>
+                <span>{v.name}</span>
+                 <span>{v.check ? '已选': '未选'}</span> 
+              </div>
+            </Select.Option>
+          )
+        })
+      } */}
     </Select>
   )
 }

src/core/widgets/settings/index.js

@@ -3,10 +3,7 @@ import groupBase from './groupBase'
 import groupSource from './groupSource'
 import groupVerify from './groupVerify'
 import BooleanSwitch from './BooleanSwitch'
-import EnumOptions from './EnumOptions'
 import InputAddon from './InputAddon'
-import CascadeField from './CascadeField'
-import DataSource from './DataSource'
 
 const settings = {
   ...form,
@@ -14,10 +11,7 @@ const settings = {
   ...groupSource,
   ...groupVerify,
   BooleanSwitch,
-  EnumOptions,
   InputAddon,
-  CascadeField,
-  DataSource,
 }
 
 export default settings
\ No newline at end of file

src/core/widgets/text/TextInput/index.js

@@ -27,19 +27,6 @@ const TextInput = (props) => {
   const { value, onChange, schema, addons } = props
   const { title, disabled, placeholder, presetValue, addonBefore, addonAfter, maxLength, rules, uniqueVerify, tableName, fieldName } = schema
 
-  const style = useMemo(() => {
-    let paths = ['【本人姓名】', '【本人部门】']
-    if (paths.includes(value)) {
-      if (value === '【本人姓名】') {
-        onChange(userInfo.fullName)
-      } else if (value === '【本人部门】') {
-        onChange(userInfo.depart.name)
-      }
-      return { color: 'blue' }
-    }
-    return null
-  }, [value])
-
   const handleChange = (e) => {
     if (addons) {
       onChange(e.target.value)
@@ -47,10 +34,19 @@ const TextInput = (props) => {
   }
 
   useEffect(() => {
+    let paths = ['【本人姓名】', '【本人部门】']
+    let value = presetValue
+    if (paths.includes(value)) {
+      if (value === '【本人姓名】') {
+        value = userInfo.fullName
+      } else if (value === '【本人部门】') {
+        value = userInfo.depart.name
+      }
+    }
     if (addons) {
-      addons.setValue(addons.dataPath, presetValue)
+      addons.setValue(addons.dataPath, value)
     } else {
-      onChange(presetValue)
+      onChange(value)
     }
   }, [presetValue])
 
@@ -78,7 +74,6 @@ const TextInput = (props) => {
 
   return (
     <Input
-      style={style}
       disabled={disabled}
       value={value}
       maxLength={maxLength}