Skip to content

Commit 04a4f35

Browse files
xuechaosxuechaos
authored
Merge pull request #178 from alibaba/0.3.0
0.3.0
2 parents 4ea44f5 + c32fbd9 commit 04a4f35

File tree

118 files changed

+24418
-2069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+24418
-2069
lines changed

‎console/src/main/resources/static/.vscode/settings.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"editor.tabSize": 2,
3+
"editor.formatOnSave": true,
4+
"[javascript]": {
5+
"editor.formatOnSave": true,
6+
"editor.formatOnPaste": false
7+
},
8+
"[javascriptreact]": {
9+
"editor.formatOnSave": true,
10+
"editor.formatOnPaste": false
11+
},
12+
"[typescript]": {
13+
"editor.formatOnSave": true,
14+
"editor.formatOnPaste": false
15+
},
16+
"[typescriptreact]": {
17+
"editor.formatOnSave": true,
18+
"editor.formatOnPaste": false
19+
},
20+
"[html]": {
21+
"editor.formatOnSave": true
22+
}
23+
}
24+

‎console/src/main/resources/static/build.js‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,13 @@ const spawnAsync = (...args) => new Promise((resolve, reject) => {
2626
});
2727

2828
spawnAsync('roadhog', ['build'])
29-
.then(() => {
30-
const _buildDir = path.join(__dirname, buildDir);
31-
if (!fs.statSync(_buildDir).isDirectory()) {
32-
return;
33-
}
34-
let fileList = fs.readdirSync(_buildDir, "utf8");
35-
fileList.forEach((fileName) => {
36-
if (fileName === "." || fileName === "..") {
37-
return;
38-
}
39-
const _buildPath = path.join(buildDir, fileName);
40-
const _targetPath = path.join(targetDir, fileName);
41-
fs.writeFileSync(_targetPath, fs.readFileSync(_buildPath, "utf8"), "utf8");
42-
})
43-
});
29+
.then(() => {
30+
// 复制index.js
31+
const copyFileList = ['index.js', 'index.css'];
32+
copyFileList.forEach((fileName) => {
33+
const _srcFileName = path.join(buildDir, fileName);
34+
const _targetFileName = path.join(targetDir, fileName);
35+
36+
fs.writeFileSync(_targetFileName, fs.readFileSync(_srcFileName, "utf8"), "utf8");
37+
});
38+
});

‎console/src/main/resources/static/i18ndoc.js‎

Lines changed: 0 additions & 1027 deletions
Large diffs are not rendered by default.

‎console/src/main/resources/static/index.html‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,15 @@
2020
<meta http-equiv="X-UA-Compatible" content="ie=edge">
2121
<title>Nacos</title>
2222
<link rel="shortcut icon" href="//www.aliyun.com/favicon.ico" type="image/x-icon" />
23-
<link rel="stylesheet" href="//g.alicdn.com/aliyun/console-base/0.0.18/app.css">
24-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/aliyun/console/1.3.63/styles/bootstrap/bootstrap.css">
25-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/aliyun/console/1.3.63/styles/console1412.css">
26-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/cm/edas/2.132.6/styles/edas/edas.console.css">
23+
<link rel="stylesheet" type="text/css" href="public/css/bootstrap.css">
24+
<link rel="stylesheet" type="text/css" href="public/css/console1412.css">
2725
<!-- 第三方css开始 -->
28-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.css">
29-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/merge.css">
30-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/bootstrap.css">
31-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/cm-design/simpleMVC/public/styles/icons/icon.css">
32-
<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/font-awesome.css">
33-
<link rel="stylesheet" type="text/css" href="index.css">
34-
26+
<link rel="stylesheet" type="text/css" href="public/css/codemirror.css">
27+
<link rel="stylesheet" type="text/css" href="public/css/merge.css">
28+
<link rel="stylesheet" type="text/css" href="public/css/icon.css">
29+
<link rel="stylesheet" type="text/css" href="public/css/font-awesome.css">
3530
<!-- 第三方css结束 -->
36-
<script src="//g.alicdn.com/cm-design/simplemvc-cdn/0.0.67/jquery.js"></script>
37-
<!-- i18nJs开始 -->
38-
<script src="i18ndoc.js"></script>
39-
<!-- i18nJs结束 -->
31+
<link rel="stylesheet" type="text/css" href="index.css">
4032
</head>
4133

4234
<body>
@@ -45,18 +37,18 @@
4537
<div id="other"></div>
4638

4739
<!-- 第三方js开始 -->
48-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.64/naruto/lib/codemirror.js"></script>
49-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/javascript.js"></script>
50-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/xml.js"></script>
51-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.fullscreen.js"></script>
52-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.lint.js"></script>
53-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.lib.json-lint.js"></script>
54-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.json-lint.js"></script>
55-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.lib.clike-lint.js"></script>
56-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/diff_match_patch.js"></script>
57-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/merge.js"></script>
58-
<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/loader.js"></script>
59-
40+
<script src="public/js/jquery.js"></script>
41+
<script src="public/js/codemirror.js"></script>
42+
<script src="public/js/javascript.js"></script>
43+
<script src="public/js/xml.js"></script>
44+
<script src="public/js/codemirror.addone.fullscreen.js"></script>
45+
<script src="public/js/codemirror.addone.lint.js"></script>
46+
<script src="public/js/codemirror.lib.json-lint.js"></script>
47+
<script src="public/js/codemirror.addone.json-lint.js"></script>
48+
<script src="public/js/codemirror.lib.clike-lint.js"></script>
49+
<script src="public/js/diff_match_patch.js"></script>
50+
<script src="public/js/merge.js"></script>
51+
<script src="public/js/loader.js"></script>
6052
<!-- 第三方js结束 -->
6153
<script src="index.js"></script>
6254
</body>

‎console/src/main/resources/static/index.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎console/src/main/resources/static/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
"husky": "^0.12.0",
3232
"roadhog": "^2.0.0"
3333
}
34-
}
34+
}

0 commit comments

Comments
 (0)