Merge remote-tracking branch 'origin/hotfix-configs'

Author: heqingpan

src/components/common/PageContainer.vue

@@ -121,7 +121,7 @@ import constant from '@/types/constant'
 import apis from '@/apis/index'
 const slots = useSlots()
 const toast = useMessage()
-const emits = defineEmits(['onSave'])
+const emits = defineEmits(['onSave', 'notify'])
 let props = defineProps({
   config: {
     type: Object as PropType<CrudOptions<Object>>,
@@ -131,6 +131,10 @@ let props = defineProps({
     type: Array<any>,
     default: () => [],
   },
+  callback: {
+    type: Function,
+    default: undefined,
+  },
 })
 const showDrawer = ref(false)
 const height = ref(500)
@@ -242,8 +246,10 @@ const onSave = async (formData: any) => {
     if (data.success) {
       if (formData.mode === constant.FORM_MODE_CREATE) {
         toast.info('添加成功')
+        emits('notify', 'add')
       } else {
         toast.info('编辑成功')
+        emits('notify', 'edit')
       }
       refreshData()
     } else {
@@ -271,6 +277,7 @@ const onUpdate = async (formData: any) => {
   if (status === 200 && data && typeof data === 'object') {
     if (data.success) {
       toast.info('修改成功')
+      emits('notify', 'edit')
       refreshData()
     } else {
       toast.error(data.message || '修改失败')
@@ -292,6 +299,7 @@ const onDelete = async (params: AnyObj) => {
   if (status === 200 && data && typeof data === 'object') {
     if (data.success) {
       toast.info('删除成功')
+      emits('notify', 'delete')
       refreshData()
     } else {
       toast.error(data.message || '删除失败')

src/components/config/ConfigFormContainer.vue

@@ -78,7 +78,7 @@ import { useMessage, NButton } from 'naive-ui'
 import constant from '@/types/constant'
 import type { AnyObj } from 'encjs/core/base'
 import { CloseOutline } from '@vicons/ionicons5'
-
+import { namespaceStore } from '@/data/namespace'
 const toast = useMessage()
 const configForm = ref<HTMLDivElement>() as any
 let props = defineProps({
@@ -134,13 +134,13 @@ const onNext = async () => {
     vt.value = 2
   }
 }
-
 /**
  * 保存配置数据
  *
  * @param formData 配置项
  */
 const onSave = async (formData: AnyObj) => {
+  formData.tenant = namespaceStore.current.value.namespaceId
   let url = formData.mode === 'add' || formData.mode === constant.FORM_MODE_CREATE ? `${apis.configAdd || ''}` : `${apis.configUpdate || ''}`
   let { status, data } = await apis.postJSON(url, {
     data: formData,

src/components/namespace/NamespacePopSelect.vue

@@ -1,7 +1,7 @@
 <template>
   <n-select
     class="on-select"
-    v-model:value="value.namespaceId"
+    v-model:value="namespaceId"
     :options="optionList"
     size="medium"
     @update:value="update"
@@ -18,7 +18,7 @@ import { namespaceStore } from '@/data/namespace'
 let value = namespaceStore.current as any
 let optionList = namespaceStore.optionList as any
 const emits = defineEmits(['change'])
-
+const namespaceId = ref(namespaceStore.current.value.namespaceId || '')
 /**
  *
  * @param v 选中项
@@ -30,7 +30,7 @@ const update = (v: string) => {
         namespaceId: item.value,
         namespaceName: item.label,
       }
-      value = obj
+      namespaceId.value = item.value
       namespaceStore.setCurrent(obj)
       emits('change', obj)
     }

src/data/namespace.ts

@@ -50,13 +50,21 @@ function createStore(): INamespaceStore {
     }
   }
 
+  const refresh = async () => {
+    const { status, data } = await apis.getJSON(apis.namespacesList)
+    if (status == 200 && data && typeof data === 'object' && Array.isArray(data.data)) {
+      setLastList(data.data)
+    }
+  }
+
   return {
     current: currentRef,
     listList: listListRef,
     optionList: optionListRef,
     setCurrent,
     setLastList,
     initLoad,
+    refresh,
   }
 }
 

src/pages/manage/namespace.vue

@@ -15,6 +15,7 @@
       validator: validator,
       pagination: paginationReactive,
     }"
+    @notify="notify"
   >
     <template #header="{ methods }">
       <div>命名空间</div>
@@ -49,7 +50,10 @@
           path="namespaceId"
           label="命名空间Id"
         >
-          <NInput v-model:value="formData.namespaceId" />
+          <NInput
+            v-model:value="formData.namespaceId"
+            :disabled="formData.mode === 'update'"
+          />
         </NFormItem>
       </NForm>
     </template>
@@ -61,9 +65,12 @@ import { NPopconfirm, NTag, NButton, NForm, NFormItem, NInput, type FormItemRule
 import apis from '@/apis/index'
 import type { INamespace } from '@/types/namespace'
 import { useWebResources } from '@/data/resources'
+import { namespaceStore } from '@/data/namespace'
+
 let webResources = useWebResources()
 const formRef = ref<FormInst | null>(null)
 const pageContainer = ref<any>(null)
+const columns = ref<any>([])
 const paginationReactive = reactive({
   page: 1,
   pageCount: 1,
@@ -83,18 +90,18 @@ const paginationReactive = reactive({
 /**
  * 表格表格字段
  */
-const columns = [
-  {
-    title: '命名空间名称',
-    key: 'namespaceName',
-  },
-  {
-    title: '命名空间ID',
-    key: 'namespaceId',
-  },
-]
-const optColumn = [
-  {
+const createColumns = () => {
+  const columns = [
+    {
+      title: '命名空间名称',
+      key: 'namespaceName',
+    },
+    {
+      title: '命名空间ID',
+      key: 'namespaceId',
+    },
+  ]
+  const optColumn = {
     title: '操作',
     key: 'type',
     fixed: 'right',
@@ -141,12 +148,23 @@ const optColumn = [
         </div>
       )
     },
-  },
-]
-if (webResources.canUpdateNamespace) {
-  columns.push(optColumn)
+  }
+
+  if (webResources.canUpdateNamespace) {
+    columns.push(optColumn)
+  }
+  return columns
+}
+
+// 通知更新命名空间
+const notify = (mark: string = '') => {
+  namespaceStore.refresh()
 }
 
+onMounted(() => {
+  columns.value = createColumns()
+})
+
 /**
  * 表单校验
  */

src/pages/manage/service/index.vue

@@ -62,6 +62,7 @@
           type="info"
           @click="
             methods.createForm({
+              namespaceId: namespaceStore.current.value.namespaceId || '',
               groupName: '',
               serviceName: '',
               protectThreshold: 0,
@@ -156,7 +157,7 @@ const router = useRouter()
 const paramRef = ref({
   serviceParam: '',
   groupParam: '',
-  namespaceId: '',
+  namespaceId: namespaceStore.current.value.namespaceId,
   pageNo: 1,
   pageSize: 10,
 })

src/pages/p/login.vue

@@ -41,6 +41,7 @@
                 placeholder="验证码"
                 v-model:value="modelRef.captcha"
                 @keydown.enter.prevent
+                @keyup.enter="submit"
               />
             </n-form-item>
           </div>

src/types/namespace.d.ts

@@ -16,5 +16,6 @@ export interface INamespaceStore {
   optionList: Ref<UnwrapRef<Array<ILabelItem>>>
   setCurrent: (arg0: INamespace) => any
   setLastList: (list: Array<INamespace>) => any
-  initLoad: () => any
+  initLoad: () => void
+  refresh: () => void
 }