sync

snltty · Sep 23, 2024 · 9ff74a8 · 9ff74a8
1 parent eaab9c9
commit 9ff74a8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/linker.web/src/views/full/install/Common.vue b/linker.web/src/views/full/install/Common.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="t-c">
         <el-checkbox v-model="state.form.client" label="作为客户端" />
-        <!-- <el-checkbox v-model="state.form.server" label="作为服务端" /> -->
+        <el-checkbox v-model="state.form.server" label="作为服务端" />
     </div>
 </template>
 
@@ -15,8 +15,8 @@ export default {
         const step = inject('step');
         const state =  reactive({
             form: {
-                client:true,//step.value.form.common.client ||  (step.value.json.Common && step.value.json.Common.client) || false,
-                server:false,//step.value.form.common.server ||  (step.value.json.Common && step.value.json.Common.server) || false,
+                client:step.value.form.common.client ||  (step.value.json.Common && step.value.json.Common.client) || true,
+                server:step.value.form.common.server ||  (step.value.json.Common && step.value.json.Common.server) || false,
             }
         });
         const handleValidate = (prevJson) => {

diff --git a/linker.web/src/views/full/install/Index.vue b/linker.web/src/views/full/install/Index.vue
@@ -13,13 +13,13 @@
                     <el-card shadow="never" v-if="step.step == 1">
                         <Common ref="currentDom"></Common>
                     </el-card>
-                    <!-- <el-card shadow="never"  v-if="step.step == 2">
-                        <Server ref="currentDom"></Server>
-                    </el-card> -->
                     <el-card shadow="never"  v-if="step.step == 2">
-                        <Client ref="currentDom"></Client>
+                        <Server ref="currentDom"></Server>
                     </el-card>
                     <el-card shadow="never"  v-if="step.step == 3">
+                        <Client ref="currentDom"></Client>
+                    </el-card>
+                    <el-card shadow="never"  v-if="step.step == 4">
                         <div class="t-c">完成保存后，请重启软件</div>
                     </el-card>
                 </div>
@@ -48,7 +48,7 @@ export default {
         const state = reactive({
             show: globalData.value.config.Common.Install == false,
             steps:['选择模式',
-            // '服务端',
+            '服务端',
             '客户端',
             '完成']
         });

diff --git a/version.txt b/version.txt
@@ -1,5 +1,5 @@
 v1.4.2
-2024-09-24 00:50:43
+2024-09-24 00:52:36
 1. 优化服务器代理穿透，延长UDP超时时间，优化穿透添加逻辑
 2. 当提示端口被占用时，可以稍等一段时间再尝试启动穿透
 3. 优化配置同步