@@ -193,8 +193,8 @@ import {mapState} from 'vuex'
export default {
components:{list,listDetails,DrawerOverlay,ImgUpload},
name: "approve",
- data(){
- return{
+ data() {
+ return {
minDate: new Date(2020, 0, 1),
maxDate: new Date(2025, 10, 1),
currentDate: new Date(2021, 0, 17),
@@ -204,62 +204,63 @@ export default {
pageSize: 250,
total: 0,
noText: '',
- loadIng:false,
+ loadIng: false,
+ addLoadIng: false,
- tabsValue:"",
+ tabsValue: "",
//
- approvalType:"all",
- approvalList:[
- {value:"all",label:this.$L("全部审批")},
- {value:"请假",label:this.$L("请假")},
- {value:"加班申请",label:this.$L("加班申请")},
+ approvalType: "all",
+ approvalList: [
+ { value: "all", label: this.$L("全部审批") },
+ { value: "请假", label: this.$L("请假") },
+ { value: "加班申请", label: this.$L("加班申请") },
],
- searchState:"all",
- searchStateList:[
- {value:"all",label:this.$L("全部状态")},
- {value:1,label:this.$L("审批中")},
- {value:2,label:this.$L("已通过")},
- {value:3,label:this.$L("已拒绝")},
- {value:4,label:this.$L("已撤回")}
+ searchState: "all",
+ searchStateList: [
+ { value: "all", label: this.$L("全部状态") },
+ { value: 1, label: this.$L("审批中") },
+ { value: 2, label: this.$L("已通过") },
+ { value: 3, label: this.$L("已拒绝") },
+ { value: 4, label: this.$L("已撤回") }
],
//
- unreadTotal:0,
+ unreadTotal: 0,
unreadList: [],
- doneList:[],
- notifyList:[],
+ doneList: [],
+ notifyList: [],
initiatedList: [],
//
- details:{},
- detailsShow:false,
+ details: {},
+ detailsShow: false,
//
- addTitle:'',
- addShow:false,
- startTimeOpen:false,
- endTimeOpen:false,
+ addTitle: '',
+ addShow: false,
+ startTimeOpen: false,
+ endTimeOpen: false,
addData: {
- department_id:0,
+ department_id: 0,
applyType: '',
type: '',
startTime: "2023-04-20",
- startTimeHour:"09",
- startTimeMinute:"00",
+ startTimeHour: "09",
+ startTimeMinute: "00",
endTime: "2023-04-20",
- endTimeHour:"18",
- endTimeMinute:"00",
- other:""
+ endTimeHour: "18",
+ endTimeMinute: "00",
+ other: ""
},
addRule: {
- department_id:{ type: 'number',required: true, message: this.$L('请选择部门！'), trigger: 'change' },
- applyType: { type: 'string',required: true, message: this.$L('请选择申请类型！'), trigger: 'change' },
- type: { type: 'string',required: true, message: this.$L('请选择假期类型！'), trigger: 'change' },
- startTime: { type: 'string',required: true, message: this.$L('请选择开始时间！'), trigger: 'change' },
- endTime:{ type: 'string',required: true, message: this.$L('请选择结束时间！'), trigger: 'change' },
- description:{ type: 'string',required: true, message: this.$L('请输入事由！'), trigger: 'change' },
+ department_id: { type: 'number', required: true, message: this.$L('请选择部门！'), trigger: 'change' },
+ applyType: { type: 'string', required: true, message: this.$L('请选择申请类型！'), trigger: 'change' },
+ type: { type: 'string', required: true, message: this.$L('请选择假期类型！'), trigger: 'change' },
+ startTime: { type: 'string', required: true, message: this.$L('请选择开始时间！'), trigger: 'change' },
+ endTime: { type: 'string', required: true, message: this.$L('请选择结束时间！'), trigger: 'change' },
+ description: { type: 'string', required: true, message: this.$L('请输入事由！'), trigger: 'change' },
},
- selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","丧假","哺乳假"],
+ selectTypes: ["年假", "事假", "病假", "调休", "产假", "陪产假", "婚假", "丧假", "哺乳假"],
//
- showDateTime:false
+ showDateTime: false
}
},
computed: {
@@ -320,7 +321,9 @@ export default {
return;
}
this.__tabsClick = setTimeout(() => { this.__tabsClick =null; },time)
-
+ if(time == 0){
+ this.loadIng = true;
+ }
this.tabsValue = val || this.tabsValue
if(val!=""){
this.approvalType = this.searchState = "all"
@@ -392,7 +395,7 @@ export default {
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
- this.loadIng--;
+ this.loadIng = false;
});
},
@@ -425,7 +428,7 @@ export default {
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
- this.loadIng--;
+ this.loadIng = false;
});
},
@@ -458,7 +461,7 @@ export default {
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
- this.loadIng--;
+ this.loadIng = false;
});
},
@@ -492,12 +495,13 @@ export default {
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
- this.loadIng--;
+ this.loadIng = false;
});
},
// 添加申请
addApply(){
+ this.addLoadIng = true;
this.$store.dispatch("call", {
url: 'users/basic',
data: {
@@ -516,12 +520,11 @@ export default {
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
- this.loadIng--;
+ this.addLoadIng = false;
});
}).catch(({msg}) => {
+ this.addLoadIng = false;
$A.modalError(msg);
- }).finally(_ => {
- this.loadIng--;
});
},
@@ -529,7 +532,7 @@ export default {
onInitiate(){
this.$refs.initiateRef.validate((valid) => {
if (valid) {
- this.loadIng = 1;
+ this.loadIng = true;
var obj = JSON.parse(JSON.stringify(this.addData))
obj.startTime = obj.startTime +" "+ obj.startTimeHour + ":" + obj.startTimeMinute;
@@ -557,14 +560,12 @@ export default {
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
- this.loadIng--;
+ this.loadIng = false;
});
}
});
}
-
-
- },
+ }
}
From 6870a29ec91293c95d405641394d3a88facfac9b Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 3 Aug 2023 16:12:17 +0800
Subject: [PATCH 04/12] =?UTF-8?q?init=EF=BC=9A=E5=88=86=E4=BA=AB=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3=20-=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=88=86=E4=BA=AB=E6=96=87=E6=9C=AC=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Api/UsersController.php | 33 +++++++++++++-------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 3bc609f1c..853058874 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1839,6 +1839,10 @@ class UsersController extends AbstractController
* @apiGroup users
* @apiName share__list
*
+ * @apiParam {String} [type] 分享类型：file-文件，text-列表 默认file
+ * @apiParam {Number} [pid] 父级文件id，用于获取子目录和上传到指定目录的id
+ * @apiParam {Number} [upload_file_id] 上传文件id
+ *
* @apiSuccess {Number} ret 返回状态码（1正确、0错误）
* @apiSuccess {String} msg 返回信息（错误描述）
* @apiSuccess {Object} data 返回数据
@@ -1846,6 +1850,7 @@ class UsersController extends AbstractController
public function share__list()
{
$user = User::auth();
+ $type = Request::input('type', 'file');
$pid = intval(Request::input('pid', -1));
$uploadFileId = intval(Request::input('upload_file_id', -1));
// 上传文件
@@ -1857,7 +1862,7 @@ class UsersController extends AbstractController
}
// 获取数据
$lists = [];
- if ($pid !== -1) {
+ if ($type == 'file' && $pid !== -1) {
$fileList = (new File)->getFileList($user, $pid, 'dir', false);
foreach ($fileList as $file) {
if ($file['id'] != $pid) {
@@ -1870,15 +1875,16 @@ class UsersController extends AbstractController
];
}
}
-
} else {
- $lists[] = [
- 'type' => 'children',
- 'url' => Base::fillUrl("api/users/share/list") . "?pid=0",
- 'icon' => url("images/file/light/folder.png"),
- 'extend' => ['upload_file_id' => 0],
- 'name' => Doo::translate('文件'),
- ];
+ if($type == 'file'){
+ $lists[] = [
+ 'type' => 'children',
+ 'url' => Base::fillUrl("api/users/share/list") . "?pid=0",
+ 'icon' => url("images/file/light/folder.png"),
+ 'extend' => ['upload_file_id' => 0],
+ 'name' => Doo::translate('文件'),
+ ];
+ }
$dialogList = (new WebSocketDialog)->getDialogList($user->userid);
foreach ($dialogList['data'] as $dialog) {
if ($dialog['avatar']) {
@@ -1897,8 +1903,13 @@ class UsersController extends AbstractController
'type' => 'item',
'name' => $dialog['name'],
'icon' => $avatar,
- 'url' => Base::fillUrl("api/dialog/msg/sendfiles"),
- 'extend' => ['dialog_ids' => $dialog['id']]
+ 'url' => $type == "file" ? Base::fillUrl("api/dialog/msg/sendfiles") : Base::fillUrl("api/dialog/msg/sendtext"),
+ 'extend' => [
+ 'dialog_ids' => $dialog['id'],
+ 'text_type' => 'text',
+ 'reply_id' => 0,
+ 'silence' => 'no'
+ ]
];
}
}
From 7147db0ef2bcc82c59f6beb35efe014fc0c45de7 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 3 Aug 2023 17:16:44 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat=EF=BC=9A=E5=8F=91=E9=80=81=E6=96=87?=
=?UTF-8?q?=E6=9C=AC=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=20-=20=20?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BE=A4=E5=8F=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Api/DialogController.php | 109 ++++++++++--------
1 file changed, 58 insertions(+), 51 deletions(-)
diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 14287de11..586f91673 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -718,6 +718,7 @@ class DialogController extends AbstractController
}
//
$dialog_id = intval(Request::input('dialog_id'));
+ $dialog_ids = trim(Request::input('dialog_ids'));
$update_id = intval(Request::input('update_id'));
$update_mark = !($user->bot && in_array(strtolower(trim(Request::input('update_mark'))), ['no', 'false', '0']));
$reply_id = intval(Request::input('reply_id'));
@@ -725,59 +726,65 @@ class DialogController extends AbstractController
$text_type = strtolower(trim(Request::input('text_type')));
$silence = in_array(strtolower(trim(Request::input('silence'))), ['yes', 'true', '1']);
$markdown = in_array($text_type, ['md', 'markdown']);
- //
- WebSocketDialog::checkDialog($dialog_id);
- //
- if ($update_id > 0) {
- $action = $update_mark ? "update-$update_id" : "change-$update_id";
- } elseif ($reply_id > 0) {
- $action = "reply-$reply_id";
- } else {
- $action = "";
- }
- //
- if (!$markdown) {
- $text = WebSocketDialogMsg::formatMsg($text, $dialog_id);
- }
- $strlen = mb_strlen($text);
- $noimglen = mb_strlen(preg_replace("/
]*?>/i", "", $text));
- if ($strlen < 1) {
- return Base::retError('消息内容不能为空');
- }
- if ($noimglen > 200000) {
- return Base::retError('消息内容最大不能超过200000字');
- }
- if ($noimglen > 5000) {
- // 内容过长转成文件发送
- $path = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
- Base::makeDir(public_path($path));
- $path = $path . md5($text) . ".htm";
- $file = public_path($path);
- file_put_contents($file, $text);
- $size = filesize(public_path($path));
- if (empty($size)) {
- return Base::retError('消息发送保存失败');
+ //
+ $result = [];
+ $dialogIds = $dialog_ids ? explode(',', $dialog_ids) : [$dialog_id];
+ foreach($dialogIds as $dialog_id) {
+ //
+ WebSocketDialog::checkDialog($dialog_id);
+ //
+ if ($update_id > 0) {
+ $action = $update_mark ? "update-$update_id" : "change-$update_id";
+ } elseif ($reply_id > 0) {
+ $action = "reply-$reply_id";
+ } else {
+ $action = "";
}
- $ext = $markdown ? 'md' : 'htm';
- $fileData = [
- 'name' => "LongText-{$strlen}.{$ext}",
- 'size' => $size,
- 'file' => $file,
- 'path' => $path,
- 'url' => Base::fillUrl($path),
- 'thumb' => '',
- 'width' => -1,
- 'height' => -1,
- 'ext' => $ext,
- ];
- return WebSocketDialogMsg::sendMsg($action, $dialog_id, 'file', $fileData, $user->userid, false, false, $silence);
+ //
+ if (!$markdown) {
+ $text = WebSocketDialogMsg::formatMsg($text, $dialog_id);
+ }
+ $strlen = mb_strlen($text);
+ $noimglen = mb_strlen(preg_replace("/]*?>/i", "", $text));
+ if ($strlen < 1) {
+ return Base::retError('消息内容不能为空');
+ }
+ if ($noimglen > 200000) {
+ return Base::retError('消息内容最大不能超过200000字');
+ }
+ if ($noimglen > 5000) {
+ // 内容过长转成文件发送
+ $path = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
+ Base::makeDir(public_path($path));
+ $path = $path . md5($text) . ".htm";
+ $file = public_path($path);
+ file_put_contents($file, $text);
+ $size = filesize(public_path($path));
+ if (empty($size)) {
+ return Base::retError('消息发送保存失败');
+ }
+ $ext = $markdown ? 'md' : 'htm';
+ $fileData = [
+ 'name' => "LongText-{$strlen}.{$ext}",
+ 'size' => $size,
+ 'file' => $file,
+ 'path' => $path,
+ 'url' => Base::fillUrl($path),
+ 'thumb' => '',
+ 'width' => -1,
+ 'height' => -1,
+ 'ext' => $ext,
+ ];
+ $result = WebSocketDialogMsg::sendMsg($action, $dialog_id, 'file', $fileData, $user->userid, false, false, $silence);
+ }
+ //
+ $msgData = ['text' => $text];
+ if ($markdown) {
+ $msgData['type'] = 'md';
+ }
+ $result = WebSocketDialogMsg::sendMsg($action, $dialog_id, 'text', $msgData, $user->userid, false, false, $silence);
}
- //
- $msgData = ['text' => $text];
- if ($markdown) {
- $msgData['type'] = 'md';
- }
- return WebSocketDialogMsg::sendMsg($action, $dialog_id, 'text', $msgData, $user->userid, false, false, $silence);
+ return $result;
}
/**
From e26d75c894e8f9103093f864b610f8f6d6442280 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 3 Aug 2023 18:09:11 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fiex=EF=BC=9A1.=20=E5=8A=A0=E5=BC=BA?=
=?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=20,=20=202.=E8=A7=A3=E5=86=B3=E5=9C=A8?=
=?UTF-8?q?=E7=BD=91=E9=A1=B5=E5=9B=BE=E7=89=87=E4=B8=8A=E7=9B=B4=E6=8E=A5?=
=?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=A4=8D=E5=88=B6=E5=9B=BE=E7=89=87=EF=BC=88?=
=?UTF-8?q?=E9=9D=9Ejpg=E7=9A=84=EF=BC=89=E5=90=8E=EF=BC=8C=E7=B2=98?=
=?UTF-8?q?=E8=B4=B4=E5=88=B0=E6=B6=88=E6=81=AF=E6=A1=86=EF=BC=8C=E5=8F=91?=
=?UTF-8?q?=E9=80=81=E5=90=8E=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Api/DialogController.php | 2 +-
app/Models/WebSocketDialogMsg.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 586f91673..9c59ef6a9 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -728,7 +728,7 @@ class DialogController extends AbstractController
$markdown = in_array($text_type, ['md', 'markdown']);
//
$result = [];
- $dialogIds = $dialog_ids ? explode(',', $dialog_ids) : [$dialog_id];
+ $dialogIds = $dialog_ids ? explode(',', $dialog_ids) : [$dialog_id ?: 0];
foreach($dialogIds as $dialog_id) {
//
WebSocketDialog::checkDialog($dialog_id);
diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php
index 51a90eea8..0ee8dd69e 100644
--- a/app/Models/WebSocketDialogMsg.php
+++ b/app/Models/WebSocketDialogMsg.php
@@ -641,7 +641,7 @@ class WebSocketDialogMsg extends AbstractModel
}
// 其他网络图片
$imageSaveLocal = Base::settingFind("system", "image_save_local");
- preg_match_all("/]*?src=([\"'])(.*?\.(png|jpg|jpeg|webp|gif))\\1[^>]*?>/is", $text, $matchs);
+ preg_match_all("/]*?src=([\"'])(.*?(png|jpg|jpeg|webp|gif).*?)\\1[^>]*?>/is", $text, $matchs);
foreach ($matchs[2] as $key => $str) {
if ($imageSaveLocal === 'close') {
$imageSize = getimagesize($str);
From 77d3ba0c3bc5c8a34c5f3266bc39aba68f011446 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 4 Aug 2023 17:14:46 +0800
Subject: [PATCH 07/12] =?UTF-8?q?feat=EF=BC=9A=E5=AE=A1=E6=89=B9=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E5=88=97=E8=A1=A8=20-=20=E6=B7=BB=E5=8A=A0=E4=B8=8A?=
=?UTF-8?q?=E6=8B=89=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BB=A5?=
=?UTF-8?q?=E5=8F=8A=E4=B8=80=E4=BA=9BloadIng=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/pages/manage/approve/details.vue | 3 +-
.../assets/js/pages/manage/approve/index.vue | 224 +++++++++++++-----
resources/assets/sass/pages/page-approve.scss | 16 ++
3 files changed, 189 insertions(+), 54 deletions(-)
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index a81e8e674..4a16f77fd 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -293,6 +293,7 @@ export default {
},
// 获取详情
getInfo(isScrollToBottom = false) {
+ this.loadIng++;
this.$store.dispatch("call", {
method: 'get',
url: 'approve/process/detail',
@@ -388,7 +389,7 @@ export default {
},
// 提交评论
confirmComment(){
- this.loadIng++;
+ this.loadIng = 1;
this.$store.dispatch("call", {
method: 'post',
url: 'approve/process/addGlobalComment',
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index 05a97863c..9747d6ee7 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -13,41 +13,55 @@
-
-
-
{{$L('暂无数据')}}
-
-
-
-
-
+
+
-
{{$L('暂无数据')}}
@@ -58,20 +72,26 @@
{{$L('暂无数据')}}
@@ -81,22 +101,28 @@
-
-
-
{{$L('暂无数据')}}
+
{{$L('暂无数据')}}
@@ -195,13 +221,15 @@ export default {
name: "approve",
data() {
return {
+ modalTransferIndex: window.modalTransferIndex,
+
minDate: new Date(2020, 0, 1),
maxDate: new Date(2025, 10, 1),
currentDate: new Date(2021, 0, 17),
procdefList: [],
page: 1,
- pageSize: 250,
+ pageSize: 10,
total: 0,
noText: '',
loadIng: false,
@@ -224,11 +252,25 @@ export default {
{ value: 4, label: this.$L("已撤回") }
],
//
- unreadTotal: 0,
unreadList: [],
+ unreadPage: 1,
+ unreadTotal: 0,
+ unreadLoad: false,
+ //
doneList: [],
+ donePage: 1,
+ doneLoad: false,
+ doneTotal: 0,
+ //
notifyList: [],
+ notifyPage: 1,
+ notifyLoad: false,
+ notifyTotal: 0,
+ //
initiatedList: [],
+ initiatedPage: 1,
+ initiatedLoad: false,
+ initiatedTotal: 0,
//
details: {},
detailsShow: false,
@@ -276,7 +318,7 @@ export default {
}
},
watch: {
- '$route' (to, from) {
+ '$route' (to) {
if(to.name == 'manage-approve'){
this.tabsClick()
}
@@ -308,6 +350,7 @@ export default {
this.addData.startTime = this.addData.endTime = this.getCurrentDate();
},
methods:{
+ // 获取当前时间
getCurrentDate() {
const today = new Date();
const year = today.getFullYear();
@@ -315,6 +358,7 @@ export default {
const date = String(today.getDate()).padStart(2, '0');
return `${year}-${month}-${date}`;
},
+
// tab切换事件
tabsClick(val,time= 1000){
if(!val && this.__tabsClick && time>0){
@@ -325,19 +369,35 @@ export default {
this.loadIng = true;
}
this.tabsValue = val || this.tabsValue
- if(val!=""){
+ if(val){
this.approvalType = this.searchState = "all"
}
if(this.tabsValue == 'unread'){
+ if(val === false){
+ this.unreadPage = 1;
+ this.unreadList = [];
+ }
this.getUnreadList();
}
if(this.tabsValue == 'done'){
+ if(val === false){
+ this.donePage = 1;
+ this.doneList = [];
+ }
this.getDoneList();
}
if(this.tabsValue == 'notify'){
+ if(val === false){
+ this.notifyPage = 1;
+ this.notifyList = [];
+ }
this.getNotifyList();
}
if(this.tabsValue == 'initiated'){
+ if(val === false){
+ this.initiatedPage = 1;
+ this.initiatedList = [];
+ }
this.getInitiatedList();
}
},
@@ -363,29 +423,59 @@ export default {
})
},
+ // 下拉加载
+ handleScroll(e){
+ if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight) {
+ if(this.tabsValue == 'unread' && !this.unreadLoad && this.unreadList.length < this.unreadTotal){
+ this.unreadLoad = true;
+ this.unreadPage = this.unreadPage + 1;
+ this.getUnreadList('scroll');
+ }
+ if(this.tabsValue == 'done' && !this.doneLoad && this.doneList.length < this.doneTotal){
+ this.doneLoad = true;
+ this.donePage = this.donePage + 1;
+ this.getDoneList('scroll');
+ }
+ if(this.tabsValue == 'notify' && !this.notifyLoad && this.notifyList.length < this.notifyTotal){
+ this.notifyLoad = true;
+ this.notifyPage = this.notifyPage + 1;
+ this.getNotifyList('scroll');
+ }
+ if(this.tabsValue == 'initiated' && !this.initiatedLoad && this.initiatedList.length < this.initiatedTotal){
+ this.initiatedLoad = true;
+ this.initiatedPage = this.initiatedPage + 1;
+ this.getInitiatedList('scroll');
+ }
+ }
+ },
+
// 获取待办列表
- getUnreadList(){
+ getUnreadList(type='init'){
this.$store.dispatch("call", {
method: 'get',
url: 'approve/process/findTask',
data: {
- page:this.page,
- page_size: this.pageSize,
+ page: type == 'scroll' ? this.unreadPage : 1,
+ page_size: type == 'scroll' ? this.pageSize : this.unreadPage * this.pageSize,
proc_def_name: this.approvalType == 'all' ? '' : this.approvalType,
}
}).then(({data}) => {
let activeId = 0;
let activeIndex = 0;
+ this.unreadTotal = data.total;
if( this.unreadList.length == 0 || this.unreadList.length == data.rows.length){
this.unreadList?.map((res)=>{ if(res._active) activeId = res.id })
}
- this.unreadList = data.rows.map((h,index)=>{
+ let lists = data.rows.map((h,index)=>{
h._active = activeId > 0 ? h.id == activeId : index == 0;
if(h._active) activeIndex = index
+ if(type == 'scroll' && this.unreadList.map(item=>{return item.id}).indexOf(h.id) == -1 ){
+ this.unreadList.push(h)
+ }
return h;
})
- if(this.approvalType == 'all'){
- this.unreadTotal = this.unreadList.length
+ if(type != 'scroll'){
+ this.unreadList = lists;
}
if(this.tabsValue == 'unread'){
this.$nextTick(()=>{
@@ -396,30 +486,38 @@ export default {
$A.modalError(msg);
}).finally(_ => {
this.loadIng = false;
+ this.unreadLoad = false;
});
},
// 获取已办列表
- getDoneList(){
+ getDoneList(type='init'){
this.$store.dispatch("call", {
method: 'get',
url: 'approve/procHistory/findTask',
data: {
- page:this.page,
- page_size: this.pageSize,
+ page: type == 'scroll' ? this.donePage : 1,
+ page_size: type == 'scroll' ? this.pageSize : this.donePage * this.pageSize,
proc_def_name: this.approvalType == 'all' ? '' : this.approvalType,
}
}).then(({data}) => {
let activeId = 0;
- let activeIndex = 0;
- if( this.doneList.length == 0 || this.doneList.length == data.rows.length){
- this.doneList?.map((res)=>{ if(res._active) activeId = res.id })
+ let activeIndex = 0;
+ this.doneTotal = data.total;
+ if( this.doneList.length == 0 || this.doneList.length == data.total){
+ this.doneList?.map((res)=>{ if(res._active) activeId = res.id })
}
- this.doneList = data.rows.map((h,index)=>{
+ let lists = data.rows.map((h,index)=>{
h._active = activeId > 0 ? h.id == activeId : index == 0;
if(h._active) activeIndex = index
+ if(type == 'scroll' && this.doneList.map(item=>{return item.id}).indexOf(h.id) == -1 ){
+ this.doneList.push(h)
+ }
return h;
})
+ if(type != 'scroll'){
+ this.doneList = lists;
+ }
if(this.tabsValue == 'done'){
this.$nextTick(()=>{
this.details = this.doneList[activeIndex] || {}
@@ -429,30 +527,38 @@ export default {
$A.modalError(msg);
}).finally(_ => {
this.loadIng = false;
+ this.doneLoad = false;
});
},
// 获取抄送列表
- getNotifyList(){
+ getNotifyList(type){
this.$store.dispatch("call", {
method: 'get',
url: 'approve/procHistory/findProcNotify',
data: {
- page:this.page,
- page_size: this.pageSize,
+ page: type == 'scroll' ? this.notifyPage : 1,
+ page_size: type == 'scroll' ? this.pageSize : this.notifyPage * this.pageSize,
proc_def_name: this.approvalType == 'all' ? '' : this.approvalType,
}
}).then(({data}) => {
let activeId = 0;
let activeIndex = 0;
+ this.notifyTotal = data.total;
if( this.notifyList.length == 0 || this.notifyList.length == data.rows.length){
this.notifyList?.map((res)=>{ if(res._active) activeId = res.id })
}
- this.notifyList = data.rows.map((h,index)=>{
+ let lists = data.rows.map((h,index)=>{
h._active = activeId > 0 ? h.id == activeId : index == 0;
if(h._active) activeIndex = index
+ if(type == 'scroll' && this.notifyList.map(item=>{return item.id}).indexOf(h.id) == -1 ){
+ this.notifyList.push(h)
+ }
return h;
})
+ if(type != 'scroll'){
+ this.notifyList = lists;
+ }
if(this.tabsValue == 'notify'){
this.$nextTick(()=>{
this.details = this.notifyList[activeIndex] || {}
@@ -462,31 +568,39 @@ export default {
$A.modalError(msg);
}).finally(_ => {
this.loadIng = false;
+ this.notifyLoad = false;
});
},
// 获取我发起的
- getInitiatedList(){
+ getInitiatedList(type){
this.$store.dispatch("call", {
method: 'post',
url: 'approve/process/startByMyselfAll',
data: {
- page: this.page,
- page_size: this.pageSize,
+ page: type == 'scroll' ? this.initiatedPage : 1,
+ page_size: type == 'scroll' ? this.pageSize : this.initiatedPage * this.pageSize,
proc_def_name: this.approvalType == 'all' ? '' : this.approvalType,
state: this.searchState == 'all' ? '' : this.searchState
}
}).then(({data}) => {
let activeId = 0;
let activeIndex = 0;
+ this.initiatedTotal = data.total;
if( this.initiatedList.length == 0 || this.initiatedList.length == data.rows.length){
this.initiatedList?.map((res)=>{ if(res._active) activeId = res.id })
}
- this.initiatedList = data.rows.map((h,index)=>{
+ let lists = data.rows.map((h,index)=>{
h._active = activeId > 0 ? h.id == activeId : index == 0;
if(h._active) activeIndex = index
+ if(type == 'scroll' && this.initiatedList.map(item=>{return item.id}).indexOf(h.id) == -1 ){
+ this.initiatedList.push(h)
+ }
return h;
})
+ if(type != 'scroll'){
+ this.initiatedList = lists;
+ }
if(this.tabsValue == 'initiated'){
this.$nextTick(()=>{
this.details = this.initiatedList[activeIndex] || {}
@@ -496,6 +610,7 @@ export default {
$A.modalError(msg);
}).finally(_ => {
this.loadIng = false;
+ this.initiatedLoad = false;
});
},
@@ -556,7 +671,10 @@ export default {
$A.messageSuccess(msg);
this.addShow = false;
this.$refs.initiateRef.resetFields();
- this.tabsClick();
+ this.tabsValue = 'initiated';
+ this.$nextTick(()=>{
+ this.tabsClick();
+ })
}).catch(({msg}) => {
$A.modalError(msg);
}).finally(_ => {
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index a0b6b0449..d94fc6f7b 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -39,9 +39,21 @@
margin-bottom: 10px;
> div {
+ display: flex;
+ gap: 10px;
+ overflow: hidden;
+ .ivu-select {
+ width: 150px;
+ }
.ivu-dropdown {
margin-right: 8px;
}
+ .load{
+ font-size: 12px;
+ width: 20px;
+ height: 32px;
+ overflow: hidden;
+ }
}
}
@@ -70,6 +82,10 @@
max-width: 100%;
}
+ .load{
+ text-align: center;
+ }
+
.approve-main-list {
display: flex;
flex-direction: column;
From bc5046c04db9658b24bbb487ce2dc58d42289769 Mon Sep 17 00:00:00 2001
From: zzw <2318266924@qq.com>
Date: Fri, 4 Aug 2023 18:14:02 +0800
Subject: [PATCH 08/12] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E9=80=9A?=
=?UTF-8?q?=E4=B9=89=E5=8D=83=E9=97=AE=E6=9C=BA=E5=99=A8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Api/SystemController.php | 18 +++++++++++++++++-
app/Models/UserBot.php | 1 +
app/Tasks/BotReceiveMsgTask.php | 16 ++++++++++++++++
.../manage/setting/components/SystemAibot.vue | 16 ++++++++++++++++
4 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 7f7efd9f1..0150f8fca 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -258,7 +258,9 @@ class SystemController extends AbstractController
'claude_agency',
'wenxin_key',
'wenxin_secret',
- 'wenxin_model'
+ 'wenxin_model',
+ 'qianwen_key',
+ 'qianwen_model'
];
if ($type == 'save') {
@@ -292,6 +294,12 @@ class SystemController extends AbstractController
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
}
}
+ if ($backup['qianwen_key'] != $setting['qianwen_key']) {
+ $botUser = User::botGetOrCreate('ai-qianwen');
+ if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
+ WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
+ }
+ }
}
//
$setting['wenxin_model'] = $setting['wenxin_model'] ?: 'ERNIE-Bot-turbo';
@@ -302,6 +310,14 @@ class SystemController extends AbstractController
}
}
}
+ $setting['qianwen_model'] = $setting['qianwen_model'] ?: 'qwen-v1';
+ if (env("SYSTEM_SETTING") == 'disabled') {
+ foreach ($keys as $item) {
+ if (strlen($setting[$item]) > 12) {
+ $setting[$item] = substr($setting[$item], 0, 4) . str_repeat('*', strlen($setting[$item]) - 8) . substr($setting[$item], -4);
+ }
+ }
+ }
//
return Base::retSuccess('success', $setting ?: json_decode('{}'));
}
diff --git a/app/Models/UserBot.php b/app/Models/UserBot.php
index 2bfe2c626..2c8c62564 100644
--- a/app/Models/UserBot.php
+++ b/app/Models/UserBot.php
@@ -55,6 +55,7 @@ class UserBot extends AbstractModel
'ai-openai' => 'ChatGPT',
'ai-claude' => 'Claude',
'ai-wenxin' => 'Wenxin',
+ 'ai-qianwen' => 'QianWen',
'bot-manager' => '机器人管理',
default => '', // 不是系统机器人时返回空（也可以拿来判断是否是系统机器人）
};
diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php
index bc0061c64..aff4ab207 100644
--- a/app/Tasks/BotReceiveMsgTask.php
+++ b/app/Tasks/BotReceiveMsgTask.php
@@ -417,6 +417,22 @@ class BotReceiveMsgTask extends AbstractTask
$error = 'The client version is low (required version ≥ v0.29.12).';
}
break;
+ // QianWen 机器人
+ case 'ai-qianwen@bot.system':
+ $setting = Base::setting('aibotSetting');
+ $webhookUrl = "{$serverUrl}/ai/qianwen/send";
+ $extras = [
+ 'qianwen_key' => $setting['qianwen_key'],
+ 'qianwen_model' => $setting['qianwen_model'],
+ 'server_url' => $serverUrl,
+ ];
+ if (empty($extras['qianwen_key'])) {
+ $error = 'Robot disabled.';
+ } elseif (in_array($this->client['platform'], ['win', 'mac', 'web'])
+ && !Base::judgeClientVersion("0.29.11", $this->client['version'])) {
+ $error = 'The client version is low (required version ≥ v0.29.12).';
+ }
+ break;
// 其他机器人
default:
$userBot = UserBot::whereBotId($botUser->userid)->first();
diff --git a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue
index af6083208..415c7fccc 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue
@@ -47,6 +47,22 @@
+
+
{{$L('通义千问')}} (Qianwen)
+
+
桂公网安备 45010802000393号
+ 桂ICP备45010802000393号