update

backend/controller/apps_manager.py

@@ -5,17 +5,13 @@ import os
 import re
 import shutil
 import copy
-import time
-import types
 import json
 import logging
-import traceback
 from urllib import parse
 from datetime import datetime
 from pony.orm import *
 
 from app import signalManager, config
-from model import fullStackDB
 from model.annex import Annex
 from model.apps import Apps
 from model.user import User
@@ -83,7 +79,7 @@ class AppsManager(object):
             if app_info:
                 app_info['md5'] = str(app_info['md5'])
 
-            result = BuildLogs(app=app, app_path=epk_filename, app_info=app_info, create_by=editor, create_at=datetime.now(), update_by=editor, update_at=datetime.now())
+            result = BuildLogs(app=app, app_path=epk_filename, app_info=app_info, source=1, create_by=editor, create_at=datetime.now(), update_by=editor, update_at=datetime.now())
             commit()
             AppLogs(app_name=app.app_name, app_path=epk_filename, app_version=data.get("app_version"), app_info=app_info, create_by=editor, create_at=datetime.now())
             commit()
@@ -270,7 +266,9 @@ class AppsManager(object):
             if not user:
                 return False, "user does not exists"
 
-            if data.get("access_key"): data.pop("access_key")
+            if data.get("access_key"):
+                data.pop("access_key")
+
             data.update({
                 'create_by': user,
                 'create_at': datetime.now(),
@@ -317,7 +315,7 @@ class AppsManager(object):
                 build.set(app_path=epk_path, app_info=app_info, update_by=user, update_at=datetime.now())
                 commit()
             else:
-                BuildLogs(app=app, app_path=epk_path, app_info=app_info, create_by=user, create_at=datetime.now(), update_by=user, update_at=datetime.now())
+                BuildLogs(app=app, app_path=epk_path, app_info=app_info, source=2, create_by=user, create_at=datetime.now(), update_by=user, update_at=datetime.now())
                 commit()
 
             # 新增一条AppLogs

backend/model/build_logs.py

@@ -16,6 +16,7 @@ class BuildLogs(db.Entity):
     app = Required("Apps", reverse="app_build_log")
     app_path = Optional(str, default="")
     app_info = Optional(Json, default={})
+    source = Optional(int, default="") # 打包来源 1管理中心 2后端接口
     create_at = Required(datetime, default=datetime.now)
     create_by = Required("User", reverse='build_logs_creator') # BuildLogs与User一对一关系
     update_at = Required(datetime, default=datetime.now)

frontend/src/views/system/apps.vue

 <template>
   <div class="app-container">
     <el-form :inline="true" ref="form" :model="form" size="mini">
+      <el-form-item label="应用名称" prop="uuid">
+        <el-select v-model="form.uuid" filterable placeholder="请输入标题">
+          <el-option
+            v-for="(item, index) in selectList"
+            :key="index"
+            :label="item.app_name"
+            :value="item.uuid"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        ><el-button type="primary" @click="onSubmit"
+          >查询</el-button
+        ></el-form-item
+      >
       <el-form-item
         ><el-button type="warning" @click="onAdd"
           >添加应用</el-button
@@ -220,6 +235,7 @@ export default {
       imageUrl: "",
       total: 0,
       list: [],
+      selectList: [],
       isLoading: false,
       form: {
         uuid: null,
@@ -368,6 +384,15 @@ export default {
       this.imageUrl = null;
       this.post.logo = file.file;
     },
+    fetchSelectData() {
+      getAppsList({ scope_type: "list" })
+        .then((res) => {
+          if (res.code == 200) this.selectList = res.data;
+        })
+        .catch((err) => {
+          console.log(err.message);
+        });
+    },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         let result = true;
@@ -440,6 +465,7 @@ export default {
   mounted() {},
   created() {
     this.fetchData(mapTrim(this.form));
+    this.fetchSelectData();
   },
 };
 </script>

frontend/src/views/system/build.vue

@@ -4,9 +4,9 @@
       <el-form-item label="应用名称" prop="uuid">
         <el-select v-model="form.uuid" filterable placeholder="请输入标题">
           <el-option
-            v-for="(item, index) in roles"
+            v-for="(item, index) in selectList"
             :key="index"
-            :label="item.name"
+            :label="item.app_name"
             :value="item.uuid"
           ></el-option>
         </el-select>
@@ -34,6 +34,12 @@
         min-width="180"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        prop="source_text"
+        label="打包来源"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         prop="app_path"
         label="应用路径"
@@ -93,7 +99,7 @@ export default {
       total: 0,
       list: [],
       isLoading: false,
-      roles: [],
+      selectList: [],
       form: {
         uuid: null,
         name: null,
@@ -129,7 +135,11 @@ export default {
       getAppLogsList(params)
         .then((res) => {
           this.total = res.count;
-          this.list = res.data;
+          this.list = res.data.map(item => {
+              if (item.source == 1) item.source_text = "后台";
+              else if (item.source == 2) item.source_text = "接口";
+              return item;
+          });
         })
         .catch((err) => {
           // this.$message.error(err.message)
@@ -142,7 +152,7 @@ export default {
     fetchSelectData() {
       getAppLogsList({ scope_type: "list" })
         .then((res) => {
-          if (res.code == 200) this.roles = res.data;
+          if (res.code == 200) this.selectList = res.data;
         })
         .catch((err) => {
           // this.$message.error(err.message)