diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index ffe558e88..9b0e68fe2 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -224,9 +224,11 @@ export default { this.$store.state.windowLandscape = windowOrientation === 'landscape' this.$store.state.windowPortrait = windowOrientation === 'portrait' - this.$store.state.formLabelClassName = windowWidth > 576 ? '' : 'form-label-weight-bold' - this.$store.state.formLabelPosition = windowWidth > 576 ? 'right' : 'top' - this.$store.state.formLabelWidth = windowWidth > 576 ? 'auto' : '' + this.$store.state.formOptions = { + class: windowWidth > 576 ? '' : 'form-label-weight-bold', + labelPosition: windowWidth > 576 ? 'right' : 'top', + labelWidth: windowWidth > 576 ? 'auto' : '', + } $A.eeuiAppSendMessage({ action: 'windowSize', diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index efeacdc2c..68487fb9b 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -211,9 +211,7 @@ ref="addProject" :model="addData" :rules="addRule" - :class="formLabelClassName" - :labelPosition="formLabelPosition" - :labelWidth="formLabelWidth" + v-bind="formOptions" @submit.native.prevent> @@ -256,7 +254,7 @@ v-model="createGroupShow" :title="$L('创建群组')" :mask-closable="false"> -
+ @@ -536,9 +534,7 @@ export default { 'okrWindow', - 'formLabelPosition', - 'formLabelWidth', - 'formLabelClassName' + 'formOptions' ]), ...mapGetters(['dashboardTask']), diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index e8654cfae..e5dc362b6 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -188,7 +188,7 @@ - + @@ -255,7 +255,7 @@ export default { }, }, computed: { - ...mapState(['formLabelPosition', 'formLabelWidth', 'formLabelClassName']), + ...mapState(['formOptions']), isShowAgreeBtn() { return (this.datas.candidate || '').split(',').indexOf(this.userId + '') != -1 && !this.datas.is_finished diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index 1661d7e13..8d6078b78 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -172,7 +172,7 @@ - + @@ -86,7 +86,7 @@ export default { }, computed: { - ...mapState(['formLabelPosition', 'formLabelWidth', 'formLabelClassName']), + ...mapState(['formOptions']), }, methods: { diff --git a/resources/assets/js/pages/manage/components/CheckinExport.vue b/resources/assets/js/pages/manage/components/CheckinExport.vue index 3f88b6477..3b24dc656 100644 --- a/resources/assets/js/pages/manage/components/CheckinExport.vue +++ b/resources/assets/js/pages/manage/components/CheckinExport.vue @@ -3,7 +3,7 @@ v-model="show" :title="$L('导出签到数据')" :mask-closable="false"> - +
{{$L('每次最多选择导出100个成员')}}
@@ -93,7 +93,7 @@ export default { }, computed: { - ...mapState(['formLabelPosition', 'formLabelWidth', 'formLabelClassName']), + ...mapState(['formOptions']), }, methods: { diff --git a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue index 60f4d9c28..a10eea4cf 100644 --- a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue +++ b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue @@ -39,7 +39,7 @@ v-model="addShow" :title="$L('添加群成员')" :mask-closable="false"> - +
{{$L('此操作仅加入群成员并不会加入部门')}}
@@ -86,7 +86,7 @@ export default { }, computed: { - ...mapState(['cacheDialogs', 'cacheUserBasic', 'userIsAdmin', 'formLabelPosition', 'formLabelWidth', 'formLabelClassName']), + ...mapState(['cacheDialogs', 'cacheUserBasic', 'userIsAdmin', 'formOptions']), dialogData() { return this.cacheDialogs.find(({id}) => id == this.dialogId) || {}; diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 64727d4de..b6db1b0ae 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -401,7 +401,7 @@ v-model="modifyShow" :title="$L('修改资料')" :mask-closable="false"> - + {{$L(`正在修改系统机器人:${modifyData.system_name}`)}} @@ -515,7 +515,7 @@ v-model="todoSettingShow" :title="$L('设置待办')" :mask-closable="false"> - + {{$L('所有成员')}} @@ -573,7 +573,7 @@ v-model="groupTransferShow" :title="$L('转让群主身份')" :mask-closable="false"> - + @@ -886,9 +886,7 @@ export default { 'keyboardType', 'keyboardHeight', 'safeAreaBottom', - 'formLabelPosition', - 'formLabelWidth', - 'formLabelClassName' + 'formOptions' ]), ...mapGetters(['isLoad']), diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index e6b6b0d86..2acfd173b 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -6,7 +6,7 @@ :title="$L(addData.type === 'join' ? '加入会议' : '新会议')" :mask-closable="false" :closable="!addData.sharekey"> - +