Merge branch 'dev' of http://192.168.1.41:3000/lanjianrong/financial_audit_console into dev

config/routes.ts

@@ -22,12 +22,6 @@
     path: '/',
     redirect: '/project/management'
   },
-  // {
-  //   path: '/dashboard',
-  //   name: 'dashboard',
-  //   icon: 'icon-shouye',
-  //   component: './Dashboard'
-  // },
   {
     path: '/project',
     name: 'project',

package.json

@@ -48,7 +48,7 @@
   "dependencies": {
     "@ant-design/icons": "^4.5.0",
     "@ant-design/pro-form": "1.67.1",
-    "@ant-design/pro-layout": "6.32.2",
+    "@ant-design/pro-layout": "6.19.3",
     "@ant-design/pro-table": "2.74.1",
     "@designable/core": "^1.0.0-beta.43",
     "@designable/formily-setters": "^1.0.0-beta.43",
@@ -56,12 +56,12 @@
     "@designable/react": "^1.0.0-beta.43",
     "@designable/react-settings-form": "^1.0.0-beta.43",
     "@designable/shared": "^1.0.0-beta.43",
-    "@formily/antd": "^2.0.8",
-    "@formily/core": "^2.0.8",
-    "@formily/react": "^2.0.8",
-    "@formily/reactive": "^2.0.11",
-    "@formily/reactive-react": "^2.0.11",
-    "@formily/shared": "^2.0.11",
+    "@formily/antd": "^2.1.4",
+    "@formily/core": "^2.1.4",
+    "@formily/react": "^2.1.4",
+    "@formily/reactive": "^2.1.4",
+    "@formily/reactive-react": "^2.1.4",
+    "@formily/shared": "^2.1.4",
     "@umijs/route-utils": "^1.0.36",
     "ahooks": "^3.0.0",
     "antd": "4.20.7",
@@ -87,9 +87,9 @@
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "@types/react-helmet": "^6.1.0",
-    "@umijs/fabric": "^2.10.2",
+    "@umijs/fabric": "^2.11.1",
     "@umijs/plugin-antd-dayjs": "^0.3.0",
-    "@umijs/plugin-esbuild": "^1.0.1",
+    "@umijs/plugin-esbuild": "^1.4.1",
     "@umijs/preset-ant-design-pro": "^1.2.0",
     "@umijs/preset-react": "^1.8.17",
     "@umijs/yorkie": "^2.0.3",

src/pages/Schema/Base/components/Designable/antd/components/Field/shared.ts

@@ -93,24 +93,24 @@ export const createFieldSchema = (
             'x-decorator': 'FormItem',
             'x-component': 'Input.TextArea'
           },
-          // 'x-display': {
-          //   type: 'string',
-          //   enum: ['visible', 'hidden', 'none', ''],
-          //   'x-decorator': 'FormItem',
-          //   'x-component': 'Select',
-          //   'x-component-props': {
-          //     defaultValue: 'visible'
-          //   }
-          // },
-          // 'x-pattern': {
-          //   type: 'string',
-          //   enum: ['editable', 'disabled', 'readOnly', 'readPretty', ''],
-          //   'x-decorator': 'FormItem',
-          //   'x-component': 'Select',
-          //   'x-component-props': {
-          //     defaultValue: 'editable'
-          //   }
-          // },
+          'x-display': {
+            type: 'string',
+            enum: ['visible', 'hidden', 'none', ''],
+            'x-decorator': 'FormItem',
+            'x-component': 'Select',
+            'x-component-props': {
+              defaultValue: 'visible'
+            }
+          },
+          'x-pattern': {
+            type: 'string',
+            enum: ['editable', 'disabled', 'readOnly', 'readPretty', ''],
+            'x-decorator': 'FormItem',
+            'x-component': 'Select',
+            'x-component-props': {
+              defaultValue: 'editable'
+            }
+          },
           default: {
             'x-decorator': 'FormItem',
             'x-component': 'ValueInput'

src/pages/Schema/Base/index.tsx

@@ -4,7 +4,7 @@ import LeftMenu from './components/LeftMenu'
 import { useState, useEffect } from 'react'
 import { history, connect, Link } from 'umi'
 import type { ProjectModelState, SchemaBaseModelState } from 'umi'
-import { createForm, onFieldMount, onFieldReact } from '@formily/core'
+import { createForm } from '@formily/core'
 import { createSchemaField } from '@formily/react'
 import {
   FormItem,
@@ -107,11 +107,7 @@ const Index: React.FC<BaseProps> = ({ base, pTypeList, dispatch }) => {
 
   const renderForm = () => {
     const normalForm = createForm({
-      validateFirst: true,
-      effects() {
-        onFieldReact('isCreated', field => generateFieldIsCreated(field))
-        onFieldMount('projectTypeID', field => (field.dataSource = pTypeList))
-      }
+      validateFirst: true
     })
 
     const SchemaField = createSchemaField({