Przeglądaj źródła

bug fixed and support for properies file type editing (#680)

* make the edit button of the properties file clickable

* bug fixed - Service Management only shows one device status

* bug fixed, the master server cannot be validated at startup because parameters 'masterZNode' are not initialized
Cheko.R 5 lat temu
rodzic
commit
58879c7dcf

+ 3 - 0
escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java

@@ -344,9 +344,12 @@ public abstract class AbstractZKClient {
 		String parentPath = getZNodeParentPath(zkNodeType);
 
 		List<MasterServer> masterServers = new ArrayList<>();
+		int i = 0;
 		for(String path : masterMap.keySet()){
 			MasterServer masterServer = ResInfo.parseHeartbeatForZKInfo(masterMap.get(path));
 			masterServer.setZkDirectory( parentPath + "/"+ path);
+			masterServer.setId(i);
+			i ++;
 			masterServers.add(masterServer);
 		}
 		return masterServers;

+ 1 - 1
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js

@@ -18,6 +18,6 @@
 /**
  * Create file type
  */
-let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql']
+let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties']
 
 export { filtTypeArr }

+ 2 - 1
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js

@@ -28,7 +28,8 @@ const handlerSuffix = {
   '.java': 'textile',
   '.sql': 'sql',
   '.hql': 'sql',
-  '.xml': 'xml'
+  '.xml': 'xml',
+  '.properties': 'textile'
 }