Copyright OceanBase

.gitignore

@@ -28,4 +28,5 @@ src/plugins/pluginList.ts
 .env
 config/config.odcPlugin.js
 yarn-error.log
-yarn.lock
+# yarn.lock
+pnpm-lock.yaml

README.md

@@ -53,7 +53,7 @@ pnpm run prepack obclient
 #### Install Dependencies
 
 ```shell
-pnpm install
+pnpm run install-odc
 ```
 
 #### Configure ODC Server Address

build/electron-build.config.js

@@ -21,9 +21,13 @@ const config = {
     writeUpdateInfo: false
   },
   win: {
+    publisherName: 'OceanBase',
     target: 'nsis',
     rfc3161TimeStampServer: "http://sha256timestamp.ws.symantec.com/sha256/timestamp",
-    signingHashAlgorithms: ["sha256"]
+    signingHashAlgorithms: ["sha256"],
+    signtoolOptions: {
+      sign: "./scripts/client/winsign.js"
+    }
   },
   nsis: {
     differentialPackage: false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "odc",
-  "version": "4.3.4",
+  "version": "4.4.0",
   "private": true,
   "description": "企业级数据开发平台",
   "homepage": "https://www.oceanbase.com/",
@@ -12,6 +12,7 @@
     "name": "odc"
   },
   "scripts": {
+    "install-odc": "node ./scripts/rename.js && pnpm install --registry=https://registry.npmmirror.com",
     "analyze": "ANALYZE=1 cross-env NODE_OPTIONS=--max_old_space_size=8192 max build",
     "build-main-dev": "cross-env NODE_OPTIONS=--max_old_space_size=8192 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",
@@ -23,7 +24,7 @@
     "dev:client": "concurrently \"UMI_ENV=client npm run dev\" \"npm run build-main-dev\"",
     "postinstall": "node scripts/plugin/initPlugins.js && max setup",
     "oic:clear": "oic --configPath ./scripts/must.js --clear",
-    "oic:extract": "oic --configPath ./scripts/must.js --extract all",
+    "oic:extract": "oic --configPath ./scripts/must.js --parallel --extract all",
     "oic:migrate": "oic --configPath ./scripts/must.js --migrate",
     "prepack": "node ./scripts/clientDependencies/index.js",
     "pack-client:all": "node ./scripts/client/build.js all",
@@ -71,14 +72,13 @@
     "tree-kill": "^1.2.1"
   },
   "devDependencies": {
-    "axios": "^1.7.7",
+    "@ant-design/icons": "^4.0.0",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
-    "@ant-design/icons": "^4.0.0",
-    "@oceanbase-odc/monaco-plugin-ob": "~1.4.2",
-    "@oceanbase-odc/ob-intl-cli": "^2.1.3",
-    "@oceanbase-odc/ob-parser-js": "^3.0.5",
+    "@oceanbase-odc/monaco-plugin-ob": "~1.5.3",
+    "@oceanbase-odc/ob-intl-cli": "^2.2.0",
+    "@oceanbase-odc/ob-parser-js": "^3.1.2",
     "@oceanbase-odc/ob-react-data-grid": "^4.0.0",
     "@sentry/react": "^7.88.0",
     "@testing-library/react": "^11.2.2",
@@ -87,21 +87,22 @@
     "@types/jest": "^22.2.2",
     "@types/lodash": "^4.14.168",
     "@types/memoize-one": "^4.1.1",
-    "@types/node": "^9.6.0",
+    "@types/node": "^16.7.0",
     "@types/react": "^16.0.0",
     "@types/react-dom": "^16.0.0",
     "@types/react-resizable": "^1.7.3",
     "@types/react-virtualized": "^9.21.21",
     "@types/request": "^2.48.7",
     "@umijs/fabric": "^3.0.0",
-    "@umijs/max": "^4.0.66",
+    "@umijs/max": "^4.4.12",
     "adm-zip": "^0.5.5",
     "ahooks": "^2.9.0",
     "ali-oss": "^6.17.1",
     "antd": "^5.23.4",
     "antlr4": "~4.8.0",
     "array-move": "^4.0.0",
     "aws-sdk": "^2.1231.0",
+    "axios": "^1.7.7",
     "bignumber.js": "^9.0.0",
     "blueimp-md5": "^2.19.0",
     "cherio": "^1.0.0-rc.2",
@@ -162,7 +163,7 @@
     "tar": "^6.1.11",
     "ts-is-present": "^1.1.3",
     "ts-loader": "8.4.0",
-    "typescript": "^4.0.0",
+    "typescript": "^5.9.2",
     "webpack": "^4.28.0",
     "webpack-cli": "^3.2.1",
     "webpack-merge": "^4.2.1",

scripts/client/winsign.js

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+exports.default = async function(configuration) {
+    // do not include passwords or other sensitive data in the file
+    // rather create environment variables with sensitive data
+    const CONFIG_FILE = process.env.WINDOWS_SIGN_CONFIG_FILE;
+
+    require("child_process").execSync(
+      // your commande here ! For exemple and with JSign :
+      ` smctl sign --keypair-alias key_1318155498 --config-file ${CONFIG_FILE}  --input "${configuration.path}" -v`,
+      {
+        stdio: "inherit"
+      }
+    );
+  };

scripts/clientDependencies/pullJar.js

@@ -20,13 +20,33 @@ const jarUrl = `odc-build/${pkg.version}/jar/odc-slim.jar`;
 const pluginUrl = `odc-build/${pkg.version}/plugins`;
 const startersUrl = `odc-build/${pkg.version}/starters`;
 const modulesUrl = `odc-build/${pkg.version}/modules`;
-const { oss } = require('./util');
+const { oss, download } = require('./util');
 const isSkipJar = process.env.ODC_BUILD_SKIP_JAR;
 
+const baseUrl = "https://odc-front.oss-cn-beijing.aliyuncs.com/";
+
 exports.run = async function () {
   if (isSkipJar) {
     return true;
   }
+  const [isSuccess1, isSuccess2] = await Promise.all([
+    download(
+    baseUrl + `library/h2/h2-v1.jar`,
+    'libraries/script',
+    'h2-v1.jar',
+  ),
+  download(
+    baseUrl + `library/h2/h2-v2.jar`,
+    'libraries/script',
+    'h2-v2.jar',
+  )
+  ])
+  if (!isSuccess1 || !isSuccess2) {
+    process.exit(1);
+  }
+  console.log('h2-v1.jar and h2-v2.jar download success')
+
+
   const plugins = await oss.getOSSFolderFiles(pluginUrl)
   console.log(plugins)
   for (let plugin of plugins) {

scripts/clientDependencies/pullJre.js

@@ -31,7 +31,7 @@ exports.run = async function () {
     fs.rmSync(jrePath, { recursive: true, force: true });
   }
   const isSuccess = await download(
-    baseUrl + `library/jre/${platform}/jre.zip`,
+    baseUrl + `library/jre/${platform}/jre17.zip`,
     'libraries/jre',
     'jre.zip',
   );

scripts/rename.js

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * 把假的文件先删除，然后创建一个link到hidden.yaml文件
+ */
+
+
+const path = require('path');
+const fs = require('fs');
+
+// 参数 preinstall 和 postinstall
+// preinstall 代表install
+// postinstall 代表install完成之后
+
+const lockFilePath = path.join(process.cwd(), 'hidden.yaml');
+
+const fakeLockFilePath = path.join(process.cwd(), 'pnpm-lock.yaml');
+console.log('init install lock file')
+
+if (fs.existsSync(fakeLockFilePath)) {
+    fs.unlinkSync(fakeLockFilePath);
+}
+
+fs.symlinkSync(lockFilePath, fakeLockFilePath, 'file');
+
+
+

src/common/datasource/fileSystem/index.tsx

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { ConnectType, TaskType } from '@/d.ts';
 import { IDataSourceModeConfig } from '../interface';
 import { haveOCP } from '@/util/env';

src/common/datasource/oceanbase/obmysql.ts

@@ -121,6 +121,7 @@ const items: Record<
       sqlExplain: true,
       supportOBProxy: true,
       plRun: true,
+      plEdit: true,
       export: {
         fileLimit: true,
         snapshot: true,

src/common/network/database.ts

@@ -22,42 +22,31 @@ import request from '@/util/request';
 import { getDropSQL } from '@/util/sql';
 import { executeSQL } from './sql';
 
+interface listDatabasesParams {
+  projectId?: number;
+  dataSourceId?: number;
+  page?: number;
+  size?: number;
+  name?: string;
+  environmentId?: number[];
+  /** 是否包含未分配项目的数据库 */
+  containsUnassigned?: boolean;
+  existed?: boolean;
+  includesPermittedAction?: boolean;
+  /** 是否查询数据库管理员owners列表，默认不查 */
+  includesDbOwner?: boolean;
+  type?: DBType[];
+  connectType?: ConnectType[];
+  dataSourceName?: string;
+  clusterName?: string;
+  tenantName?: string;
+}
+
 export async function listDatabases(
-  projectId?: number,
-  dataSourceId?: number,
-  page?: number,
-  size?: number,
-  name?: string,
-  environmentId?: number[],
-  /**
-   * 是否包含未分配项目的数据库
-   */
-  containsUnassigned?: boolean,
-  existed?: boolean,
-  includesPermittedAction?: boolean,
-  type?: DBType[],
-  connectType?: ConnectType[],
-  dataSourceName?: string,
-  clusterName?: string,
-  tenantName?: string,
+  params: listDatabasesParams,
 ): Promise<IResponseData<IDatabase>> {
   const res = await request.get(`/api/v2/database/databases`, {
-    params: {
-      projectId,
-      dataSourceId,
-      name,
-      page,
-      size,
-      environmentId,
-      containsUnassigned,
-      existed,
-      includesPermittedAction,
-      type: type,
-      connectType: connectType,
-      dataSourceName,
-      clusterName,
-      tenantName,
-    },
+    params: params,
   });
 
   return res?.data;

src/common/network/databaseChange.ts

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { IResponse, IResponseData } from '@/d.ts';
 import request from '@/util/request';
 

src/common/network/logicalDatabase.ts

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { IResponse, IResponseData } from '@/d.ts';
 import { PreviewLogicalTableTopologiesErrorEnum } from '@/d.ts/database';
 import {

src/common/network/materializedView/helper.ts

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { TableIndexScope, TableIndexType } from '@/page/Workspace/components/CreateTable/interface';
 import { ColumnStoreType } from '@/d.ts/table';
 import { convertServerTablePartitionToTablePartition, PartitionLevelEnum } from '../table/helper';