gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2021-06-21 22:41:14 +08:00
parent 77a905c109
commit 0a8addc128
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Module/Base.php
View File

@ -304,9 +304,9 @@ class Base
* 去除html
* @param $text
* @param int $length
* @return mixed|string
* @return string
*/
public static function getHtml($text, $length = 255)
public static function getHtml($text, $length = 250)
{
return Base::cutStr(strip_tags($text), $length, 0, "...");
}

4
resources/assets/js/components/UserAvatar.vue
View File

@ -7,7 +7,7 @@
<slot/>
<p>{{$L('昵称')}}: {{user.nickname}}</p>
<p>{{$L('职位/职称')}}: {{user.profession || '-'}}</p>
<div v-if="userId != userid && !hideIconMenu" class="avatar-icons">
<div v-if="userId != userid && showIconMenu" class="avatar-icons">
<Icon type="ios-chatbubbles" @click="openDialog"/>
</div>
</div>
@ -45,7 +45,7 @@
type: Boolean,
default: false
},
hideIconMenu: {
showIconMenu: {
type: Boolean,
default: false
},

6
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -83,7 +83,7 @@
<Button size="small" type="primary" @click="$refs.owner.ok()">{{$L('确定')}}</Button>
</div>
</div>
<UserAvatar v-if="getOwner" :userid="getOwner.userid" :size="20" hide-icon-menu/>
<UserAvatar v-if="getOwner" :userid="getOwner.userid" :size="20"/>
<div v-else>--</div>
</Poptip>
</li>
@ -201,7 +201,7 @@
</div>
</div>
<div v-if="getOwner" class="user-list">
<UserAvatar :userid="getOwner.userid" :size="28" hide-icon-menu/>
<UserAvatar :userid="getOwner.userid" :size="28"/>
</div>
<div v-else>--</div>
</Poptip>
@ -233,7 +233,7 @@
</div>
</div>
<div v-if="getAssist.length > 0" class="user-list">
<UserAvatar v-for="item in getAssist" :key="item.userid" :userid="item.userid" :size="28" hide-icon-menu/>
<UserAvatar v-for="item in getAssist" :key="item.userid" :userid="item.userid" :size="28"/>
</div>
<div v-else>--</div>
</Poptip>

4
resources/assets/js/pages/manage/messenger.vue
View File

@ -26,7 +26,7 @@
<i v-else-if="dialog.group_type=='task'" class="iconfont icon-avatar task">&#xe6f4;</i>
<Icon v-else class="icon-avatar" type="ios-people" />
</template>
<div v-else-if="dialog.dialog_user" class="user-avatar"><UserAvatar :userid="dialog.dialog_user.userid" :size="42" hide-icon-menu/></div>
<div v-else-if="dialog.dialog_user" class="user-avatar"><UserAvatar :userid="dialog.dialog_user.userid" :size="42"/></div>
<Icon v-else class="icon-avatar" type="md-person" />
<div class="dialog-box">
<div class="dialog-title">
@ -45,7 +45,7 @@
<div class="label">{{label}}</div>
<ul>
<li v-for="(user, index) in users" :key="index" @click="openContacts(user)">
<div class="avatar"><UserAvatar :userid="user.userid" :size="30" hide-icon-menu/></div>
<div class="avatar"><UserAvatar :userid="user.userid" :size="30"/></div>
<div class="nickname">{{user.nickname}}</div>
</li>
</ul>

30
resources/assets/js/store/state.js vendored
View File

@ -282,24 +282,24 @@ state.taskId = 0;
state.columnColorList = [
{name: '默认', color: ''},
{name: '灰色', color: '#6C6F71'},
{name: '棕色', color: '#695C56'},
{name: '橘色', color: '#9E7549'},
{name: '黄色', color: '#A0904F'},
{name: '绿色', color: '#4D7771'},
{name: '蓝色', color: '#4C7088'},
{name: '紫色', color: '#6B5C8D'},
{name: '粉色', color: '#8E5373'},
{name: '红色', color: '#9D6058'},
{name: '灰色', color: '#444444'},
{name: '棕色', color: '#947364'},
{name: '橘色', color: '#faaa6c'},
{name: '黄色', color: '#f2d86d'},
{name: '绿色', color: '#73b45c'},
{name: '蓝色', color: '#51abea'},
{name: '紫色', color: '#b583e3'},
{name: '粉色', color: '#ff819c'},
{name: '红色', color: '#ff7070'},
];
state.taskColorList = [
{name: '默认', color: ''},
{name: '黄色', color: '#FCF4A7'},
{name: '蓝色', color: '#BCF2FD'},
{name: '绿色', color: '#C3FDAA'},
{name: '粉色', color: '#F6C9C8'},
{name: '紫色', color: '#BAC9FB'},
{name: '灰色', color: '#EEEEEE'},
{name: '黄色', color: '#fffae6'},
{name: '蓝色', color: '#e5f5ff'},
{name: '绿色', color: '#ecffe5'},
{name: '粉色', color: '#ffeaee'},
{name: '紫色', color: '#f6ecff'},
{name: '灰色', color: '#f3f3f3'},
];
// 会话聊天