Skip to content

Commit

Permalink
fix: header
Browse files Browse the repository at this point in the history
  • Loading branch information
wangsizhu0504 committed Nov 9, 2023
1 parent 722b08d commit 74e0db0
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 232 deletions.
26 changes: 26 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -225,3 +225,29 @@ MIT License
========================================================================

The files under the directory streampark-console/streampark-console-webapp/ without the "Apache License 2.0" License header are provided under the MIT License, from https://github.com/vbenjs/vue-vben-admin

The list of specific documents is as follows

streampark-console/streampark-console-webapp/build/**
streampark-console/streampark-console-webapp/src/components/**
streampark-console/streampark-console-webapp/src/directives/**
streampark-console/streampark-console-webapp/src/logics/**
streampark-console/streampark-console-webapp/src/utils/**
streampark-console/streampark-console-webapp/src/App.vue
streampark-console/streampark-console-webapp/src/main.ts
streampark-console/streampark-console-webapp/src/locales/helper.ts
streampark-console/streampark-console-webapp/src/locales/setupI18n.ts
streampark-console/streampark-console-webapp/src/locales/useLocale.ts
streampark-console/streampark-console-webapp/src/views/base/error-log/**
streampark-console/streampark-console-webapp/src/views/base/exception/**
streampark-console/streampark-console-webapp/src/views/base/lock/**
streampark-console/streampark-console-webapp/src/views/base/redirect/**
streampark-console/streampark-console-webapp/src/enums/**
streampark-console/streampark-console-webapp/src/design/**
streampark-console/streampark-console-webapp/src/hooks/**
streampark-console/streampark-console-webapp/src/layouts/**
streampark-console/streampark-console-webapp/src/router/**
streampark-console/streampark-console-webapp/src/settings/**
streampark-console/streampark-console-webapp/src/store/**
streampark-console/streampark-console-webapp/types/**

Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* Make clicks pass-through */
#nprogress {
pointer-events: none;
Expand Down
21 changes: 2 additions & 19 deletions streampark-console/streampark-console-webapp/src/design/swal2.less
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

.swal2-container {
.api-exception {
font-size: 0.75rem;
Expand Down Expand Up @@ -106,12 +89,12 @@
color: #e1e1e1;
}

.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step ~ .swal2-progress-step {
.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step~.swal2-progress-step {
background: #58585b;
color: #fff;
}

.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step ~ .swal2-progress-step-line {
.swal2-progress-steps .swal2-progress-step.swal2-active-progress-step~.swal2-progress-step-line {
background: #58585b;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

export enum BuildStateEnum {
/** has changed, need rebuild */
NEED_REBUILD = -2,
Expand Down
16 changes: 0 additions & 16 deletions streampark-console/streampark-console-webapp/src/enums/formEnum.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export const enum FormTypeEnum {
Create = 'create',
Edit = 'edit',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

export enum ProjectTypeEnum {
FLINK = 1,
SPARK = 2,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { watch, Ref, unref, ref, computed } from 'vue';
import { until, createEventHook, tryOnUnmounted } from '@vueuse/core';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<script lang="ts" setup name="Github">
import { Tooltip } from 'ant-design-vue';
import Icon from '/@/components/Icon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<script lang="ts" setup name="Slogan">
import { computed } from 'vue';
import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<script lang="ts">
export default {
name: 'UserTeam',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
import FullScreen from './FullScreen.vue';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export const REDIRECT_NAME = 'Redirect';

export const PARENT_LAYOUT_NAME = 'ParentLayout';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// github repo url
export const GITHUB_URL = 'https://github.com/apache/incubator-streampark';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { defineStore } from 'pinia';

interface FlinkApplicationState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,19 @@
-->
<template>
<transition>
<div :class="prefixCls">
<div class="fixed z-index-999999 w-full h-full bg-white [dark]:bg-[#151515]">
<Login sessionTimeout />
</div>
</transition>
</template>
<script lang="ts" setup>
import { onBeforeUnmount, onMounted, ref } from 'vue';
import Login from './Login.vue';
import { useDesign } from '/@/hooks/web/useDesign';
import { useUserStore } from '/@/store/modules/user';
import { usePermissionStore } from '/@/store/modules/permission';
import { useAppStore } from '/@/store/modules/app';
import { PermissionModeEnum } from '/@/enums/appEnum';

const { prefixCls } = useDesign('st-login');
const userStore = useUserStore();
const permissionStore = usePermissionStore();
const appStore = useAppStore();
Expand All @@ -41,29 +39,14 @@
};

onMounted(() => {
// Record the current UserId
userId.value = userStore.getUserInfo?.userId;
console.log('Mounted', userStore.getUserInfo);
});

onBeforeUnmount(() => {
if (userId.value && userId.value !== userStore.getUserInfo.userId) {
// Not the same user is logged in, refresh the entire page to discard the previous user's page state
document.location.reload();
} else if (isBackMode() && permissionStore.getLastBuildMenuTime === 0) {
// In the background permission mode, if the menu is not loaded successfully, the entire page is reloaded. This usually happens when this module is loaded after pressing F5 to refresh the entire page after the session expires
document.location.reload();
}
});
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-st-login';

.@{prefix-cls} {
position: fixed;
z-index: 9999999;
width: 100%;
height: 100%;
background: @component-background;
}
</style>

0 comments on commit 74e0db0

Please sign in to comment.