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-07 21:40:58 +08:00
parent fd1ce8b257
commit f4f03c57ef
5 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/assets/js/pages/manage/components/ProjectList.vue
View File

@ -156,9 +156,9 @@
<Input <Input
ref="addColumnName" ref="addColumnName"
v-model="addColumnName" v-model="addColumnName"
@on-blur="addColumnShow=false" @on-blur="addColumnBlur"
@on-clear="addColumnShow=false"
@on-enter="addColumnSubmit" @on-enter="addColumnSubmit"
@on-clear="addColumnShow=false"
:placeholder="$L('列表名称，回车创建')" :placeholder="$L('列表名称，回车创建')"
clearable/> clearable/>
</div> </div>
@ -695,6 +695,12 @@ export default {
}) })
}, },
addColumnBlur() {
if (this.addColumnName === '') {
this.addColumnShow = false
}
},
addColumnSubmit() { addColumnSubmit() {
let name = this.addColumnName.trim(); let name = this.addColumnName.trim();
if (name === '') { if (name === '') {
@ -712,6 +718,7 @@ export default {
success: ({ret, data, msg}) => { success: ({ret, data, msg}) => {
if (ret === 1) { if (ret === 1) {
$A.messageSuccess(msg); $A.messageSuccess(msg);
this.addColumnName = '';
this.projectDetail.project_column.push(data) this.projectDetail.project_column.push(data)
} else { } else {
$A.modalError(msg, 301); $A.modalError(msg, 301);

2
resources/assets/js/pages/manage/components/TaskAddSimple.vue
View File

@ -17,7 +17,7 @@
<div class="priority"> <div class="priority">
<ul> <ul>
<li v-for="(item, key) in taskPriority" :key="key"> <li v-for="(item, key) in taskPriority" :key="key">
<Tooltip :content="item.name + ' (' + item.days + $L('天') + ')'" transfer> <Tooltip v-if="active" :content="item.name + ' (' + item.days + $L('天') + ')'" transfer>
<i <i
class="iconfont" class="iconfont"
:style="{color:item.color}" :style="{color:item.color}"

9
resources/assets/js/store/mutations.js vendored
View File

@ -139,6 +139,7 @@ export default {
if (state.projectDetail.id === project_id) { if (state.projectDetail.id === project_id) {
state.projectDetail = data; state.projectDetail = data;
} }
state.method.setStorage("cacheProject", state.cacheProject);
} else { } else {
$A.modalError(msg); $A.modalError(msg);
} }
@ -172,20 +173,20 @@ export default {
return; return;
} }
// //
if (state.cacheUserBasic["::loading"] === true) { if (state.cacheUserBasic["::load"] === true) {
setTimeout(() => { setTimeout(() => {
this.commit('getUserBasic', params); this.commit('getUserBasic', params);
}, 20); }, 20);
return; return;
} }
state.cacheUserBasic["::loading"] = true; state.cacheUserBasic["::load"] = true;
$A.apiAjax({ $A.apiAjax({
url: 'users/basic', url: 'users/basic',
data: { data: {
userid: array userid: array
}, },
complete: () => { complete: () => {
state.cacheUserBasic["::loading"] = false; state.cacheUserBasic["::load"] = false;
typeof complete === "function" && complete() typeof complete === "function" && complete()
}, },
success: ({ret, data, msg}) => { success: ({ret, data, msg}) => {
@ -195,6 +196,7 @@ export default {
time, time,
data: item data: item
}; };
state.method.setStorage("cacheUserBasic", state.cacheUserBasic);
this.commit('setUserOnlineStatus', item); this.commit('setUserOnlineStatus', item);
typeof success === "function" && success(item, true) typeof success === "function" && success(item, true)
}); });
@ -329,6 +331,7 @@ export default {
dialog: data.dialog, dialog: data.dialog,
data: data.data.reverse(), data: data.data.reverse(),
}; };
state.method.setStorage("cacheDialog", state.cacheDialog);
if (state.dialogId === dialog_id) { if (state.dialogId === dialog_id) {
state.dialogDetail = state.cacheDialog[dialog_id].dialog; state.dialogDetail = state.cacheDialog[dialog_id].dialog;
state.cacheDialog[dialog_id].data.forEach((item) => { state.cacheDialog[dialog_id].data.forEach((item) => {

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

@ -49,41 +49,43 @@ const method = {
}, },
storage(key, value) { storage(key, value) {
let keyName = 'state'; if (!key) {
return;
}
let keyName = '__state__';
if (key.substring(0, 5) === 'cache') {
keyName = '__state:Cache__';
}
if (typeof value === 'undefined') { if (typeof value === 'undefined') {
return this.loadFromlLocal('__::', key, '', '__' + keyName + '__'); return this.loadFromlLocal(key, '', keyName);
} else { } else {
this.savaToLocal('__::', key, value, '__' + keyName + '__'); this.savaToLocal(key, value, keyName);
} }
}, },
savaToLocal(id, key, value, keyName) { savaToLocal(key, value, keyName) {
try { try {
if (typeof keyName === 'undefined') keyName = '__seller__'; if (typeof keyName === 'undefined') keyName = '__seller__';
let seller = window.localStorage[keyName]; let seller = window.localStorage[keyName];
if (!seller) { if (!seller) {
seller = {}; seller = {};
seller[id] = {};
} else { } else {
seller = JSON.parse(seller); seller = JSON.parse(seller);
if (!seller[id]) {
seller[id] = {};
}
} }
seller[id][key] = value; seller[key] = value;
window.localStorage[keyName] = JSON.stringify(seller); window.localStorage[keyName] = JSON.stringify(seller);
} catch (e) { } catch (e) {
} }
}, },
loadFromlLocal(id, key, def, keyName) { loadFromlLocal(key, def, keyName) {
try { try {
if (typeof keyName === 'undefined') keyName = '__seller__'; if (typeof keyName === 'undefined') keyName = '__seller__';
let seller = window.localStorage[keyName]; let seller = window.localStorage[keyName];
if (!seller) { if (!seller) {
return def; return def;
} }
seller = JSON.parse(seller)[id]; seller = JSON.parse(seller);
if (!seller || typeof seller[key] === 'undefined') { if (!seller || typeof seller[key] === 'undefined') {
return def; return def;
} }
@ -195,8 +197,8 @@ state.dialogMsgUnread = 0;
state.taskPriority = []; state.taskPriority = [];
// 其他 // 其他
state.cacheProject = {}; state.cacheProject = state.method.getStorageJson("cacheProject");
state.cacheUserBasic = {}; state.cacheUserBasic = state.method.getStorageJson("cacheUserBasic");
state.cacheDialog = {}; state.cacheDialog = state.method.getStorageJson("cacheDialog");
export default state export default state

10
resources/assets/sass/project-list.scss vendored
View File

@ -185,6 +185,12 @@
height: 36px; height: 36px;
.ivu-input { .ivu-input {
height: 36px; height: 36px;
padding: 4px 10px;
}
.ivu-input-icon {
width: 36px;
height: 36px;
line-height: 36px;
} }
} }
&.show-input { &.show-input {
@ -239,7 +245,7 @@
} }
.ivu-poptip-popper { .ivu-poptip-popper {
color: #515a6e; color: #515a6e;
min-width: 150px; min-width: 130px;
.ivu-poptip-body { .ivu-poptip-body {
padding: 0; padding: 0;
} }
@ -383,6 +389,8 @@
> li { > li {
list-style: none; list-style: none;
margin-left: -6px; margin-left: -6px;
width: 32px;
height: 32px;
&:first-child { &:first-child {
margin-left: 0; margin-left: 0;
} }