Merge branch 'dev-4.2.4'

oceanbase · Apr 7, 2024 · e13b27e · e13b27e
2 parents a169f16 + ff703cc
commit e13b27e
Show file tree

Hide file tree

Showing 441 changed files with 39,396 additions and 33,460 deletions.
diff --git a/.github/workflows/bundleSize.yaml b/.github/workflows/bundleSize.yaml
@@ -8,6 +8,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+          run_install: false
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: "build:odc"

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run precommit
diff --git a/.secignore b/.secignore
@@ -30,6 +30,7 @@
     http://editorconfig.org*
     http://www.apache.org*
     https://dev.mysql.com*
+    https://open.feishu.cn*
 
 --------------------------------------------------------
 # Should use GLOB wildcard to config and analysis the ignored folder

diff --git a/build/electron-build.config.js b/build/electron-build.config.js
@@ -76,6 +76,11 @@ const config = {
       from: `${distDir}/renderer`,
       to: 'renderer',
     },
+    {
+      from: `build/setting.json`,
+      to: 'setting.json',
+    },
+
   ],
 };
 

diff --git a/build/setting.json b/build/setting.json
@@ -0,0 +1,4 @@
+{
+    "client.jvm.params": "-Xms512m\n-Xmx2048m",
+    "client.start.params": ""
+}
diff --git a/config/config.js b/config/config.js
@@ -12,6 +12,8 @@ console.log('git last commit: ', version);
  */
 const disableBrowserUpdate = process.env.DISABLE_BROWSER_UPDATE;
 
+let enableSourceMap = process.env.ENABLE_SOURCEMAP === "true";
+
 console.log(disableBrowserUpdate);
 
 let publicPath = '/';
@@ -36,6 +38,7 @@ const config = {
       content: version,
     },
   ],
+  devtool: enableSourceMap ? "cheap-module-source-map" : (process.env.NODE_ENV === 'development' ? 'cheap-module-source-map' : false),
 
   antd: {
     import: true,

diff --git a/config/routes.js b/config/routes.js
@@ -39,6 +39,11 @@ module.exports = [
               component: '@/page/Login',
               spmBPos: 'b41895',
             },
+            {
+              path: '/testLDAP',
+              name: 'testLDAP',
+              component: '@/page/Login/components/LDAPModal',
+            },
             {
               path: '/',
               component: '../layout/DefaultContainer',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "odc",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "private": true,
   "description": "企业级数据开发平台",
   "homepage": "https://www.oceanbase.com/",
@@ -13,20 +13,21 @@
   },
   "scripts": {
     "start": "max dev",
+    "oic:extract": "oic --configPath ./scripts/must.js --extract all",
+    "oic:clear": "oic --configPath ./scripts/must.js --clear",
     "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 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",
+    "analyze": "ANALYZE=1 cross-env NODE_OPTIONS=--max_old_space_size=8192 max build",
+    "dev": "node scripts/plugin/initPlugins.js && cross-env NODE_OPTIONS=--max_old_space_size=8192 max dev",
     "test": "max test",
     "cov": "max test --coverage",
-    "build:odc": "node scripts/plugin/initPlugins.js && npm run updateDoc && cross-env NODE_OPTIONS=--max_old_space_size=6096 max build",
-    "build:client": "node scripts/plugin/initPlugins.js && cross-env NODE_OPTIONS=--max_old_space_size=6096 UMI_ENV=client npm run build:odc && npm run build-main-prod",
-    "buildNoDoc": "node scripts/plugin/initPlugins.js && cross-env NODE_OPTIONS=--max_old_space_size=6096 max build",
+    "build:odc": "node scripts/plugin/initPlugins.js && npm run updateDoc && cross-env NODE_OPTIONS=--max_old_space_size=8192 max build",
+    "build:client": "node scripts/plugin/initPlugins.js && cross-env NODE_OPTIONS=--max_old_space_size=8192 UMI_ENV=client npm run build:odc && npm run build-main-prod",
+    "buildNoDoc": "node scripts/plugin/initPlugins.js && cross-env NODE_OPTIONS=--max_old_space_size=8192 max build",
     "prettier": "prettier --write 'src/**/*.{js,jsx,tsx,ts,less,md,json}'",
     "type-check": "tsc --noEmit",
-    "must": "node --max-old-space-size=8192 ./scripts/must.js",
-    "build-main-prod": "cross-env NODE_OPTIONS=--max_old_space_size=6096 NODE_ENV=production webpack --config ./build/webpack.main.prod.config.js",
-    "build-main-dev": "cross-env NODE_OPTIONS=--max_old_space_size=6096 NODE_ENV=development webpack -w --config ./build/webpack.main.config.js",
+    "build-main-prod": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=production webpack --config ./build/webpack.main.prod.config.js",
+    "build-main-dev": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=development webpack -w --config ./build/webpack.main.config.js",
     "prepack": "node ./scripts/clientDependencies/index.js",
     "precommit": "npm run type-check && lint-staged",
     "pack-client:all": "node ./scripts/client/build.js all",
@@ -35,7 +36,8 @@
     "pack-client:linux_aarch64": "node ./scripts/client/build.js linux_aarch64",
     "pack-client:windows": "node ./scripts/client/build.js win",
     "updateDoc": "node ./scripts/pulldoc.js",
-    "postinstall": "node scripts/plugin/initPlugins.js && max setup"
+    "postinstall": "node scripts/plugin/initPlugins.js && max setup",
+    "prepare": "husky install"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -69,10 +71,10 @@
   },
   "devDependencies": {
     "@ant-design/icons": "^4.0.0",
-    "@oceanbase-odc/monaco-plugin-ob": "^0.1.2",
-    "@oceanbase-odc/ob-intl-cli": "^1.1.5",
-    "@oceanbase-odc/ob-parser-js": "^3.0.1",
-    "@oceanbase-odc/ob-react-data-grid": "^3.0.9",
+    "@oceanbase-odc/monaco-plugin-ob": "^0.2.2",
+    "@oceanbase-odc/ob-intl-cli": "^2.0.6",
+    "@oceanbase-odc/ob-parser-js": "^3.0.2",
+    "@oceanbase-odc/ob-react-data-grid": "^3.0.10",
     "@sentry/react": "^7.88.0",
     "@svgr/webpack": "^6.5.1",
     "@testing-library/react": "^11.2.2",
@@ -114,6 +116,7 @@
     "electron-builder-notarize": "^1.5.1",
     "eventbusjs": "^0.2.0",
     "highlight.js": "^11.6.0",
+    "husky": "^8.0.3",
     "immutability-helper": "^3.0.1",
     "jest-canvas-mock": "^2.3.0",
     "js-base64": "^3.7.2",
@@ -164,8 +167,7 @@
     "webpack-merge": "^4.2.1",
     "webpack-node-externals": "^2.5.0",
     "xterm": "^4.9.0",
-    "xterm-addon-fit": "^0.4.0",
-    "yorkie": "^2.0.0"
+    "xterm-addon-fit": "^0.4.0"
   },
   "appName": "OceanBase Developer Center",
   "build": {
@@ -174,8 +176,5 @@
       "customDir": "v22.3.27"
     }
   },
-  "copyright": "© 2021 ANT GROUP",
-  "gitHooks": {
-    "pre-commit": "npm run precommit"
-  }
+  "copyright": "© 2021 ANT GROUP"
 }