Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	frontend/src/views/machine/controlSource/index.vue

frontend/src/config/index.ts

@@ -1,9 +1,9 @@
 // ? 全局默认配置项
 
 // 首页地址（默认）
-// export const HOME_URL: string = "/home/index";
+export const HOME_URL: string = "/home/index";
 
-export const HOME_URL: string = "/machine/controlSource";
+// export const HOME_URL: string = "/machine/controlSource";
 
 // 登录页地址（默认）
 export const LOGIN_URL: string = "/login";

frontend/src/layouts/components/Header/components/Avatar.vue

@@ -1,38 +1,38 @@
 <template>
-  <div class="userInfo">
-    <div class="icon">
-      <Avatar/>
-    </div>
-    <div class="username">
-      {{ username }}
-    </div>
-  </div>
-<!--  <el-dropdown trigger="click">-->
-<!--    <div class="userInfo">  -->
-<!--      <div class="icon">-->
-<!--        <Avatar />-->
-<!--      </div>-->
-<!--      <div class="username">-->
-<!--        {{ username }}-->
-<!--      </div>-->
+<!--  <div class="userInfo">-->
+<!--    <div class="icon">-->
+<!--      <Avatar/>-->
 <!--    </div>-->
-<!--    <template #dropdown>-->
-<!--      <el-dropdown-menu>-->
-<!--        <el-dropdown-item @click="openDialog('infoRef')">-->
-<!--          <el-icon><User /></el-icon>{{ $t("header.personalData") }}-->
-<!--        </el-dropdown-item>-->
-<!--        <el-dropdown-item @click="openDialog('passwordRef')">-->
-<!--          <el-icon><Edit /></el-icon>{{ $t("header.changePassword") }}-->
-<!--        </el-dropdown-item>-->
-<!--        <el-dropdown-item @click="changeMode">-->
-<!--          <el-icon><Edit /></el-icon>{{ $t("header.changeMode") }}-->
-<!--        </el-dropdown-item>-->
-<!--        <el-dropdown-item @click="openDialog('versionRegisterRef')">-->
-<!--          <el-icon><SetUp /></el-icon>{{ $t("header.versionRegister") }}-->
-<!--        </el-dropdown-item>-->
-<!--      </el-dropdown-menu>-->
-<!--    </template>-->
-<!--  </el-dropdown>-->
+<!--    <div class="username">-->
+<!--      {{ username }}-->
+<!--    </div>-->
+<!--  </div>-->
+  <el-dropdown trigger="click">
+    <div class="userInfo">
+      <div class="icon">
+        <Avatar />
+      </div>
+      <div class="username">
+        {{ username }}
+      </div>
+    </div>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item @click="openDialog('infoRef')">
+          <el-icon><User /></el-icon>{{ $t("header.personalData") }}
+        </el-dropdown-item>
+        <el-dropdown-item @click="openDialog('passwordRef')">
+          <el-icon><Edit /></el-icon>{{ $t("header.changePassword") }}
+        </el-dropdown-item>
+        <el-dropdown-item @click="changeMode">
+          <el-icon><Edit /></el-icon>{{ $t("header.changeMode") }}
+        </el-dropdown-item>
+        <el-dropdown-item @click="openDialog('versionRegisterRef')">
+          <el-icon><SetUp /></el-icon>{{ $t("header.versionRegister") }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
   <div class="avatar">
     <img src="@/assets/icons/out_login.svg" alt="avatar" @click="logout" />
   </div>

frontend/src/views/login/components/LoginForm.vue

@@ -6,7 +6,7 @@
       size='large'
   >
     <el-form-item prop='username'>
-      <el-input v-model='loginForm.username' placeholder='用户名' disabled>
+      <el-input v-model='loginForm.username' placeholder='用户名'>
         <template #prefix>
           <el-icon class='el-input__icon'>
             <user />
@@ -21,7 +21,6 @@
           placeholder='密码'
           show-password
           autocomplete='new-password'
-          disabled
       >
         <template #prefix>
           <el-icon class='el-input__icon'>
@@ -88,8 +87,8 @@ const loginRules = reactive({
 
 const loading = ref(false)
 const loginForm = reactive<Login.ReqLoginForm>({
-  username: 'user',
-  password: 'user12345.',
+  username: '',
+  password: '',
 })
 
 // login

frontend/src/views/machine/testSource/components/parameterTable.vue

@@ -6,9 +6,9 @@
         :pagination="false"
         :toolButton="false"
         :data="tableData"
-        :row-key="id"
+        row-key="id"
         :style="{ height: '250px',maxHeight: '400px',overflow:'hidden'}"
-        
+        :expand-row-keys="['0']"
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
@@ -70,6 +70,28 @@ watch(() => props.parameterStr, (newData) => {
   }
 })
 
+const defaultExpandRowKeys =computed(() => {
+ return '548c00d2e4744c38aee938cb08e2ff3b'
+})
+
+const getDefaultKey = (data: any[]) => {
+  if (!data || data.length === 0) {
+    return [];
+  }
+
+  const firstElement = data[0];
+
+  return findFirstLeafNode(firstElement);
+}
+
+const findFirstLeafNode = (node: any): any => {
+  if (!node.children || node.children.length === 0) {
+    return node.id;
+  }
+
+  return findFirstLeafNode(node.children[0]);
+}
+
 const getTableList = () => {
   if (props.parameterStr) {
     originalParameterArr = JSON.parse(props.parameterStr)