Skip to content

Commit a635f7f

Browse files
author
张晨曦
committed
Merge branch 'feature-sprint2' of https://10.30.90.89:39999/luban/dataspherestudio into feature-sprint2
2 parents 6a4a58d + 0a4b625 commit a635f7f

File tree

29 files changed

+408
-174
lines changed

29 files changed

+408
-174
lines changed

‎db/dss_dml.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_
102102
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (13, 'SharpScheduler', '/scheduler', null, null, null, null, '/scheduler', null, 0, '/scheduler', '/scheduler');
103103
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (14, 'CtView', 'http://101.226.23.99:31024/luban/datav/', null, null, null, null, 'http://101.226.23.99:31024/luban/datav/', null, 1, 'http://101.226.23.99:31024/luban/datav/', 'http://101.226.23.99:31024/luban/datav/');
104104
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (15, 'superset', 'http://superset.ctyun.cn:8088/report', 0, 1, null, 0, 'http://superset.ctyun.cn:8088/report', null, 0, 'http://superset.ctyun.cn:8088/report', 'http://superset.ctyun.cn:8088/report/login');
105-
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (16, 'workflow', '/', null, null, null, null, '/', null, 0, '/', '/');
105+
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (16, 'workflow', '/workflow', null, null, null, null, '/workflow', null, 0, '/workflow', '/workflow');
106106
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (17, 'nifi', '/', null, null, null, null, '/', null, 0, '/', '/');
107107
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (18, 'MLP', '/', null, null, null, null, '/', null, 0, '/', '/');
108108
INSERT INTO dss_application (id, name, url, is_user_need_init, level, user_init_url, exists_project_service, project_url, enhance_json, if_iframe, homepage_url, redirect_url) VALUES (19, 'streamis', '/', null, null, null, null, '/', null, 0, '/', '/');
@@ -472,7 +472,7 @@ DELETE FROM dss_appconn;
472472
INSERT INTO `dss_appconn` VALUES (2,'orchestrator-framework',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.orchestrator.DefaultOrchestratorFrameworkAppConn','/opt/dss/dss-appconns/orchestrator-framework','{\"resource\":{\"fileName\":\"orchestrator-framework.zip\",\"resourceId\":\"95a6b56c-bb16-41c7-bb73-6c65fd29ac78\",\"version\":\"v000073\"},\"lastModifiedTime\":1637154970000,\"size\":4212166}'),(3,'workflow',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.workflow.DefaultWorkflowAppConn','/opt/dss/dss-appconns/workflow','{\"resource\":{\"fileName\":\"workflow.zip\",\"resourceId\":\"f9ac5b6c-76cb-4e5e-97b9-a6820c903160\",\"version\":\"v000022\"},\"lastModifiedTime\":1637154970000,\"size\":26744}'),(5,'eventchecker',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.eventchecker.EventCheckerAppConn','/opt/dss/dss-appconns/eventchecker','{\"resource\":{\"fileName\":\"eventchecker.zip\",\"resourceId\":\"8719b185-15db-45d5-8b6d-2b7070b2c1b9\",\"version\":\"v000022\"},\"lastModifiedTime\":1637154970000,\"size\":10722445}'),(6,'datachecker',0,1,NULL,0,NULL,'com.webank.wedatapshere.dss.appconn.datachecker.DataCheckerAppConn','/opt/dss/dss-appconns/datachecker','{\"resource\":{\"fileName\":\"datachecker.zip\",\"resourceId\":\"6ae4329b-65ca-47b3-99cf-1e30b75a5cba\",\"version\":\"v000022\"},\"lastModifiedTime\":1637154969000,\"size\":11772154}'),(7,'dolphinscheduler',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.dolphinscheduler.DolphinSchedulerAppConn','/opt/dss/dss-appconns/dolphinscheduler','{\"resource\":{\"fileName\":\"dolphinscheduler.zip\",\"resourceId\":\"2325c2ee-e68f-4fee-9dfc-d628f2b7262d\",\"version\":\"v000008\"},\"lastModifiedTime\":1637154972000,\"size\":15251697}');
473473

474474
DELETE FROM dss_appconn_instance;
475-
INSERT INTO `dss_appconn_instance` VALUES (1,1,'PROD','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/'),(2,2,'DEV','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104'),(3,3,'DEV','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104'),(4,4,'DEV','http://VISUALIS_IP:VISUALIS_PORT/','','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/dss/visualis/#/projects','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/'),(5,5,'DEV','eventchecker','{\"msg.eventchecker.jdo.option.name\": \"msg\",\"msg.eventchecker.jdo.option.url\": \"EVENTCHECKER_JDBC_URL\",\"msg.eventchecker.jdo.option.username\": \"EVENTCHECKER_JDBC_USERNAME\",\"msg.eventchecker.jdo.option.password\": \"EVENTCHECKER_JDBC_PASSWORD\"}',NULL,NULL),(6,6,'DEV','datachecker','{\"job.datachecker.jdo.option.name\":\"job\",\"job.datachecker.jdo.option.url\":\"DATACHECKER_JOB_JDBC_URL\",\"job.datachecker.jdo.option.username\":\"DATACHECKER_JOB_JDBC_USERNAME\",\"job.datachecker.jdo.option.password\":\"DATACHECKER_JOB_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.name\":\"bdp\",\"bdp.datachecker.jdo.option.url\":\"DATACHECKER_BDP_JDBC_URL\",\"bdp.datachecker.jdo.option.username\":\"DATACHECKER_BDP_JDBC_USERNAME\",\"bdp.datachecker.jdo.option.password\":\"DATACHECKER_BDP_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.login.type\":\"base64\",\"bdp.mask.url\":\"http://BDP_MASK_IP:BDP_MASK_PORT/api/v1/mask-status?\",\"bdp.mask.app.id\":\"wtss\",\"bdp.mask.app.token\":\"20a0ccdfc0\"}',NULL,NULL),(7,7,'DEV','http://10.244.3.32:12345/dolphinscheduler',NULL,'http://10.244.3.32:12345/dolphinscheduler','http://10.244.3.32:12345/dolphinscheduler');
475+
INSERT INTO `dss_appconn_instance` VALUES (1,1,'PROD','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/'),(2,2,'DEV','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104'),(3,3,'DEV','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104'),(4,4,'DEV','http://VISUALIS_IP:VISUALIS_PORT/','','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/dss/visualis/#/projects','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/'),(5,5,'DEV','eventchecker','{\"msg.eventchecker.jdo.option.name\": \"msg\",\"msg.eventchecker.jdo.option.url\": \"EVENTCHECKER_JDBC_URL\",\"msg.eventchecker.jdo.option.username\": \"EVENTCHECKER_JDBC_USERNAME\",\"msg.eventchecker.jdo.option.password\": \"EVENTCHECKER_JDBC_PASSWORD\"}',NULL,NULL),(6,6,'DEV','datachecker','{\"job.datachecker.jdo.option.name\":\"job\",\"job.datachecker.jdo.option.url\":\"DATACHECKER_JOB_JDBC_URL\",\"job.datachecker.jdo.option.username\":\"DATACHECKER_JOB_JDBC_USERNAME\",\"job.datachecker.jdo.option.password\":\"DATACHECKER_JOB_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.name\":\"bdp\",\"bdp.datachecker.jdo.option.url\":\"DATACHECKER_BDP_JDBC_URL\",\"bdp.datachecker.jdo.option.username\":\"DATACHECKER_BDP_JDBC_USERNAME\",\"bdp.datachecker.jdo.option.password\":\"DATACHECKER_BDP_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.login.type\":\"base64\",\"bdp.mask.url\":\"http://BDP_MASK_IP:BDP_MASK_PORT/api/v1/mask-status?\",\"bdp.mask.app.id\":\"wtss\",\"bdp.mask.app.token\":\"20a0ccdfc0\"}',NULL,NULL),(7,7,'DEV','http://dolphinscheduler-api.ns-luban.svc.cluster.local:12345/dolphinscheduler',NULL,'http://dolphinscheduler-api.ns-luban.svc.cluster.local:12345/dolphinscheduler','http://dolphinscheduler-api.ns-luban.svc.cluster.local:12345/dolphinscheduler');
476476

477477

478478
DELETE FROM dss_component_role;

‎dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/restful/DssFrameworkAdminUserController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.webank.wedatasphere.dss.framework.admin.conf.ProjectConf;
1111
import com.webank.wedatasphere.dss.framework.admin.pojo.entity.DssAdminUser;
1212
import com.webank.wedatasphere.dss.framework.admin.service.DssAdminUserService;
13-
import com.webank.wedatasphere.dss.framework.admin.service.LdapService;
13+
//import com.webank.wedatasphere.dss.framework.admin.service.LdapService;
1414
import com.webank.wedatasphere.dss.framework.admin.xml.DssUserMapper;
1515
import org.apache.linkis.server.security.SecurityFilter;
1616
import org.apache.commons.codec.digest.DigestUtils;
@@ -45,8 +45,8 @@
4545
public class DssFrameworkAdminUserController extends BaseController {
4646
@Resource
4747
private DssAdminUserService dssAdminUserService;
48-
@Autowired
49-
private LdapService ldapService;
48+
// @Autowired
49+
// private LdapService ldapService;
5050
@Autowired
5151

5252
DssUserMapper dssUserMapper;
@@ -72,7 +72,7 @@ public TableDataInfo list(@QueryParam("userName") String userName, @QueryParam("
7272
// @PostMapping("/add")
7373
// @POST
7474
// @Path("/add")
75-
@RequestMapping(path ="add", method = RequestMethod.POST)
75+
/* @RequestMapping(path ="add", method = RequestMethod.POST)
7676
7777
public Message add(@Validated @RequestBody DssAdminUser user, @Context HttpServletRequest req
7878
) {
@@ -107,7 +107,7 @@ public Message add(@Validated @RequestBody DssAdminUser user, @Context HttpServl
107107
return Message.error().data("rows", 0).message(exception.getMessage());
108108
}
109109
110-
}
110+
}*/
111111

112112

113113
// @GET
@@ -134,7 +134,7 @@ public Message edit(@Validated @RequestBody DssAdminUser user) {
134134

135135
// @POST
136136
// @Path("/resetPsw")
137-
@RequestMapping(path ="resetPsw", method = RequestMethod.POST)
137+
/* @RequestMapping(path ="resetPsw", method = RequestMethod.POST)
138138
public Message resetPwd(@RequestBody DssAdminUser user) {
139139
try {
140140
PasswordResult passwordResult = PasswordUtils.checkPwd(user.getPassword(), user);
@@ -149,6 +149,6 @@ public Message resetPwd(@RequestBody DssAdminUser user) {
149149
} catch (Exception exception) {
150150
return Message.error().message(exception.getMessage());
151151
}
152-
}
152+
}*/
153153
}
154154

‎dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/WorkspaceMapper.xml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,10 @@
192192
on dss_onestop_user_favorites.menu_application_id = dss_onestop_menu_application.id
193193
join dss_application on dss_application.id = dss_onestop_menu_application.application_id
194194
<where>
195-
dss_onestop_user_favorites.`username` = #{username} and `workspace_id` = #{workspaceId}
196-
or `dss_onestop_user_favorites`.`workspace_id` = -1
197-
<if test="type != null">
198-
AND type = #{type}
199-
</if>
200-
201-
<if test="type = null">
202-
AND type is null
203-
</if>
195+
(dss_onestop_user_favorites.`username` = #{username} and `workspace_id` = #{workspaceId}
196+
or `dss_onestop_user_favorites`.`workspace_id` = -1)
197+
AND type = #{type}
198+
204199
</where>
205200
</select>
206201

@@ -211,13 +206,7 @@
211206
join dss_application on dss_application.id = dss_onestop_menu_application.application_id
212207
<where>
213208
dss_onestop_user_favorites.`username` = #{username} and `workspace_id` = #{workspaceId}
214-
<if test="type != null">
215-
AND type = #{type}
216-
</if>
217-
218-
<if test="type = null">
219-
AND type is null
220-
</if>
209+
AND type = #{type}
221210
</where>
222211
</select>
223212

@@ -235,13 +224,8 @@
235224
menu_application_id = #{applicationId}
236225
AND username = #{username}
237226
AND workspace_id = #{workspaceId}
238-
<if test="type != null">
239227
AND type = #{type}
240-
</if>
241228

242-
<if test="type = null">
243-
AND type is null
244-
</if>
245229

246230
</delete>
247231

‎dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/WorkspaceRestfulApi.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,17 @@ public Message getWorkspaceFavorites(@Context HttpServletRequest req, @PathVaria
137137
String header = req.getHeader("Content-language").trim();
138138
boolean isChinese = "zh-CN".equals(header);
139139
String username = SecurityFilter.getLoginUsername(req);
140-
List<WorkspaceFavoriteVo> favorites = dssWorkspaceService.getWorkspaceFavorites(workspaceId, username, isChinese,type);
140+
List<WorkspaceFavoriteVo> favorites = dssWorkspaceService.getWorkspaceFavorites(workspaceId, username, isChinese,type==null ? "":type);
141+
Set<WorkspaceFavoriteVo> favoriteVos = new HashSet<>(favorites);
142+
return Message.ok().data("favorites", favoriteVos);
143+
}
144+
145+
@RequestMapping(path ="/workspaces/{workspaceId}/components", method = RequestMethod.GET)
146+
public Message getWorkspaceComponent(@Context HttpServletRequest req, @PathVariable("workspaceId") Long workspaceId,@RequestParam(value = "type",required = false) String type) {
147+
String header = req.getHeader("Content-language").trim();
148+
boolean isChinese = "zh-CN".equals(header);
149+
String username = SecurityFilter.getLoginUsername(req);
150+
List<WorkspaceFavoriteVo> favorites = dssWorkspaceService.getWorkspaceFavorites(workspaceId, username, isChinese,type==null ? "":type);
141151
Set<WorkspaceFavoriteVo> favoriteVos = new HashSet<>(favorites);
142152
return Message.ok().data("favorites", favoriteVos);
143153
}
@@ -154,7 +164,7 @@ public Message addFavorite(@Context HttpServletRequest req, @PathVariable("works
154164
String username = SecurityFilter.getLoginUsername(req);
155165
// Long menuApplicationId = json.get("menuApplicationId").getLongValue();
156166
Long menuApplicationId = Long.valueOf(json.get("menuApplicationId"));
157-
String type = json.get("type");
167+
String type = json.get("type") == null ? "":json.get("type");
158168
Long favoriteId = dssWorkspaceService.addFavorite(username, workspaceId, menuApplicationId,type);
159169
return Message.ok().data("favoriteId", favoriteId);
160170
}
@@ -163,7 +173,7 @@ public Message addFavorite(@Context HttpServletRequest req, @PathVariable("works
163173
@RequestMapping(path ="/workspaces/{workspaceId}/favorites/{applicationId}", method = RequestMethod.POST)
164174
public Message deleteFavorite(@Context HttpServletRequest req, @PathVariable("workspaceId") Long workspaceId, @PathVariable("applicationId") Long applicationId,@RequestBody Map<String,String> json) {
165175
String username = SecurityFilter.getLoginUsername(req);
166-
String type = json.get("type");
176+
String type = json.get("type") == null ? "":json.get("type");
167177
Long favoriteId = dssWorkspaceService.deleteFavorite(username, applicationId, workspaceId,type);
168178
return Message.ok().data("favoriteId", favoriteId);
169179
}

‎web/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
VUE_APP_HOST=
22
VUE_APP_MN_CONFIG_PREFIX=
33
VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
4-
VUE_APP_VERSION=v1.2.0
4+
VUE_APP_VERSION=v2.0.1

‎web/.env.development

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
VUE_APP_HOST=http://***REMOVED***:8088
2+
VUE_APP_MN_CONFIG_PREFIX=/api/rest_j/v1/
3+
VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
4+
NODE_ENV=dev
5+
VUE_APP_VERSION=v2.0.1

‎web/.eslintrc.js

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -16,73 +16,73 @@
1616
*/
1717

1818
module.exports = {
19-
root: true,
20-
env: {
21-
node: true
22-
},
23-
extends: [
24-
'eslint:recommended',
25-
'plugin:vue/essential'
19+
root: true,
20+
env: {
21+
node: true
22+
},
23+
extends: ["eslint:recommended", "plugin:vue/essential"],
24+
rules: {
25+
"no-console": process.env.NODE_ENV === "production" ? "error" : "off",
26+
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
27+
"key-spacing": ["error"],
28+
"standard/no-callback-literal": 0,
29+
"handle-callback-err": 0,
30+
"no-return-assign": 0,
31+
eqeqeq: 0,
32+
"comma-dangle": 0,
33+
semi: 0,
34+
"space-before-function-paren": 0,
35+
"keyword-spacing": 0,
36+
"no-useless-escape": 0,
37+
"operator-linebreak": 0,
38+
indent: [
39+
"error",
40+
2,
41+
{
42+
SwitchCase: 1
43+
}
2644
],
27-
rules: {
28-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
29-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
30-
'key-spacing': ['error'],
31-
'standard/no-callback-literal': 0,
32-
'handle-callback-err': 0,
33-
'no-return-assign': 0,
34-
'eqeqeq': 0,
35-
'comma-dangle': 0,
36-
'semi': 0,
37-
'space-before-function-paren': 0,
38-
'keyword-spacing': 0,
39-
'no-useless-escape': 0,
40-
'operator-linebreak': 0,
41-
'indent': [
42-
'error',
43-
2,
44-
{
45-
'SwitchCase': 1
46-
}
47-
],
48-
'no-const-assign': 'warn',
49-
'no-this-before-super': 'warn',
50-
"no-irregular-whitespace": 0,
51-
'no-undef': 2,
52-
'no-unreachable': 'warn',
53-
'no-unused-vars': ['error', { "args": "none" }],
54-
'constructor-super': 'warn',
55-
'valid-typeof': 'warn',
56-
'one-var': 'warn',
57-
'max-len': 'off',
58-
'no-trailing-spaces': 'off',
59-
'require-jsdoc': 'warn',
60-
'camelcase': 'warn',
61-
'no-invalid-this': 'off',
62-
'linebreak-style': 0,
63-
'vue/no-parsing-error': [2, {
64-
'x-invalid-end-tag': false,
65-
'invalid-first-character-of-tag-name': false
66-
}],
67-
'no-tabs': 0,
68-
'vue/require-default-prop': 0,
69-
'vue/component-name-in-template-casing': 0,
70-
'vue/html-closing-bracket-spacing': 0,
71-
'vue/html-closing-bracket-newline': 0,
72-
'vue/singleline-html-element-content-newline': 0,
73-
'vue/multiline-html-element-content-newline': 0,
74-
'vue/attributes-order': 0,
75-
'vue/html-self-closing': 0,
76-
'no-useless-constructor': 0,
77-
'no-mixed-operators': 0,
78-
'no-new-func': 0,
79-
'no-template-curly-in-string': 0,
80-
'no-useless-call': 0,
81-
"one-var": 0,
82-
"camelcase": 0
83-
},
84-
parserOptions: {
85-
"parser": 'babel-eslint',
86-
"sourceType": "module"
87-
}
88-
}
45+
"no-const-assign": "warn",
46+
"no-this-before-super": "warn",
47+
"no-irregular-whitespace": 0,
48+
"no-undef": 2,
49+
"no-unreachable": "warn",
50+
"no-unused-vars": ["error", { args: "none" }],
51+
"constructor-super": "warn",
52+
"valid-typeof": "warn",
53+
"one-var": "warn",
54+
"max-len": "off",
55+
"no-trailing-spaces": "off",
56+
"require-jsdoc": "warn",
57+
camelcase: "warn",
58+
"no-invalid-this": "off",
59+
"linebreak-style": 0,
60+
"vue/no-parsing-error": [
61+
2,
62+
{
63+
"x-invalid-end-tag": false,
64+
"invalid-first-character-of-tag-name": false
65+
}
66+
],
67+
"no-tabs": 0,
68+
"vue/require-default-prop": 0,
69+
"vue/component-name-in-template-casing": 0,
70+
"vue/html-closing-bracket-spacing": 0,
71+
"vue/html-closing-bracket-newline": 0,
72+
"vue/singleline-html-element-content-newline": 0,
73+
"vue/multiline-html-element-content-newline": 0,
74+
"vue/attributes-order": 0,
75+
"vue/html-self-closing": 0,
76+
"no-useless-constructor": 0,
77+
"no-mixed-operators": 0,
78+
"no-new-func": 0,
79+
"no-template-curly-in-string": 0,
80+
"no-useless-call": 0,
81+
"one-var": 0,
82+
camelcase: 0
83+
},
84+
parserOptions: {
85+
parser: "babel-eslint",
86+
sourceType: "module"
87+
}
88+
};

‎web/src/apps/dataGovernance/service/api.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,10 @@ export const getLayersPreset = () =>
240240
* @params {workspaceId}
241241
* @returns Array
242242
*/
243-
export const getLayersCustom = () =>
243+
export const getLayersCustom = (keyword) =>
244244
api.fetch(
245245
`${API_PATH.WAREHOUSE_PATH}layer/subtypes`,
246-
{},
246+
{keyword},
247247
'get'
248248
)
249249

‎web/src/apps/dataGovernance/view/assetsInfo/components/lineage/base_node.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class BaseNode extends Node {
2424
text = `<span id="${opts.options.model.guid}">${opts.options.name}</span>`
2525
util.Hub.$emit('register_click_hive_table', opts.options.model)
2626
}
27+
util.Hub.$emit('register_hover', opts.options.model)
2728
let logoContainer =
2829
$(`<div class="logo-container" title="${opts.options.name}">
2930
<svg class="icon" aria-hidden="true" style="float: left;font-size: 34px;">

0 commit comments

Comments
 (0)