merge 4.2.2

build/electron-build.config.js

@@ -14,6 +14,7 @@ const config = {
     entitlementsInherit: "./node_modules/electron-builder-notarize/entitlements.mac.inherit.plist",
     gatekeeperAssess: false,
     target: 'dmg',
+    notarize: false
   },
   dmg: {
     artifactName: 'odc_${version}${env.ENV}.${ext}',

config/config.client.js

@@ -13,10 +13,6 @@ export default {
       ws: true,
     },
     '/api/': {
-      // target: 'http://11.124.185.132',
-      // target: 'http://100.81.152.104:8989',
-      // target: 'http://100.81.152.113:9000',
-      // target: 'http://100.81.152.113:8989',
       target: 'http://localhost:8989',
     },
   },

config/config.js

@@ -61,14 +61,10 @@ const config = {
   proxy: {
     // 本地开发或者对内 Site 应用的开发环境的代理配置
     '/api/v1/webSocket/obclient': {
-      target: 'http://11.124.9.80:8990',
+      target: 'http://11.162.218.70:7001/proxy/96',
       ws: true,
     },
     '/api/': {
-      // target: 'http://11.124.185.132',
-      // target: 'http://100.81.152.104:8989',
-      // target: 'http://100.81.152.113:9000',
-      // target: 'http://100.81.152.113:8989',
       target: 'http://11.162.218.70:7001/proxy/96',
     },
     '/oauth2/': {

mock/data.js

@@ -1,5 +1,4 @@
 // 上传下载文件，目前用于 BLOB 类型数据的管理
-// @see https://yuque.antfin-inc.com/ob/platform/rgfghm
 const mockJs = require('mockjs');
 import { MOCK_CONNECT_LIST } from './session';
 export default {

mock/user.js

@@ -27,7 +27,7 @@ export default {
     data: {
       id: 69,
       name: 'admin',
-      email: 'admin@alibaba-inc.com',
+      email: 'admin@oceanbase1024.com',
       password: 'admin',
       role: null,
       status: 1,

package.json

@@ -1,21 +1,21 @@
 {
   "name": "odc",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "private": true,
   "description": "企业级数据开发平台",
   "homepage": "https://www.oceanbase.com/",
   "bugs": {
     "email": "[email protected]"
   },
-  "repository": "git@code.alipay.com:oceanbase/oceanbase-developer-center.git",
+  "repository": "git@github.com:oceanbase/odc-client.git",
   "author": {
     "name": "odc"
   },
   "scripts": {
     "start": "max dev",
     "dev:client": "concurrently \"UMI_ENV=client npm run dev\" \"npm run build-main-dev\"",
     "start-electron": "electron --inspect=5858 -w ./dist/main/main.js",
-    "analyze": "ANALYZE=1 max build",
+    "analyze": "ANALYZE=1 cross-env NODE_OPTIONS=--max_old_space_size=6096 max build",
     "dev": "node scripts/plugin/initPlugins.js && cross-env NODE_OPTIONS=--max_old_space_size=6096 max dev",
     "test": "max test",
     "cov": "max test --coverage",
@@ -61,7 +61,6 @@
     "@trodi/electron-splashscreen": "^0.3.4",
     "archiver": "^5.3.0",
     "compare-versions": "^3.6.0",
-    "cron-parser": "^4.6.0",
     "detect-port": "~1.3.0",
     "electron-log": "~4.2.4",
     "qs": "^6.10.1",
@@ -70,8 +69,7 @@
   },
   "devDependencies": {
     "@ant-design/icons": "^4.0.0",
-    "@antv/g2plot": "^1.0.2",
-    "@oceanbase-odc/monaco-plugin-ob": "~0.0.20",
+    "@oceanbase-odc/monaco-plugin-ob": "~0.0.24",
     "@oceanbase-odc/ob-intl-cli": "^1.0.0",
     "@oceanbase-odc/ob-parser-js": "~2.0.6",
     "@oceanbase-odc/ob-react-data-grid": "~2.4.10",
@@ -105,8 +103,10 @@
     "copy-to-clipboard": "^3.3.1",
     "core-js": "^3",
     "cpx": "^1.5.0",
+    "cron-parser": "^4.6.0",
     "cross-env": "^6.0.3",
     "css": "^3.0.0",
+    "echarts": "^5.4.0",
     "electron": "20.3.12",
     "electron-builder": "^24.6.0",
     "electron-builder-notarize": "^1.5.1",