diff --git a/eslint.config.js b/eslint.config.js index 06fcf00..fab559e 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -20,6 +20,7 @@ export default antfu({ "react-hooks-extra/no-unnecessary-use-prefix": "off", "react-hooks-extra/prefer-use-state-lazy-initialization": "off", "react-hooks/exhaustive-deps": "off", + "react/no-implicit-key": "off", }, javascript: { "no-console": process.env.NODE_ENV === "production" ? "error" : "warn", diff --git a/jjb.config.js b/jjb.config.js index 8a8c1dd..f3e6c6a 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -9,8 +9,7 @@ module.exports = { // 应用后端分支名称,部署上线需要 javaGitBranch: "", // 接口服务地址 - API_HOST: "", - // API_HOST: "http://192.168.20.100:30140", + API_HOST: "https://gbs-gateway.qhdsafety.com", }, production: { // 应用后端分支名称,部署上线需要 diff --git a/jsconfig.json b/jsconfig.json index 4cf89dc..ed50d55 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -3,7 +3,8 @@ "baseUrl": "src", "paths": { "~/*": ["*"] - } + }, + "jsx": "react" }, "include": ["src"] } diff --git a/package.json b/package.json index 897456f..1e912c8 100644 --- a/package.json +++ b/package.json @@ -18,24 +18,24 @@ "lint": "eslint --ext .js,.jsx,.tsx --fix src" }, "dependencies": { - "@ant-design/icons": "latest", + "@ant-design/icons": "^5.6.1", "@ant-design/pro-components": "^2.8.10", "@cqsjjb/jjb-common-decorator": "latest", "@cqsjjb/jjb-common-lib": "latest", "@cqsjjb/jjb-dva-runtime": "latest", "@cqsjjb/jjb-react-admin-component": "latest", "ahooks": "^3.9.5", - "antd": "5.27.6", + "antd": "^5.27.6", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "^1.2.4" + "zy-react-library": "latest" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", "@babel/plugin-proposal-decorators": "^7.19.3", - "@cqsjjb/scripts": "2.0.0-alpha-1", + "@cqsjjb/scripts": "2.0.0", "@eslint-react/eslint-plugin": "^2.2.2", "cross-env": "^7.0.3", "eslint": "^9.37.0", diff --git a/public/index.html b/public/index.html index 54af0fc..9bfa85d 100644 --- a/public/index.html +++ b/public/index.html @@ -49,6 +49,6 @@ <% const { root } = $element; %> -
+
diff --git a/src/main.js b/src/main.js index 817369e..e8b9f5c 100644 --- a/src/main.js +++ b/src/main.js @@ -1,22 +1,19 @@ import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib"; -import { getFileUrlFromServer } from "zy-react-library/utils"; import { setup } from "@cqsjjb/jjb-dva-runtime"; import { message } from "antd"; import dayjs from "dayjs"; +import { getFileUrlFromServer } from "zy-react-library/utils"; import "dayjs/locale/zh-cn"; import "../blessed_by_buddha"; -import { getFileUrlFromServer } from "zy-react-library/utils"; -getFileUrlFromServer(); require("antd/dist/reset.css"); require("zy-react-library/css/common.less"); + dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); -getFileUrlFromServer(); const app = setup(); - -window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"; +getFileUrlFromServer(); // 非底座环境运行 if (!window.__POWERED_BY_QIANKUN__) { // 云组件默认依赖