完善分类页面

.env.test

@@ -2,5 +2,5 @@ VITE_BASE_URL=/
 
 # backend service base url, test environment
 # VITE_SERVICE_BASE_URL=http://localhost:8080/snail-job
-# VITE_SERVICE_BASE_URL=http://10.18.190.195:8080/snail-job
-VITE_SERVICE_BASE_URL=http://10.21.21.29:8080/snail-job
+VITE_SERVICE_BASE_URL=http://10.18.190.195:8080/snail-job
+# VITE_SERVICE_BASE_URL=http://10.21.21.29:8080/snail-job

src/locales/langs/en-us.ts

@@ -488,7 +488,7 @@ const local: App.I18n.Schema = {
         name: 'Please enter category name',
         categoryName: 'Category Name',
         categoryStatus: 'Please select category status',
-        categoryParentName: 'Category ID',
+        categoryParentName: 'Category Name',
         categoryType: 'Category Type',
         createTime: 'Create Time'
       },

src/locales/langs/zh-cn.ts

@@ -498,7 +498,7 @@ const local: App.I18n.Schema = {
         name: '请输入分类名称',
         categoryName: '分类名称',
         categoryStatus: '分类状态',
-        categoryParentName: '父级ID',
+        categoryParentName: '父级名称',
         categoryType: '分类类型',
         createTime: '创建时间'
       },

src/service/api/category.ts

@@ -25,7 +25,7 @@ export function fetchAddCategory(data: Api.Category.Model) {
     url: '/category',
     method: 'post',
     data:{
-      parentId: data.parent,
+      parentId: data.id,
       categoryName: data.name,
       categoryType: parseInt(data.type)
     }
@@ -39,7 +39,7 @@ export function fetchEditCategory(data: Api.Category.Model) {
     method: 'put',
     data:{
       id: data.id,
-      parentId: data.parent,
+      parentId: data.parentId,
       categoryName: data.name,
       categoryType: parseInt(data.type)
     }

src/service/api/group.ts

@@ -18,18 +18,18 @@ export function fetchGetAllGroupNameList(params?: Api.GroupConfig.GroupConfigSea
 }
 
 /** add groupConfig */
-export function fetchAddGroupConfig(data: Api.GroupConfig.GroupConfigRequestVO) {
+export function fetchAddGroupConfig(data: Api.GroupConfig.GroupConfigRequestVO, type: string) {
   return request<boolean>({
-    url: '/group',
+    url: `/group?categoryId=${type}`,
     method: 'post',
     data
   });
 }
 
 /** edit groupConfig */
-export function fetchEditGroupConfig(data: Api.GroupConfig.GroupConfigRequestVO) {
+export function fetchEditGroupConfig(data: Api.GroupConfig.GroupConfigRequestVO, type: string) {
   return request<boolean>({
-    url: '/group',
+    url: `/group?categoryId=${type}`,
     method: 'put',
     data
   });

src/typings/api.d.ts

@@ -1366,7 +1366,7 @@ declare namespace Api {
    * backend api module: "Category"
    */
   namespace Category {
-    type CategoryType = '1' | '2';
+    // type CategoryType = '1' | '2';
 
     type CategorySearchParams = {
       categoryName?: string | null, 
@@ -1379,19 +1379,21 @@ declare namespace Api {
       categoryName: string;
       level: string;
       createTime: string;
-      categoryType: CategoryType;
+      // categoryType: CategoryType;
+      categoryType: string;
+    }
+
+    type Model = {
+      id: number;
+      parentId: number;
+      name: string;
+      type: string;
+      parentName: string;
     }
 
     type RowData = Category & {
       children?: RowData[];
     };
-
-    interface Model {
-      id: number;
-      name: string;
-      type: string;
-      parent: string;
-    }
   }
   namespace Common {
     type DateRangeParams = {

src/utils/dict.ts

@@ -34,6 +34,21 @@ async function init() {
   };
   return dict;
 }
-const dict = await init();
 
-export default dict;
+function getDictLabel(dictData: indexAbleDictData[], dictValue: string) {
+  let label = '';
+  if (dictData && dictData.length > 0) {
+    dictData.forEach(item => {
+      if (item.value == dictValue) {
+        label = item.label;
+      }
+    });
+  }
+  return label;
+}
+
+
+
+const dict:indexAbleDict  = await init();
+
+export  { dict, getDictLabel };

src/views/category/index.vue

@@ -79,11 +79,19 @@ const {
 
 // 表头添加操作
 const headAdd = () => {
-  handleAdd(0);
+  let item: Api.Category.RowData = {
+    id: 0,
+    parentId: 0,
+    categoryName: "暂无父类",
+    level: "",
+    createTime: "",
+    categoryType: "1"
+  };
+  handleAdd(item);
 }
 // 行添加操作
 const Add = (item: Api.Category.RowData) => {
-  handleAdd(item.id);
+  handleAdd(item);
 }
 // 行编辑操作
 const Edit = (item: Api.Category.RowData) => {

src/views/category/modules/category-operate-drawer.vue

@@ -7,7 +7,7 @@ import { $t } from '@/locales';
 import { useAuthStore } from '@/store/modules/auth';
 import { fetchAddCategory, fetchEditCategory } from '@/service/api'
 // import { categoryTypeOptions } from '@/constants/business';
-import dict from '@/utils/dict';
+import { dict } from '@/utils/dict';
 
 // 定义组件选项
 defineOptions({
@@ -27,7 +27,7 @@ interface Emits {
   (e: 'submitted'): void;
 }
 
-let key = "字典类型";
+let key = "web_category";
 
 const categoryTypeOptions = ref([
   { value: '1', label: '网站' },
@@ -56,42 +56,40 @@ const title = computed(() => {
   return titles[props.operateType];
 });
 
-const model: Api.Category.Model = reactive(createDefaultModel());
-function updateModel(id: number, categoryName: string, categoryType: string, parentId: number) {
-  model.id = id;
-  model.name = categoryName;
-  model.type = categoryType;
-  model.parent = parentId.toString(); // 确保类型匹配
-}
-function createDefaultModel(): Api.Category.Model {
-  return {
-    id: 0,
-    name: '',
-    type: '',
-    parent: ''
-  };
-}
+const model: Api.Category.Model = reactive({
+  id: 0,
+  parentId: 0,
+  name: '',
+  type: '1',
+  parentName: ''
+});
 
 // 定义表单验证规则
 type RuleKey = Extract<keyof Api.Category.Model, App.Global.FormRule>;
 const rules: Record<RuleKey, App.Global.FormRule> = {
+  id: defaultRequiredRule,
+  parentId: defaultRequiredRule,
   name: defaultRequiredRule,
   type: defaultRequiredRule,
-  parent: defaultRequiredRule
+  parentName: defaultRequiredRule
 };
 
 // 监听抽屉的可见性，当抽屉打开时，更新表单模型
 function handleUpdateModelWhenEdit() {
-  if (props.operateType === 'add') {
-    const { id, parentId } = props.rowData!;
-    updateModel(id, '', '1', parentId);
+  if (props.operateType === 'add' && props.rowData) {
+    model.parentId = props.rowData.id;
+    model.name = '';
+    model.type = '1';
+
+    model.parentName = props.rowData.categoryName;
     console.log(model);
     return;
   }
 
   if (props.operateType === 'edit' && props.rowData) {
-    const { id, categoryName, categoryType, parentId } = props.rowData;
-    updateModel(id, categoryName, categoryType.toString(), parentId);
+    model.id = props.rowData.id;
+    model.name = props.rowData.categoryName;
+    model.type = props.rowData.categoryType;
     console.log(model);
   }
 }
@@ -185,8 +183,8 @@ async function handleCopy(source: string) {
           :options="translateOptions(categoryTypeOptions)" clearable />
       </NFormItem> -->
 
-      <NFormItem :label="$t('page.category.form.categoryParentName')" path="parent">
-        <NInput v-model:value="model.parent" :placeholder="$t('page.category.form.categoryType')" :disabled="true" />
+      <NFormItem :label="$t('page.category.form.categoryParentName')" path="parent" v-show="props.operateType === 'add'">
+        <NInput v-model:value="model.parentName" :placeholder="$t('page.category.form.categoryParentName')" :disabled="true" />
       </NFormItem>
 
     </NForm>

src/views/category/modules/category.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { NCard, NForm, NFormItemGi, NGrid, NInput, NSelect, NButton, NSpace } from 'naive-ui';
 import { useAppStore } from '@/store/modules/app';
+import { dict } from '@/utils/dict';
 const appStore = useAppStore();
 
 interface Model {
@@ -16,10 +17,10 @@ const model = defineModel<Model>('model', {
   default: () => ({ categoryName: null, categoryType: null })
 });
 
-const categoryTypeOptions = [
-  { value: '1', label: '网站' },
-  { value: '2', label: '文献' }
-];
+// const categoryTypeOptions = ref([
+//   { value: '1', label: '网站' },
+//   { value: '2', label: '文献' }
+// ]);
 
 const btnSpan = computed(() => appStore.isMobile ? '24' : '12');
 
@@ -36,6 +37,8 @@ function reset() {
     model.value.categoryType = null;
     emit('update');
 }
+
+let key = "web_category";
 </script>
 
 <template>
@@ -49,7 +52,7 @@ function reset() {
         <!-- 下拉 -->
         <NFormItemGi span="24 s:12 m:6" :label="$t('page.category.form.categoryType')" path="categoryStatus" class="pr-24px">
           <NSelect v-model:value="model.categoryType" :placeholder="$t('page.category.form.categoryType')"
-            :options="categoryTypeOptions" clearable />
+            :options="dict.type[key]" clearable />
         </NFormItemGi>
         <!-- 按钮 -->
         <NFormItemGi :y-gap="8" :span="btnSpan" class="pr-24px lg:p-t-0 md:p-t-16px">

src/views/category/modules/table.ts

@@ -1,6 +1,7 @@
 import { ref, Ref } from 'vue';
 import { useBoolean } from '@sa/hooks';
 import { $t } from '@/locales';
+import { dict, getDictLabel } from '@/utils/dict';
 
 type CategoryApiFn<T = any, R = Api.Category.CategorySearchParams> = (
   params?: R
@@ -19,8 +20,16 @@ export function useCategoryTable<T extends Api.Category.RowData[]>(apiFn: Catego
   const getData = async () => {
     loading.value = true;
     try {
-      const { data } = await apiFn(params.value);
-      tableData.value = data as Api.Category.RowData[];
+      let { data } = await apiFn(params.value);
+      if (!data) {
+        window.$message?.error($t('common.error'));
+      }else {
+        data.forEach(item => {
+          item.categoryType = getDictLabel(dict.type['web_category'], item.categoryType)
+        })
+        tableData.value = data as Api.Category.RowData[];    
+        console.log(tableData.value)
+      }
     } catch (error) {
       console.error(error);
     } finally {
@@ -47,17 +56,9 @@ export function useFormOperate<T extends Record<string, any>>(config: {
   const operateType: Ref<NaiveUI.TableOperateType>  = ref('add');
   const editingData: Ref<Api.Category.Category | null> = ref(null);
 
-  // 打开添加表单
-  function handleAdd(id: number) {
+  function handleAdd(data: Api.Category.Category) {
     operateType.value = 'add';
-    editingData.value = {
-      id: id,
-      parentId: id,
-      categoryName: "",
-      level: "",
-      createTime: "",
-      categoryType: "1"
-    };
+    editingData.value = data;
     openDrawer();
   }
 

src/views/group/modules/group-operate-drawer.vue

@@ -144,7 +144,7 @@ async function handleSubmit() {
   await validate();
   // request
   if (props.operateType === 'add') {
-    const { groupName, token, groupStatus, description, idGeneratorMode, initScene, groupPartition } = model;
+    const { groupName, token, type, groupStatus, description, idGeneratorMode, initScene, groupPartition } = model;
     const { error } = await fetchAddGroupConfig({
       groupName,
       token,
@@ -153,11 +153,11 @@ async function handleSubmit() {
       idGeneratorMode,
       initScene,
       groupPartition
-    });
+    }, type.toString());
     if (error) return;
     window.$message?.success($t('common.addSuccess'));
   } else {
-    const { groupName, token, groupStatus, description, idGeneratorMode, initScene, groupPartition } = model;
+    const { groupName, token, type,  groupStatus, description, idGeneratorMode, initScene, groupPartition } = model;
     const { error } = await fetchEditGroupConfig({
       groupName,
       token,
@@ -166,7 +166,7 @@ async function handleSubmit() {
       idGeneratorMode,
       initScene,
       groupPartition
-    });
+    }, type.toString());
     if (error) return;
     window.$message?.success($t('common.updateSuccess'));
   }