修改

yudao-ui/yudao-ui-admin-vue2/src/components/AppList/index.vue

@@ -1,11 +1,47 @@
 <template>
   <el-row>
     <el-col :span="24">
-      <el-card class="box-card">
-      <!-- <div slot="header" class="clearfix">
+      <el-card class="el-card-auto">
+      <div slot="header" class="clearfix">
         <span style="font-size: 20px;">我的应用</span>
         <el-button style="font-size: 20px;float: right; padding: 3px 0" type="text">操作按钮</el-button>
-      </div> -->
+      </div>
+      <div class="appList">
+        <div class="typeTitle">OA</div>
+        <div style="display: flex;flex-wrap: wrap;margin-bottom: 20px;">
+          <div class="app-item" v-for="item in topMenus" @click="handleSelect(item)">
+            <svg-icon :icon-class="item.meta.icon"/>
+            {{ item.meta.title }}
+          </div>
+        </div>
+      </div>
+      <div class="appList">
+        <div class="typeTitle">人事管理</div>
+        <div style="display: flex;flex-wrap: wrap;margin-bottom: 20px;">
+          <div class="app-item" v-for="item in topMenus" @click="handleSelect(item)">
+            <svg-icon :icon-class="item.meta.icon"/>
+            {{ item.meta.title }}
+          </div>
+        </div>
+      </div>
+      <div class="appList">
+        <div class="typeTitle">财务</div>
+        <div style="display: flex;flex-wrap: wrap;margin-bottom: 20px;">
+          <div class="app-item" v-for="item in topMenus" @click="handleSelect(item)">
+            <svg-icon :icon-class="item.meta.icon"/>
+            {{ item.meta.title }}
+          </div>
+        </div>
+      </div>
+      <div class="appList">
+        <div class="typeTitle">CRM</div>
+        <div style="display: flex;flex-wrap: wrap;margin-bottom: 20px;">
+          <div class="app-item" v-for="item in topMenus" @click="handleSelect(item)">
+            <svg-icon :icon-class="item.meta.icon"/>
+            {{ item.meta.title }}
+          </div>
+        </div>
+      </div>
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="OA审批" name="first">
           <div class="app-item" v-for="item in topMenus" @click="handleSelect(item)">
@@ -32,7 +68,6 @@
           </div>
         </el-tab-pane>
       </el-tabs>
-      
     </el-card>
     </el-col>
   </el-row>
@@ -71,18 +106,40 @@ export default {
     // 菜单选择事件
     handleSelect(item) {
       let key = item.path;
-      this.$router.push({ path: key });
-      // window.open(key, "_blank");
+      if (this.ishttp(key)) {
+        // http(s):// 路径新窗口打开
+        window.open(key, "_blank");
+      }else{
+        //路径内部打开
+        this.$router.push({ path: key });
+      }
     },
     handleClick(tab, event) {
         console.log(tab, event);
+    },
+    ishttp(url) {
+      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
     }
-   
   },
 };
 </script>
 
 <style lang="scss">
+.typeTitle{
+  font-size: 20px;
+  font-weight: 400;
+  color: #1f2f3d;
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+.el-card-auto {
+  min-height: 100%;
+  height: 100%;
+  margin-bottom: 20px;
+}
+.el-card-auto >>> .el-card__body {
+  height: 100%;
+}
 .el-tabs__item {
     font-size: 18px;
     font-weight: 500;
@@ -96,8 +153,10 @@ export default {
     width: 180px;
     height: 150px; 
     color: #999093;
-    padding: 0 5px;
-    margin: 10px;
+    // padding: 0 5px;
+    margin: 10px 10px 10px 10px;
+    background-color: #e8f4ff;
+    border-radius: 10%;
 }
 .app-item {
     line-height: 50px;

yudao-ui/yudao-ui-admin-vue2/src/components/Editor/index.vue

@@ -177,12 +177,12 @@ export default {
       // 获取富文本组件实例
       let quill = this.Quill;
       // 如果上传成功
-      // edit by jacker
+      // edit by 芋道源码
       if (res.code === 200 || res.code === 0) {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        // edit by jacker
+        // edit by 芋道源码
         quill.insertEmbed(length, "image", res.data);
         // 调整光标到最后
         quill.setSelection(length + 1);

yudao-ui/yudao-ui-admin-vue2/src/components/FileUpload/index.vue

@@ -151,7 +151,7 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 0) {
-        // edit by jacker
+        // edit by 芋道源码
         this.uploadList.push({ name: res.data, url: res.data });
         this.uploadedSuccessfully();
       } else {

yudao-ui/yudao-ui-admin-vue2/src/components/ImageUpload/index.vue

@@ -90,7 +90,7 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              // edit by jacker
+              // edit by 芋道源码
               item = { name: item, url: item };
             }
             return item;
@@ -121,7 +121,7 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      // edit by jacker
+      // edit by 芋道源码
       this.uploadList.push({ name: res.data, url: res.data });
       if (this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList);

yudao-ui/yudao-ui-admin-vue2/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -455,7 +455,7 @@ export default {
         this.previewModelVisible = true;
       });
     },
-    /* ------------------------------------------------ jacker methods ------------------------------------------------------ */
+    /* ------------------------------------------------ 芋道源码 methods ------------------------------------------------------ */
     async processSave() {
       const { err, xml } = await this.bpmnModeler.saveXML();
       // 读取异常时抛出异常

yudao-ui/yudao-ui-admin-vue2/src/components/parser/Parser.vue

@@ -87,7 +87,7 @@ function renderFormItem(h, elementList) {
     const config = scheme.__config__
     const layout = layouts[config.layout]
 
-    // edit by jacker，解决 el-upload 上传的问题
+    // edit by 芋道源码，解决 el-upload 上传的问题
     // 参考 https://github.com/JakHuang/form-generator/blob/master/src/components/parser/example/Index.vue 实现
     const vModel = scheme.__vModel__
     const val = data[vModel]
@@ -216,7 +216,7 @@ export default {
       this.$refs[this.formConf.formRef].validate(valid => {
         if (!valid) return false
         // 触发 submit 事件
-        // update by jacker
+        // update by 芋道源码
         // this.$emit('submit', this[this.formConf.formModel])
         this.$emit('submit', {
           conf: this.formConfCopy,

yudao-ui/yudao-ui-admin-vue2/src/layout/components/Sidebar/Logo.vue

@@ -31,11 +31,14 @@ export default {
     },
     sideTheme() {
       return this.$store.state.settings.sideTheme
+    },
+    title() {
+      return this.$store.state.settings.title
     }
   },
   data() {
     return {
-      title: '爱思系统',
+      // title: '爱思系统',
       logo: logoImg
     }
   }

yudao-ui/yudao-ui-admin-vue2/src/utils/constants.js

@@ -1,5 +1,5 @@
 /**
- * Created by jacker
+ * Created by 芋道源码
  *
  * 枚举类
  */

yudao-ui/yudao-ui-admin-vue2/src/utils/dict.js

@@ -1,5 +1,5 @@
 /**
- * Created by jacker
+ * Created by 芋道源码
  *
  * 数据字典工具类
  */

yudao-ui/yudao-ui-admin-vue2/src/utils/index.js

@@ -272,7 +272,7 @@ export function debounce(func, wait, immediate) {
 // }
 
 // 深拷贝对象
-// add by jacker https://github.com/JakHuang/form-generator/blob/dev/src/utils/index.js#L107
+// add by 芋道源码 https://github.com/JakHuang/form-generator/blob/dev/src/utils/index.js#L107
 export function deepClone(obj) {
   const _toString = Object.prototype.toString
 

yudao-ui/yudao-ui-admin-vue2/src/views/bpm/form/formEditor.vue

@@ -274,7 +274,7 @@ export default {
     }
   },
   mounted() {
-    // 【add by jacker】不读缓存
+    // 【add by 芋道源码】不读缓存
     // if (Array.isArray(drawingListInDB) && drawingListInDB.length > 0) {
     //   this.drawingList = drawingListInDB
     // } else {

yudao-ui/yudao-ui-admin-vue2/src/views/index.vue

@@ -150,7 +150,7 @@ export default {
   padding: 32px;
   background-color: rgb(240, 242, 245);
   position: relative;
-
+  height: 100vh;
   .chart-wrapper {
     background: #fff;
     padding: 16px 16px 0;

yudao-ui/yudao-ui-admin-vue2/src/views/infra/build/main.js

@@ -11,7 +11,7 @@ Vue.component('tinymce', Tinymce)
 Vue.config.productionTip = false
 Vue.prototype.$axios = axios
 
-// add by jacker：引用自 https://github.com/JakHuang/form-generator/tree/dev/src/views/index
+// add by 芋道源码：引用自 https://github.com/JakHuang/form-generator/tree/dev/src/views/index
 
 new Vue({
   router,

yudao-ui/yudao-ui-admin-vue2/src/views/login.vue

@@ -145,7 +145,7 @@ export default {
         mobile: "",
         mobileCode: "",
         rememberMe: false,
-        tenantName: "jacker",
+        tenantName: "芋道源码",
       },
       scene: 21,
 
@@ -256,7 +256,7 @@ export default {
           // 发起登陆
           // console.log("发起登录", this.loginForm);
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
-            this.$router.push({path: this.redirect || "/"}).catch(() => {
+            this.$router.push({path: "/"}).catch(() => {
             });
           }).catch(() => {
             this.loading = false;

yudao-ui/yudao-ui-admin-vue2/src/views/mp/autoReply/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  jacker：
+  芋道源码：
   ① 移除 avue 框架，使用 element-ui 重写
   ② 重写代码，保持和现有项目保持一致
 -->

yudao-ui/yudao-ui-admin-vue2/src/views/mp/components/wx-editor/WxEditor.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  jacker：
+  芋道源码：
   ① 调整 uploadData 属性，只需要传入 accountId 即可
 -->
 <template>

yudao-ui/yudao-ui-admin-vue2/src/views/mp/components/wx-material-select/main.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  jacker：
+  芋道源码：
   ① 移除 avue 组件，使用 ElementUI 原生组件
 -->
 <template>

yudao-ui/yudao-ui-admin-vue2/src/views/mp/components/wx-msg/main.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  jacker：
+  芋道源码：
   ① 移除暂时用不到的 websocket
   ② 代码优化，补充注释，提升阅读性
 -->

yudao-ui/yudao-ui-admin-vue2/src/views/mp/components/wx-news/main.vue

@@ -2,7 +2,7 @@
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
   【微信消息 - 图文】
-  jacker：
+  芋道源码：
   ① 代码优化，补充注释，提升阅读性
 -->
 <template>

yudao-ui/yudao-ui-admin-vue2/src/views/mp/components/wx-reply/main.vue

@@ -1,7 +1,7 @@
 <!--
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
-  jacker：
+  芋道源码：
   ① 移除多余的 rep 为前缀的变量，让 message 消息更简单
   ② 代码优化，补充注释，提升阅读性
   ③ 优化消息的临时缓存策略，发送消息时，只清理被发送消息的 tab，不会强制切回到 text 输入

yudao-ui/yudao-ui-admin-vue2/src/views/mp/components/wx-video-play/main.vue

@@ -2,7 +2,7 @@
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
   【微信消息 - 视频】
-  jacker：
+  芋道源码：
   ① bug 修复：
     1）joolun 的做法：使用 mediaId 从微信公众号，下载对应的 mp4 素材，从而播放内容；
       存在的问题：mediaId 有效期是 3 天，超过时间后无法播放

yudao-ui/yudao-ui-admin-vue2/src/views/mp/components/wx-voice-play/main.vue

@@ -2,7 +2,7 @@
   - Copyright (C) 2018-2019
   - All rights reserved, Designed By www.joolun.com
   【微信消息 - 语音】
-   jacker：
+   芋道源码：
   ① bug 修复：
     1）joolun 的做法：使用 mediaId 从微信公众号，下载对应的 mp4 素材，从而播放内容；
       存在的问题：mediaId 有效期是 3 天，超过时间后无法播放

yudao-ui/yudao-ui-admin-vue2/src/views/mp/draft/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  jacker：
+  芋道源码：
   ① 优化代码，和项目的代码保持一致
   ② 清理冗余代码，保证代码整洁
   ③ 增加注释，提升可读性

yudao-ui/yudao-ui-admin-vue2/src/views/mp/freePublish/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  jacker：
+  芋道源码：
   ① 优化代码，和项目的代码保持一致
 -->
 <template>

yudao-ui/yudao-ui-admin-vue2/src/views/mp/material/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  jacker：
+  芋道源码：
   ① 清理冗余 css 内容，清理冗余 data 变量
   ② 美化样式，支持播放，提升使用体验
   ③ 优化代码，特别是方法名和变量，提升可读性
@@ -401,7 +401,7 @@ export default {
   width: 100%;
   column-gap:10px;
   column-count: 5;
-  margin-top: 10px; /* jacker：增加 10px，避免顶着上面 */
+  margin-top: 10px; /* 芋道源码：增加 10px，避免顶着上面 */
 }
 .waterfall-item {
   padding: 10px;

yudao-ui/yudao-ui-admin-vue2/src/views/mp/menu/index.vue

@@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-  jacker：
+  芋道源码：
   ① less 切到 scss，减少对 less 和 less-loader 的依赖
   ②
 -->