Merge branch 'dev' into dev

wangxj3 · Jul 16, 2024 · e6ca963 · e6ca963
2 parents 378cbaa + faaef5f
commit e6ca963
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/docs/docs/en/guide/installation/kubernetes.md b/docs/docs/en/guide/installation/kubernetes.md
@@ -491,16 +491,10 @@ Take MinIO as an example: Modify the following configurations in `values.yaml`:
 common:
  configmap:
  RESOURCE_STORAGE_TYPE: "S3"
- RESOURCE_UPLOAD_PATH: "/dolphinscheduler"
- FS_DEFAULT_FS: "s3a://BUCKET_NAME"
- FS_S3A_ENDPOINT: "http://MINIO_IP:9000"
- FS_S3A_ACCESS_KEY: "MINIO_ACCESS_KEY"
- FS_S3A_SECRET_KEY: "MINIO_SECRET_KEY"
+ ...
 ```
 
-Modify `BUCKET_NAME`, `MINIO_IP`, `MINIO_ACCESS_KEY` and `MINIO_SECRET_KEY` to actual environment values.
-
-> **Note**: `MINIO_IP` can only use IP instead of the domain name, because DolphinScheduler currently doesn't support S3 path style access.
+For detailed explanation of specific fields, please see: [Resource Center Configuration](../resource/configuration.md)
 
 ### How to deploy specific components separately?
 

diff --git a/docs/docs/zh/guide/installation/kubernetes.md b/docs/docs/zh/guide/installation/kubernetes.md
@@ -490,16 +490,10 @@ common:
 common:
  configmap:
  RESOURCE_STORAGE_TYPE: "S3"
- RESOURCE_UPLOAD_PATH: "/dolphinscheduler"
- FS_DEFAULT_FS: "s3a://BUCKET_NAME"
- FS_S3A_ENDPOINT: "http://MINIO_IP:9000"
- FS_S3A_ACCESS_KEY: "MINIO_ACCESS_KEY"
- FS_S3A_SECRET_KEY: "MINIO_SECRET_KEY"
+ ...
 ```
 
-`BUCKET_NAME`, `MINIO_IP`, `MINIO_ACCESS_KEY` 和 `MINIO_SECRET_KEY` 需要被修改为实际值
-
-> **注意**: `MINIO_IP` 只能使用 IP 而非域名, 因为 DolphinScheduler 尚不支持 S3 路径风格访问 (S3 path style access)
+对于配置其他字段相关细节, 请参考: [资源中心配置详情](../resource/configuration.md)
 
 ### 如何单独部署特定组件?
 

diff --git a/dolphinscheduler-ui/src/views/resource/components/resource/edit/index.tsx b/dolphinscheduler-ui/src/views/resource/components/resource/edit/index.tsx
@@ -24,12 +24,14 @@ import { useEdit, useIsDetailPageStore } from './use-edit'
 import Card from '@/components/card'
 import MonacoEditor from '@/components/monaco-editor'
 import styles from '../index.module.scss'
+import { useDetailPageStore } from "@/views/resource/components/resource/table/use-table";
 
 export default defineComponent({
  name: 'ResourceEdit',
  setup() {
  const route = useRoute()
  const router = useRouter()
+ const detailPageStore = useDetailPageStore()
  const isDetailPageStore = useIsDetailPageStore()
  isDetailPageStore.$reset()
 
@@ -43,16 +45,24 @@ export default defineComponent({
  const { getResourceView, handleUpdateContent } = useEdit(state)
 
  const handleFileContent = () => {
- isDetailPageStore.setIsDetailPage(true)
  state.fileForm.content = resourceViewRef.state.value.content
  handleUpdateContent(fullName, tenantCode)
+ updateDetailPage()
  }
 
  const handleReturn = () => {
- isDetailPageStore.setIsDetailPage(true)
+ updateDetailPage()
  router.go(-1)
  }
 
+ const updateDetailPage = () => {
+ isDetailPageStore.setIsDetailPage(true)
+ const pathSplit = fullName.split('/')
+ pathSplit.pop()
+ detailPageStore.fullName = pathSplit.join('/')
+ detailPageStore.tenantCode = tenantCode
+ }
+
  const resourceViewRef = getResourceView(fullName, tenantCode)
  watch(
  () => resourceViewRef.state.value.content,

diff --git a/dolphinscheduler-ui/src/views/resource/components/resource/edit/use-edit.ts b/dolphinscheduler-ui/src/views/resource/components/resource/edit/use-edit.ts
@@ -19,10 +19,7 @@ import { useI18n } from 'vue-i18n'
 import type { Router } from 'vue-router'
 import { useRouter } from 'vue-router'
 import { useAsyncState } from '@vueuse/core'
-import {
- updateResourceContent,
- viewResource
-} from '@/service/modules/resources'
+import { updateResourceContent, viewResource } from '@/service/modules/resources'
 import { defineStore } from 'pinia'
 
 export function useEdit(state: any) {