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

.gitignore

@@ -19,7 +19,6 @@ yarn-error.log
 .idea
 yarn.lock
 package-lock.json
-/pnpm-lock.yaml
 *bak
 .vscode
 

.npmrc

@@ -0,0 +1 @@
+auto-install-peers=true

package.json

@@ -5,13 +5,13 @@
   "description": "",
   "scripts": {
     "analyze": "cross-env ANALYZE=1 max build",
-    "build": "max build",
-    "deploy:qa": "cross-env REACT_APP_ENV=dev auto-deploy build -t qa",
-    "deploy:prod": "cross-env REACT_APP_ENV=prod auto-deploy build -t prod",
+    "build": "cross-env REACT_APP_ENV=prod  max build",
+    "deploy:qa": "auto-deploy build -t qa",
+    "deploy:prod": "auto-deploy build -t prod",
     "dev": "npm run start:dev",
     "postinstall": "max setup",
     "precommit": "lint-staged",
-    "start": "max dev",
+    "start": "cross-env REACT_APP_ENV=dev  max dev",
     "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none max dev",
     "start:org": "cross-env REACT_APP_ENV=org MOCK=none max dev",
     "prepare": "husky install"
@@ -43,8 +43,8 @@
     "@formily/reactive": "^2.1.4",
     "@formily/reactive-react": "^2.1.4",
     "@formily/shared": "^2.1.4",
-    "@umijs/max": "4.0.0",
-    "@umijs/plugins": "4.0.0",
+    "@umijs/max": "4.0.0-rc.22",
+    "@umijs/plugins": "4.0.0-rc.22",
     "ahooks": "^3.0.0",
     "antd": "4.20.7",
     "array-move": "^4.0.0",
@@ -64,8 +64,8 @@
     "@types/lodash": "^4.14.144",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "@unocss/cli": "^0.38.2",
-    "unocss": "^0.38.2",
+    "@unocss/cli": "^0.39.3",
+    "unocss": "^0.39.3",
     "babel-plugin-import": "^1.13.5",
     "cross-env": "^7.0.0",
     "eslint": "^8.17.0",

src/global.less

@@ -88,7 +88,7 @@ ol {
   border-color: #98cbff !important;
 }
 .ant-select-tree .ant-select-tree-treenode-disabled .ant-select-tree-node-content-wrapper {
-  color: rgba(0, 0, 0, 0.45) !important;
+  color: rgba(0 0 0 / 45%) !important;
   cursor: not-allowed;
 }
 .ant-pro-page-container-warp {

windi.config.ts

@@ -1,83 +0,0 @@
-// windi.config.js
-import { defineConfig } from 'windicss/helpers'
-import lineClamp from 'windicss/plugin/line-clamp'
-import colors from 'windicss/colors'
-import proSettings from './config/defaultSettings'
-
-export default defineConfig({
-  darkMode: 'class',
-  plugins: [lineClamp, createEnterPlugin()],
-  theme: {
-    extend: {
-      colors: {
-        ...colors,
-        primary: proSettings.primaryColor
-      },
-      screens: {
-        sm: '576px',
-        md: '768px',
-        lg: '992px',
-        xl: '1200px',
-        '2xl': '1600px'
-      },
-      boxShadow: {
-        card: '0 0 13px 0 rgba(74, 53, 107, 0.08)',
-        base: '0px 6px 16px rgba(0, 0, 0, 0.08);'
-      }
-    }
-  },
-  shortcuts: {
-    'btn-outline':
-      'text-xs text-primary bg-white border border-primary rounded py-1 px-1 cursor-pointer hover:text-white hover:bg-primary'
-  }
-})
-
-/**
- * Used for animation when the element is displayed
- * @param maxOutput The larger the maxOutput output, the larger the generated css volume
- */
-function createEnterPlugin(maxOutput = 10) {
-  const createCss = (index: number, d = 'x') => {
-    const upd = d.toUpperCase()
-    return {
-      [`*> .enter-${d}:nth-child(${index})`]: {
-        transform: `translate${upd}(50px)`
-      },
-      [`*> .-enter-${d}:nth-child(${index})`]: {
-        transform: `translate${upd}(-50px)`
-      },
-      [`* > .enter-${d}:nth-child(${index}),* > .-enter-${d}:nth-child(${index})`]: {
-        'z-index': `${10 - index}`,
-        opacity: '0',
-        animation: `enter-${d}-animation 0.4s ease-in-out 0.3s`,
-        'animation-fill-mode': 'forwards',
-        'animation-delay': `${(index * 1) / 10}s`
-      }
-    }
-  }
-  const handler = ({ addBase }) => {
-    const addRawCss = {}
-    for (let index = 1; index < maxOutput; index++) {
-      Object.assign(addRawCss, {
-        ...createCss(index, 'x'),
-        ...createCss(index, 'y')
-      })
-    }
-    addBase({
-      ...addRawCss,
-      [`@keyframes enter-x-animation`]: {
-        to: {
-          opacity: '1',
-          transform: 'translateX(0)'
-        }
-      },
-      [`@keyframes enter-y-animation`]: {
-        to: {
-          opacity: '1',
-          transform: 'translateY(0)'
-        }
-      }
-    })
-  }
-  return { handler }
-}