bugs

server/Application/Api/Controller/ItemController.class.php

@@ -140,7 +140,8 @@ class ItemController extends BaseController {
 
     //我的项目列表
     public function myList(){
-        $login_user = $this->checkLogin();        
+        $login_user = $this->checkLogin();  
+        $original = I("original/d") ? I("original/d") : 0; //1：只返回自己原创的项目;默认是0      
         $member_item_ids = array(-1) ; 
         $item_members = D("ItemMember")->where("uid = '$login_user[uid]'")->select();
         if ($item_members) {
@@ -176,6 +177,11 @@ class ItemController extends BaseController {
                 unset($items[$key]);
             }
 
+            //如果有参数指定了只返回原创项目
+            if($original > 0 && $value['uid'] != $login_user['uid']){
+                unset($items[$key]);
+            }
+
         }
         $items = array_values($items);
         //读取需要置顶的项目

web_src/src/components/common/Editormd.vue

@@ -80,8 +80,10 @@ export default {
       default() {
         return {
           path: 'static/editor.md/lib/',
-          height: 1000,
+          height: 750,
           taskList: true,
+          atLink: false,
+          emailLink: false,
           tex: true, // 默认不解析
           flowChart: true, // 默认不解析
           sequenceDiagram: true, // 默认不解析
@@ -478,7 +480,7 @@ export default {
     html_decode(str) {
       var s = ''
       if (str.length == 0) return ''
-      s = str.replace(/>/g, '&')
+      s = str.replace(/&/g, '&')
       s = s.replace(/&lt;/g, '<')
       s = s.replace(/&gt;/g, '>')
       s = s.replace(/&nbsp;/g, ' ')

web_src/src/components/item/show/show_single_page_item/Index.vue

@@ -9,6 +9,11 @@
         <h2 id="doc-title">{{page_title}}</h2>
 
         <div class="tool-bar pull-right">
+          <el-tooltip class="item" effect="dark" :content="$t('goback')" placement="left">
+            <router-link to="/item/index">
+              <i class="el-icon-back"></i>
+            </router-link>
+          </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="$t('share')" placement="top">
             <i class="el-icon-share" @click="share_item"></i>
           </el-tooltip>
@@ -21,20 +26,17 @@
           >
             <i class="el-icon-edit" @click="edit_page"></i>
           </el-tooltip>
-          <el-dropdown>
+          <el-dropdown v-if="item_info.ItemPermn">
             <span class="el-dropdown-link">
               <i class="el-icon-caret-bottom el-icon--right"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <router-link :to="'/item/export/'+item_info.item_id" v-if="item_info.ItemPermn">
+              <router-link :to="'/item/export/'+item_info.item_id">
                 <el-dropdown-item>{{$t('export')}}</el-dropdown-item>
               </router-link>
-              <router-link :to="'/item/setting/'+item_info.item_id" v-if="item_info.ItemCreator">
+              <router-link :to="'/item/setting/'+item_info.item_id">
                 <el-dropdown-item>{{$t('item_setting')}}</el-dropdown-item>
               </router-link>
-              <router-link to="/item/index">
-                <el-dropdown-item>{{$t('goback')}}</el-dropdown-item>
-              </router-link>
             </el-dropdown-menu>
           </el-dropdown>
         </div>

web_src/src/components/team/Item.vue

@@ -156,15 +156,8 @@ export default {
     },
     getItemList() {
       var that = this
-      var url = DocConfig.server + '/api/item/myList'
-      var params = new URLSearchParams()
-      that.axios.get(url, params).then(function(response) {
-        if (response.data.error_code === 0) {
-          var json = response.data.data
-          that.itemList = json
-        } else {
-          that.$alert(response.data.error_message)
-        }
+      this.request('/api/item/myList', {'original': 1}).then((data) => {
+        that.itemList = data.data
       })
     },
     MyFormSubmit() {