优化代码

Author: tangtanglove

package.json

@@ -45,12 +45,13 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.0.0",
-    "@ant-design/pro-card": "^1.4.1",
-    "@ant-design/pro-descriptions": "^1.0.26",
-    "@ant-design/pro-layout": "^6.5.8",
-    "@ant-design/pro-table": "^2.9.9",
+    "@ant-design/pro-card": "^1.4.3",
+    "@ant-design/pro-descriptions": "^1.0.29",
+    "@ant-design/pro-form": "^1.1.6",
+    "@ant-design/pro-layout": "^6.5.10",
+    "@ant-design/pro-table": "^2.9.13",
     "@tinymce/tinymce-react": "^3.8.1",
-    "antd": "^4.7.2",
+    "antd": "^4.7.3",
     "classnames": "^2.2.6",
     "lodash": "^4.17.11",
     "moment": "^2.29.1",
@@ -68,37 +69,37 @@
   },
   "devDependencies": {
     "@ant-design/pro-cli": "^2.0.2",
-    "@types/classnames": "^2.2.7",
+    "@types/classnames": "^2.2.11",
     "@types/express": "^4.17.8",
     "@types/history": "^4.7.8",
     "@types/jest": "^26.0.15",
-    "@types/lodash": "^4.14.162",
+    "@types/lodash": "^4.14.163",
     "@types/qs": "^6.9.5",
-    "@types/react": "^16.9.53",
-    "@types/react-dom": "^16.8.4",
+    "@types/react": "^16.9.55",
+    "@types/react-dom": "^16.9.9",
     "@types/react-helmet": "^5.0.13",
     "@umijs/fabric": "^2.3.1",
     "@umijs/plugin-blocks": "^2.0.5",
     "@umijs/plugin-esbuild": "^1.0.0-beta.2",
     "@umijs/preset-ant-design-pro": "^1.3.0",
-    "@umijs/preset-react": "^1.6.14",
+    "@umijs/preset-react": "^1.6.16",
     "@umijs/preset-ui": "^2.2.8",
     "@umijs/yorkie": "^2.0.3",
     "carlo": "^0.9.46",
     "cross-env": "^7.0.0",
     "cross-port-killer": "^1.1.1",
     "detect-installer": "^1.0.1",
     "enzyme": "^3.11.0",
-    "eslint": "^7.11.0",
+    "eslint": "^7.12.1",
     "express": "^4.17.1",
     "gh-pages": "^3.0.0",
     "husky": "^4.3.0",
     "jsdom-global": "^3.0.2",
-    "lint-staged": "^10.4.2",
+    "lint-staged": "^10.5.0",
     "mockjs": "^1.0.1-beta3",
     "prettier": "^2.1.2",
     "pro-download": "1.0.1",
-    "puppeteer-core": "^5.3.1",
+    "puppeteer-core": "^5.4.1",
     "stylelint": "^13.7.2"
   },
   "engines": {

src/pages/Quark/components/Form.tsx

@@ -62,6 +62,7 @@ const Form: React.FC<Form> = (props:any) => {
           layout={props.form.layout}
           labelCol={props.form.labelCol}
           wrapperCol={props.form.wrapperCol}
+          dateFormatter={props.form.dateFormatter}
         >
           <FormItem form={form} items={props.form.items} />
         </ProForm>
@@ -84,6 +85,7 @@ const Form: React.FC<Form> = (props:any) => {
         layout={props.form.layout}
         labelCol={props.form.labelCol}
         wrapperCol={props.form.wrapperCol}
+        dateFormatter={props.form.dateFormatter}
       >
         <FormItem form={form} items={props.form.items} />
       </ProForm>

src/pages/Quark/components/FormItem.tsx

@@ -179,7 +179,7 @@ const FormItem: React.FC<FormItem> = (props:any) => {
               help={item.help ? item.help : undefined}
               extra={item.extra}
             >
-              <Select style={item.style ? item.style : []} disabled={item.disabled}>
+              <Select style={item.style ? item.style : []} disabled={item.disabled} placeholder={item.placeholder}>
                 <Select.Option key={0} value={0}>
                   无图标
                 </Select.Option>
@@ -325,6 +325,7 @@ const FormItem: React.FC<FormItem> = (props:any) => {
               help={item.help ? item.help : undefined}
             >
               <Select
+                placeholder={item.placeholder}
                 style={item.style ? item.style : []}
                 options={item.options}
                 disabled={item.disabled}
@@ -547,6 +548,7 @@ const FormItem: React.FC<FormItem> = (props:any) => {
                 style={item.style}
                 options={item.options}
                 api={item.api}
+                allowClear={item.allowClear}
               />
             </Form.Item>;
             break;

src/pages/Quark/components/Search.tsx

@@ -10,10 +10,11 @@ export interface Search {
   placeholder?:any;
   style?:any;
   options?:any;
+  allowClear?:any;
   onChange?:(value: any) => void;
 }
 
-const Search: React.FC<Search> = ({ api=null, mode=undefined, size=undefined, value=null, placeholder=null, style=[], options=[], onChange }) => {
+const Search: React.FC<Search> = ({ api=null, mode=undefined, size=undefined, value=null, placeholder=null, style=[], options=[],allowClear=false, onChange }) => {
   const [selectOptions, setSelectOptions] = useState(undefined);
 
   const triggerChange = (changedValue:any) => {
@@ -57,6 +58,7 @@ const Search: React.FC<Search> = ({ api=null, mode=undefined, size=undefined, va
       onSearch={(value: any) => onInputSearch(value)}
       placeholder={placeholder}
       style={style}
+      allowClear={allowClear}
       onChange={onSelectChange}
     >
       {!!getSelectOptions &&