From faa8adcdf525806d7b2945b75d12d6a82212bc03 Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Thu, 28 Nov 2024 13:57:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=8C=85=E6=9F=A5=E7=9C=8B=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/fs.js                                 |  70 +++----
 .../node-layout/components/file-package.vue   |  84 ++++++++
 src/router/index.js                           | 180 ++++++++++--------
 src/router/route-menu.js                      |  34 ++--
 4 files changed, 233 insertions(+), 135 deletions(-)
 create mode 100644 src/pages/node/list/node-layout/components/file-package.vue

diff --git a/src/api/fs.js b/src/api/fs.js
index 2dd6e21..6e1df68 100644
--- a/src/api/fs.js
+++ b/src/api/fs.js
@@ -1,35 +1,35 @@
-import axios from './config'
-
-// 获取文件
-export function lsFile(data) {
-  return axios({
-    url: '/fs/ls',
-    headers: {
-      'Content-Type': 'application/json; charset=UTF-8'
-    },
-    method: 'post',
-    data
-  })
-}
-
-// 查询文件
-export function catFile(data) {
-  return axios({
-    url: '/fs/cat',
-    headers: {
-      'Content-Type': 'application/json; charset=UTF-8'
-    },
-    method: 'post',
-    data
-  })
-}
-
-// 查询文件所属软件包
-export function getPkgByFile(data) {
-  return axios({
-    // baseURL: 'http://172.30.17.23:2124',
-    url: '/getPkgByFile',
-    method: 'post',
-    data
-  })
-}
+import axios from './config'
+
+// 获取文件
+export function lsFile(data) {
+  return axios({
+    url: '/fs/ls',
+    headers: {
+      'Content-Type': 'application/json; charset=UTF-8'
+    },
+    method: 'post',
+    data
+  })
+}
+
+// 查询文件
+export function catFile(data) {
+  return axios({
+    url: '/fs/cat',
+    headers: {
+      'Content-Type': 'application/json; charset=UTF-8'
+    },
+    method: 'post',
+    data
+  })
+}
+
+// 查询文件所属软件包
+export function getPkgByFile(data) {
+  return axios({
+    // baseURL: 'http://172.30.17.23:2124',
+    url: '/getPkgByFile',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/pages/node/list/node-layout/components/file-package.vue b/src/pages/node/list/node-layout/components/file-package.vue
new file mode 100644
index 0000000..06aeadf
--- /dev/null
+++ b/src/pages/node/list/node-layout/components/file-package.vue
@@ -0,0 +1,84 @@
+<template>
+  <div>
+    <!-- :scroll="{x: 900, y: tableHeight - 50}" -->
+    <!-- :key="tableKey" -->
+    <a-table
+      :key="defaultTableKey"
+      :data-source="tableData"
+      bordered
+      :columns="columns"
+      :pagination="pagination"
+      children-column-name="nodeInfoList"
+      default-expand-all-rows
+      :scroll="{x: 900, y: 500}"
+      :loading="loading"
+      @change="change"
+    >
+      <span slot="system" slot-scope="text" placement="topLeft" :title="text">{{ text }}</span>
+    </a-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    fileName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      defaultTableKey: 1,
+      tableData: [],
+      listQuery: {
+        total: 0,
+        pageNum: 1,
+        pageSize: 10
+      },
+      loading: false,
+      columns: [
+        { title: '软件包名', dataIndex: 'name', key: 'name', width: 200, ellipsis: true },
+        { title: '节点地址', dataIndex: 'url', key: 'url', width: 150, ellipsis: true },
+        { title: '系统版本', dataIndex: 'system', key: 'system', ellipsis: true, scopedSlots: { customRender: 'system' }},
+        { title: '内核版本', dataIndex: 'kernel', key: 'kernel', ellipsis: true, scopedSlots: { customRender: 'kernel' }}
+      ]
+    }
+  },
+  computed: {
+    pagination() {
+      return {
+        total: this.listQuery.total || 0,
+        current: this.listQuery.pageNum || 1,
+        pageSize: this.listQuery.pageSize || 10,
+        pageSizeOptions: ['10', '20', '50'],
+        showSizeChanger: true,
+        showTotal: (total) => {
+          return `共 ${total} 条`
+        }
+      }
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    tableKey(defaultNum) {
+      let randNumber
+      do {
+        randNumber = Math.floor(Math.random() * 10)
+      } while (randNumber === defaultNum)
+
+      return randNumber
+    },
+
+    // 分页、排序、筛选变化时触发
+    change(pagination) {
+      this.listQuery.pageNum = pagination.current
+      this.listQuery.pageSize = pagination.pageSize
+      this.defaultTableKey = this.tableKey(this.defaultTableKey)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/router/index.js b/src/router/index.js
index 148145c..283d381 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,84 +1,96 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-Vue.use(Router)
-
-const children = [
-  {
-    path: '/node/list',
-    name: 'node-list',
-    meta: { title: '节点列表' },
-    component: () => import('../pages/node/list')
-  },
-  {
-    path: '/node/nodeGroupManager',
-    name: 'nodeGroupManager',
-    meta: { title: '分组管理' },
-    component: () => import('../pages/node/nodeGroupManager')
-  },
-  {
-    path: '/user/list',
-    name: 'user-list',
-    meta: { title: '用户列表' },
-    component: () => import('../pages/user')
-  },
-  {
-    path: '/audit/list',
-    name: 'audit-list',
-    meta: { title: '审计日志' },
-    component: () => import('@/pages/audit')
-  },
-  {
-    path: '/repository/package',
-    name: 'repository-package',
-    meta: { title: '软件包列表' },
-    component: () => import('@/pages/repository/package')
-  },
-  {
-    path: '/repository/source',
-    name: 'repository-source',
-    meta: { title: '软件源模板列表' },
-    component: () => import('@/pages/repository/source')
-  },
-  {
-    path: '/script/script',
-    name: 'script-script',
-    meta: { title: '脚本列表' },
-    component: () => import('@/pages/script/script')
-  }
-]
-
-const router = new Router({
-  mode: 'hash',
-  routes: [
-    {
-      path: '/login',
-      name: 'login',
-      component: () => import('../pages/login')
-    },
-    {
-      path: '/',
-      name: 'home',
-      component: () => import('../pages/layout'),
-      redirect: '/node/list',
-      children: children
-    },
-    {
-      path: '/install',
-      name: 'install',
-      component: () => import('../pages/install')
-    },
-    {
-      path: '*',
-      name: '404',
-      component: () => import('../pages/404')
-    },
-    {
-      path: '/system/ipAccess',
-      name: 'ipAccess',
-      component: () => import('../pages/system/ipAccess')
-    }
-  ]
-})
-
-export default router
+import Vue from 'vue'
+import Router from 'vue-router'
+
+Vue.use(Router)
+
+const children = [
+  {
+    path: '/node/list',
+    name: 'node-list',
+    meta: { title: '节点列表' },
+    component: () => import('../pages/node/list')
+  },
+  {
+    path: '/node/nodeGroupManager',
+    name: 'nodeGroupManager',
+    meta: { title: '分组管理' },
+    component: () => import('../pages/node/nodeGroupManager')
+  },
+  {
+    path: '/user/list',
+    name: 'user-list',
+    meta: { title: '用户列表' },
+    component: () => import('../pages/user')
+  },
+  {
+    path: '/audit/list',
+    name: 'audit-list',
+    meta: { title: '审计日志' },
+    component: () => import('@/pages/audit')
+  },
+  {
+    path: '/repository/package',
+    name: 'repository-package',
+    meta: { title: '软件包列表' },
+    component: () => import('@/pages/repository/package')
+  },
+  {
+    path: '/repository/source',
+    name: 'repository-source',
+    meta: { title: '软件源模板列表' },
+    component: () => import('@/pages/repository/source')
+  },
+  {
+    path: '/script/script',
+    name: 'script-script',
+    meta: { title: '脚本列表' },
+    component: () => import('@/pages/script/script')
+  },
+  {
+    path: '/script/command',
+    name: 'script-command',
+    meta: { title: '命令列表' },
+    component: () => import('@/pages/script/command')
+  },
+  {
+    path: '/upgrade/list',
+    name: 'upgrade-list',
+    meta: { title: '升级列表' },
+    component: () => import('@/pages/upgrade')
+  }
+]
+
+const router = new Router({
+  mode: 'hash',
+  routes: [
+    {
+      path: '/login',
+      name: 'login',
+      component: () => import('../pages/login')
+    },
+    {
+      path: '/',
+      name: 'home',
+      component: () => import('../pages/layout'),
+      redirect: '/node/list',
+      children: children
+    },
+    {
+      path: '/install',
+      name: 'install',
+      component: () => import('../pages/install')
+    },
+    {
+      path: '*',
+      name: '404',
+      component: () => import('../pages/404')
+    },
+    {
+      path: '/system/ipAccess',
+      name: 'ipAccess',
+      component: () => import('../pages/system/ipAccess')
+    }
+  ]
+})
+
+export default router
diff --git a/src/router/route-menu.js b/src/router/route-menu.js
index 9360f1f..dfdbf57 100644
--- a/src/router/route-menu.js
+++ b/src/router/route-menu.js
@@ -1,16 +1,18 @@
-/**
- * 路由菜单
- * key 对应后台接口返回的菜单中的 id
- * value 表示该路由的 path
- */
-const routeMenuMap = {
-  'nodeList': '/node/list',
-  'nodeGroupManager': '/node/nodeGroupManager',
-  'audit': '/audit/list',
-  'user': '/user/list',
-  'repository_source': '/repository/source',
-  'repository_package': '/repository/package',
-  'manageScript': '/script/script'
-}
-
-export default routeMenuMap
+/**
+ * 路由菜单
+ * key 对应后台接口返回的菜单中的 id
+ * value 表示该路由的 path
+ */
+const routeMenuMap = {
+  'nodeList': '/node/list',
+  'nodeGroupManager': '/node/nodeGroupManager',
+  'audit': '/audit/list',
+  'user': '/user/list',
+  'repository_source': '/repository/source',
+  'repository_package': '/repository/package',
+  'manageScript': '/script/script',
+  'manageCommand': '/script/command',
+  'upgrade': '/upgrade/list'
+}
+
+export default routeMenuMap
-- 
Gitee


From b74da5ccb5dc63c75ef4043222ee68aee49693e6 Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Thu, 28 Nov 2024 14:06:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=89=80=E5=B1=9E=E8=BD=AF=E4=BB=B6=E5=8C=85?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node-layout/components/file-package.vue   | 25 +++++++++++++++++++
 .../list/node-layout/dictionaryTree/index.vue |  1 -
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/pages/node/list/node-layout/components/file-package.vue b/src/pages/node/list/node-layout/components/file-package.vue
index 06aeadf..298f1a1 100644
--- a/src/pages/node/list/node-layout/components/file-package.vue
+++ b/src/pages/node/list/node-layout/components/file-package.vue
@@ -20,6 +20,7 @@
 </template>
 
 <script>
+import { getPkgByFile } from '@/api/fs'
 export default {
   props: {
     fileName: {
@@ -60,8 +61,32 @@ export default {
     }
   },
   mounted() {
+    this.fetchData()
   },
   methods: {
+    fetchData() {
+      this.loading = true
+      return new Promise((resolve, reject) => {
+        getPkgByFile({
+          pkgFile: this.fileName
+        })
+          .then(res => {
+            res.data.nodePkgVoList.forEach((item, index) => {
+              item.key = index
+              item?.nodeInfoList && item?.nodeInfoList?.forEach((nodeInfo, jIndex) => {
+                nodeInfo.key = nodeInfo.name + jIndex
+              })
+            })
+            this.tableData = res.data.nodePkgVoList
+            // 更新defaultTableKey，使default-expand-all-rows生效，默认展开
+            this.defaultTableKey = this.tableKey(this.defaultTableKey)
+            resolve(res)
+          })
+          .catch((err) => { reject(err) })
+          .finally(() => { this.loading = false })
+      })
+    },
+
     tableKey(defaultNum) {
       let randNumber
       do {
diff --git a/src/pages/node/list/node-layout/dictionaryTree/index.vue b/src/pages/node/list/node-layout/dictionaryTree/index.vue
index f74d459..c9c8e2e 100644
--- a/src/pages/node/list/node-layout/dictionaryTree/index.vue
+++ b/src/pages/node/list/node-layout/dictionaryTree/index.vue
@@ -57,7 +57,6 @@
         </div>
       </div>
     </a-drawer>
-
     <!-- 所属软件包弹窗 -->
     <a-modal v-model="pkgVisible" title="详情信息" :footer="null" :destroy-on-close="true" :width="750">
       <FilePackage :file-name="fileName" />
-- 
Gitee