diff --git a/package.json b/package.json
index 91ded8ac2dbc494480da09fe55e105b051e41186..ef2600d643bf90ba412a86e33d61161346fb30bf 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,8 @@
"less": "^4.1.1",
"less-loader": "^9.0.0",
"style-loader": "^2.0.0",
+ "ts-loader": "^9.2.5",
+ "typescript": "^4.4.3",
"url-loader": "^4.1.1",
"vue-loader": "^15.9.7",
"vue-template-compiler": "^2.6.12",
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..84f56612f1a27cb61eff36a7ae198c6a185c30e1
Binary files /dev/null and b/src/.DS_Store differ
diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js
index f167503f452df3cb8a14b88e982b1e42b580c9bd..21b35c349a644e6909cdef84bc6f916c7ebf6579 100644
--- a/src/assets/js/utils.js
+++ b/src/assets/js/utils.js
@@ -400,6 +400,9 @@ export function renderLinkCard(title, item) {
case "2":
content = `${item.url}`;
break;
+ case "3":
+ content = `${item.url}`;
+ break;
default:
content = `
${
diff --git a/src/assets/jupyter-render b/src/assets/jupyter-render
index 8c69391a8fffcfde695c25b951fb0990b1a3fb7a..cd0387cdc3154027e028d924242a064501769db4 160000
--- a/src/assets/jupyter-render
+++ b/src/assets/jupyter-render
@@ -1 +1 @@
-Subproject commit 8c69391a8fffcfde695c25b951fb0990b1a3fb7a
+Subproject commit cd0387cdc3154027e028d924242a064501769db4
diff --git a/src/components/content/components/link-type-select.vue b/src/components/content/components/link-type-select.vue
index eb911a6a6d9c057e2ffc4c093deb1f5aedeecd55..514f291f95213124f8d56d31ef1363e371048cdd 100644
--- a/src/components/content/components/link-type-select.vue
+++ b/src/components/content/components/link-type-select.vue
@@ -67,7 +67,12 @@ export default {
avatar: "",
icon: "lianjie",
nickname: "链接"
- }
+ },
+ {
+ avatar: "",
+ icon: "kapian",
+ nickname: "NoteBook"
+ },
],
selectDisable: false
};
diff --git a/src/components/content/mixins/select-link-type-mixins.js b/src/components/content/mixins/select-link-type-mixins.js
index 48100e483994798051de35ee0e7e867825fc41f4..20ee0767fe00d0ce9f465070210dea0dfce33634 100644
--- a/src/components/content/mixins/select-link-type-mixins.js
+++ b/src/components/content/mixins/select-link-type-mixins.js
@@ -15,6 +15,9 @@ export default {
case 2:
typeStr = linkTypeSpiltStr + "2";
break;
+ case 3:
+ typeStr = linkTypeSpiltStr + "3";
+ break;
default:
break;
}
diff --git a/src/components/header/components/tool-button.vue b/src/components/header/components/tool-button.vue
index 7d7795a06e79335664f3a4aadd669890c1458635..7eb6f2418be4b74bd5be7dcf198af90dd4317467 100644
--- a/src/components/header/components/tool-button.vue
+++ b/src/components/header/components/tool-button.vue
@@ -362,8 +362,7 @@ export default {
&.icon-lianjie {
font-size: 16px;
}
- &.icon-file,
- &.icon-aite {
+ &.icon-file {
font-size: 19px;
}
}
diff --git a/src/main.js b/src/main.js
index d7119ea95e992d915482424a4a83f787266ab8d7..af145662f9b3bdf0b21400623b00b9df28f37c4f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,7 @@ import Vtip from "vtip";
import "vtip/lib/index.min.css";
import { initStyle, setzIndex, isNotEmpty } from "@/assets/js/utils";
import "@/assets/style/global.less";
+import "@/assets/jupyter-render/src/main.ts";
Vue.use(Vtip.directive);
function initMdEditor(obj) {
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..3f3dfa9e52a0702ff3568b092a9fe5c63a14eee1
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,18 @@
+{
+ "compilerOptions": {
+ "target": "esnext",
+ "module": "esnext",
+ "moduleResolution": "node",
+ "strict": true,
+ "jsx": "preserve",
+ "esModuleInterop": true,
+ "sourceMap": true,
+ "lib": ["esnext", "dom"],
+ "plugins": [{ "name": "@vuedx/typescript-plugin-vue" }],
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["src/*"]
+ }
+ },
+ "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+}
diff --git a/webpack.config.js b/webpack.config.js
index f1b9b8855a655e54ac2413e92d6824c20c7a3458..860d29fe8a7153a52ca4a0e50d89092610e9ee71 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,11 +8,11 @@ module.exports = {
},
devServer: {
contentBase: path.resolve(__dirname, "dist"),
- host: 'live.csdn.net',
+ host: "live.csdn.net",
open: true
},
resolve: {
- extensions: [".js", ".vue", ".json"],
+ extensions: [".js", ".ts", ".vue", ".json"],
alias: {
"@": path.resolve(__dirname, "./src")
}
@@ -31,6 +31,14 @@ module.exports = {
{
test: /\.(ttf|woff|png|svg)$/,
loader: "url-loader"
+ },
+ {
+ test: /\.tsx?$/,
+ loader: "ts-loader",
+ exclude: /node_modules/,
+ options: {
+ appendTsSuffixTo: [/\.vue$/]
+ }
}
]
},