From 53bf46fac5d198f50828d823acfb29cbcca5a6b7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 13 Jul 2022 10:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=AD=97=E5=85=B8,=E5=A2=9E=E5=8A=A0=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=E6=96=B9=E6=A1=88=E5=BA=94=E7=94=A8=E6=A6=82=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../develop/AppDeployCustom/AiLibTable.vue    |   5 +-
 .../AppDeployCustom/AppDeployCustom.vue       |   2 +-
 .../oms/apps/develop/AppDeployCustom/add.vue  | 102 +++++++++++-------
 3 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue b/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
index 73dd804b..5ce962fa 100644
--- a/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
+++ b/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
@@ -10,7 +10,7 @@
       </template>
     </ai-search-bar>
     <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :colConfigs="columns"
-              :size.sync="page.size" border @getList="getTableData" tableSize="mini">
+              :size.sync="page.size" border @getList="getTableData" tableSize="mini" :dict="dict">
       <el-table-column slot="chb" width="100px">
         <template #header>
           <el-checkbox v-if="multiple" v-model="selectAll" @change="handleCheckAll"/>
@@ -40,7 +40,7 @@ export default {
       default: () => [
         {prop: 'label', label: "应用名称"},
         {prop: 'project', label: "项目/框架"},
-        {prop: 'category', label: "分类"},
+        {prop: 'category', label: "分类", dict: "appsCategory"},
         {prop: 'name', label: "模块名"},
       ]
     },
@@ -116,6 +116,7 @@ export default {
     }
   },
   created() {
+    this.dict.load('appsCategory')
     this.$set(this.search, this.searchKey, "")
     this.getTableData()
   }
diff --git a/project/oms/apps/develop/AppDeployCustom/AppDeployCustom.vue b/project/oms/apps/develop/AppDeployCustom/AppDeployCustom.vue
index 1536b089..2f5dd796 100644
--- a/project/oms/apps/develop/AppDeployCustom/AppDeployCustom.vue
+++ b/project/oms/apps/develop/AppDeployCustom/AppDeployCustom.vue
@@ -24,7 +24,7 @@ export default {
     }
   },
   created() {
-    this.dict.load('yesOrNo','systemType')
+    this.dict.load('yesOrNo', 'systemType', 'appsCategory')
   }
 }
 </script>
diff --git a/project/oms/apps/develop/AppDeployCustom/add.vue b/project/oms/apps/develop/AppDeployCustom/add.vue
index 033e82fa..4bb8ed3c 100644
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -3,47 +3,54 @@
     <ai-detail>
       <ai-title slot="title" :title="pageTitle" isShowBottomBorder/>
       <template #content>
-        <el-form ref="AddForm" :model="form" size="small" label-width="120px" :rules="rules">
-          <ai-card title="基本信息">
-            <template #content>
-              <el-form-item label="项目/系统名称" prop="name">
-                <el-input v-model="form.name" placeholder="请输入" clearable/>
-              </el-form-item>
-              <el-row type="flex">
-                <div class="fill">
-                  <el-form-item label="系统类型" prop="type">
-                    <ai-select v-model="form.type" :selectList="dict.getDict('systemType')"/>
+        <el-tabs tab-position="left">
+          <el-tab-pane label="方案设置">
+            <el-form ref="AddForm" :model="form" size="small" label-width="120px" :rules="rules">
+              <ai-card title="基本信息">
+                <template #content>
+                  <el-form-item label="项目/系统名称" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入" clearable/>
                   </el-form-item>
-                  <el-form-item label="更新项目路径" prop="dist">
-                    <el-input v-model="form.dist" placeholder="常填写nginx路径,下载包从这里取" clearable/>
-                  </el-form-item>
-                </div>
-                <div class="fill mar-l16">
-                  <el-form-item label="库项目根路径" prop="customPath">
-                    <el-input v-model="form.customPath" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="版本号" prop="version">
-                    <el-input v-model="form.version" placeholder="请输入" clearable/>
-                  </el-form-item>
-                </div>
-              </el-row>
-            </template>
-          </ai-card>
-          <ai-card title="主库应用">
-            <template #content>
-              <ai-lib-table v-if="form.type" v-model="form.apps" v-bind="$props" multiple searchKey="name"
-                            :action="`/node/wechatapps/list?type=${form.type}&isMain=1`"/>
-              <ai-empty v-else>请先选择系统类型</ai-empty>
-            </template>
-          </ai-card>
-          <ai-card title="扩展设置">
-            <template #content>
-              <el-form-item label="主包应用设置" prop="extra">
+                  <el-row type="flex">
+                    <div class="fill">
+                      <el-form-item label="系统类型" prop="type">
+                        <ai-select v-model="form.type" :selectList="dict.getDict('systemType')"/>
+                      </el-form-item>
+                      <el-form-item label="更新项目路径" prop="dist">
+                        <el-input v-model="form.dist" placeholder="常填写nginx路径,下载包从这里取" clearable/>
+                      </el-form-item>
+                    </div>
+                    <div class="fill mar-l16">
+                      <el-form-item label="库项目根路径" prop="customPath">
+                        <el-input v-model="form.customPath" placeholder="请输入" clearable/>
+                      </el-form-item>
+                      <el-form-item label="版本号" prop="version">
+                        <el-input v-model="form.version" placeholder="请输入" clearable/>
+                      </el-form-item>
+                    </div>
+                  </el-row>
+                </template>
+              </ai-card>
+              <ai-card title="主库应用">
+                <template #content>
+                  <ai-lib-table v-if="form.type" v-model="form.apps" v-bind="$props" multiple searchKey="name"
+                                :action="`/node/wechatapps/list?type=${form.type}&isMain=1`"/>
+                  <ai-empty v-else>请先选择系统类型</ai-empty>
+                </template>
+              </ai-card>
+              <ai-card title="扩展设置">
+                <template #content>
+                  <el-form-item label="主包应用设置" prop="extra">
 
-              </el-form-item>
-            </template>
-          </ai-card>
-        </el-form>
+                  </el-form-item>
+                </template>
+              </ai-card>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="方案应用" lazy>
+            <ai-table :tableData="appList" :colConfigs="colConfigs" :isShowPagination="false" :dict="dict"/>
+          </el-tab-pane>
+        </el-tabs>
       </template>
       <template #footer>
         <el-button @click="back">取消</el-button>
@@ -67,6 +74,17 @@ export default {
   computed: {
     isEdit: v => !!v.$route.query.id,
     pageTitle: v => v.isEdit ? "编辑定制方案" : "新增定制方案",
+    appList() {
+      return this.form.appList?.map(e => {
+        e.category = e.libPath.replace(/^\/[^\/]+\/([^\/]+)\/.+/, '$1')
+        if (/\/project\//.test(e.libPath)) {
+          e.project = e.libPath.replace(/.*project\/([^\/]+)\/.+/, '$1')
+        } else if (/\/core\//.test(e.libPath)) {
+          e.project = "core"
+        } else e.project = "standard"
+        return e
+      })
+    }
   },
   data() {
     return {
@@ -77,6 +95,12 @@ export default {
         customPath: {required: true, message: "请输入"},
         extra: {required: true, message: "请设置主页配置"},
       },
+      colConfigs: [
+        {prop: 'label', label: "应用名称"},
+        {prop: 'project', label: "项目/框架"},
+        {prop: 'category', label: "分类", dict: "appsCategory"},
+        {prop: 'name', label: "模块名"},
+      ]
     }
   },
   methods: {