fix: 1. lisence 具体项不对的时候提醒

2. 从日历页面修改任务时间，就算时间不变也提示修改了
3. android滑动返回有问题，会文件页面循环返回
4. SSEClient 连接失败后死循环

language/original-web.txt

@@ -1403,3 +1403,5 @@ APP推送
 请等待打包完成
 选择一个项目查看更多任务
 首页
+无相关数据
+当前环境

language/translate.json

@@ -18511,5 +18511,16 @@
         "de": "Die titelseite.",
         "fr": "La page de couverture",
         "id": "Halaman depan"
+    },
+    {
+        "key": "无相关数据",
+        "zh": "",
+        "zh-CHT": "無相關數據",
+        "en": "No relevant data",
+        "ko": "관련 데이터 없음",
+        "ja": "データはありません",
+        "de": "Es liegen keine daten vor.",
+        "fr": "Aucune donnée disponible",
+        "id": "Tidak ada data yang relevan"
     }
 ]

public/language/web/zh.js

@@ -1 +1 @@
-if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
+if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]

resources/assets/js/components/Mobile/Back.vue

@@ -154,6 +154,7 @@ export default {
                 route: this.$route,
                 callback: (appName, isAccept) => {
                     if(isAccept){
+                        console.log(1)
                         microAppIsAccept = true;
                     }
                 }
@@ -165,18 +166,12 @@ export default {
             if (this.$Modal.removeLast()) {
                 return;
             }
-            if (this.fileFolderId > 0) {
+            if (this.routeName === 'manage-file') {
-                const file = this.fileLists.find(({id, permission}) => id == this.fileFolderId && permission > -1)
+                if (this.fileFolderId == 0) {
-                if (file) {
+                    this.goForward({name: 'manage-application'});
-                    const prevFile = this.fileLists.find(({id, permission}) => id == file.pid && permission > -1)
-                    if (prevFile) {
-                        this.goForward({name: 'manage-file', params: {folderId: prevFile.id, fileId: null}});
                     return;
                 }
             }
-                this.goForward({name: 'manage-file'});
-                return;
-            }
             if (this.routeName === 'manage-messenger') {
                 if (this.$route.params.dialogAction === 'contacts') {
                     if (this.messengerSearchKey.contacts) {

resources/assets/js/pages/manage/calendar.vue

@@ -354,14 +354,15 @@ export default {
         },
 
         onBeforeUpdateSchedule(res) {
-            const changes = res.changes
+            const {changes, schedule} = res;
-            const schedule = res.event
             let data = this.cacheTasks.find(({id}) => id === schedule.id);
             if (!data) {
                 return;
             }
-            console.log(schedule)
+            if(changes?.start?.getTime() == schedule?.start?.getTime() && changes?.end?.getTime() == schedule?.end?.getTime()){
-            if (changes.start || changes.end) {
+                return;
+            }
+            if (changes?.start || changes?.end) {
                 const cal = this.$refs.cal.getInstance();
                 cal.updateSchedule(schedule.id, schedule.calendarId, changes);
                 //

resources/assets/js/pages/manage/components/HomeCalendar.vue

@@ -32,7 +32,7 @@
                                     <div slot="content" v-html="getTimes(data.date)"></div>
                                     <div @click="onDayClick(data)" class="item-day">
                                         <div>{{data.day}}</div>
-                                        <i v-if="isCheck(data)" class="badge"></i>
+                                        <i v-if="data.check" class="badge"></i>
                                     </div>
                                 </ETooltip>
                             </td>
@@ -202,8 +202,8 @@ export default {
         }
     },
     methods: {
-        isCheck(data){
+        isCheck(date){
-            let time = new Date(data.date).getTime()
+            let time = new Date(date).getTime()
             return this.list.find(h=>{
                 if(!h.start_at || !h.end_at){
                     return false;
@@ -238,6 +238,7 @@ export default {
                         future: today.getTime() < curDate.getTime(),
                         month: curMonth == this.month
                     }
+                    array[i][j].check = this.isCheck( array[i][j].date )
                     calcTime += 86400 * 1000
                 }
             }
@@ -394,7 +395,10 @@ export default {
             if (!data) {
                 return;
             }
-            if (changes.start || changes.end) {
+            if(changes?.start?.getTime() == schedule?.start?.getTime() && changes?.end?.getTime() == schedule?.end?.getTime()){
+                return;
+            }
+            if (changes?.start || changes?.end) {
                 const cal = this.$refs.cal.getInstance();
                 cal.updateSchedule(schedule.id, schedule.calendarId, changes);
                 //

resources/assets/js/pages/manage/dashboard.vue

@@ -4,7 +4,7 @@
         <Alert v-if="warningMsg" class="dashboard-warning" type="warning" show-icon>
             <span @click="goForward({name: 'manage-setting-license'})">{{warningMsg}}</span>
         </Alert>
-        <div class="dashboard-wrapper" :style="wrapperStyle">
+        <div class="dashboard-wrapper">
             <div class="dashboard-hello">
                 <span class="tite">{{$L('欢迎您，' + userInfo.nickname)}}</span>
                 <div class="dashboard-search">
@@ -187,12 +187,6 @@ export default {
             return dashboardTask.today_count + dashboardTask.overdue_count + dashboardTask.all_count;
         },
 
-        wrapperStyle({warningMsg}) {
-            return warningMsg ? {
-                'max-height': 'calc(100% - 50px)'
-            } : null
-        },
-
         searchProjectList(){
             if (!this.searchKey){
                 return []

resources/assets/js/pages/manage/project.vue

@@ -31,8 +31,11 @@ export default {
 
         projId() {
             const {projectId} = this.$route.params;
+            if (!this.windowPortrait){
                 return parseInt(/^\d+$/.test(projectId) ? projectId : 0) || this.projectId || 0;
             }
+            return parseInt(/^\d+$/.test(projectId) ? projectId : 0) || 0;
+        }
     },
 
     watch: {

resources/assets/js/pages/manage/setting/license.vue

@@ -4,7 +4,7 @@
             <FormItem label="License" prop="license">
                 <Input v-model="formData.license" type="textarea" :autosize="{minRows: 2,maxRows: 5}" :placeholder="$L('请输入License...')" />
             </FormItem>
-            <FormItem :label="$L('详细信息')">
+            <FormItem>
                 <div class="license-box">
                     <ul v-if="formData.info.sn">
                         <li>
@@ -51,7 +51,6 @@
                                 <Icon class="information" type="ios-information-circle-outline" />
                             </ETooltip>
                         </li>
-                        <li v-for="tip in formData.error" class="warning">{{tip}}</li>
                     </ul>
                     <ul v-else>
                         <li>
@@ -60,6 +59,21 @@
                     </ul>
                 </div>
             </FormItem>
+            <FormItem :label="$L('当前环境')" v-if="formData.error?.length > 0">
+                <div class="license-box">
+                    <ul>
+                        <li>
+                            <em>SN:</em>
+                            <span>{{formData.doo_sn}}</span>
+                        </li>
+                        <li>
+                            <em>MAC:</em>
+                            <span>{{infoJoin(formData.macs)}}</span>
+                        </li>
+                        <li v-for="tip in formData.error" class="warning">{{tip}}</li>
+                    </ul>
+                </div>
+            </FormItem>
         </Form>
         <div class="setting-footer">
             <Button :loading="loadIng > 0" type="primary" @click="submitForm">{{$L('提交')}}</Button>

resources/assets/js/store/utils.js

@@ -127,13 +127,11 @@ export class SSEClient {
                 this._removeAllEvent(type, handler);
                 this.unsunscribe();
             }
-
             if (this.retry > 0) {
+                this.retry--;
                 this.timer = setTimeout(() => {
                     this.subscribe(type, handler);
                 }, this.options.interval);
-            } else {
-                this.retry--;
             }
         };
     }

resources/assets/sass/pages/page-setting.scss

@@ -237,6 +237,7 @@
                 flex: 1;
                 padding: 24px 40px;
                 overflow: auto;
+                padding-bottom: 0;
             }
             .ivu-tabs {
                 flex: 1;