diff --git a/components.d.ts b/components.d.ts index f993c57..d3c2e95 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,6 +12,7 @@ export {} declare module 'vue' { export interface GlobalComponents { CardItem: typeof import('./src/components/cardItem/index.vue')['default'] + Comment: typeof import('./src/components/comment/index.vue')['default'] CommonFilter: typeof import('./src/components/commonFilter/index.vue')['default'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] diff --git a/src/components/comment/index.vue b/src/components/comment/index.vue new file mode 100644 index 0000000..6f8cbe1 --- /dev/null +++ b/src/components/comment/index.vue @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + {{ item.nickname }} + 作者 + + {{ item.content }} + + + + + + + + {{ reply.nickname }} + + 回复 + @{{ reply.replyTo }} + + : + {{ reply.content }} + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/stage/dict/dictFieldConfig.vue b/src/pages/stage/dict/dictFieldConfig.vue index 3c3eb3f..04f1f50 100644 --- a/src/pages/stage/dict/dictFieldConfig.vue +++ b/src/pages/stage/dict/dictFieldConfig.vue @@ -91,12 +91,12 @@ pagination height="calc(100vh - 186px)" :immediate="false" - row-key="id" - lazy - :load="load" - :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :request-api="fetchData" > + + + {{ row.label }} + { + console.log('next') +} + // 请求数据信息 const fetchData = async (params) => { try { @@ -217,14 +223,6 @@ const fetchData = async (params) => { keyword: searchQuery.value, ...filterForm, }); - - if (response.records) { - response.records = response.records.map((item) => ({ - ...item, - children: item.children || [], - hasChildren: true, // 设置为true加载子集数据信息 - })); - } return response; } catch (error) { console.log("getTableData Error", error); @@ -251,8 +249,8 @@ const load = async ( resolve: (data: User[]) => void ) => { try { - const resp = await getNextDictMenu(parentId.value,row.id); - console.log("获取当前返回的二级数据信息==>:",resp); + const resp = await getNextDictMenu(parentId.value, row.id); + console.log("获取当前返回的二级数据信息==>:", resp); resolve([]); } catch (error) { resolve([]); @@ -270,11 +268,10 @@ const onConfirmSuccess = () => { tableRef.value && tableRef.value.refresh(); }; - // 关闭popover 重置数据信息 -const onCloseFilter = () =>{ - filterForm.status = ""; -} +const onCloseFilter = () => { + filterForm.status = ""; +}; // 筛选重置 const onReset = () => { diff --git a/src/pages/stage/personnel/index.vue b/src/pages/stage/personnel/index.vue index aaa49fc..2fdf53c 100644 --- a/src/pages/stage/personnel/index.vue +++ b/src/pages/stage/personnel/index.vue @@ -1,13 +1,12 @@ - - - + + + - \ No newline at end of file +