Merge pull request #42 from ZhouYixun/dev

v1.1.0
SonicCloudOrg · Nov 3, 2021 · ee9d5c5 · ee9d5c5
2 parents 2fbfe87 + f760630
commit ee9d5c5
Show file tree

Hide file tree

Showing 15 changed files with 4,694 additions and 1,966 deletions.
diff --git a/README.md b/README.md
@@ -10,13 +10,13 @@
 </p>
 <p align="center">
   <a href="#">  
-    <img src="https://img.shields.io/badge/release-v1.0.0-orange">
+    <img src="https://img.shields.io/badge/release-v1.1.0-orange">
   </a>
   <a href="#">  
     <img src="https://img.shields.io/badge/vue-3.2.14-success">
   </a>
   <a href="#">  
-    <img src="https://img.shields.io/badge/elementPlus-1.1.0/beta.20-success">
+    <img src="https://img.shields.io/badge/elementPlus-1.1.0/beta.24-success">
   </a>
 </p>
 <p align="center">

diff --git a/README_CN.md b/README_CN.md
@@ -10,13 +10,13 @@
 </p>
 <p align="center">
   <a href="#">  
-    <img src="https://img.shields.io/badge/release-v1.0.0-orange">
+    <img src="https://img.shields.io/badge/release-v1.1.0-orange">
   </a>
   <a href="#">  
     <img src="https://img.shields.io/badge/vue-3.2.14-success">
   </a>
   <a href="#">  
-    <img src="https://img.shields.io/badge/elementPlus-1.1.0/beta.20-success">
+    <img src="https://img.shields.io/badge/elementPlus-1.1.0/beta.24-success">
   </a>
 </p>
 <p align="center">

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
         "@element-plus/icons": "0.0.11",
         "axios": "^0.21.4",
         "echarts": "^5.2.1",
-        "element-plus": "^1.1.0-beta.20",
+        "element-plus": "^1.1.0-beta.24",
         "moment": "^2.29.1",
         "rollup-plugin-copy": "^3.4.0",
         "vue": "^3.2.14",

diff --git a/src/assets/common.css b/src/assets/common.css
@@ -283,4 +283,23 @@ body,
 
 .project-table-expand .el-form-item {
     display: flex;
+}
+
+.remote-tab {
+    border: 1px solid #EBEEF5 !important;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
+}
+
+.remote-tab .el-tabs__item{
+    border-bottom: 1px solid #EBEEF5 !important;
+    padding: 0 15px;
+}
+
+.remote-tab .el-tabs__content{
+    padding: 15px;
+    border-left: 1px solid #EBEEF5;
+}
+
+.remote-tab .el-tabs__header{
+    margin-right: 0px!important;
 }
diff --git a/src/assets/img/LGE.jpg b/src/assets/img/LGE.jpg
diff --git a/src/assets/img/You.jpg b/src/assets/img/You.jpg
diff --git a/src/assets/img/chrome.jpg b/src/assets/img/chrome.jpg
diff --git a/src/components/Header.vue b/src/components/Header.vue
@@ -128,7 +128,7 @@ onMounted(() => {
       </div>
       <div class="flex-center">
 
-        <el-menu :background-color="store.state.menuBack" :text-color="store.state.menuText"
+        <el-menu :ellipsis="false" :background-color="store.state.menuBack" :text-color="store.state.menuText"
                  :active-text-color="store.state.menuActiveText" mode="horizontal" class="el-menu-horizontal-demo font"
                  :default-active="route.path">
           <el-menu-item :index="route.params.projectId? '/Home/' + route.params.projectId + '/Devices':'/Index/Devices'"
@@ -166,37 +166,37 @@ onMounted(() => {
             <el-menu-item index="1-1" @click="dialogUserInfo = true">我的信息</el-menu-item>
             <el-menu-item index="1-2" @click="dialogChangePwd = true">修改密码</el-menu-item>
             <el-menu-item index="1-3" @click="logout"> 注销</el-menu-item>
-          </el-sub-menu>
-          <el-sub-menu index="2">
-            <template #title
-            ><span
-                class="flex-center font title"
-            ><img
-                style="margin-right: 5px"
-                width="20"
-                :src="logo"
-            />关于Sonic</span
-            >
-            </template
-            >
-            <el-menu-item index="2-1"
-                          @click="goToUrl('http://zhouyixun.gitee.io/sonic-official-website/#/Home')"
-            >Sonic官方网站
-            </el-menu-item
-            >
-            <el-menu-item index="2-2"
-                          @click="goToUrl('https://github.com/ZhouYixun/sonic-server/releases/tag/release')"
-            >版本更新记录
-              <el-badge
-                  value="New"
-                  style="margin: 0 0 5px 5px"
-              ></el-badge
+            <el-sub-menu index="2">
+              <template #title
+              ><span
+                  class="flex-center font title"
+              ><img
+                  style="margin-right: 5px"
+                  width="20"
+                  :src="logo"
+              />关于Sonic</span
+              >
+              </template
               >
-            </el-menu-item>
-            <el-menu-item index="2-3"
-                          @click="goToUrl(axios.defaults.baseURL.substring(0,axios.defaults.baseURL.length-4)+'/doc.html')">
-              REST API
-            </el-menu-item>
+              <el-menu-item index="2-1"
+                            @click="goToUrl('http://zhouyixun.gitee.io/sonic-official-website/#/Home')"
+              >Sonic官方网站
+              </el-menu-item
+              >
+              <el-menu-item index="2-2"
+                            @click="goToUrl('http://zhouyixun.gitee.io/sonic-official-website/#/Version')"
+              >版本更新记录
+                <el-badge
+                    value="New"
+                    style="margin: 0 0 5px 5px"
+                ></el-badge
+                >
+              </el-menu-item>
+              <el-menu-item index="2-3"
+                            @click="goToUrl(axios.defaults.baseURL.substring(0,axios.defaults.baseURL.length-4)+'/doc.html')">
+                REST API
+              </el-menu-item>
+            </el-sub-menu>
           </el-sub-menu>
         </el-menu>
       </div>

diff --git a/src/components/ProjectUpdate.vue b/src/components/ProjectUpdate.vue
@@ -15,6 +15,7 @@ const project = ref({
   id: null,
   projectName: "",
   projectDes: "",
+  robotType: 1,
   robotToken: "",
   robotSecret: "",
   projectImg: ""
@@ -34,10 +35,10 @@ const getImg = (name) => {
   }
   return result;
 }
-const robotType = ref(1)
 const robotList = [{name: "钉钉群机器人", value: 1, img: "DingTalk"}
   , {name: "企业微信机器人(即将开放)", value: 2, img: "WeChat", disabled: true},
-  {name: "飞书群机器人(即将开放)", value: 3, img: "FeiShu", disabled: true}]
+  {name: "飞书群机器人", value: 3, img: "FeiShu"},
+  {name: "友空间机器人(即将开放)", value: 4, img: "You", disabled: true}]
 const beforeAvatarUpload = (file) => {
   if (file.name.endsWith(".jpg") || file.name.endsWith(".png")) {
     return true;
@@ -147,7 +148,7 @@ onMounted(() => {
     <el-form-item label="机器人类型">
       <el-select
           style="width: 100%"
-          v-model="robotType"
+          v-model="project.robotType"
           placeholder="请选择机器人类型"
       >
         <el-option

diff --git a/src/components/StepLog.vue b/src/components/StepLog.vue
@@ -106,6 +106,7 @@ const getTag = (status) => {
                   :z-index="5000"
                   fit="contain"
                   style="width: 100px; height: 100%; margin-top: 10px"
+                  hide-on-click-modal
                   :src="scope.row.log"
                   :preview-src-list="[
                             scope.row.log,

diff --git a/src/components/StepUpdate.vue b/src/components/StepUpdate.vue
@@ -608,20 +608,6 @@ onMounted(() => {
     </div>
 
     <div v-if="step.stepType === 'install'">
-      <el-form-item
-          prop="content"
-          label="应用包名"
-          :rules="{
-            required: true,
-            message: '包名不能为空',
-            trigger: 'blur',
-          }"
-      >
-        <el-input
-            v-model="step.content"
-            placeholder="请输入应用包名"
-        ></el-input>
-      </el-form-item>
       <el-form-item
           prop="text"
           label="安装路径"