From 0bf3020db7368365aab934426c9fe8fc3580f5a7 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 1 Sep 2023 17:37:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1.=20okr=E6=80=A7=E8=83=BD=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=20=202.=20=E8=A7=A3=E5=86=B3okr?=
=?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=87=AA=E5=8A=A8=E5=8A=A0=E4=B8=8A#/=20=20?=
=?UTF-8?q?=20=203.okr=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E5=BF=AB?=
=?UTF-8?q?=E9=80=9F=204.okr=E5=85=B6=E4=BB=96bug=E4=BF=AE=E5=A4=8D=205.?=
=?UTF-8?q?=E5=8A=A0=E5=BC=BA=E4=BC=9A=E8=AE=AE=E5=8A=9F=E8=83=BDuid?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=206.okr=E6=89=93=E4=B8=8D?=
=?UTF-8?q?=E5=BC=80=E4=BF=AE=E5=A4=8D=207.=20=E5=BA=94=E7=94=A8=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E5=92=8C=E5=B8=83?=
=?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Api/UsersController.php | 2 +-
docker-compose.yml | 2 +-
resources/assets/js/components/MicroApps.vue | 24 ++++++++++++++-----
resources/assets/js/microapp.js | 4 ++--
resources/assets/js/pages/manage.vue | 4 ++--
.../assets/js/pages/manage/application.vue | 2 +-
resources/assets/js/pages/manage/apps.vue | 4 ++--
resources/assets/sass/pages/page-apply.scss | 14 ++++++++---
8 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index c1e6d0b12..2f721deaf 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/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);
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d381e263..4e2c03738 100755
--- a/docker-compose.yml
+++ b/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"
diff --git a/resources/assets/js/components/MicroApps.vue b/resources/assets/js/components/MicroApps.vue
index 5caf4c141..ae0fe6966 100644
--- a/resources/assets/js/components/MicroApps.vue
+++ b/resources/assets/js/components/MicroApps.vue
@@ -1,8 +1,8 @@
-
+
-
+
{}
}
},
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) {
// 卸载
diff --git a/resources/assets/js/microapp.js b/resources/assets/js/microapp.js
index 3383d7df9..0dab8e7a9 100644
--- a/resources/assets/js/microapp.js
+++ b/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;
}
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index a06a097fd..e744daedc 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -301,7 +301,7 @@
-
+
diff --git a/resources/assets/js/pages/manage/apps.vue b/resources/assets/js/pages/manage/apps.vue
index f70b9fe15..ca9924980 100644
--- a/resources/assets/js/pages/manage/apps.vue
+++ b/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
}
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index c57989b02..06f41a5a9 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/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;
+ }
+ }
}
}
}
\ No newline at end of file