From 87c1fee42534cf945cca8091899deeb46ad9b373 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Thu, 20 Mar 2025 09:50:56 +0800
Subject: [PATCH] fix: failed required validation for map management secret key
 fields (#6509)

---
 .../plugins/@nocobase/plugin-map/package.json   |  4 ++--
 .../src/client/components/Configuration.tsx     | 17 +++++++++++++----
 .../@nocobase/plugin-map/src/locale/zh-CN.json  |  5 ++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/plugins/@nocobase/plugin-map/package.json b/packages/plugins/@nocobase/plugin-map/package.json
index 4e002704cc..05e1f9febd 100644
--- a/packages/plugins/@nocobase/plugin-map/package.json
+++ b/packages/plugins/@nocobase/plugin-map/package.json
@@ -7,8 +7,8 @@
   "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
-  "homepage": "https://docs.nocobase.com/handbook/map",
-  "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/map",
+  "homepage": "https://docs.nocobase.com/handbook/block-map",
+  "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-map",
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.10",
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
index 589ef5185a..9eacc12916 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
@@ -32,7 +32,8 @@ const BaseConfiguration: React.FC<BaseConfigurationProps> = ({ type, children })
     return apiClient.resource(MapConfigurationResourceKey);
   }, [apiClient]);
 
-  const onSubmit = (values) => {
+  const onSubmit = async (values) => {
+    await form.validateFields();
     resource
       .set({
         ...values,
@@ -62,10 +63,18 @@ const AMapConfiguration = () => {
   const { t } = useMapTranslation();
   return (
     <BaseConfiguration type="amap">
-      <Form.Item required name="accessKey" label={t('Access key')}>
+      <Form.Item
+        rules={[{ required: true, message: t('Access key is required') }]}
+        name="accessKey"
+        label={t('Access key')}
+      >
         <TextAreaWithGlobalScope />
       </Form.Item>
-      <Form.Item required name="securityJsCode" label={t('securityJsCode or serviceHost')}>
+      <Form.Item
+        rules={[{ required: true, message: t('securityJsCode or serviceHost is required') }]}
+        name="securityJsCode"
+        label={t('securityJsCode or serviceHost')}
+      >
         <TextAreaWithGlobalScope />
       </Form.Item>
     </BaseConfiguration>
@@ -76,7 +85,7 @@ const GoogleMapConfiguration = () => {
   const { t } = useMapTranslation();
   return (
     <BaseConfiguration type="google">
-      <Form.Item required name="accessKey" label={t('Api key')}>
+      <Form.Item rules={[{ required: true, message: t('Api key is required') }]} name="accessKey" label={t('Api key')}>
         <TextAreaWithGlobalScope />
       </Form.Item>
     </BaseConfiguration>
diff --git a/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json
index a55d5e3778..c8debc9810 100644
--- a/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json
+++ b/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json
@@ -47,5 +47,8 @@
   "Create map block": "创建地图区块",
   "Start point": "起点",
   "End point": "终点",
-  "Concatenation order field": "连接顺序字段"
+  "Concatenation order field": "连接顺序字段",
+  "securityJsCode or serviceHost is required": "securityJsCode 或 serviceHost 是必填",
+  "Access key is required": "访问密钥是必填",
+  "Api key is required": "Api key 是必填"
 }