mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-11 18:42:54 +00:00
no message
This commit is contained in:
parent
ae5ccfd775
commit
ec8e144655
@ -2555,7 +2555,7 @@ class UsersController extends AbstractController
|
||||
{
|
||||
User::auth();
|
||||
//
|
||||
$detail = Base::json2array(Request::input('detail'));
|
||||
$detail = Request::input();
|
||||
$detail = array_intersect_key($detail, array_flip([ 'device_name', 'app_brand', 'app_model','app_os']));
|
||||
if (empty($detail)) {
|
||||
return Base::retError('参数错误');
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
:transition-names="[$A.isAndroid() ? '' : `drawer-slide-${transitionName}`, '']"
|
||||
:beforeClose="beforeClose"
|
||||
fullscreen
|
||||
:class-name="modalClass">
|
||||
:class-name="className">
|
||||
<div v-if="isFullscreen" class="overlay-body">
|
||||
<slot/>
|
||||
</div>
|
||||
@ -61,7 +61,10 @@ export default {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
className: {
|
||||
drawerClass: {
|
||||
type: String
|
||||
},
|
||||
modalClass: {
|
||||
type: String
|
||||
},
|
||||
beforeClose: Function
|
||||
@ -87,16 +90,22 @@ export default {
|
||||
transitionName(){
|
||||
return this.isFullscreen ? 'bottom' : this.placement
|
||||
},
|
||||
modalClass() {
|
||||
className() {
|
||||
const array = []
|
||||
if (this.isFullscreen) {
|
||||
return "common-drawer-modal"
|
||||
}
|
||||
if (this.className) {
|
||||
return `common-drawer-overlay ${this.className} ${this.transitionName}`
|
||||
array.push("common-drawer-modal")
|
||||
if (this.modalClass) {
|
||||
array.push(this.modalClass)
|
||||
}
|
||||
} else {
|
||||
return `common-drawer-overlay ${this.transitionName}`
|
||||
array.push("common-drawer-overlay")
|
||||
if (this.drawerClass) {
|
||||
array.push(this.drawerClass)
|
||||
}
|
||||
array.push(this.transitionName)
|
||||
}
|
||||
}
|
||||
return array.join(" ");
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.isFullscreen = this.windowWidth < 500 && this.placement != 'bottom'
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
</Row>
|
||||
|
||||
<!--查看所有项目-->
|
||||
<DrawerOverlay v-model="approvalSettingShow" placement="right" :size="1200">
|
||||
<DrawerOverlay v-model="approvalSettingShow" placement="right" :size="1200">
|
||||
<iframe :src="iframeSrc"></iframe>
|
||||
</DrawerOverlay>
|
||||
|
||||
|
||||
@ -566,7 +566,7 @@
|
||||
<DrawerOverlay
|
||||
v-model="replyListShow"
|
||||
placement="right"
|
||||
class-name="dialog-wrapper-drawer-list"
|
||||
modal-class="dialog-wrapper-modal-list"
|
||||
:size="500">
|
||||
<DialogWrapper
|
||||
v-if="replyListShow"
|
||||
@ -602,7 +602,7 @@
|
||||
<DrawerOverlay
|
||||
v-model="todoViewShow"
|
||||
placement="right"
|
||||
class-name="dialog-wrapper-drawer-list"
|
||||
modal-class="dialog-wrapper-modal-list"
|
||||
:size="500">
|
||||
<div class="dialog-wrapper inde-list">
|
||||
<div class="dialog-nav">
|
||||
|
||||
@ -2467,9 +2467,10 @@ body:not(.window-touch) {
|
||||
}
|
||||
}
|
||||
|
||||
.dialog-wrapper-drawer-list {
|
||||
position: absolute !important;
|
||||
overflow: hidden !important;
|
||||
.dialog-wrapper-modal-list {
|
||||
.ivu-modal-fullscreen {
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes head-box-loading-animation {
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 5596d130c5f73f0b8143a3734261f5d3df0c6410
|
||||
Subproject commit 65c178f6d6994922bd0a9e05ef79c9655a3dbb49
|
||||
Loading…
x
Reference in New Issue
Block a user