From 9ca1f09fc51178c0546c9a286815e475cb59aeb3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 23 Dec 2022 18:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../develop/AppDeployWxmp/AppDeployWxmp.vue   | 31 ++++++++++++-------
 ui/packages/basic/AiSelect.vue                |  6 +++-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
index c4e12b61..648adf56 100644
--- a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
+++ b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
@@ -4,9 +4,9 @@
       <ai-title slot="title" title="小程序部署发布" isShowBottomBorder/>
       <template #content>
         <ai-search-bar>
-          <!--          <template #left>-->
-          <!--            <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">增加</el-button>-->
-          <!--          </template>-->
+          <template #left>
+            <el-button type="primary" @click="handleSyncData">同步数据</el-button>
+          </template>
           <template #right>
             <el-input size="small" placeholder="搜索项目/系统/appId/上传版本" v-model="search.name" clearable
                       @change="page.current=1,getTableData()"/>
@@ -17,7 +17,7 @@
           <el-table-column type="expand" slot="expand">
             <template slot-scope="{row}">
               <ai-wrapper>
-                <ai-info-item labelWidth="200px" v-for="op in desConfigs" :key="op.prop" :value="row[op.prop]"
+                <ai-info-item labelWidth="200px" v-for="op in desConfigs" :key="op.prop" :value="row.dvcpConfig[op.prop]"
                               v-bind="op"/>
               </ai-wrapper>
             </template>
@@ -43,10 +43,11 @@
     <ai-dialog :visible.sync="dialog" title="部署设置" width="600px" @close="form={}" @onConfirm="submit">
       <el-form ref="DialogForm" :model="form" size="small" label-width="120px" :rules="rules">
         <el-form-item label="项目/系统" prop="name">
-          {{ form.name }}(appid:<b v-text="form.miniapp_appid"/>)
+          {{ form.name }}(appid:<b v-text="form.appid"/>)
         </el-form-item>
         <el-form-item label="版本号" prop="version">
-          <ai-select v-model="form.version" :instance="instance" action="/node/custom/list?type=mp" :prop="{label:'name'}"/>
+          <ai-select v-model="form.version" :instance="instance" action="/node/custom/list?type=mp" :prop="{label:'name'}"
+                     @select="v=>form.versionName=v.name"/>
         </el-form-item>
         <el-form-item label="小程序上传私钥" prop="privateKey">
           <el-input v-model="form.privateKey" clearable placeholder="请输入"/>
@@ -102,8 +103,8 @@ export default {
       colConfigs: [
         {slot: "expand"},
         {label: "项目/系统名称", prop: "name", width: 300},
-        {label: "appId", prop: "miniapp_appid", width: 180},
-        {label: "管理后台", prop: "web_url"},
+        {label: "appId", prop: "appid", width: 180},
+        {label: "管理后台", prop: "webUrl"},
         {label: "上传版本", render: (h, {row}) => h('p', row.versionName || row.version)},
         {slot: "process"},
         {slot: "options"}
@@ -119,20 +120,26 @@ export default {
     }
   },
   methods: {
+    handleSyncData() {
+      this.instance.post("/node/wxmp/sync").then(this.getTableData)
+    },
     getTableData() {
       this.instance.post("/node/wxmp/list", null, {
         params: {...this.page, ...this.search}
       }).then(res => {
         if (res?.data) {
-          this.tableData = res.data?.records.map(e => ({...e, count: 0}))
+          this.tableData = res.data?.records.map(e => {
+            e.dvcpConfig = JSON.parse(e.dvcpConfig)
+            return {...e, count: 0}
+          })
           this.page.total = res.data.total
         }
       })
     },
     handleDownload(row) {
-      let {appid, pid} = row
+      let {id} = row
       this.instance.post("/node/wxmp/download", null, {
-        params: {appid, pid},
+        params: {id},
         responseType: "blob"
       }).then(res => {
         if (res?.code == 1) {
@@ -150,7 +157,7 @@ export default {
       })
     },
     handleZip(row) {
-      let {miniapp_appid: appid, version, id} = row
+      let {appid, version, id} = row
       if (!version) return this.$message.error("请先维护要上传的版本!")
       appid && this.instance.post("/node/wxmp/getZip", null, {
         params: {appid, id}
diff --git a/ui/packages/basic/AiSelect.vue b/ui/packages/basic/AiSelect.vue
index f9e857ef..35d60713 100644
--- a/ui/packages/basic/AiSelect.vue
+++ b/ui/packages/basic/AiSelect.vue
@@ -37,6 +37,10 @@ export default {
       handler(v) {
         v && this.isAction && !this.options.toString() && this.getOptions()
       }
+    },
+    value(v) {
+      this.$emit("select", this.isAction ? this.options.find(e => e[this.actionProp.value] == v) :
+          this.selectList.find(e => e.dictValue == v))
     }
   },
   props: {
@@ -100,7 +104,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-:deep( .ai-select .el-select ){
+:deep( .ai-select .el-select ) {
   width: 100%;
 }
 </style>