diff --git a/resources/assets/js/components/MicroApps.vue b/resources/assets/js/components/MicroApps.vue index e01f350f3..7da902a57 100644 --- a/resources/assets/js/components/MicroApps.vue +++ b/resources/assets/js/components/MicroApps.vue @@ -103,39 +103,47 @@ export default { ]), appData() { + const {initialData} = this.appConfig; + return { - vues: { + instance: { Vue, store, components: { DialogWrapper, UserSelect, - DatePicker + DatePicker, + }, + options: { + shortcuts: $A.timeOptionShortcuts(), } }, - datas: { - ...this.appConfig.initialData, + initialData: { + ...initialData, + + systemInfo: window.systemInfo, + + isEEUiApp: $A.isEEUiApp, + isElectron: $A.isElectron, + isMainElectron: $A.isMainElectron, + isSubElectron: $A.isSubElectron, - // theme: this.themeName, themeName: this.themeName, languages: { languageList, languageName, - // languageType: languageName, }, userInfo: this.userInfo, userToken: this.userToken, - - electron: this.$Electron, }, - onClose: () => { + handleClose: () => { this.$refs.drawer?.onClose(); }, - nextZIndex: () => { + nextModalIndex: () => { if (typeof window.modalTransferIndex === 'number') { return window.modalTransferIndex++; } diff --git a/resources/assets/js/components/Mobile/Back.vue b/resources/assets/js/components/Mobile/Back.vue index 053369503..e70236703 100644 --- a/resources/assets/js/components/Mobile/Back.vue +++ b/resources/assets/js/components/Mobile/Back.vue @@ -6,7 +6,6 @@