From 6a3d52838cd2344f832e235e71886019331bdaf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= <zhaoweigeng@wodcloud.com>
Date: Fri, 17 Feb 2023 16:42:03 +0800
Subject: [PATCH] =?UTF-8?q?[refactor](=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?):=20=E9=92=88=E5=AF=B9=E5=BC=80=E5=8F=91=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B9=E6=96=B0=E5=A2=9E=E5=AD=90=E7=BA=A7?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .beagle.yml                         | 24 ++++-----
 src/page/main/config/dict/index.vue | 79 +++++++++++++++++++++++++++--
 2 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index f49a3c9..044cdb0 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -71,18 +71,18 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       registry_password: # 密码
         from_secret: REGISTRY_PASSWORD_ALIYUN
   
-  - name: deploy-cloud
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
-    settings:
-      namespace: apaas-v5
-      deployment: apaas-manage-ui
-      container: apaas-manage-ui
-      image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.9-alpha
-    environment:
-      KUBERNETES_SERVER:
-        from_secret: KUBERNETES_SERVER
-      KUBERNETES_TOKEN:
-        from_secret: KUBERNETES_TOKEN
+  # - name: deploy-cloud
+  #   image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
+  #   settings:
+  #     namespace: apaas-v5
+  #     deployment: apaas-manage-ui
+  #     container: apaas-manage-ui
+  #     image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.9-alpha
+  #   environment:
+  #     KUBERNETES_SERVER:
+  #       from_secret: KUBERNETES_SERVER
+  #     KUBERNETES_TOKEN:
+  #       from_secret: KUBERNETES_TOKEN
 
   - name: docker-arm64
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue
index 48c89fc..3de6b77 100644
--- a/src/page/main/config/dict/index.vue
+++ b/src/page/main/config/dict/index.vue
@@ -28,6 +28,10 @@
           <bg-filter-group @search="changeSearch" v-model="filter.search" placeholder="请输入关键字">
             <template v-slot:left_action v-if="nodeClassifyId != '263758a4-0349-4d49-a816-e8ff8d33a8bb'">
               <div class="apaas_button">
+                <el-button class="register_btn" type="primary" @click="backDict" v-if="dictLevel != 1">
+                  <!-- <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon> -->
+                  返回上级
+                </el-button>
                 <el-button class="register_btn" type="primary" @click="register">
                   <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
                   新增
@@ -56,7 +60,15 @@
           </bg-filter-group>
           <div class="table_container">
             <div class="table bg-scroll">
-              <bg-table ref="bgTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
+              <bg-table ref="bgTable" :headers="isLang && dictLevel == 1 ? langHeaders : headers" :rows="tableRows" :isIndex="true" :stripe="true">
+                <template v-slot:name="{ row }">
+                  <span class="can_click_text" @click="getChildren(row)" v-if="isLang && dictLevel == 1">
+                    {{ row.name }}
+                  </span>
+                  <span v-else>
+                    {{ row.name }}
+                  </span>
+                </template>
                 <template v-slot:updated_time="{ row }">
                   {{ row.updated_time.split("+")[0].replace("T", " ").replace("Z", " ") }}
                 </template>
@@ -204,6 +216,36 @@ const state = reactive({
       fixed: "right",
     },
   ], // 表格数据表头
+  langHeaders: [
+    {
+      label: "名称",
+      prop: "name",
+    },
+    {
+      label: "版本数",
+      prop: "total_children",
+    },
+    {
+      label: "描述",
+      prop: "describe",
+      minWidth: 360,
+    },
+    {
+      label: "更新时间",
+      prop: "updated_time",
+      width: 220,
+    },
+    {
+      label: "是否启用",
+      prop: "state",
+    },
+    {
+      label: "操作",
+      prop: "action",
+      width: 176,
+      fixed: "right",
+    },
+  ],
   tableRows: [], // 表格数据
   tableTotal: 0, // 表格数据条数
   filter: {
@@ -234,6 +276,7 @@ const state = reactive({
     name: "",
     describe: "",
     state: 1,
+    p_dict_id: "",
   },
   rules: {
     name: [{ required: true, message: "请输入名称", trigger: "blur" }],
@@ -243,10 +286,30 @@ const state = reactive({
     ],
     state: [{ required: true, message: "请选择是否启用", trigger: "change" }],
   },
+  fatherRow: null,
 });
 
+const isLang = computed(() => {
+  return state.nodeClassifyId == "59315100-5c2a-4381-83fe-32934605f0a9"
+})
+
+const dictLevel = ref(1)
+
+const getChildren = (row) => {
+  dictLevel.value = 2
+  state.tableRows = row.children || []
+  state.tableTotal = row.total_children
+  state.fatherRow = row
+}
+const backDict = () => {
+  dictLevel.value = 1
+  state.fatherRow = null
+  changePage(1);
+}
 const nodeClick = (item) => {
   state.nodeId = item.id;
+  dictLevel.value = 1
+  state.fatherRow = null
   state.nodeClassifyId = item.classify_id;
   state.filter = {
     state: "",
@@ -317,8 +380,15 @@ const getTableRows = () => {
     })
     .then((res) => {
       if (res.data.code == 200) {
-        state.tableRows = res.data.data || [];
-        state.tableTotal = res.data.total;
+        let data = res.data.data || []
+        if (dictLevel.value == 1) {
+          state.tableRows = data;
+          state.tableTotal = res.data.total;
+        }else {
+          let row = data.filter(e => {return e.dict_id == state.fatherRow.dict_id})
+          state.tableRows = row[0].children
+          state.tableTotal = row[0].total_children
+        }
         if (state.tableRows.length > 0) {
           state.tableRows.forEach((e) => {
             e.canMoveUp = true;
@@ -360,6 +430,7 @@ const register = () => {
     name: "",
     describe: "",
     state: 1,
+    p_dict_id: state.fatherRow ? state.fatherRow.dict_id : "",
   };
   if (state.bgForm) {
     nextTick().then(() => {
@@ -384,6 +455,7 @@ const edit_row = (row) => {
           name: state.actionRow.name,
           describe: state.actionRow.describe,
           state: state.actionRow.state,
+          p_dict_id: state.actionRow.p_dict_id
         };
       } else {
         ElMessage.error(res.data.data);
@@ -518,6 +590,7 @@ const {
   addDialog,
   formData,
   rules,
+  langHeaders,
 } = toRefs(state);
 </script>
 
-- 
2.26.0