Skip to content

Commit 82e980c

Browse files
author
张晨曦
committed
Merge branch 'dev-1.2.0_k8s' of https://10.30.90.89:39999/luban/dataspherestudio into dev-1.2.0_k8s
2 parents db2423f + 8b78098 commit 82e980c

File tree

5 files changed

+101
-92
lines changed

5 files changed

+101
-92
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://***REMOVED***:12345/dolphinscheduler',NULL,'http://***REMOVED***:12345/dolphinscheduler','http://***REMOVED***: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

‎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/workflows/module/dispatch/dashboard/index.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ export default {
141141
if (this.daySelected === 1) {
142142
tYear = dd.getFullYear(),
143143
tMonth = dd.getMonth() + 1 > 9 ? dd.getMonth() + 1 : '0' + (dd.getMonth() + 1),
144-
tDay = dd.getDate()
144+
tDay = dd.getDate() > 9 ? dd.getDate() : '0' + dd.getDate()
145145
} else if (this.daySelected === 2) {
146146
dd.setDate(dd.getDate() - 1)
147147
tYear = dd.getFullYear(),
148148
tMonth = dd.getMonth() + 1 > 9 ? dd.getMonth() + 1 : '0' + (dd.getMonth() + 1),
149-
tDay = dd.getDate()
149+
tDay = dd.getDate() > 9 ? dd.getDate() : '0' + dd.getDate()
150150
}
151151
if (this.daySelected) {
152152
this.getMixedBarLineData(`${tYear}-${tMonth}-${tDay}`, (dd) => {
@@ -219,7 +219,7 @@ export default {
219219
res.totalList.forEach(item => {
220220
item.startTime = formatDate(item.startTime)
221221
item.endTime = formatDate(item.endTime)
222-
let curHour = new Date(item.startTime).getHours() + 1
222+
let curHour = new Date(item.startTime).getHours()
223223
objTotal[curHour] = objTotal[curHour] + 1
224224
let curState = item.state
225225
if (curState === 'SUCCESS') {
@@ -249,7 +249,7 @@ export default {
249249
function getFormatDateString(dd) {
250250
let tYear = dd.getFullYear(),
251251
tMonth = dd.getMonth() + 1 > 9 ? dd.getMonth() + 1 : '0' + (dd.getMonth() + 1),
252-
tDay = dd.getDate()
252+
tDay = dd.getDate() > 9 ? dd.getDate() : '0' + dd.getDate()
253253
return `${tYear}-${tMonth}-${tDay}`
254254
}
255255
if (!this.projectName) return

‎web/src/apps/workspace/module/permissions/module/personManagement.vue‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,26 @@
9595
<div class="tableWrap">
9696
<div class="addWrap">
9797
<p>{{ tableTitle }}</p>
98-
<Button type="primary" @click="handleAdd()" icon="md-add">{{
99-
$t("message.permissions.add")
100-
}}</Button>
98+
<Button
99+
v-if="false"
100+
type="primary"
101+
@click="handleAdd()"
102+
icon="md-add"
103+
>{{ $t("message.permissions.add") }}</Button
104+
>
101105
</div>
102106
<Table :columns="columns" :data="userList" :loading="tableLoading">
103107
<template slot-scope="{ row, index }" slot="operation">
104108
<div class="deptName">
105109
<div class="operation" @click="edit(row, index)">
106110
{{ $t("message.permissions.edit") }}
107111
</div>
108-
<Divider type="vertical" />
109-
<div class="operation" @click="modifyPassword(row, index)">
112+
<Divider v-if="false" type="vertical" />
113+
<div
114+
class="operation"
115+
v-if="false"
116+
@click="modifyPassword(row, index)"
117+
>
110118
{{ $t("message.permissions.modifyPassword") }}
111119
</div>
112120
<Divider v-if="false" type="vertical" />
@@ -169,7 +177,7 @@
169177
</div>
170178
<label slot="option-label" slot-scope="{ node }">
171179
<Icon
172-
style="font-size: 16px;margin-right:5px;top: -3px;"
180+
style="font-size: 16px; margin-right: 5px; top: -3px"
173181
:type="
174182
node.isBranch ? 'ios-folder-outline' : 'ios-paper-outline'
175183
"
@@ -325,8 +333,8 @@ export default {
325333
tag === "empty"
326334
? this.$t("message.permissions.passwordEmpty")
327335
: tag === "keyboard"
328-
? this.$t("message.permissions.pwdKeyboardError")
329-
: this.$t("message.permissions.pwdCheckError")
336+
? this.$t("message.permissions.pwdKeyboardError")
337+
: this.$t("message.permissions.pwdCheckError")
330338
)
331339
);
332340
}
@@ -752,7 +760,7 @@ export default {
752760
};
753761
</script>
754762
<style lang="scss" scoped>
755-
@import '@/common/style/variables.scss';
763+
@import "@/common/style/variables.scss";
756764
.container {
757765
width: 100%;
758766
// height: 100%;
@@ -855,7 +863,8 @@ export default {
855863
width: 22px;
856864
@include font-color($light-text-color, $dark-text-color);
857865
}
858-
.folder-label, .foldIcon{
866+
.folder-label,
867+
.foldIcon {
859868
@include font-color($light-text-color, $dark-text-color);
860869
}
861870
.operation {

0 commit comments

Comments
 (0)