fix: 增加默认展开参数

Author: sazima

config_c.json

@@ -1,8 +1,7 @@
 {
   "server": {
-    "url": "ws://192.168.9.224:18888/websocket_path",
-    "password": "helloworld",
-    "compress": true
+    "url": "ws://127.0.0.1:18888/websocket_path",
+    "password": "helloworld"
   },
   "client_name": "windows10_sql",
   "log_file": "/var/log/nt/nt.log"

config_s.json

@@ -3,6 +3,7 @@
     "password": "helloworld",
     "path": "/websocket_path",
     "log_file": "/var/log/nt/nt.log",
+    "default_expand_all": false,
     "admin": {
         "enable": true,
         "admin_password": "new_password"

context/context_utils.py

@@ -2,6 +2,7 @@
 
 from entity.message.push_config_entity import ClientData
 from entity.server_config_entity import AdminEntity
+from entity.server_config_entity import ServerConfigEntity
 
 c = {}
 
@@ -18,6 +19,8 @@ class ContextUtils:
     _client_name_to_config_in_server = '_client_name_to_config_in_server'
     _nonce_to_timestamp = '_nonce_to_timestamp'
 
+    _server_config = '_server_config'  # 服务端配置
+
     @classmethod
     def get_password(cls) -> str:
         return c.get(cls._password_key)
@@ -97,3 +100,11 @@ def get_nonce_to_time(cls) -> Dict[bytes, int]:
     @classmethod
     def set_nonce_to_time(cls, data:  Dict[bytes, int]):
         c[cls._nonce_to_timestamp] = data
+
+    @classmethod
+    def get_server_config(cls) -> ServerConfigEntity:
+        return c[cls._server_config]
+
+    @classmethod
+    def set_server_config(cls, s: ServerConfigEntity):
+        c[cls._server_config] = s

entity/server_config_entity.py

@@ -21,4 +21,6 @@ class ServerConfigEntity(TypedDict):
     log_file: str
     admin: AdminEntity
 
+    default_expand_all: bool
+
     client_config: Dict[str, List[_ClientEntity]]  # 在服务端配置的

run_server.py

@@ -96,6 +96,7 @@ def main():
     print('github: ', SystemConstant.GITHUB)
     signal.signal(signal.SIGINT, signal_handler)
     server_config = load_config()
+    ContextUtils.set_server_config(server_config)
     ContextUtils.set_cookie_to_time({})
     ContextUtils.set_nonce_to_time({})
     ContextUtils.set_password(server_config['password'])

server/admin_http_handler.py

@@ -79,6 +79,8 @@ async def get(self):
                 return
             online_client_name_list: List[str] = list(MyWebSocketaHandler.client_name_to_handler.keys())
             return_list = []
+            server_config = ContextUtils.get_server_config()
+            expand_all = server_config.get('default_expand_all', False)
             client_name_to_config_list_in_server = ContextUtils.get_client_name_to_config_in_server()
             online_set: Set[str] = set()
             for client_name in online_client_name_list:
@@ -95,6 +97,7 @@ async def get(self):
                     'config_list': config_list,
                     'status': 'online',
                     'version': handler.version,
+                    'expand': expand_all,
                     'can_delete_names': [x['name'] for x in client_name_to_config_list_in_server.get(client_name, [])]
                     # 配置在服务器上的, 可以删除
                 })
@@ -108,6 +111,7 @@ async def get(self):
                     'config_list': config_list,
                     'version': '',
                     'status': 'offline',
+                    'expand': expand_all,
                     'can_delete_names': [x['name'] for x in client_name_to_config_list_in_server.get(client_name, [])]
                 })
             return_list.sort(key=lambda x: x['client_name'])

server/template/ele_index.html

@@ -6,6 +6,7 @@
             :data="tableData"
             medium="medium"
             row-key="client_name"
+            :expand-row-keys="expands"
             style="width: 90%; margin: 0 auto">
         <el-table-column type="expand">
             <template slot-scope="props">
@@ -123,6 +124,7 @@
         delimiters: ['{[', ']}'], // 这句可以指定 {[ ]} 为插值表达式的新符号
         data() {
             return {
+                expands: [],
                 tableData: [{client_name: 'ssh'}],
                 dialogFormVisible: false,
                 formLabelWidth: '120px',
@@ -139,7 +141,7 @@
             }
         },
         mounted() {
-            this.getClientList()
+            this.getClientList(true)
             this.intervalTask = setInterval(this.getClientList, 6000)
         },
         beforeDestroy() {
@@ -217,7 +219,7 @@
 
 
             },
-            getClientList() {
+            getClientList(updateExpand) {
                 var url = window.location.href.split('?')[0] + '/api'
                 axios.get(url, {
                     headers: {token: localStorage.getItem('token')}
@@ -233,6 +235,14 @@
                         }
                     }
                     this.tableData = res.data.data
+                    if (updateExpand) {
+                        this.tableData.forEach(item => {
+                            const {client_name, expand} = item
+                            if (expand) {
+                                this.expands.push(client_name)
+                            }
+                        });
+                    }
                     console.log(this.tableData)
                 }).catch(err => {
                     console.log(err)