附件控件优化

package.json

 {
     "name": "panda-xform",
-    "version": "1.4.0",
-    "description": "1.4.0: 统一表单配置信息",
+    "version": "1.4.1",
+    "description": "1.4.1: 附件控件优化",
     "keywords": [
         "panda-xform"
     ],

src/core/FormDesigner/config/otherSettings.js

@@ -137,7 +137,7 @@ const globalSettings = {
       title: '整体布局',
       type: 'number',
       enum: [1, 2, 3],
-      default: 1,
+      default: 3,
       enumNames: ['一行一列', '一行两列', '一行三列'],
       widget: 'select',
       props: {
@@ -167,8 +167,6 @@ const globalSettings = {
       },
     },
   },
-
-
 }
 
 export {

src/core/widgets/file/FileUpload/index.js

 import React, { useEffect, useMemo, useState } from 'react'
 import styles from './index.less'
 import { Upload, Button, message, Modal } from 'antd'
-import { UploadOutlined, FileOutlined } from '@ant-design/icons'
+import { UploadOutlined, FileOutlined, ArrowDownOutlined } from '@ant-design/icons'
 import FileViewer from 'react-file-viewer'
 import { uploadFileUrl, downloadFileUrl, downloadFile } from '../../../../apis/process'
 import { downloadFunc, filenameVerification } from '../../../../utils/utils'
 
 const accepts = {
+  '全部': [],
   '图片': ['.bmp', '.gif', '.jpeg', 'tiff', '.png', '.svg', '.jpg'],
-  // '文档': ['.docx', '.xlsx', '.pdf'],
-  '文档': [],
+  '文档': ['.docx', '.xlsx', '.pdf'],
   '视频': ['.mp4'],
   '音频': ['.mp3'],
 }
@@ -51,7 +51,7 @@ const getFileType = (fileName) => {
 const FileUpload = (props) => {
 
   const { value, schema, onChange } = props
-  const { disabled, fileType, listType, presetValue, placeholder } = schema
+  const { disabled, fileType, showType, presetValue, placeholder, preview, download } = schema
 
   const [showList, setShowList] = useState('')
   const [visible, setVisible] = useState(false)
@@ -60,8 +60,13 @@ const FileUpload = (props) => {
   const option = {
     name: 'file',
     action: `${window.location.origin}${uploadFileUrl}`,
-    listType: listType,
+    listType: showType,
     withCredentials: true,
+    showUploadList: download ?
+      {
+        showDownloadIcon: '下载',
+        downloadIcon: <ArrowDownOutlined />,
+      } : {},
     beforeUpload(file, fileList) {
       /** @Tips: 解决提交文件中存在特殊字符的问题 */
       let _continueUpload = true;
@@ -104,6 +109,7 @@ const FileUpload = (props) => {
       }
     },
     onPreview: (file) => {
+      if (!preview) return message.info('该附件禁止预览')
       let fileType = getFileType(file.name)
       if (fileType) {
         setShowFile({ name: file.name, fileType: fileType, filePath: file.url })
@@ -161,7 +167,11 @@ const FileUpload = (props) => {
         iconRender={iconRender}
         {...option}
       >
-        {listType !== 'picture-card' ? <Button icon={<UploadOutlined />}>{placeholder || '上传'}</Button> : (disabled ? null : (placeholder || '+ 上传'))}
+        {
+          showType !== 'picture-card' ?
+            <Button icon={<UploadOutlined />}>{placeholder || '上传'}</Button>
+            : (disabled ? null : (placeholder || '+ 上传'))
+        }
       </Upload>
       <Modal
         width={'70%'}

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

@@ -33,12 +33,12 @@ const VerifyTextInput = (props) => {
   }, [value])
 
   const selectChange = (value) => {
-    const item = options.find(v => v.value === value)
-
-    onChange([{
-      pattern: value,
-      message: item.message,
-    }])
+    if (value) {
+      const item = options.find(v => v.value === value)
+      onChange([{ pattern: value, message: item.message }])
+    } else {
+      onChange([])
+    }
   }
 
   return (

src/core/widgets/settings/base/InputDefault/index.js

@@ -9,34 +9,29 @@ const options = [
 
 const InputDefault = (props) => {
 
-  console.log('props', props)
-
   const { value, onChange } = props
 
-  const [visible, setVisible] = useState(false)
-
   const style = useMemo(() => {
+    let paths = ['【本人姓名】', '【本人部门】']
+    if (paths.includes(value)) {
+      return { color: 'blue' }
+    }
+    return null
+  }, [value])
 
-  },)
-
-  const iconClick = () => {
-    setVisible(true)
-  }
-
-  const onOk = () => {
-
+  const selectChange = (value) => {
+    onChange(value)
   }
 
-  const onCancel = () => {
-    setVisible(false)
-  }
 
-  const selectChange = (value) => {
-    onChange(value)
+  const inputChange = (e) => {
+    onChange(e.target.value)
   }
 
   const content = (
     <Select
+      allowClear
+      placeholder='请选择环境变量'
       style={{ width: '100%' }}
       options={options}
       onChange={selectChange}
@@ -48,13 +43,13 @@ const InputDefault = (props) => {
     <div className='InputDefault'>
       <Input
         value={value}
-        onChange={(e) => onChange(e.target.value)}
+        onChange={inputChange}
         style={style}
         addonAfter={
           <Popover
             placement="topRight"
             content={content}
-            title="数据将从环境变量读取"
+            title="环境变量"
             trigger="click"
           >
             <EllipsisOutlined />

src/core/widgets/settings/Placeholder/index.js → src/core/widgets/settings/base/Placeholder/index.js

@@ -6,6 +6,8 @@ const Placeholder = (props) => {
   const { value, addons, onChange } = props
   const { title } = addons.formData
 
+  console.log('props', props)
+
   const inputChange = (e) => {
     onChange(e.target.value)
   }

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

-import InputDefault from "./InputDefault"
+import InputDefault from './InputDefault'
+import Placeholder from './Placeholder'
 
 const base = {
   InputDefault,
+  Placeholder,
 }
 
 export default base
\ No newline at end of file

src/core/widgets/settings/index.js

@@ -3,7 +3,6 @@ import BooleanSwitch from './BooleanSwitch'
 import EnumOptions from './EnumOptions'
 import FieldNames from './FieldNames'
 import InputAddon from './InputAddon'
-import Placeholder from './Placeholder'
 import CascadeField from './CascadeField'
 import DateSelect from './DateSelect'
 import DataSource from './DataSource'
@@ -15,7 +14,6 @@ const settings = {
   EnumOptions,
   FieldNames,
   InputAddon,
-  Placeholder,
   CascadeField,
   DateSelect,
   DataSource,

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

@@ -4,7 +4,7 @@ import style from '../../style'
 
 const NumberInput = ({ value, onChange, schema }) => {
 
-  const { disabled, presetValue } = schema
+  const { disabled, presetValue, placeholder } = schema
 
   const valueShow = useMemo(() => {
     return presetValue || value
@@ -12,6 +12,7 @@ const NumberInput = ({ value, onChange, schema }) => {
 
   return (
     <InputNumber
+      placeholder={placeholder}
       disabled={disabled}
       value={valueShow}
       onChange={value => onChange(value)}

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

@@ -25,31 +25,6 @@ const RichText = forwardRef(({ schema, onChange, value }, ref) => {
     return value || presetValue
   }, [presetValue, value])
 
-  // 图片上传
-  const uploadImg = file => {
-    const formData = new FormData();
-    formData.append('file', file);
-    setLoading(true);
-    request({
-      url: uploadFileAPI,
-      method: 'POST',
-      data: formData,
-    })
-      .then(res => {
-        if (!res.data) return;
-        // eslint-disable-next-line no-useless-escape
-        const img = res.data.replace(/[\\ \/=]/g, '/');
-        const imgHtml = `
-                    <img contenteditable="false" style="display: block;" width="50%" src="${downFileAPI}?filePath=${img}" >
-                `;
-        editor.cmd.do('insertHTML', imgHtml);
-        setLoading(false);
-      })
-      .catch(err => {
-        setLoading(false);
-      });
-  }
-
   const editorChange = (editor) => {
     onChange(editor.getHtml())
   }

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

@@ -5,7 +5,7 @@ const TextArea = ({ value, onChange, schema }) => {
 
   console.log('多行文本', schema)
 
-  const { disabled, placeholder, presetValue } = schema
+  const { disabled, placeholder, presetValue, maxLength, rows } = schema
 
   const valueShow = useMemo(() => {
     return presetValue || value
@@ -18,9 +18,10 @@ const TextArea = ({ value, onChange, schema }) => {
 
   return (
     <Input.TextArea
+      maxLength={maxLength}
       disabled={disabled}
       value={valueShow}
-      rows={5}
+      rows={rows}
       placeholder={placeholder}
       onChange={handleChange}
     />

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

@@ -7,21 +7,35 @@ const iconList = Object.keys(icons).filter((item) => typeof icons[item] === 'obj
 
 const TextInput = (props) => {
 
+  const userInfo = window?.globalConfig?.userInfo || { fullName: '【本人姓名】', depart: { name: '【本人部门】' } }
+
   const { value, onChange, schema } = props
   const { disabled, placeholder, presetValue, prefix, suffix, maxLength, rules } = schema
 
   const valueShow = useMemo(() => {
-    return presetValue || value
-  }, [presetValue, value])
+    return value || presetValue
+  }, [value, presetValue])
+
+  const style = useMemo(() => {
+    let paths = ['【本人姓名】', '【本人部门】']
+    if (paths.includes(presetValue)) {
+      if (presetValue === '【本人姓名】') {
+        onChange(userInfo.fullName)
+      } else if (presetValue === '【本人部门】') {
+        onChange(userInfo.depart.name)
+      }
+      return { color: 'blue' }
+    }
+    return null
+  }, [presetValue])
 
   const handleChange = (e) => {
     onChange(e.target.value)
   }
 
-  console.log('rules', rules)
-
   return (
     <Input
+      style={style}
       rules={rules}
       disabled={disabled}
       value={valueShow}