github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-06 21:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-04-28 07:25:57 +08:00
parent 46787b187f
commit 3ceb183d8b
11 changed files with 138 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/Models/File.php
View File

@ -266,19 +266,7 @@ class File extends AbstractModel
];
}
//
if ($userid === null) {
$userid = [$this->userid];
$builder = WebSocket::select(['userid']);
if ($action == 'content') {
$builder->wherePath("/single/file/{$this->id}");
} elseif ($this->pid > 0) {
$builder->wherePath("/manage/file/{$this->pid}");
} else {
$builder->wherePath("/manage/file");
}
$userid = array_merge($userid, $builder->pluck('userid')->toArray());
$userid = array_values(array_filter(array_unique($userid)));
}
$userid = $this->pushUserid($action, $userid);
if (empty($userid)) {
return;
}
@ -301,6 +289,47 @@ class File extends AbstractModel
Task::deliver($task);
}
/**
* 获取推送会员
* @param $action
* @param $userid
* @return array|int[]|mixed|null[]
*/
public function pushUserid($action, $userid = null) {
$wherePath = "/manage/file";
if ($userid === null) {
$array = [$this->userid];
if ($action == 'add' && $this->pid == 0) {
return $array;
}
if ($action == 'content') {
$wherePath = "/single/file/{$this->id}";
} elseif ($this->pid > 0) {
$wherePath = "/manage/file/{$this->pid}";
} else {
$tmpArray = FileUser::whereFileId($this->id)->pluck('userid')->toArray();
if (empty($tmpArray)) {
return $array;
}
if (!in_array(0, $tmpArray)) {
return $tmpArray;
}
}
$tmpArray = WebSocket::wherePath($wherePath)->pluck('userid')->toArray();
if (empty($tmpArray)) {
return $array;
}
$array = array_values(array_filter(array_unique(array_merge($array, $tmpArray))));
} else {
$array = is_array($userid) ? $userid : [$userid];
if (in_array(0, $array)) {
return WebSocket::wherePath($wherePath)->pluck('userid')->toArray();
}
}
return $array;
}
/**
* 处理返回图片地址
* @param array $item

2
electron/drawio.js vendored
View File

@ -1,4 +1,4 @@
window.utilsStorage={getStorageString(key,def=''){let value=this.storage(key);return typeof value==="string"||typeof value==="number"?value:def},storage(key,value){if(!key){return}let keyName='__state__';if(key.substring(0,5)==='cache'){keyName='__state:'+key+'__'}if(typeof value==='undefined'){return this.loadFromlLocal(key,'',keyName)}else{this.savaToLocal(key,value,keyName)}},savaToLocal(key,value,keyName){try{if(typeof keyName==='undefined')keyName='__seller__';let seller=window.localStorage[keyName];if(!seller){seller={}}else{seller=JSON.parse(seller)}seller[key]=value;window.localStorage[keyName]=JSON.stringify(seller)}catch(e){}},loadFromlLocal(key,def,keyName){try{if(typeof keyName==='undefined')keyName='__seller__';let seller=window.localStorage[keyName];if(!seller){return def}seller=JSON.parse(seller);if(!seller||typeof seller[key]==='undefined'){return def}return seller[key]}catch(e){return def}},}
window.utilsStorage={getStorageString(key,def=''){let value=this.operationStorage(key);return typeof value==="string"||typeof value==="number"?value:def},operationStorage(key,value){if(!key){return}let keyName='__state__';if(key.substring(0,5)==='cache'){keyName='__state:'+key+'__'}if(typeof value==='undefined'){return this.loadFromlLocal(key,'',keyName)}else{this.savaToLocal(key,value,keyName)}},savaToLocal(key,value,keyName){try{if(typeof keyName==='undefined')keyName='__seller__';let seller=window.localStorage[keyName];if(!seller){seller={}}else{seller=JSON.parse(seller)}seller[key]=value;window.localStorage[keyName]=JSON.stringify(seller)}catch(e){}},loadFromlLocal(key,def,keyName){try{if(typeof keyName==='undefined')keyName='__seller__';let seller=window.localStorage[keyName];if(!seller){return def}seller=JSON.parse(seller);if(!seller||typeof seller[key]==='undefined'){return def}return seller[key]}catch(e){return def}},}
window.cacheServerUrl = window.utilsStorage.getStorageString("cacheServerUrl")
if (window.cacheServerUrl) {

2
resources/assets/js/components/ImgUpload.vue
View File

@ -168,7 +168,7 @@
uploadHeaders() {
return {
fd: $A.getStorageString("userWsFd"),
fd: $A.getSessionStorageString("userWsFd"),
token: this.userToken,
}
},

2
resources/assets/js/components/MDEditor/index.vue
View File

@ -173,7 +173,7 @@
headers() {
return {
fd: $A.getStorageString("userWsFd"),
fd: $A.getSessionStorageString("userWsFd"),
token: this.userToken,
}
},

2
resources/assets/js/components/TEditor.vue
View File

@ -170,7 +170,7 @@
headers() {
return {
fd: $A.getStorageString("userWsFd"),
fd: $A.getSessionStorageString("userWsFd"),
token: this.userToken,
}
},

91
resources/assets/js/functions/common.js vendored
View File

@ -1043,45 +1043,45 @@
/**
* =============================================================================
* ******************************** storage ********************************
* ***************************** localStorage ******************************
* =============================================================================
*/
$.extend({
setStorage(key, value) {
return this.storage(key, value);
return this.operationStorage(key, value);
},
getStorage(key, def = null) {
let value = this.storage(key);
let value = this.operationStorage(key);
return value || def;
},
getStorageString(key, def = '') {
let value = this.storage(key);
let value = this.operationStorage(key);
return typeof value === "string" || typeof value === "number" ? value : def;
},
getStorageInt(key, def = 0) {
let value = this.storage(key);
let value = this.operationStorage(key);
return typeof value === "number" ? value : def;
},
getStorageBoolean(key, def = false) {
let value = this.storage(key);
let value = this.operationStorage(key);
return typeof value === "boolean" ? value : def;
},
getStorageArray(key, def = []) {
let value = this.storage(key);
let value = this.operationStorage(key);
return this.isArray(value) ? value : def;
},
getStorageJson(key, def = {}) {
let value = this.storage(key);
let value = this.operationStorage(key);
return this.isJson(value) ? value : def;
},
storage(key, value) {
operationStorage(key, value) {
if (!key) {
return;
}
@ -1129,6 +1129,79 @@
},
});
/**
* =============================================================================
* ***************************** sessionStorage ****************************
* =============================================================================
*/
$.extend({
setSessionStorage(key, value) {
return this.operationSessionStorage(key, value);
},
getSessionStorage(key, def = null) {
let value = this.operationSessionStorage(key);
return value || def;
},
getSessionStorageString(key, def = '') {
let value = this.operationSessionStorage(key);
return typeof value === "string" || typeof value === "number" ? value : def;
},
getSessionStorageInt(key, def = 0) {
let value = this.operationSessionStorage(key);
return typeof value === "number" ? value : def;
},
operationSessionStorage(key, value) {
if (!key) {
return;
}
let keyName = '__state__';
if (key.substring(0, 5) === 'cache') {
keyName = '__state:' + key + '__';
}
if (typeof value === 'undefined') {
return this.loadFromlSession(key, '', keyName);
} else {
this.savaToSession(key, value, keyName);
}
},
savaToSession(key, value, keyName) {
try {
if (typeof keyName === 'undefined') keyName = '__seller__';
let seller = window.sessionStorage[keyName];
if (!seller) {
seller = {};
} else {
seller = JSON.parse(seller);
}
seller[key] = value;
window.sessionStorage[keyName] = JSON.stringify(seller);
} catch (e) {
}
},
loadFromlSession(key, def, keyName) {
try {
if (typeof keyName === 'undefined') keyName = '__seller__';
let seller = window.sessionStorage[keyName];
if (!seller) {
return def;
}
seller = JSON.parse(seller);
if (!seller || typeof seller[key] === 'undefined') {
return def;
}
return seller[key];
} catch (e) {
return def;
}
},
});
/**
* =============================================================================
* ********************************* ihttp *********************************

3
resources/assets/js/functions/web.js vendored
View File

@ -396,7 +396,8 @@
* @returns {*}
*/
getFileName(file) {
let {name, ext} = file;
let name = file.name || '';
let ext = file.ext || '';
if (ext != '') {
name += "." + ext;
}

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

@ -67,7 +67,7 @@ export default {
headers() {
return {
fd: $A.getStorageString("userWsFd"),
fd: $A.getSessionStorageString("userWsFd"),
token: this.userToken,
}
},

2
resources/assets/js/pages/manage/file.vue
View File

@ -528,7 +528,7 @@ export default {
headers() {
return {
fd: $A.getStorageString("userWsFd"),
fd: $A.getSessionStorageString("userWsFd"),
token: this.userToken,
}
},

8
resources/assets/js/pages/single/file.vue
View File

@ -2,7 +2,7 @@
<div class="single-file">
<PageTitle :title="pageName"/>
<Loading v-if="loadIng > 0"/>
<template v-else>
<template v-else-if="fileInfo">
<FilePreview v-if="isPreview" :code="code" :file="fileInfo" :historyId="historyId"/>
<FileContent v-else v-model="fileShow" :file="fileInfo"/>
</template>
@ -32,7 +32,7 @@ export default {
code: null,
fileShow: true,
fileInfo: {},
fileInfo: null,
}
},
mounted() {
@ -43,10 +43,10 @@ export default {
return this.$route.query ? $A.runNum(this.$route.query.history_id) : 0;
},
isPreview() {
return this.code || this.fileInfo.permission === 0 || this.historyId > 0
return this.code || this.historyId > 0 || (this.fileInfo && this.fileInfo.permission === 0)
},
pageName() {
let name = this.fileInfo.name;
let name = this.fileInfo ? this.fileInfo.name : '';
if (this.$route.query && this.$route.query.history_at) {
name += ` [${this.$route.query.history_at}]`
}

4
resources/assets/js/store/actions.js vendored
View File

@ -16,7 +16,7 @@ export default {
params.header['Content-Type'] = 'application/json';
params.header['language'] = $A.getLanguage();
params.header['token'] = state.userToken;
params.header['fd'] = $A.getStorageString("userWsFd");
params.header['fd'] = $A.getSessionStorageString("userWsFd");
params.header['version'] = window.systemInfo.version || "0.0.1";
params.header['platform'] = $A.Platform;
//
@ -2212,7 +2212,7 @@ export default {
const {type, msgId} = msgDetail;
switch (type) {
case "open":
$A.setStorage("userWsFd", msgDetail.data.fd)
$A.setSessionStorage("userWsFd", msgDetail.data.fd)
break
case "receipt":