fix：1. okr性能问题修复 2. 解决okr路由自动加上#/ 3.okr日期选择快速 4.okr其他bug修复 5.加强会议功能uid生成逻辑 6.okr打不开修复 7. 应用页面字体大小和布局调整

app/Http/Controllers/Api/UsersController.php

@@ -1180,7 +1180,7 @@ class UsersController extends AbstractController
         }
         $uid = intval(str_pad(Base::generatePassword(4,1), 9, 8, STR_PAD_LEFT));
         if($user){
-            $uid = intval(str_pad(Request::header('fd'), 5, 9, STR_PAD_LEFT).$user->userid);
+            $uid = intval(str_pad(Base::generatePassword(4,1), 5, 9, STR_PAD_LEFT).$user->userid);
         }
         try {
             $service = new AgoraTokenGenerator($meetingSetting['appid'], $meetingSetting['app_certificate'], $meeting->channel, $uid);

docker-compose.yml

@@ -176,7 +176,7 @@ services:
   
   okr:
     container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.0.5"
+    image: "kuaifan/doookr:0.0.6"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       DOO_TASK_URL: "http://${APP_IPPR}.3"

resources/assets/js/components/MicroApps.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="page-microapp">
-        <transition name="microapp-load">
+        <transition name="microapp-load" v-if="showSpin">
             <div class="microapp-load">
-                <Loading />
+                <Loading/>
             </div>
         </transition>
         <micro-app v-if="url && !loading" 
@@ -47,24 +47,31 @@ export default {
             type: String,
             default: ""
         },
-        data:{
+        datas:{
             type: Object,
             default: () => {}
         }
     },
     data() {
         return {
+            showSpin: false,
             loading: false,
             appUrl: '',
-            appData: {}
+            appData: {},
         }
     },
     deactivated() {
     },
     mounted() {
+        this.showSpin = true;
         this.appData = this.getAppData
     },
     watch: {
+        loading(val){
+            if(val){
+                this.showSpin = true;
+            }
+        },
         url(val) {
             this.loading = true;
             this.$nextTick(() => {
@@ -79,7 +86,7 @@ export default {
         path(val) {
             this.appData = { path: val }
         },
-        data: {
+        datas: {
             handler(info) {
                 this.appData = info
             },
@@ -135,18 +142,23 @@ export default {
     methods: {
         handleCreate(e) {
             // 创建前
+            this.showSpin = window.eventCenterForAppNameViteLoad ? false : true
             window.eventCenterForAppNameVite = new EventCenterForMicroApp(this.name)
             this.appData = this.getAppData
         },
         handleBeforeMount(e) {
             // 加载前
+            window.eventCenterForAppNameViteLoad = 1;
         },
         handleMount(e) {
             // 加载完成
-            this.appData = this.data;
+            if(this.datas){
+                this.appData = this.datas;
+            }
             if(this.path){
                 this.appData.path = this.path
             }
+            this.showSpin = false;
         },
         handleUnmount(e) {
             // 卸载

resources/assets/js/microapp.js

@@ -1,9 +1,9 @@
 import microApp from '@micro-zoe/micro-app'
 
 const getUrl = (s) => {
-    let url = $A.apiUrl(s)
+    let url = $A.apiUrl('../' + s)
     if (url.indexOf('http') == -1) {
-        url =  window.location.origin + url
+        url = window.location.origin + url
     }
     return import.meta.env.VITE_OKR_WEB_URL || url;
 }

resources/assets/js/pages/manage.vue

@@ -301,7 +301,7 @@
         <MobileNotification ref="mobileNotification"/>
 
         <!-- okr明细 -->
-        <MicroApps v-show="false" v-if="$route.name != 'manage-apps'" name="okr-details" :url="okrUrl" :data="okrWindow"/>
+        <MicroApps v-show="false" v-if="$route.name != 'manage-apps'" name="okr-details" :url="okrUrl" :datas="okrWindow"/>
     </div>
 </template>
 
@@ -474,7 +474,7 @@ export default {
 
         // okr路由
         okrUrl() {
-            let url = $A.apiUrl("/apps/okr")
+            let url = $A.apiUrl("../apps/okr")
             if (url.indexOf('http') == -1) {
                 url = window.location.origin + url
             }

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

@@ -20,7 +20,7 @@
                             :xs="{ span: 8 }" 
                             :sm="{ span: 8 }" 
                             :lg="{ span: 6 }" 
-                            :xl="{ span: 4 }" 
+                            :xl="{ span: 6 }" 
                             :xxl="{ span: 3 }"
                         >
                             <div class="apply-col">

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

@@ -22,11 +22,11 @@ export default {
     watch: {
         '$route': {
             handler(to) {
+                this.loading = true;
                 if (to.name == 'manage-apps') {
-                    this.loading = true;
                     this.$nextTick(() => {
                         this.loading = false;
-                        let url = $A.apiUrl("/apps/okr")
+                        let url = $A.apiUrl("../apps/okr")
                         if (url.indexOf('http') == -1) {
                             url = window.location.origin + url
                         }

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

@@ -45,10 +45,10 @@
                 margin-bottom: 16px;
 
                 >div {
-                    font-size: 12px;
-                    font-weight: bold;
+                    font-size: 14px;
+                    font-weight: normal;
                     background: #ffffff;
-                    color: #282828;
+                    color: #333333;
                     border-radius: 8px;
                     padding: 14px;
                     display: flex;
@@ -351,6 +351,14 @@ body.window-portrait {
         }
         .apply-content{
             padding: 16px 20px;
+            .apply-col {
+                margin-bottom: 16px;
+    
+                >div {
+                    font-size: 12px;
+                    font-weight: bold;
+                }
+            }
         }
     }
 }