item mark

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

@@ -182,7 +182,7 @@ class ItemController extends BaseController {
                 $member_item_ids[] = $value['item_id'] ;
             }
         }
-        $items  = D("Item")->field("item_id,uid,item_name,item_domain,item_type,last_update_time,item_description,is_del")->where("uid = '$login_user[uid]' or item_id in ( ".implode(",", $member_item_ids)." ) ")->order("item_id asc")->select();
+        $items  = D("Item")->field("item_id,uid,item_name,item_domain,item_type,last_update_time,item_description,is_del,password")->where("uid = '$login_user[uid]' or item_id in ( ".implode(",", $member_item_ids)." ) ")->order("item_id asc")->select();
         
         
         foreach ($items as $key => $value) {
@@ -191,6 +191,13 @@ class ItemController extends BaseController {
             }else{
                $items[$key]['creator'] = 0 ;
             }
+            //判断是否为私密项目
+            if ($value['password']) {
+                $items[$key]['is_private'] = 1 ; 
+            }else{
+                $items[$key]['is_private'] = 0 ; 
+            }
+            unset($items[$key]['password']);
             //如果项目已标识为删除
             if ($value['is_del'] == 1) {
                 unset($items[$key]);

web_src/src/components/item/Index.vue

@@ -66,13 +66,22 @@
                      v-dragging="{ item: item, list: itemListByKeyword, group: 'item' }"
                   >
                     <router-link class="thumbnail item-thumbnail"  :to="'/' +  (item.item_domain ? item.item_domain:item.item_id )" title="">
+                      <!-- 自己创建的话显示项目设置按钮 -->
                       <span class="item-setting " @click.prevent="click_item_setting(item.item_id)" :title="$t('item_setting')" v-if="item.creator" >
                         <i class="el-icon-setting"></i>
                       </span>
+                       <!-- 如果是加入的项目的话，这里显示退出按钮 -->
                       <span class="item-exit" @click.prevent="click_item_exit(item.item_id)" :title="$t('item_exit')" v-if="! item.creator">
                         <i class="el-icon-close"></i>
                       </span>
                       <p class="my-item">{{item.item_name}}</p>
+                      <!-- 如果是加密项目的话，这里显示一个加密图标 -->
+                        <span class="item-private" v-if="item.is_private" >
+                          <el-tooltip class="item" effect="dark"  :content="$t('private_tips')" placement="right">
+                            <i class="el-icon-lock"></i>
+                          </el-tooltip>
+                        </span>
+
                     </router-link>
                   </li>
                 </draggable>
@@ -189,6 +198,13 @@
     margin-top:5px;
     display: none;
   }
+  .item-private{
+    float:right;
+    margin-right:15px;
+    margin-top: -20px;
+    display: none;
+    cursor:default;
+  }
 
   .thumbnails li a i{
     color: #777;
@@ -202,7 +218,10 @@
   .item-thumbnail:hover .item-exit {
     display: block;
   }
-
+  .item-thumbnail:hover .item-private {
+    display: block;
+  }
+  
   .search-box-div{
     width: 190px;
     margin-left: 60px;

web_src/static/lang/en.js

@@ -321,4 +321,5 @@ exports.default = {
     "export_format_markdown":"Markdown zip",
     "export_markdown_tips":"The exported compressed package can be re imported into showdoc. Select 'Import File' when creating a new item",
 
+    "private_tips":"It's a private item",
 };

web_src/static/lang/zh-CN.js

@@ -329,4 +329,7 @@ exports.default = {
     "export_format_markdown":"markdown压缩包",
     "export_markdown_tips":"导出的压缩包可以重新导入showdoc，在新建项目的时候选择“文件导入”即可",
     
+    "private_tips":"这是一个私密项目",
+
+    
 };