sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 23:17:21 +08:00
Code Activity

merge alas

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/packages/renderer/.eslintrc.json
View File

@@ -11,13 +11,10 @@
"parser": "@typescript-eslint/parser",
"ecmaVersion": 12,
"sourceType": "module"
<<<<<<< HEAD
},
"rules": {
/** These rules are disabled because they are incompatible with prettier */
"vue/html-self-closing": "off",
"vue/singleline-html-element-content-newline": "off"
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
}
}

14
webapp/packages/renderer/index.html
View File

@@ -1,5 +1,4 @@
<!DOCTYPE html>
<<<<<<< HEAD
<html
lang="en-US"
id="htmlRoot"
@@ -20,17 +19,4 @@
type="module"
></script>
</body>
=======
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' blob:">
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<title>Alas</title>
</head>
<body>
<div id="app"></div>
<script src="./src/index.ts" type="module"></script>
</body>
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
</html>

32
webapp/packages/renderer/src/App.vue
View File

@@ -1,5 +1,4 @@
<template>
<<<<<<< HEAD
<a-config-provider :locale="locale">
<div
id="app"
@@ -89,35 +88,4 @@ body {
opacity: 0;
transform: translateX(30px);
}
=======
<div id="app">
<app-header></app-header>
<router-view></router-view>
</div>
</template>
<script lang="ts">
import {defineComponent} from 'vue';
import AppHeader from '/@/components/AppHeader.vue'
export default defineComponent({
name: 'App',
components: {
AppHeader
},
});
</script>
<style>
#app {
width: 100vw;
height: 100vh;
overflow: hidden;
}
body {
margin: 0;
padding: 0;
}
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
</style>

27
webapp/packages/renderer/src/components/Alas.vue
View File

@@ -1,5 +1,4 @@
<template>
<<<<<<< HEAD
<iframe
class="alas"
:src="webuiUrl"
@@ -29,30 +28,4 @@ export default defineComponent({
height: 100vh;
overflow: hidden;
}
=======
<iframe class="alas" :src="url"></iframe>
</template>
<script lang="ts">
import {defineComponent} from 'vue';
import {webuiUrl} from '../../../main/src/config';
export default defineComponent({
name: 'Alas',
computed: {
url: function () {
return webuiUrl;
},
},
});
</script>
<style scoped>
.alas {
border-width: 0;
width: 100vw;
height: 100vh;
overflow: hidden;
}
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
</style>

70
webapp/packages/renderer/src/components/AppHeader.vue
View File

@@ -2,7 +2,6 @@
<div class="app-header">
<div class="header-drag"></div>
<div class="header-icon">
<<<<<<< HEAD
<ArrowDownOutlined
class="icon"
@click="trayWin"
@@ -19,18 +18,11 @@
class="icon"
@click="closeWin"
></CloseOutlined>
=======
<ArrowDownOutlined class="icon" @click="trayWin"></ArrowDownOutlined>
<MinusOutlined class="icon" @click="minimizeWin"></MinusOutlined>
<BorderOutlined class="icon" @click="maximizeWin"></BorderOutlined>
<CloseOutlined class="icon" @click="closeWin"></CloseOutlined>
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
</div>
</div>
</template>
<script lang="ts">
<<<<<<< HEAD
import {defineComponent, h} from 'vue';
import {
BorderOutlined,
@@ -133,66 +125,4 @@ export default defineComponent({
padding: 10px;
margin-right: 5px;
}
=======
import {defineComponent} from 'vue';
import {BorderOutlined, CloseOutlined, MinusOutlined, ArrowDownOutlined} from '@ant-design/icons-vue';
const ipcRenderer = require('electron').ipcRenderer;
export default defineComponent({
name: 'AppHeader',
components: {
ArrowDownOutlined,
MinusOutlined,
BorderOutlined,
CloseOutlined,
},
methods: {
trayWin() {
ipcRenderer.send('window-tray');
},
minimizeWin() {
ipcRenderer.send('window-min');
},
maximizeWin() {
ipcRenderer.send('window-max');
},
closeWin() {
ipcRenderer.send('window-close');
},
},
});
</script>
<style scoped>
.app-header {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 51px;
display: flex;
flex-direction: row;
-webkit-app-region: drag;
}
.header-drag {
width: 100%;
height: 100%;
}
.header-icon {
-webkit-app-region: no-drag;
text-align: right;
font-size: 20px;
color: #7c7c7c;
display: flex;
align-items: center;
}
.icon {
padding: 10px;
margin-right: 5px;
}
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
</style>

7
webapp/packages/renderer/src/index.ts
View File

@@ -1,7 +1,6 @@
import {createApp} from 'vue';
import App from '/@/App.vue';
import router from '/@/router';
<<<<<<< HEAD
import {setupI18n} from '/@/locales/setupI18n';
import {setupThemeSetting} from '/@/settings/themeSetting';
import {setupStore} from '/@/store';
@@ -32,9 +31,3 @@ async function bootstrap() {
}
await bootstrap();
=======
createApp(App)
.use(router)
.mount('#app');
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0

4
webapp/packages/renderer/src/router.ts
View File

@@ -2,15 +2,11 @@ import {createRouter, createWebHashHistory} from 'vue-router';
import Alas from '/@/components/Alas.vue';
const routes = [
<<<<<<< HEAD
{path: '/', name: 'Loading', component: () => import('./views/LoadingPage.vue')},
{path: '/Install', name: 'InstallPage', component: () => import('./views/InstallAlas.vue')},
{path: '/Launch', name: 'LaunchPage', component: () => import('./views/Launch.vue')},
{path: '/Import', name: 'ImportConfig', component: () => import('./views/ImportConfig.vue')},
{path: '/Alas', name: 'Alas', component: Alas},
=======
{path: '/', name: 'Alas', component: Alas},
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
];
export default createRouter({

19
webapp/packages/renderer/tsconfig.json
View File

@@ -1,5 +1,4 @@
{
<<<<<<< HEAD
"compilerOptions": {
"module": "esnext",
"target": "esnext",
@@ -20,33 +19,15 @@
},
"lib": ["ESNext", "dom", "dom.iterable"]
},
=======
"extends": "../../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"/@/*": [
"./src/*"
]
},
"lib": ["ESNext", "dom", "dom.iterable"]
},
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"include": [
"src/**/*.vue",
"src/**/*.ts",
"src/**/*.tsx",
"types/**/*.d.ts",
"../../types/**/*.d.ts",
<<<<<<< HEAD
"../../../types/**/*.d.ts",
"./components.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.test.ts"],
"typeRoots": ["../../node_modules/@types/", "./types", "../../../types"]
=======
"../preload/types/electron-api.d.ts"
]
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
}

4
webapp/packages/renderer/types/shims-vue.d.ts vendored
View File

@@ -1,9 +1,5 @@
declare module '*.vue' {
<<<<<<< HEAD
import type {DefineComponent} from 'vue';
=======
import type { DefineComponent } from 'vue';
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
// eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any
const component: DefineComponent<{}, {}, any>;
export default component;

34
webapp/packages/renderer/vite.config.js
View File

@@ -1,7 +1,6 @@
/* eslint-env node */
import {chrome} from '../../electron-vendors.config.json';
<<<<<<< HEAD
import vue from '@vitejs/plugin-vue';
import {renderer} from 'unplugin-auto-expose';
import {join, resolve} from 'node:path';
@@ -21,13 +20,6 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
const PACKAGE_ROOT = __dirname;
const PROJECT_ROOT = join(PACKAGE_ROOT, '../..');
=======
import {join} from 'path';
import {builtinModules} from 'module';
import vue from '@vitejs/plugin-vue';
const PACKAGE_ROOT = __dirname;
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
/**
* @type {import('vite').UserConfig}
@@ -36,7 +28,6 @@ const PACKAGE_ROOT = __dirname;
const config = {
mode: process.env.MODE,
root: PACKAGE_ROOT,
<<<<<<< HEAD
envDir: PROJECT_ROOT,
resolve: {
alias: [
@@ -54,14 +45,6 @@ const config = {
},
],
},
=======
resolve: {
alias: {
'/@/': join(PACKAGE_ROOT, 'src') + '/',
},
},
plugins: [vue()],
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
base: '',
server: {
fs: {
@@ -73,7 +56,6 @@ const config = {
target: `chrome${chrome}`,
outDir: 'dist',
assetsDir: '.',
<<<<<<< HEAD
rollupOptions: {
input: join(PACKAGE_ROOT, 'index.html'),
},
@@ -123,22 +105,6 @@ const config = {
'@arco-design/web-vue/es/locale/lang/ja-jp',
'@arco-design/web-vue/es/locale/lang/zh-tw',
],
=======
terserOptions: {
ecma: 2020,
compress: {
passes: 2,
},
safari10: false,
},
rollupOptions: {
external: [
...builtinModules,
],
},
emptyOutDir: true,
brotliSize: false,
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
},
};