Merge branch 'main' into ztf-42_zhaoke

ui/src/locales/en-US.ts

@@ -74,12 +74,14 @@ export default {
 
     'interpreter': 'Interpreter',
     'curr_proxy_interpreter': 'Interpreter Of Current Proxy',
+    'curr_proxy': 'Current Proxy',
     'create_interpreter': 'Create Interpreter',
     'edit_interpreter': 'Edit Interpreter',
     'interpreter_path': 'Interpreter Path',
     'script_lang': 'Script Language',
 
     'remote_proxy': 'Remote Proxy',
+    'curr_server': 'Current Server',
     'proxy_desc':  'The execution script will be uploaded to the proxy server(user directory/ztf/proxyExecDir), please deploy the script dependencies to the proxy server in advance',
     'create_remote_proxy': 'Create Remote Proxy',
     'edit_remote_proxy': 'Edit Remote Proxy',

ui/src/locales/zh-CN.ts

@@ -56,7 +56,7 @@ export default {
 
     'zentao_site': '禅道站点',
     'local': '本地',
-    'local_proxy': '本地代理',
+    'local_proxy': '本地节点',
     'site_management': '禅道站点管理',
     'site_num': '{count} 个站点',
     'create_site': '新建站点',
@@ -82,6 +82,7 @@ export default {
 
     'interpreter': '运行环境',
     'curr_proxy_interpreter': '当前节点运行环境',
+    'curr_proxy': '当前执行节点',
     'create_interpreter': '新建运行环境',
     'edit_interpreter': '编辑运行环境',
     'interpreter_path': '可执行文件路径',
@@ -100,6 +101,7 @@ export default {
     'rsa_path': '密钥路径',
 
     'remote_server': '服务器管理',
+    'curr_server': '当前服务器',
     'create_remote_server': '新建服务器',
     'edit_remote_server': '编辑服务器',
     'server_link': '服务器地址',

ui/src/views/proxy/ProxyNav.vue

 <template>
+    <View class="space-left">
+    <View class="title space">{{t('remote_proxy')}}：</View>
     <Button id="proxyMenuToggle"
-            :label="currProxy.id == 0 || currProxy.id == undefined ? t('local_proxy') : currProxy.name"
-            class="rounded border lighten-16"
-            suffix-icon="caret-down"/>
-
+        :label="currProxy.id == 0 || currProxy.id == undefined ? t('local_proxy') : currProxy.name"
+        class="rounded border lighten-16"
+        suffix-icon="caret-down"/>
+    </View>
   <DropdownMenu
       v-if="proxies.length>0"
       toggle="#proxyMenuToggle"

ui/src/views/settings/SettingsModal.vue

@@ -9,6 +9,13 @@
   <div class="site-main space-top space-left space-right">
     <LanguageSettings></LanguageSettings>
 
+    <p class="divider setting-space-top"></p>
+    <div class="t-card-toolbar">
+      <div class="left strong">
+        <span class="space-right">{{ t("curr_server") }} : {{defaultServerName}}</span>
+        <span class="space">{{ t("curr_proxy") }} : {{defaultProxy.name == '' ? t('local_proxy') : defaultProxy.name}}</span>
+      </div>
+    </div>
     <p class="divider setting-space-top"></p>
     <div class="t-card-toolbar">
       <div class="left strong">
@@ -67,32 +74,20 @@
         <span :title="proxyRecord.value.path">{{ proxyRecord.value.name }}</span>
       </template>
       <template #action="proxyRecord">
-        <Button v-if="proxyRecord.value.id!=0" @click="() => handleEditProxy(proxyRecord, record)" class="tab-setting-btn" size="sm">{{
-          t("edit")
-        }}</Button>
-        <Button v-if="proxyRecord.value.id!=0" @click="() => handleRemoveProxy(proxyRecord, record)" class="tab-setting-btn" size="sm"
-          >{{ t("delete") }}
-        </Button>
-        <Button @click="() => handleInterpreterManger(proxyRecord)" class="tab-setting-btn" size="sm"
-          >{{ t("interpreter") }}
-        </Button>
+        <div class="flex-end">
+          <Button v-if="proxyRecord.value.id!=0" @click="() => handleEditProxy(proxyRecord, record)" class="tab-setting-btn" size="sm">{{t("edit")}}</Button>
+          <Button v-if="proxyRecord.value.id!=0" @click="() => handleRemoveProxy(proxyRecord, record)" class="tab-setting-btn" size="sm">{{ t("delete") }}</Button>
+          <Button @click="() => handleInterpreterManger(proxyRecord)" class="tab-setting-btn" size="sm">{{ t("interpreter") }}</Button>
+        </div>
       </template>
     </Table>
       </template>
 
       <template #action="record">
-        <Button v-if="record.value.id" @click="() => handleEditServer(record)" class="tab-setting-btn" size="sm">{{
-          t("edit")
-        }}</Button>
-        <Button v-if="record.value.id" @click="() => handleRemoveServer(record)" class="tab-setting-btn" size="sm"
-          >{{ t("delete") }}
-        </Button>
-        <Button v-if="!record.value.is_default" @click="() => handleSetDefault(record)" class="tab-setting-btn" size="sm"
-          >{{ t("set_default") }}</Button>
-        <Button @click="() => createProxy(record)" class="tab-setting-btn" size="sm">{{
-          t("create_remote_proxy")
-        }}
-        </Button>
+        <Button @click="() => createProxy(record)" class="tab-setting-btn text-align-left" size="sm">{{t("create_remote_proxy")}}</Button>
+        <Button v-if="record.value.id" @click="() => handleEditServer(record)" class="tab-setting-btn" size="sm">{{t("edit")}}</Button>
+        <Button v-if="record.value.id" @click="() => handleRemoveServer(record)" class="tab-setting-btn" size="sm">{{ t("delete") }}</Button>
+        <Button v-if="!record.value.is_default" @click="() => handleSetDefault(record)" class="tab-setting-btn" size="sm">{{ t("set_default") }}</Button>
       </template>
     </Table>
     <p v-else class="empty-tip">
@@ -274,6 +269,7 @@ const showCreateProxyModal = ref(false);
 const showCreateServerModal = ref(false);
 const showInterpreterModal = ref(false);
 const defaultProxy = computed<any>(() => store.state.proxy.currProxy);
+const defaultServerName = ref('')
 
 let languageMap = ref<any>({});
 const getInterpretersA = async () => {
@@ -298,10 +294,12 @@ const list = () => {
       let defaultServerId = 0;
       json.data.forEach(server => {
         if(server.is_default) {
+          defaultServerName.value = server.name
           defaultServerId = server.id;
         }
       });
       json.data.splice(0, 0, {id: 0, path: 'local', name: t('local'), is_default: defaultServerId > 0 ? false : true});
+      defaultServerName.value = defaultServerId > 0 ? defaultServerName.value : t('local');
       remoteServers.value = json.data;
       json.data.forEach((server, index) => {
         listProxy({proxyPath: server.path}).then((proxies) => {
@@ -499,4 +497,13 @@ const interpreterModalClose = () => {
   color: #1890ff;
   border-style: hidden !important;
 }
+.flex-end{
+  display: flex;
+  justify-content: flex-end;
+  flex-wrap: wrap;
+}
+.text-align-left{
+    text-align: left;
+    margin-bottom: 1rem;
+}
 </style>